diff options
| author | hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843> | 2013-10-09 17:56:16 +0000 |
|---|---|---|
| committer | hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843> | 2013-10-09 17:56:16 +0000 |
| commit | eb10d9d14796215db7670011d576523a7c17d182 (patch) | |
| tree | 8fdfbbab5499543ef394319dc9d6e38453e74e9e | |
| parent | b057717283eddba5098ef07264602e367a2e665d (diff) | |
Rename integration convergence test function and run tests only if Multipole::enable_test = yes
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Multipole/trunk@96 4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843
| -rw-r--r-- | schedule.ccl | 14 | ||||
| -rw-r--r-- | src/tests.cc | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/schedule.ccl b/schedule.ccl index d460e0f..328e1de 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -1,10 +1,9 @@ #schedule.ccl for thorn Multipole -STORAGE: test_integration_convergence_orders - if (enable_test) { STORAGE: harmonics[1] + STORAGE: test_integration_convergence_orders } schedule Multipole_Calc at CCTK_ANALYSIS after (calc_np,PsiKadelia,Accelerator_CopyBack) @@ -27,9 +26,12 @@ schedule Multipole_ParamCheck at CCTK_PARAMCHECK OPTIONS: GLOBAL } "Check Multipole parameters" -# # Tests +# Tests -schedule Multipole_TestSimpson at CCTK_PARAMCHECK +if (enable_test) { - LANG: C -} "Test simpson integration method" + schedule Multipole_TestIntegrationConvergence at CCTK_PARAMCHECK + { + LANG: C + } "Test convergence of integration" +} diff --git a/src/tests.cc b/src/tests.cc index 21542d9..ff5cc0a 100644 --- a/src/tests.cc +++ b/src/tests.cc @@ -53,7 +53,7 @@ CCTK_REAL integration_convergence_order(CCTK_REAL (*integration_fn) (const CCTK_ return log10(error1/error2) / log10((CCTK_REAL) n2/n1); } -void Multipole_TestSimpson(CCTK_ARGUMENTS) +void Multipole_TestIntegrationConvergence(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; *test_simpson_convergence_order = integration_convergence_order(&Simpson2DIntegral); |