From 3c7377e5febe749e4e2b7107d58782b88fedfff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ne=C4=8Dada?= Date: Sat, 21 Mar 2020 21:16:24 +0200 Subject: [PATCH] Update test programs to current API. Former-commit-id: 199c0a0010eea1becce6297186ea06e93c2de6cd --- tests/single_translations_vs_calc.c | 2 +- tests/tbeyn.c | 2 +- tests/tbeyn2.c | 2 +- tests/tbeyn3.c | 2 +- tests/tbeyn_gsl.c | 2 +- tests/test_vswf_translations.c | 2 +- tests/test_vswf_translations_array.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/single_translations_vs_calc.c b/tests/single_translations_vs_calc.c index 6545fae..d64e4c7 100644 --- a/tests/single_translations_vs_calc.c +++ b/tests/single_translations_vs_calc.c @@ -22,7 +22,7 @@ int test_AB_single_vs_array(const qpms_trans_calculator *c, qpms_bessel_t wavety cart3_t kd_cart) { int fails = 0; - sph_t kd_sph = cart2sph(kd_cart); + csph_t kd_sph = sph2csph(cart2sph(kd_cart)); complex double A[ssq(c->nelem)], B[ssq(c->nelem)]; QPMS_ENSURE_SUCCESS(qpms_trans_calculator_get_AB_arrays(c, A, B, c->nelem, 1, kd_sph, false, wavetype)); diff --git a/tests/tbeyn.c b/tests/tbeyn.c index e2f52f4..2cef25b 100644 --- a/tests/tbeyn.c +++ b/tests/tbeyn.c @@ -26,7 +26,7 @@ int main() { beyn_result_t *result = beyn_solve(dim, L, M_function, NULL /*M_inv_Vhat_function*/, NULL /*params*/, - contour, 1e-4, 1e-4); + contour, 1e-4, 1, 1e-4); printf("Found %zd eigenvalues:\n", result->neig); for (size_t i = 0; i < result->neig; ++i) { complex double eig = result->eigval[i]; diff --git a/tests/tbeyn2.c b/tests/tbeyn2.c index 43b37d5..ba787f2 100644 --- a/tests/tbeyn2.c +++ b/tests/tbeyn2.c @@ -45,7 +45,7 @@ int main(int argc, char **argv) { beyn_result_t *result = beyn_solve(dim, L, M_function, NULL /*M_inv_Vhat_function*/, &p /*params*/, - contour, 1e-4, 1e-4); + contour, 1e-4, 1, 1e-4); printf("Found %zd eigenvalues:\n", result->neig); for (size_t i = 0; i < result->neig; ++i) { complex double eig = result->eigval[i]; diff --git a/tests/tbeyn3.c b/tests/tbeyn3.c index 52ede9a..5f7e2ce 100644 --- a/tests/tbeyn3.c +++ b/tests/tbeyn3.c @@ -81,7 +81,7 @@ int main(int argc, char **argv) { beyn_result_t *result = beyn_solve(dim, L, M_function, NULL /*M_inv_Vhat_function*/, &p /*params*/, - contour, 1e-4, 1e-4); + contour, 1e-4, 1, 1e-4); printf("Found %zd eigenvalues:\n", result->neig); for (size_t i = 0; i < result->neig; ++i) { complex double eig = result->eigval[i]; diff --git a/tests/tbeyn_gsl.c b/tests/tbeyn_gsl.c index 9f73b0c..b2dd1d8 100644 --- a/tests/tbeyn_gsl.c +++ b/tests/tbeyn_gsl.c @@ -28,7 +28,7 @@ int main() { beyn_result_gsl_t *result = beyn_solve_gsl(dim, L, M_function, NULL /*M_inv_Vhat_function*/, NULL /*params*/, - contour, 1e-4, 1e-4); + contour, 1e-4, 1, 1e-4); printf("Found %zd eigenvalues:\n", result->neig); for (size_t i = 0; i < result->neig; ++i) { gsl_complex eig = gsl_vector_complex_get(result->eigval, i); diff --git a/tests/test_vswf_translations.c b/tests/test_vswf_translations.c index dc77b5d..5b555bd 100644 --- a/tests/test_vswf_translations.c +++ b/tests/test_vswf_translations.c @@ -114,7 +114,7 @@ int test_sphwave_translation(const qpms_trans_calculator *c, qpms_bessel_t wavet for(qpms_y_t y2 = 0; y2 < nelem; ++y2){ qpms_m_t m2; qpms_l_t l2; qpms_y2mn_p(y2, &m2, &l2); - if(qpms_trans_calculator_get_AB_p(c, &(A[y2]), &(B[y2]), m2, l2, m1, l1, ss, (w1s.r > ss.r) , wavetype)) + if(qpms_trans_calculator_get_AB_p(c, &(A[y2]), &(B[y2]), m2, l2, m1, l1, sph2csph(ss), (w1s.r > ss.r) , wavetype)) abort(); } diff --git a/tests/test_vswf_translations_array.c b/tests/test_vswf_translations_array.c index f330a49..84d3da0 100644 --- a/tests/test_vswf_translations_array.c +++ b/tests/test_vswf_translations_array.c @@ -106,7 +106,7 @@ int test_sphwave_translation(const qpms_trans_calculator *c, qpms_bessel_t wavet complex double A_whole[nelem][nelem], B_whole[nelem][nelem]; if (qpms_trans_calculator_get_AB_arrays(c,(complex double *) A_whole, (complex double *) B_whole, - 1, nelem, ss, (w1s.r > ss.r), wavetype)) abort(); + 1, nelem, sph2csph(ss), (w1s.r > ss.r), wavetype)) abort(); for(qpms_y_t y1 = 0; y1 < nelem; ++y1) { //index of the wave originating in o1 that will be reconstructed in o2