diff options
| author | hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843> | 2013-10-09 17:56:25 +0000 |
|---|---|---|
| committer | hinder <hinder@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843> | 2013-10-09 17:56:25 +0000 |
| commit | 13f3a1c28489d6b4e0b78df1e277073f1a42b2a7 (patch) | |
| tree | 11ceab7b7bb3b83b2fcad8b302fcc1ff650fa679 | |
| parent | eb10d9d14796215db7670011d576523a7c17d182 (diff) | |
Enable and add test for trapezoidal integration method
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Multipole/trunk@97 4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843
| -rw-r--r-- | interface.ccl | 1 | ||||
| -rw-r--r-- | src/integrate.cc | 2 | ||||
| -rw-r--r-- | src/integrate.hh | 2 | ||||
| -rw-r--r-- | src/tests.cc | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/interface.ccl b/interface.ccl index 6c12ff7..74ae269 100644 --- a/interface.ccl +++ b/interface.ccl @@ -17,4 +17,5 @@ CCTK_REAL harmonics type=GF timelevels=1 CCTK_REAL test_integration_convergence_orders type=SCALAR { test_simpson_convergence_order + test_trapezoidal_convergence_order } "Test integration convergence orders" diff --git a/src/integrate.cc b/src/integrate.cc index 90a27d9..1f64c29 100644 --- a/src/integrate.cc +++ b/src/integrate.cc @@ -48,7 +48,7 @@ CCTK_REAL Midpoint2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, C return hx * hy * integrand_sum; } -static CCTK_REAL Trapezoidal2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy) +CCTK_REAL Trapezoidal2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy) { CCTK_REAL integrand_sum = 0.0; int ix = 0, iy = 0; diff --git a/src/integrate.hh b/src/integrate.hh index 168fd2f..85e2abb 100644 --- a/src/integrate.hh +++ b/src/integrate.hh @@ -6,6 +6,8 @@ CCTK_REAL Midpoint2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy); +CCTK_REAL Trapezoidal2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy); + CCTK_REAL Simpson2DIntegral(CCTK_REAL const *f, int nx, int ny, CCTK_REAL hx, CCTK_REAL hy); diff --git a/src/tests.cc b/src/tests.cc index ff5cc0a..09562c2 100644 --- a/src/tests.cc +++ b/src/tests.cc @@ -57,6 +57,7 @@ void Multipole_TestIntegrationConvergence(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; *test_simpson_convergence_order = integration_convergence_order(&Simpson2DIntegral); + *test_trapezoidal_convergence_order = integration_convergence_order(&Trapezoidal2DIntegral); } // void Multipole_TestIntegrate(CCTK_ARGUMENTS) |