[Commits] [svn:einsteintoolkit] Multipole/trunk/ (Rev. 96)

[ian.hinder at aei.mpg.de]

User: hinder
Date: 2013/10/09 12:56 PM

Modified:
 /trunk/
  schedule.ccl
 /trunk/src/
  tests.cc

Log:
 Rename integration convergence test function and run tests only if Multipole::enable_test = yes

File Changes:

Directory: /trunk/src/
======================

File [modified]: tests.cc
Delta lines: +1 -1
===================================================================
--- trunk/src/tests.cc	2013-10-09 17:56:08 UTC (rev 95)
+++ trunk/src/tests.cc	2013-10-09 17:56:16 UTC (rev 96)
@@ -53,7 +53,7 @@
   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);

Directory: /trunk/
==================

File [modified]: schedule.ccl
Delta lines: +8 -6
===================================================================
--- trunk/schedule.ccl	2013-10-09 17:56:08 UTC (rev 95)
+++ trunk/schedule.ccl	2013-10-09 17:56:16 UTC (rev 96)
@@ -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 @@
   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"
+}