Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[Carpet] branch, master, updated. carpet-6-init-379-gc83793e
by Carpet git repositories 12 Oct '13

12 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 c83793e7f141d969bad07757ed970aa053a3ad57 (commit) via be2bd96c56aa6dd5b1fb6654b130f3e44e049e8e (commit) from b9dcd6e71ae740d1660af390d473680439604551 (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 c83793e7f141d969bad07757ed970aa053a3ad57 Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Fri Oct 11 11:56:50 2013 -0700 Carpet: skip CheckFence routine if electric_fence is off enumerating the variables is expensive enough to show up in the timer output commit be2bd96c56aa6dd5b1fb6654b130f3e44e049e8e Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Fri Oct 11 11:56:31 2013 -0700 CarpetLib: make electric_fence parameter restricted ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/param.ccl | 4 ++++ Carpet/Carpet/src/CallFunction.cc | 4 ++++ Carpet/CarpetLib/param.ccl | 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-377-gb9dcd6e
by Carpet git repositories 11 Oct '13

11 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 b9dcd6e71ae740d1660af390d473680439604551 (commit) from e99f723c8589aa0b9b2c84e1448c81d10843eb81 (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 b9dcd6e71ae740d1660af390d473680439604551 Author: Frank Löffler <knarf(a)cct.lsu.edu> Date: Fri Oct 11 22:54:55 2013 -0500 CycleClock: define CycleClock_Setup() without HAVE_TICK_COUNTER Define a dummy CycleClock_Setup() routine for Cactus to call from the scheduler. Without this, the linker will rightfully complain about the missing symbol if the architecture doesn't have counters (HAVE_TICK_COUNTER isn't defined). ----------------------------------------------------------------------- Summary of changes: Carpet/CycleClock/src/clock.cc | 9 +++++++++ 1 file changed, 9 insertions(+) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-376-ge99f723
by Carpet git repositories 11 Oct '13

11 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 e99f723c8589aa0b9b2c84e1448c81d10843eb81 (commit) from 1f11d59bdc897023e049d16a3e58a18cef2403cc (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 e99f723c8589aa0b9b2c84e1448c81d10843eb81 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Fri Oct 11 09:30:58 2013 -0400 CarpetLib: Define elapsed() when CycleClock provides no timer ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetLib/src/timestat.hh | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits