diff --git a/fitpack/CMakeLists.txt b/fitpack/CMakeLists.txt index 85884cb..00460d3 100644 --- a/fitpack/CMakeLists.txt +++ b/fitpack/CMakeLists.txt @@ -21,7 +21,7 @@ include(FortranCInterface) FortranCInterface_HEADER( FortranCInterface.h MACRO_NAMESPACE "FC_" - SYMBOL_NAMESPACE "FC_" + SYMBOL_NAMESPACE "fitpack_" #SYMBOL_NAMESPACE "" # SYMBOLS ${func_str} SYMBOLS ${func_name} diff --git a/include/mcc/mcc_bsplines.h b/include/mcc/mcc_bsplines.h index 6dfb14e..7475c37 100644 --- a/include/mcc/mcc_bsplines.h +++ b/include/mcc/mcc_bsplines.h @@ -8,147 +8,147 @@ extern "C" { -void FC_GLOBAL(insert, INSERT)(int*, double*, int*, double*, int*, double*, double*, int*, double*, int*, int*); + /* fitting on XY-grid */ -void FC_GLOBAL(surfit, SURFIT)(int* iopt, - // void surfit(int* iopt, - int* m, - double* x, - double* y, - double* z, - double* w, - double* xb, - double* xe, - double* yb, - double* ye, - int* kx, - int* ky, - double* s, - int* nxest, - int* nyest, - int* nmax, - double* eps, - int* nx, - double* tx, - int* ny, - double* ty, - double* c, - double* fp, - double* wrk1, - int* lwrk1, - double* wrk2, - int* lwrk2, - int* iwrk, - int* kwrk, - int* ier); +void fitpack_surfit(int* iopt, + // void surfit(int* iopt, + int* m, + double* x, + double* y, + double* z, + double* w, + double* xb, + double* xe, + double* yb, + double* ye, + int* kx, + int* ky, + double* s, + int* nxest, + int* nyest, + int* nmax, + double* eps, + int* nx, + double* tx, + int* ny, + double* ty, + double* c, + double* fp, + double* wrk1, + int* lwrk1, + double* wrk2, + int* lwrk2, + int* iwrk, + int* kwrk, + int* ier); /* XY-grid */ -void FC_GLOBAL(bispev, BISPEV)(double* tx, - // void bispev(double* tx, - int* nx, - double* ty, - int* ny, - double* c, - int* kx, - int* ky, - double* x, - int* mx, - double* y, - int* my, - double* z, - double* wrk, - int* lwrk, - int* iwrk, - int* kwrk, - int* ier); +void fitpack_bispev(double* tx, + // void bispev(double* tx, + int* nx, + double* ty, + int* ny, + double* c, + int* kx, + int* ky, + double* x, + int* mx, + double* y, + int* my, + double* z, + double* wrk, + int* lwrk, + int* iwrk, + int* kwrk, + int* ier); /* XY-grid */ -void FC_GLOBAL(parder, PARDER)(double* tx, - // void parder(double* tx, - int* nx, - double* ty, - int* ny, - double* c, - int* kx, - int* ky, - int* nux, - int* nuy, - double* x, - int* mx, - double* y, - int* my, - double* z, - double* wrk, - int* lwrk, - int* iwrk, - int* kwrk, - int* ier); +void fitpack_parder(double* tx, + // void parder(double* tx, + int* nx, + double* ty, + int* ny, + double* c, + int* kx, + int* ky, + int* nux, + int* nuy, + double* x, + int* mx, + double* y, + int* my, + double* z, + double* wrk, + int* lwrk, + int* iwrk, + int* kwrk, + int* ier); /* fitting on sphere */ -void FC_GLOBAL(sphere, SPHERE)(int* iopt, - // void sphere(int* iopt, - int* m, - double* teta, - double* phi, - double* r, - double* w, - double* s, - int* ntest, - int* npest, - double* eps, - int* nt, - double* tt, - int* np, - double* tp, - double* c, - double* fp, - double* wrk1, - int* lwrk1, - double* wrk2, - int* lwrk2, - int* iwrk, - int* kwrk, - int* ier); +void fitpack_sphere(int* iopt, + // void sphere(int* iopt, + int* m, + double* teta, + double* phi, + double* r, + double* w, + double* s, + int* ntest, + int* npest, + double* eps, + int* nt, + double* tt, + int* np, + double* tp, + double* c, + double* fp, + double* wrk1, + int* lwrk1, + double* wrk2, + int* lwrk2, + int* iwrk, + int* kwrk, + int* ier); /* calculation for set of points (not grid) */ -void FC_GLOBAL(bispeu, BISPEU)(double* tx, - // void bispeu(double* tx, - int* nx, - double* ty, - int* ny, - double* c, - int* kx, - int* ky, - double* x, - double* y, - double* z, - int* m, - double* wrk, - int* lwrk, - int* ier); +void fitpack_bispeu(double* tx, + // void bispeu(double* tx, + int* nx, + double* ty, + int* ny, + double* c, + int* kx, + int* ky, + double* x, + double* y, + double* z, + int* m, + double* wrk, + int* lwrk, + int* ier); /* calculation for set of points (not grid) */ -void FC_GLOBAL(pardeu, PARDEU)(double* tx, - // void pardeu(double* tx, - int* nx, - double* ty, - int* ny, - double* c, - int* kx, - int* ky, - int* nux, - int* nuy, - double* x, - double* y, - double* z, - int* m, - double* wrk, - int* lwrk, - int* iwrk, - int* kwrk, - int* ier); +void fitpack_pardeu(double* tx, + // void pardeu(double* tx, + int* nx, + double* ty, + int* ny, + double* c, + int* kx, + int* ky, + int* nux, + int* nuy, + double* x, + double* y, + double* z, + int* m, + double* wrk, + int* lwrk, + int* iwrk, + int* kwrk, + int* ier); } @@ -265,15 +265,15 @@ int fitpack_sphere_smooth(const TethaT& tetha, if constexpr (std::ranges::contiguous_range) { auto weight_ptr = const_cast(std::ranges::data(weight)); - FC_GLOBAL(sphere, SPHERE)(&iopt, &m, tetha_ptr, phi_ptr, func_ptr, weight_ptr, &s_par, &nt, &np, &eps, &ntest, - tetha_knots_ptr, &npest, phi_knots_ptr, std::ranges::data(coeffs), &resi2_sum, - wrk1.data(), &lwrk1, wrk2.data(), &lwrk2, iwrk.data(), &kwrk, &res); + fitpack_sphere(&iopt, &m, tetha_ptr, phi_ptr, func_ptr, weight_ptr, &s_par, &nt, &np, &eps, &ntest, + tetha_knots_ptr, &npest, phi_knots_ptr, std::ranges::data(coeffs), &resi2_sum, wrk1.data(), + &lwrk1, wrk2.data(), &lwrk2, iwrk.data(), &kwrk, &res); } else { std::vector weight_vec(m, weight); - FC_GLOBAL(sphere, SPHERE)(&iopt, &m, tetha_ptr, phi_ptr, func_ptr, weight_vec.data(), &s_par, &nt, &np, &eps, - &ntest, tetha_knots_ptr, &npest, phi_knots_ptr, std::ranges::data(coeffs), &resi2_sum, - wrk1.data(), &lwrk1, wrk2.data(), &lwrk2, iwrk.data(), &kwrk, &res); + fitpack_sphere(&iopt, &m, tetha_ptr, phi_ptr, func_ptr, weight_vec.data(), &s_par, &nt, &np, &eps, &ntest, + tetha_knots_ptr, &npest, phi_knots_ptr, std::ranges::data(coeffs), &resi2_sum, wrk1.data(), + &lwrk1, wrk2.data(), &lwrk2, iwrk.data(), &kwrk, &res); } @@ -367,8 +367,8 @@ int fitpack_eval_spl2d_grid(const TXT& tx, auto x_ptr = const_cast(std::ranges::data(x)); auto y_ptr = const_cast(std::ranges::data(y)); - FC_GLOBAL(bispev, BISPEV)(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, x_ptr, &mx, y_ptr, &my, - std::ranges::data(func), wrk.data(), &lwrk, iwrk.data(), &kwrk, &ier); + fitpack_bispev(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, x_ptr, &mx, y_ptr, &my, std::ranges::data(func), + wrk.data(), &lwrk, iwrk.data(), &kwrk, &ier); return ier; } @@ -431,8 +431,8 @@ int fitpack_eval_spl2d(const TXT& tx, int lwrk = kx + ky + 2; std::vector wrk(lwrk); - FC_GLOBAL(bispeu, BISPEU)(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, x_ptr, y_ptr, std::ranges::data(func), - &m, wrk.data(), &lwrk, &ier); + fitpack_bispeu(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, x_ptr, y_ptr, std::ranges::data(func), &m, + wrk.data(), &lwrk, &ier); // bispeu(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, x_ptr, y_ptr, std::ranges::data(func), &m, wrk.data(), // &lwrk, &ier); @@ -538,8 +538,8 @@ int fitpack_parder_spl2d_grid(const TXT& tx, int ier = 0; - FC_GLOBAL(parder, PARDER)(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, &dx, &dy, x_ptr, &mx, y_ptr, &my, - std::ranges::data(pder), wrk.data(), &lwrk, iwrk.data(), &kwrk, &ier); + fitpack_parder(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, &dx, &dy, x_ptr, &mx, y_ptr, &my, + std::ranges::data(pder), wrk.data(), &lwrk, iwrk.data(), &kwrk, &ier); return ier; } @@ -606,8 +606,8 @@ int fitpack_parder_spl2d(const TXT& tx, int kwrk = 2 * m; std::vector iwrk(kwrk); - FC_GLOBAL(pardeu, PARDEU)(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, &dx, &dy, x_ptr, y_ptr, - std::ranges::data(pder), &m, wrk.data(), &lwrk, iwrk.data(), &kwrk, &ier); + fitpack_pardeu(tx_ptr, &ntx, ty_ptr, &nty, coeffs_ptr, &kx, &ky, &dx, &dy, x_ptr, y_ptr, std::ranges::data(pder), + &m, wrk.data(), &lwrk, iwrk.data(), &kwrk, &ier); return ier; }