Commits October 2013

commits@lists.einsteintoolkit.org

8 participants
87 discussions

[Carpet] branch, master, updated. carpet-6-init-375-g1f11d59
by Carpet git repositories 10 Oct '13

10 Oct '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 1f11d59bdc897023e049d16a3e58a18cef2403cc (commit) from 369933761ae450342b1771b561da3796c18c0f6e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1f11d59bdc897023e049d16a3e58a18cef2403cc Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Oct 10 19:19:37 2013 -0400 CycleClock: Do not abort when no good clock is available ----------------------------------------------------------------------- Summary of changes: Carpet/CycleClock/src/clock.cc | 4 ++++ Carpet/CycleClock/src/cycle.cc | 4 ++++ Carpet/CycleClock/src/cycleclock.h | 8 ++++---- 3 files changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-374-g3699337
by Carpet git repositories 10 Oct '13

10 Oct '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 369933761ae450342b1771b561da3796c18c0f6e (commit) from b991b3a287c25a543b5c6bb81273e88d50893e55 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 369933761ae450342b1771b561da3796c18c0f6e Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Oct 10 16:59:41 2013 -0400 Carpet: Make dependency on CycleClock optional ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetLib/configuration.ccl | 4 ++-- Carpet/CarpetLib/interface.ccl | 2 -- Carpet/CarpetLib/src/timestat.hh | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] Multipole/trunk/test/ (Rev. 104)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:57 PM Added: /trunk/test/test_22/ test_midpoint_pi_symmetry..asc /trunk/test/test_simpson/ test_simpson_pi_symmetry..asc /trunk/test/test_trapezoidal/ test_trapezoidal_pi_symmetry..asc Modified: /trunk/test/ test_22.par, test_simpson.par, test_trapezoidal.par Log: Enable tests and add test data for integration symmetries File Changes: Directory: /trunk/test/ ======================= File [modified]: test_22.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_22.par 2013-10-09 17:57:23 UTC (rev 103) +++ trunk/test/test_22.par 2013-10-09 17:57:35 UTC (rev 104) @@ -88,5 +88,5 @@ # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes -CarpetIOASCII::out0d_vars = "Multipole::test_midpoint_convergence_order" +CarpetIOASCII::out0d_vars = "Multipole::test_midpoint_convergence_order Multipole::test_midpoint_pi_symmetry" CarpetIOASCII::out0d_every = 1 File [modified]: test_simpson.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_simpson.par 2013-10-09 17:57:23 UTC (rev 103) +++ trunk/test/test_simpson.par 2013-10-09 17:57:35 UTC (rev 104) @@ -88,5 +88,5 @@ # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes -CarpetIOASCII::out0d_vars = "Multipole::test_simpson_convergence_order" +CarpetIOASCII::out0d_vars = "Multipole::test_simpson_convergence_order Multipole::test_simpson_pi_symmetry" CarpetIOASCII::out0d_every = 1 File [modified]: test_trapezoidal.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_trapezoidal.par 2013-10-09 17:57:23 UTC (rev 103) +++ trunk/test/test_trapezoidal.par 2013-10-09 17:57:35 UTC (rev 104) @@ -88,5 +88,5 @@ # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes -CarpetIOASCII::out0d_vars = "Multipole::test_trapezoidal_convergence_order" +CarpetIOASCII::out0d_vars = "Multipole::test_trapezoidal_convergence_order Multipole::test_trapezoidal_pi_symmetry" CarpetIOASCII::out0d_every = 1 Directory: /trunk/test/test_22/ =============================== File [added]: test_midpoint_pi_symmetry..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_22/test_midpoint_pi_symmetry..asc (rev 0) +++ trunk/test/test_22/test_midpoint_pi_symmetry..asc 2013-10-09 17:57:35 UTC (rev 104) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 -0.0396300132163937 + Directory: /trunk/test/test_simpson/ ==================================== File [added]: test_simpson_pi_symmetry..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_simpson/test_simpson_pi_symmetry..asc (rev 0) +++ trunk/test/test_simpson/test_simpson_pi_symmetry..asc 2013-10-09 17:57:35 UTC (rev 104) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 -2.31397260470599e-16 + Directory: /trunk/test/test_trapezoidal/ ======================================== File [added]: test_trapezoidal_pi_symmetry..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_trapezoidal/test_trapezoidal_pi_symmetry..asc (rev 0) +++ trunk/test/test_trapezoidal/test_trapezoidal_pi_symmetry..asc 2013-10-09 17:57:35 UTC (rev 104) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 2.18788665995926e-16 +

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 103)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:57 PM Modified: /trunk/src/ integrate.cc Log: integrate.cc: Add a comment on the lack of symmetry of the "midpoint" integration method File Changes: Directory: /trunk/src/ ====================== File [modified]: integrate.cc Delta lines: +7 -0 =================================================================== --- trunk/src/integrate.cc 2013-10-09 17:57:15 UTC (rev 102) +++ trunk/src/integrate.cc 2013-10-09 17:57:23 UTC (rev 103) @@ -41,6 +41,13 @@ assert(nx > 0); assert(ny > 0); assert (f); + // This sum should probably exclude the upper end points. As + // currently implemented, it does not naturally map to the "sum of + // areas" definition of the integral, as there is an additional + // contribution from the last term in the sum. This introduces an + // additional first order error to a method which is already only + // first order. + for (iy = 0; iy <= ny; iy++) for (ix = 0; ix <= nx; ix++) integrand_sum += f[idx(ix,iy)];

1 0

[svn:einsteintoolkit] Multipole/trunk/ (Rev. 102)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:57 PM Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ tests.cc Log: Add tests for symmetry of integration It is desirable that integrands with exact pi-antisymmetry integrate to zero; we add measures of this here. This is the case for all but the midpoint method. File Changes: Directory: /trunk/src/ ====================== File [modified]: tests.cc Delta lines: +46 -0 =================================================================== --- trunk/src/tests.cc 2013-10-09 17:57:06 UTC (rev 101) +++ trunk/src/tests.cc 2013-10-09 17:57:15 UTC (rev 102) @@ -40,6 +40,38 @@ return result; } + +static CCTK_REAL test_pi_symmetric_sphere_integral(CCTK_REAL (*integration_fn) (const CCTK_REAL *, int, int, CCTK_REAL, CCTK_REAL)) +{ + const int n = 100; + const int nth = n; + const int nph = n; + const int array_size=(nth+1)*(nph+1); + const CCTK_REAL PI = acos(-1.0); + + CCTK_REAL *f = new CCTK_REAL[array_size]; + + const CCTK_REAL dth = PI/nth; + const CCTK_REAL dph = 2*PI/nph; + + for (int ith = 0; ith <= nth; ith++) + { + for (int iph = 0; iph <= nph; iph++) + { + const int i = Multipole_Index(ith, iph, nth); + + const CCTK_REAL th = ith*dth; + const CCTK_REAL ph = iph*dph; + + f[i] = -(cos(ph)*sqrt(5/PI)*pow(cos(th/2.),3)*sin(th/2.)); + } + } + + const CCTK_REAL result = integration_fn(f, nth, nph, dth, dph); + delete [] f; + return result; +} + CCTK_REAL integration_convergence_order(CCTK_REAL (*integration_fn) (const CCTK_REAL *, int, int, CCTK_REAL, CCTK_REAL)) { const int n1 = 100; @@ -61,6 +93,20 @@ *test_midpoint_convergence_order = integration_convergence_order(&Midpoint2DIntegral); } +void Multipole_TestIntegrationSymmetry(CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + + *test_simpson_pi_symmetry = test_pi_symmetric_sphere_integral(&Simpson2DIntegral); + *test_midpoint_pi_symmetry = test_pi_symmetric_sphere_integral(&Midpoint2DIntegral); + *test_trapezoidal_pi_symmetry = test_pi_symmetric_sphere_integral(&Trapezoidal2DIntegral); + *test_driscollhealy_pi_symmetry = test_pi_symmetric_sphere_integral(&DriscollHealy2DIntegral); + printf("Pi symmetry Simpson integral: %.19g\n", *test_simpson_pi_symmetry); + printf("Pi symmetry midpoint integral: %.19g\n", *test_midpoint_pi_symmetry); + printf("Pi symmetry trapezoidal integral: %.19g\n", *test_trapezoidal_pi_symmetry); + printf("Pi symmetry Driscoll and Healy integral: %.19g\n", *test_driscollhealy_pi_symmetry); +} + // void Multipole_TestIntegrate(CCTK_ARGUMENTS) // { // const int n = 100; Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +8 -0 =================================================================== --- trunk/interface.ccl 2013-10-09 17:57:06 UTC (rev 101) +++ trunk/interface.ccl 2013-10-09 17:57:15 UTC (rev 102) @@ -20,3 +20,11 @@ test_trapezoidal_convergence_order, test_simpson_convergence_order } "Test integration convergence orders" + +CCTK_REAL test_integration_symmetries type=SCALAR +{ + test_midpoint_pi_symmetry, + test_trapezoidal_pi_symmetry, + test_simpson_pi_symmetry, + test_driscollhealy_pi_symmetry +} "Test integration symmetries" File [modified]: schedule.ccl Delta lines: +6 -0 =================================================================== --- trunk/schedule.ccl 2013-10-09 17:57:06 UTC (rev 101) +++ trunk/schedule.ccl 2013-10-09 17:57:15 UTC (rev 102) @@ -4,6 +4,7 @@ { STORAGE: harmonics[1] STORAGE: test_integration_convergence_orders + STORAGE: test_integration_symmetries } schedule Multipole_Calc at CCTK_ANALYSIS after (calc_np,PsiKadelia,Accelerator_CopyBack) @@ -34,4 +35,9 @@ { LANG: C } "Test convergence of integration" + + schedule Multipole_TestIntegrationSymmetry at CCTK_PARAMCHECK + { + LANG: C + } "Test symmetry of integration" }

1 0

[svn:einsteintoolkit] Multipole/trunk/test/test_22/ (Rev. 101)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:57 PM Added: /trunk/test/test_22/ test_midpoint_convergence_order..asc Log: Add midpoint integration method convergence test result File Changes: Directory: /trunk/test/test_22/ =============================== File [added]: test_midpoint_convergence_order..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_22/test_midpoint_convergence_order..asc (rev 0) +++ trunk/test/test_22/test_midpoint_convergence_order..asc 2013-10-09 17:57:06 UTC (rev 101) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 1.00240015248131 +

1 0

[svn:einsteintoolkit] Multipole/trunk/ (Rev. 100)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:56 PM Modified: /trunk/ interface.ccl /trunk/src/ tests.cc /trunk/test/ test_22.par Log: Add midpoint method convergence test File Changes: Directory: /trunk/src/ ====================== File [modified]: tests.cc Delta lines: +1 -0 =================================================================== --- trunk/src/tests.cc 2013-10-09 17:56:47 UTC (rev 99) +++ trunk/src/tests.cc 2013-10-09 17:56:58 UTC (rev 100) @@ -58,6 +58,7 @@ DECLARE_CCTK_ARGUMENTS; *test_simpson_convergence_order = integration_convergence_order(&Simpson2DIntegral); *test_trapezoidal_convergence_order = integration_convergence_order(&Trapezoidal2DIntegral); + *test_midpoint_convergence_order = integration_convergence_order(&Midpoint2DIntegral); } // void Multipole_TestIntegrate(CCTK_ARGUMENTS) Directory: /trunk/test/ ======================= File [modified]: test_22.par Delta lines: +4 -1 =================================================================== --- trunk/test/test_22.par 2013-10-09 17:56:47 UTC (rev 99) +++ trunk/test/test_22.par 2013-10-09 17:56:58 UTC (rev 100) @@ -1,5 +1,5 @@ -ActiveThorns = "CoordBase SymBase Boundary CartGrid3d IOUtil Carpet CarpetLib CarpetInterp AEILocalInterp InitBase Multipole LoopControl" +ActiveThorns = "CoordBase SymBase Boundary CartGrid3d IOUtil Carpet CarpetLib CarpetInterp AEILocalInterp InitBase Multipole LoopControl CarpetIOASCII" ############################################################# # Grid @@ -87,3 +87,6 @@ # CarpetIOASCII::out1d_x = yes # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes + +CarpetIOASCII::out0d_vars = "Multipole::test_midpoint_convergence_order" +CarpetIOASCII::out0d_every = 1 Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +2 -1 =================================================================== --- trunk/interface.ccl 2013-10-09 17:56:47 UTC (rev 99) +++ trunk/interface.ccl 2013-10-09 17:56:58 UTC (rev 100) @@ -16,6 +16,7 @@ CCTK_REAL test_integration_convergence_orders type=SCALAR { + test_midpoint_convergence_order, + test_trapezoidal_convergence_order, test_simpson_convergence_order - test_trapezoidal_convergence_order } "Test integration convergence orders"

1 0

[svn:einsteintoolkit] Multipole/trunk/test/ (Rev. 99)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:56 PM Added: /trunk/test/ test_trapezoidal.par /trunk/test/test_trapezoidal/ mp_harmonic_im_r8.00.ph.asc, mp_harmonic_im_r8.00.th.asc, mp_harmonic_l0_m0_r8.00.asc, mp_harmonic_l1_m-1_r8.00.asc, mp_harmonic_l1_m0_r8.00.asc, mp_harmonic_l1_m1_r8.00.asc, mp_harmonic_l2_m-1_r8.00.asc, mp_harmonic_l2_m-2_r8.00.asc, mp_harmonic_l2_m0_r8.00.asc, mp_harmonic_l2_m1_r8.00.asc, mp_harmonic_l2_m2_r8.00.asc, mp_harmonic_re_r8.00.ph.asc, mp_harmonic_re_r8.00.th.asc, test_trapezoidal_convergence_order..asc Log: Add test for trapezoidal integration method File Changes: Directory: /trunk/test/ ======================= File [added]: test_trapezoidal.par Delta lines: +92 -0 =================================================================== --- trunk/test/test_trapezoidal.par (rev 0) +++ trunk/test/test_trapezoidal.par 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1,92 @@ + +ActiveThorns = "CoordBase SymBase Boundary CartGrid3d IOUtil Carpet CarpetLib CarpetInterp AEILocalInterp InitBase Multipole LoopControl CarpetIOASCII" + +############################################################# +# Grid +############################################################# + +CartGrid3D::type = "coordbase" +CartGrid3D::domain = "full" +CartGrid3D::avoid_origin = "no" + +CoordBase::domainsize = minmax +CoordBase::xmin = -10 +CoordBase::ymin = -10 +CoordBase::zmin = -10 +CoordBase::xmax = 10 +CoordBase::ymax = 10 +CoordBase::zmax = 10 +CoordBase::dx = 0.2 +CoordBase::dy = 0.2 +CoordBase::dz = 0.2 +CoordBase::boundary_size_x_lower = 2 +CoordBase::boundary_size_y_lower = 2 +CoordBase::boundary_size_z_lower = 2 +CoordBase::boundary_shiftout_x_lower = 0 +CoordBase::boundary_shiftout_y_lower = 0 +CoordBase::boundary_shiftout_z_lower = 0 +CoordBase::boundary_size_x_upper = 2 +CoordBase::boundary_size_y_upper = 2 +CoordBase::boundary_size_z_upper = 2 +CoordBase::boundary_shiftout_x_upper = 0 +CoordBase::boundary_shiftout_y_upper = 0 +CoordBase::boundary_shiftout_z_upper = 0 + +############################################################# +# Carpet +############################################################# + +Carpet::ghost_size = 3 +Carpet::domain_from_coordbase = "yes" +Carpet::poison_new_timelevels = "yes" +Carpet::check_for_poison = "no" +CarpetLib::poison_value = 113 +Carpet::init_fill_timelevels = "yes" + +############################################################# +# CarpetLib +############################################################# + +CarpetLib::poison_new_memory = "yes" + +############################################################# +# Cactus +############################################################# + +Cactus::terminate = "iteration" +Cactus::cctk_itlast = 0 + +############################################################# +# Multipole +############################################################# + +Multipole::nradii = 1 +Multipole::radius[0] = 8.0 +Multipole::variables = "Multipole::harmonic_re{sw=-2 cmplx='Multipole::harmonic_im' name='harmonic'}" +Multipole::integration_method = "trapezoidal" + +Multipole::enable_test = "yes" +Multipole::test_l = 2 +Multipole::test_m = 2 +Multipole::out_1d_every = 1 + +############################################################# +# Output +############################################################# + +IO::out_dir = $parfile +IO::out_fileinfo = "none" + +# Enabling 1D output for the test grid functions would be helpful for +# localising any failures but it makes the tests dependent on the +# number of processors, as CarpetIOASCII's output is dependent on +# this. + +# CarpetIOASCII::out1d_vars = "Multipole::harmonics" +# CarpetIOASCII::out1d_every = 1 +# CarpetIOASCII::out1d_x = yes +# CarpetIOASCII::out1d_y = yes +# CarpetIOASCII::out1d_z = yes + +CarpetIOASCII::out0d_vars = "Multipole::test_trapezoidal_convergence_order" +CarpetIOASCII::out0d_every = 1 Directory: /trunk/test/test_trapezoidal/ ======================================== File [added]: mp_harmonic_im_r8.00.ph.asc Delta lines: +104 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_im_r8.00.ph.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_im_r8.00.ph.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1,104 @@ +"Time = 0 +0.000000 5.341621717946576991e-17 +0.062832 0.05908272357625558163 +0.125664 0.1172335976390736084 +0.188496 0.1735357640795202605 +0.251327 0.2271010934402109549 +0.314159 0.2770848541179522506 +0.376991 0.3226990304560694023 +0.439823 0.3632238274429471225 +0.502655 0.3980205224812608522 +0.565487 0.4265400723078277556 +0.628319 0.4483329443869139563 +0.691150 0.4630553007318252146 +0.753982 0.4704749615530876006 +0.816814 0.4704749615530870455 +0.879646 0.4630553007318246594 +0.942478 0.4483329443869139563 +1.005310 0.4265400723078278111 +1.068142 0.3980205224812605191 +1.130973 0.3632238274429472891 +1.193805 0.3226990304560692913 +1.256637 0.2770848541179523616 +1.319469 0.2271010934402110937 +1.382301 0.1735357640795201495 +1.445133 0.1172335976390738305 +1.507964 0.05908272357625565102 +1.570796 -1.080937077952825899e-18 +1.633628 -0.05908272357625524857 +1.696460 -0.1172335976390735945 +1.759292 -0.1735357640795195111 +1.822124 -0.2271010934402106496 +1.884956 -0.2770848541179521396 +1.947787 -0.3226990304560689027 +2.010619 -0.3632238274429472336 +2.073451 -0.3980205224812608522 +2.136283 -0.4265400723078279777 +2.199115 -0.4483329443869139008 +2.261947 -0.4630553007318246594 +2.324779 -0.4704749615530868234 +2.387610 -0.4704749615530867679 +2.450442 -0.4630553007318249925 +2.513274 -0.4483329443869140674 +2.576106 -0.4265400723078281997 +2.638938 -0.3980205224812605191 +2.701770 -0.363223827442946956 +2.764602 -0.3226990304560695133 +2.827433 -0.2770848541179521951 +2.890265 -0.227101093440211288 +2.953097 -0.1735357640795202327 +3.015929 -0.1172335976390740525 +3.078761 -0.05908272357625561633 +3.141593 1.128851862588426379e-16 +3.204425 0.05908272357625510285 +3.267256 0.1172335976390735252 +3.330088 0.1735357640795197331 +3.392920 0.2271010934402107606 +3.455752 0.2770848541179523061 +3.518584 0.3226990304560693468 +3.581416 0.3632238274429465119 +3.644247 0.3980205224812606302 +3.707079 0.4265400723078277001 +3.769911 0.4483329443869141784 +3.832743 0.4630553007318256031 +3.895575 0.4704749615530871565 +3.958407 0.470474961553087101 +4.021239 0.4630553007318254366 +4.084070 0.4483329443869144004 +4.146902 0.4265400723078277556 +4.209734 0.3980205224812608522 +4.272566 0.3632238274429464564 +4.335398 0.3226990304560687917 +4.398230 0.2770848541179524727 +4.461062 0.2271010934402105108 +4.523893 0.1735357640795198719 +4.586725 0.1172335976390739554 +4.649557 0.05908272357625504734 +4.712389 2.284473287243558895e-16 +4.775221 -0.05908272357625498489 +4.838053 -0.1172335976390735807 +4.900885 -0.1735357640795197609 +4.963716 -0.2271010934402110382 +5.026548 -0.2770848541179522506 +5.089380 -0.3226990304560685141 +5.152212 -0.3632238274429464009 +5.215044 -0.3980205224812609632 +5.277876 -0.4265400723078279221 +5.340708 -0.4483329443869139008 +5.403539 -0.4630553007318252146 +5.466371 -0.470474961553087101 +5.529203 -0.4704749615530869344 +5.592035 -0.463055300731824937 +5.654867 -0.4483329443869135678 +5.717699 -0.4265400723078281997 +5.780530 -0.3980205224812614628 +5.843362 -0.363223827442946845 +5.906194 -0.3226990304560690692 +5.969026 -0.2770848541179523616 +6.031858 -0.22710109344021151 +6.094690 -0.1735357640795197609 +6.157522 -0.1172335976390737888 +6.220353 -0.05908272357625506122 +6.283185 -1.976266587454604297e-16 + + File [added]: mp_harmonic_im_r8.00.th.asc Delta lines: +54 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_im_r8.00.th.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_im_r8.00.th.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1,54 @@ +"Time = 0 +0.000000 0.6307831305050434212 +0.062832 0.006414478478045328516 +0.125664 2.926186227276146829e-16 +0.188496 2.386143598765005219e-16 +0.251327 -1.420084232264331917e-16 +0.314159 1.777240527155209573e-16 +0.376991 1.638154941593066095e-16 +0.439823 1.580236523128021832e-16 +0.502655 9.684566415599272793e-17 +0.565487 -3.469487216420912885e-17 +0.628319 1.011041002333707997e-16 +0.691150 7.999484602692621821e-17 +0.753982 5.341621717946576991e-17 +0.816814 4.255698807620960161e-17 +0.879646 -2.755703360697257134e-17 +0.942478 3.312157109350618348e-17 +1.005310 9.164156058357568613e-18 +1.068142 4.136430182637461761e-17 +1.130973 3.93568926162343637e-17 +1.193805 2.959892296258195764e-17 +1.256637 2.515951604708110849e-17 +1.319469 3.916167830229968497e-17 +1.382301 1.059617470841231802e-17 +1.445133 6.098417063879056444e-18 +1.507964 1.027594448571300023e-17 +1.570796 -3.523247651629027143e-17 +1.633628 -1.456220359444229049e-18 +1.696460 -1.410063837397148702e-17 +1.759292 5.613015692432480741e-18 +1.822124 6.635796753069970284e-18 +1.884956 6.568542235803732263e-18 +1.947787 9.855341525364593679e-18 +2.010619 -5.508866192607108089e-18 +2.073451 4.622356468968703956e-18 +2.136283 6.611848247478812561e-18 +2.199115 2.858520867375647277e-18 +2.261947 2.590500913413465802e-19 +2.324779 1.520091510550632901e-18 +2.387610 -1.713262760772048037e-20 +2.450442 1.718382086966605172e-18 +2.513274 9.414189862246460786e-19 +2.576106 5.036919495096394639e-19 +2.638938 2.847075820349658673e-19 +2.701770 3.309989484742896642e-19 +2.764602 7.09384461930837558e-20 +2.827433 5.000736099493162766e-20 +2.890265 4.760554507445765016e-20 +2.953097 -1.805583750081199166e-20 +3.015929 5.343533318497654634e-21 +3.078761 6.3364941679916884e-22 +3.141593 -7.22781544709519842e-37 + + File [added]: mp_harmonic_l0_m0_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l0_m0_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l0_m0_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 0 0 File [added]: mp_harmonic_l1_m-1_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l1_m-1_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l1_m-1_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 0 0 File [added]: mp_harmonic_l1_m0_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l1_m0_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l1_m0_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 0 0 File [added]: mp_harmonic_l1_m1_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l1_m1_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l1_m1_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 0 0 File [added]: mp_harmonic_l2_m-1_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l2_m-1_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l2_m-1_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 -3.084588393705386578e-17 1.720378076789101466e-17 File [added]: mp_harmonic_l2_m-2_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l2_m-2_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l2_m-2_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 1.138927479537339823e-10 1.118247678211310438e-17 File [added]: mp_harmonic_l2_m0_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l2_m0_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l2_m0_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 -1.972076544340019278e-17 7.195607036871429069e-08 File [added]: mp_harmonic_l2_m1_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l2_m1_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l2_m1_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 9.233534510396670281e-17 3.678958802688812425e-16 File [added]: mp_harmonic_l2_m2_r8.00.asc Delta lines: +1 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_l2_m2_r8.00.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_l2_m2_r8.00.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1 @@ +0.000000 0.9991533008868566101 7.11347051830939968e-18 File [added]: mp_harmonic_re_r8.00.ph.asc Delta lines: +104 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_re_r8.00.ph.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_re_r8.00.ph.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1,104 @@ +"Time = 0 +0.000000 0.4714051344795946452 +0.062832 0.467687868496530601 +0.125664 0.4565949764204048078 +0.188496 0.4383014236215818649 +0.251327 0.4130954585389419731 +0.314159 0.3813747754991172467 +0.376991 0.3436396201486748292 +0.439823 0.3004850309575128331 +0.502655 0.2525915434611012422 +0.565487 0.2007146483930815628 +0.628319 0.1456722117101460767 +0.691150 0.08833261385994624348 +0.753982 0.0295998309385308786 +0.816814 -0.02959983093853089942 +0.879646 -0.08833261385994582715 +0.942478 -0.1456722117101461045 +1.005310 -0.2007146483930816183 +1.068142 -0.2525915434611012977 +1.130973 -0.300485030957512611 +1.193805 -0.3436396201486749402 +1.256637 -0.3813747754991173022 +1.319469 -0.4130954585389421396 +1.382301 -0.4383014236215819759 +1.445133 -0.4565949764204046968 +1.507964 -0.4676878684965307675 +1.570796 -0.4714051344795952003 +1.633628 -0.4676878684965312116 +1.696460 -0.4565949764204050298 +1.759292 -0.4383014236215813653 +1.822124 -0.4130954585389423062 +1.884956 -0.3813747754991171912 +1.947787 -0.3436396201486755508 +2.010619 -0.3004850309575126666 +2.073451 -0.2525915434611009647 +2.136283 -0.2007146483930813963 +2.199115 -0.145672211710146271 +2.261947 -0.08833261385994620185 +2.324779 -0.02959983093853062186 +2.387610 0.02959983093853071207 +2.450442 0.08833261385994579939 +2.513274 0.1456722117101459657 +2.576106 0.2007146483930811465 +2.638938 0.2525915434611014088 +2.701770 0.3004850309575123335 +2.764602 0.3436396201486751623 +2.827433 0.3813747754991176908 +2.890265 0.4130954585389419731 +2.953097 0.4383014236215818649 +3.015929 0.4565949764204046968 +3.078761 0.4676878684965314892 +3.141593 0.4714051344795943677 +3.204425 0.4676878684965311006 +3.267256 0.4565949764204046413 +3.330088 0.4383014236215818649 +3.392920 0.4130954585389420841 +3.455752 0.3813747754991171912 +3.518584 0.3436396201486757729 +3.581416 0.3004850309575129441 +3.644247 0.2525915434611011867 +3.707079 0.2007146483930816183 +3.769911 0.145672211710146271 +3.832743 0.08833261385994643777 +3.895575 0.02959983093853109717 +3.958407 -0.02959983093853056288 +4.021239 -0.0883326138599464239 +4.084070 -0.1456722117101458269 +4.146902 -0.2007146483930817016 +4.209734 -0.2525915434611011312 +4.272566 -0.3004850309575127221 +4.335398 -0.3436396201486753843 +4.398230 -0.3813747754991170802 +4.461062 -0.4130954585389422506 +4.523893 -0.4383014236215819204 +4.586725 -0.4565949764204048633 +4.649557 -0.4676878684965311561 +4.712389 -0.4714051344795950338 +4.775221 -0.4676878684965316002 +4.838053 -0.4565949764204047523 +4.900885 -0.4383014236215819759 +4.963716 -0.4130954585389418066 +5.026548 -0.3813747754991175798 +5.089380 -0.3436396201486756063 +5.152212 -0.3004850309575128331 +5.215044 -0.2525915434611007981 +5.277876 -0.200714648393081424 +5.340708 -0.1456722117101463265 +5.403539 -0.08833261385994690962 +5.466371 -0.02959983093853164535 +5.529203 0.02959983093853053859 +5.592035 0.088332613859946299 +5.654867 0.1456722117101458269 +5.717699 0.2007146483930807301 +5.780530 0.2525915434611006316 +5.843362 0.3004850309575120559 +5.906194 0.3436396201486754398 +5.969026 0.3813747754991170247 +6.031858 0.4130954585389420286 +6.094690 0.4383014236215816428 +6.157522 0.4565949764204046968 +6.220353 0.4676878684965309896 +6.283185 0.4714051344795947562 + + File [added]: mp_harmonic_re_r8.00.th.asc Delta lines: +54 -0 =================================================================== --- trunk/test/test_trapezoidal/mp_harmonic_re_r8.00.th.asc (rev 0) +++ trunk/test/test_trapezoidal/mp_harmonic_re_r8.00.th.asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1,54 @@ +"Time = 0 +0.000000 -8.80289179457185799e-16 +0.062832 0.6231245530661584375 +0.125664 0.6258190228933131483 +0.188496 0.6196596992337820575 +0.251327 0.6111215679566899261 +0.314159 0.6002881616211543925 +0.376991 0.5872649752392626876 +0.439823 0.5721780328572182439 +0.502655 0.5551722253737308987 +0.565487 0.5364093860695589022 +0.628319 0.5160661561144331833 +0.691150 0.4943316785539432767 +0.753982 0.4714051344795946452 +0.816814 0.447493156296473682 +0.879646 0.4228072006721167453 +0.942478 0.3975608424363436533 +1.005310 0.37196712173057489 +1.068142 0.3462359033535465924 +1.130973 0.3205713329354391572 +1.193805 0.2951694104757784931 +1.256637 0.2702157403654934509 +1.319469 0.2458834314661353659 +1.382301 0.2223312435844497503 +1.445133 0.1997019777222116266 +1.507964 0.1781211248076795539 +1.570796 0.1576957826262607443 +1.633628 0.1385139262975075558 +1.696460 0.1206438899337402004 +1.759292 0.1041342775866162806 +1.822124 0.08901404797365959631 +1.884956 0.07529303859782114638 +1.947787 0.06296265788326334267 +2.010619 0.05199693903018270252 +2.073451 0.04235381504000218511 +2.136283 0.03397662104341544337 +2.199115 0.02679582193746246274 +2.261947 0.02073089969599720139 +2.324779 0.0156923880855150584 +2.387610 0.01158401689597711795 +2.450442 0.008304916835505299355 +2.513274 0.005751875269321123606 +2.576106 0.003821566914013105852 +2.638938 0.002412751990280704532 +2.701770 0.001428390934720448913 +2.764602 0.0007776521592554753309 +2.827433 0.000377755173091246974 +2.890265 0.0001556483610775961923 +2.953097 4.947535271276211051e-05 +3.015929 9.805208296189968497e-06 +3.078761 6.131081706940525447e-07 +3.141593 -1.077203552463963929e-22 + + File [added]: test_trapezoidal_convergence_order..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_trapezoidal/test_trapezoidal_convergence_order..asc (rev 0) +++ trunk/test/test_trapezoidal/test_trapezoidal_convergence_order..asc 2013-10-09 17:56:47 UTC (rev 99) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 2.00042739440297 +

1 0

[svn:einsteintoolkit] Multipole/trunk/ (Rev. 98)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

User: hinder Date: 2013/10/09 12:56 PM Modified: /trunk/ param.ccl /trunk/src/ utils.cc Log: Make trapezoidal integration method available via parameter File Changes: Directory: /trunk/src/ ====================== File [modified]: utils.cc Delta lines: +41 -45 =================================================================== --- trunk/src/utils.cc 2013-10-09 17:56:25 UTC (rev 97) +++ trunk/src/utils.cc 2013-10-09 17:56:35 UTC (rev 98) @@ -345,58 +345,54 @@ iu = Multipole_Index(0,1,ntheta); CCTK_REAL dph = ph[iu] - ph[il]; - if (CCTK_Equals(integration_method, "Simpson") || - CCTK_Equals(integration_method, "DriscollHealy") || - CCTK_Equals(integration_method, "midpoint")) - { - static CCTK_REAL *fr = 0; - static CCTK_REAL *fi = 0; - static bool allocated_memory = false; + static CCTK_REAL *fr = 0; + static CCTK_REAL *fi = 0; + static bool allocated_memory = false; - // Construct an array for the real integrand - if (!allocated_memory) - { - fr = new CCTK_REAL[array_size]; - fi = new CCTK_REAL[array_size]; - allocated_memory = true; - } + // Construct an array for the real integrand + if (!allocated_memory) + { + fr = new CCTK_REAL[array_size]; + fi = new CCTK_REAL[array_size]; + allocated_memory = true; + } - // the below calculations take the integral of conj(array1)*array2*sin(th) - for (int i = 0; i < array_size; i++) - { - fr[i] = (array1r[i] * array2r[i] + - array1i[i] * array2i[i] ) * sin(th[i]); - fi[i] = (array1r[i] * array2i[i] - - array1i[i] * array2r[i] ) * sin(th[i]); - } + // the below calculations take the integral of conj(array1)*array2*sin(th) + for (int i = 0; i < array_size; i++) + { + fr[i] = (array1r[i] * array2r[i] + + array1i[i] * array2i[i] ) * sin(th[i]); + fi[i] = (array1r[i] * array2i[i] - + array1i[i] * array2r[i] ) * sin(th[i]); + } - if (CCTK_Equals(integration_method, "midpoint")) + if (CCTK_Equals(integration_method, "midpoint")) + { + *outre = Midpoint2DIntegral(fr, ntheta, nphi, dth, dph); + *outim = Midpoint2DIntegral(fi, ntheta, nphi, dth, dph); + } + else if (CCTK_Equals(integration_method, "trapezoidal")) + { + *outre = Trapezoidal2DIntegral(fr, ntheta, nphi, dth, dph); + *outim = Trapezoidal2DIntegral(fi, ntheta, nphi, dth, dph); + } + else if (CCTK_Equals(integration_method, "Simpson")) + { + if (nphi % 2 != 0 || ntheta % 2 != 0) { - *outre = Midpoint2DIntegral(fr, ntheta, nphi, dth, dph); - *outim = Midpoint2DIntegral(fi, ntheta, nphi, dth, dph); + CCTK_WARN (CCTK_WARN_ABORT, "The Simpson integration method requires even ntheta and even nphi"); } - else if (CCTK_Equals(integration_method, "Simpson")) + *outre = Simpson2DIntegral(fr, ntheta, nphi, dth, dph); + *outim = Simpson2DIntegral(fi, ntheta, nphi, dth, dph); + } + else if (CCTK_Equals(integration_method, "DriscollHealy")) + { + if (ntheta % 2 != 0) { - if (nphi % 2 != 0 || ntheta % 2 != 0) - { - CCTK_WARN (CCTK_WARN_ABORT, "The Simpson integration method requires even ntheta and even nphi"); - } - *outre = Simpson2DIntegral(fr, ntheta, nphi, dth, dph); - *outim = Simpson2DIntegral(fi, ntheta, nphi, dth, dph); + CCTK_WARN (CCTK_WARN_ABORT, "The Driscoll&Healy integration method requires even ntheta"); } - else if (CCTK_Equals(integration_method, "DriscollHealy")) - { - if (ntheta % 2 != 0) - { - CCTK_WARN (CCTK_WARN_ABORT, "The Driscoll&Healy integration method requires even ntheta"); - } - *outre = DriscollHealy2DIntegral(fr, ntheta, nphi, dth, dph); - *outim = DriscollHealy2DIntegral(fi, ntheta, nphi, dth, dph); - } - else - { - CCTK_WARN(CCTK_WARN_ABORT, "internal error"); - } + *outre = DriscollHealy2DIntegral(fr, ntheta, nphi, dth, dph); + *outim = DriscollHealy2DIntegral(fi, ntheta, nphi, dth, dph); } else { Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -0 =================================================================== --- trunk/param.ccl 2013-10-09 17:56:25 UTC (rev 97) +++ trunk/param.ccl 2013-10-09 17:56:35 UTC (rev 98) @@ -31,6 +31,7 @@ { "midpoint" :: "Midpoint rule (1st order)" "Simpson" :: "Simpson's rule (4th order) [requires even ntheta and nphi]" + "trapezoidal" :: "Trapezoidal rule (2nd order)" "DriscollHealy" :: "Driscoll & Healy (exponentially convergent) [requires even ntheta]" } "midpoint"

1 0

[svn:einsteintoolkit] Multipole/trunk/ (Rev. 97)
by ian.hinder＠aei.mpg.de 09 Oct '13

09 Oct '13

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"

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits October 2013