User: hinder Date: 2013/10/09 12:56 PM
Modified: /trunk/ interface.ccl /trunk/src/ integrate.cc, integrate.hh, tests.cc
Log: Enable and add test for trapezoidal integration method
File Changes:
Directory: /trunk/src/ ======================
File [modified]: integrate.cc Delta lines: +1 -1 =================================================================== --- trunk/src/integrate.cc 2013-10-09 17:56:16 UTC (rev 96) +++ trunk/src/integrate.cc 2013-10-09 17:56:25 UTC (rev 97) @@ -48,7 +48,7 @@ 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;
File [modified]: integrate.hh Delta lines: +2 -0 =================================================================== --- trunk/src/integrate.hh 2013-10-09 17:56:16 UTC (rev 96) +++ trunk/src/integrate.hh 2013-10-09 17:56:25 UTC (rev 97) @@ -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);
File [modified]: tests.cc Delta lines: +1 -0 =================================================================== --- trunk/src/tests.cc 2013-10-09 17:56:16 UTC (rev 96) +++ trunk/src/tests.cc 2013-10-09 17:56:25 UTC (rev 97) @@ -57,6 +57,7 @@ { DECLARE_CCTK_ARGUMENTS; *test_simpson_convergence_order = integration_convergence_order(&Simpson2DIntegral); + *test_trapezoidal_convergence_order = integration_convergence_order(&Trapezoidal2DIntegral); }
// void Multipole_TestIntegrate(CCTK_ARGUMENTS)
Directory: /trunk/ ==================
File [modified]: interface.ccl Delta lines: +1 -0 =================================================================== --- trunk/interface.ccl 2013-10-09 17:56:16 UTC (rev 96) +++ trunk/interface.ccl 2013-10-09 17:56:25 UTC (rev 97) @@ -17,4 +17,5 @@ CCTK_REAL test_integration_convergence_orders type=SCALAR { test_simpson_convergence_order + test_trapezoidal_convergence_order } "Test integration convergence orders"