From cd937e73ebcd2072948a8dba5d762d2444467920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ne=C4=8Dada?= Date: Mon, 27 Aug 2018 01:13:37 +0000 Subject: [PATCH] Rename macros for old "ewald-like" sums Former-commit-id: 7ac883fff074a19f3418bf78179d7d7135f3fa41 --- qpms/translations.c | 8 ++++---- qpms/translations.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qpms/translations.c b/qpms/translations.c index 148a2cb..a1ebf70 100644 --- a/qpms/translations.c +++ b/qpms/translations.c @@ -493,7 +493,7 @@ void qpms_trans_calculator_free(qpms_trans_calculator *c) { free(c->A_multipliers); free(c->B_multipliers[0]); free(c->B_multipliers); -#ifdef LATTICESUMS +#ifdef LATTICESUMS_OLD free(c->hct); free(c->legendre0); #endif @@ -905,7 +905,7 @@ qpms_trans_calculator } free(qmaxes); -#ifdef LATTICESUMS +#ifdef LATTICESUMS_OLD c->hct = hankelcoefftable_init(2*lMax+1); c->legendre0 = malloc(gsl_sf_legendre_array_n(2*lMax+1) * sizeof(double)); if (gsl_sf_legendre_array_e(GSL_SF_LEGENDRE_NONE,2*lMax+1, @@ -1149,7 +1149,7 @@ int qpms_trans_calculator_get_AB_arrays(const qpms_trans_calculator *c, } -#ifdef LATTICESUMS +#ifdef LATTICESUMS_OLD int qpms_trans_calculator_get_shortrange_AB_arrays_buf(const qpms_trans_calculator *c, complex double *Adest, complex double *Bdest, @@ -1429,7 +1429,7 @@ int qpms_trans_calculator_get_2DFT_longrange_AB_arrays(const qpms_trans_calculat lrhankel_recpart); } -#endif // LATTICESUMS +#endif // LATTICESUMS_OLD complex double qpms_trans_calculator_get_A_ext(const qpms_trans_calculator *c, diff --git a/qpms/translations.h b/qpms/translations.h index f3f1f98..4dd4709 100644 --- a/qpms/translations.h +++ b/qpms/translations.h @@ -6,7 +6,7 @@ #include #include -#ifdef LATTICESUMS +#ifdef LATTICESUMS_OLD #include "bessels.h" #endif @@ -45,7 +45,7 @@ typedef struct qpms_trans_calculator { // Spherical Bessel function coefficients: // TODO #endif -#ifdef LATTICESUMS +#ifdef LATTICESUMS_OLD complex double *hct; // Hankel function coefficient table double *legendre0; // Zero-argument Legendre functions – this might go outside #ifdef in the end... #endif @@ -91,7 +91,7 @@ int qpms_trans_calculator_get_AB_arrays_ext(const qpms_trans_calculator *c, double kdlj_r, double kdlj_theta, double kdlj_phi, int r_ge_d, int J); -#ifdef LATTICESUMS +#ifdef LATTICESUMS_OLD // Short-range parts of the translation coefficients int qpms_trans_calculator_get_shortrange_AB_p(const qpms_trans_calculator *c, complex double *Adest, complex double *Bdest, @@ -116,7 +116,7 @@ int qpms_trans_calculator_get_2DFT_longrange_AB_arrays(const qpms_trans_calculat size_t deststride, size_t srcstride, sph_t k_sph, qpms_bessel_t J /* Only J=3 valid for now */, qpms_l_t longrange_order_cutoff, unsigned kappa, double cv, double k0); -#endif // LATTICESUMS +#endif // LATTICESUMS_OLD