Commits April 2014

commits@lists.einsteintoolkit.org

8 participants
175 discussions

[svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 150)
by rhaas＠tapir.caltech.edu 30 Apr '14

30 Apr '14

User: rhaas Date: 2014/04/30 02:31 PM Modified: /trunk/src/ tov.c Log: fix just introduced error handling the common case of TOV_Populate_Timelevels==1 File Changes: Directory: /trunk/src/ ====================== File [modified]: tov.c Delta lines: +2 -0 =================================================================== --- trunk/src/tov.c 2014-04-30 19:25:56 UTC (rev 149) +++ trunk/src/tov.c 2014-04-30 19:31:06 UTC (rev 150) @@ -948,6 +948,8 @@ TOV_Copy(i3D, vely_p, vely); TOV_Copy(i3D, velz_p, velz); TOV_Copy(i3D, w_lorentz_p, w_lorentz); + // fall through + case 1: break; default: CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING,

1 0

[svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 149)
by rhaas＠tapir.caltech.edu 30 Apr '14

30 Apr '14

User: rhaas Date: 2014/04/30 02:25 PM Modified: /trunk/src/ tov.c Log: fix missing semicolon The previous commit (rev 148) accidentally commited changes to gxy etc that should have been a separate commit. They are not wrong, just should have been separated out. File Changes: Directory: /trunk/src/ ====================== File [modified]: tov.c Delta lines: +1 -1 =================================================================== --- trunk/src/tov.c 2014-04-30 19:16:57 UTC (rev 148) +++ trunk/src/tov.c 2014-04-30 19:25:56 UTC (rev 149) @@ -948,7 +948,7 @@ TOV_Copy(i3D, vely_p, vely); TOV_Copy(i3D, velz_p, velz); TOV_Copy(i3D, w_lorentz_p, w_lorentz); - break: + break; default: CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, "Unsupported number of TOV_Populate_TimelevelsL: %d",

1 0

[svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 148)
by rhaas＠tapir.caltech.edu 30 Apr '14

30 Apr '14

User: rhaas Date: 2014/04/30 02:16 PM Modified: /trunk/src/ tov.c Log: respect ADMBase::initial_shift parameter Before this commit TOVSolver extended ADMBase::initial_shift to allow a "tov" keyword value. However it did not actually check anywhere that this value was set and instead set the shift to zero unconditionally if TOV_Clear_Initial_Data and not TOV_Use_Old_Initial_Data (line 546 of tov.c). It should instead have checked the value of this parameter and set the shift to zero if the parameter says "tov" independent of TOV_Clear_Initial_Data etc. File Changes: Directory: /trunk/src/ ====================== File [modified]: tov.c Delta lines: +45 -1 =================================================================== --- trunk/src/tov.c 2014-01-14 04:05:47 UTC (rev 147) +++ trunk/src/tov.c 2014-04-30 19:16:57 UTC (rev 148) @@ -514,9 +514,10 @@ CCTK_REAL my_velx, my_vely, my_velz, my_psi4; CCTK_REAL PI, local_tiny; - CCTK_INT tov_lapse; + CCTK_INT tov_lapse, tov_shift; tov_lapse = CCTK_EQUALS(initial_lapse, "tov"); + tov_shift = CCTK_EQUALS(initial_shift, "tov"); PI=4.0*atan(1.0); local_tiny=1.0e-14; @@ -690,6 +691,7 @@ gxx[i3D] = max_g_diag/my_psi4; gyy[i3D] = max_g_diag/my_psi4; gzz[i3D] = max_g_diag/my_psi4; + gxy[i3D] = gxz[i3D] = gyz[i3D] = 0.0; } } /* check matter */ @@ -711,6 +713,12 @@ { if (tov_lapse) alp[i3D] = exp(phi_point[star]); + if (tov_shift) + { + betax[i3D] = 0.0; + betay[i3D] = 0.0; + betaz[i3D] = 0.0; + } my_velx=TOV_Velocity_x[star]; my_vely=TOV_Velocity_y[star]; my_velz=TOV_Velocity_z[star]; @@ -720,6 +728,12 @@ { if (tov_lapse) alp[i3D] = exp(phi_point[star]); + if (tov_shift) + { + betax[i3D] = 0.0; + betay[i3D] = 0.0; + betaz[i3D] = 0.0; + } my_velx=TOV_Velocity_x[star]; my_vely=TOV_Velocity_y[star]; my_velz=TOV_Velocity_z[star]; @@ -734,15 +748,23 @@ psi[i3D] = pow(max_g_diag, 0.25); my_psi4 = max_g_diag; gxx[i3D] = gyy[i3D] = gzz[i3D] = 1.0; + gxy[i3D] = gxz[i3D] = gyz[i3D] = 0.0; } else { gxx[i3D] = max_g_diag; gyy[i3D] = max_g_diag; gzz[i3D] = max_g_diag; + gxy[i3D] = gxz[i3D] = gyz[i3D] = 0.0; } if (tov_lapse) alp[i3D] = exp(phi_point[star]); + if (tov_shift) + { + betax[i3D] = 0.0; + betay[i3D] = 0.0; + betaz[i3D] = 0.0; + } my_velx=TOV_Velocity_x[star]; my_vely=TOV_Velocity_y[star]; my_velz=TOV_Velocity_z[star]; @@ -783,6 +805,12 @@ { if (tov_lapse) alp[i3D] *= exp(phi_point[star_i]); + if (tov_shift) + { + betax[i3D] = 0.0; + betay[i3D] = 0.0; + betaz[i3D] = 0.0; + } if (TOV_Conformal_Flat_Three_Metric) { /* This is a hack, since it does not check if the input data is @@ -793,7 +821,10 @@ my_psi4 + pow(psi[i3D], 4.0) * gxx[i3D]; psi[i3D] = pow(my_psi4, 0.25); if (!TOV_Use_Old_Initial_Data) + { gxx[i3D] = gyy[i3D] = gzz[i3D] = 1.0; + gxy[i3D] = gxz[i3D] = gyz[i3D] = 0.0; + } } else gxx[i3D] += (r_point[star_i] * r_point[star_i] / @@ -894,22 +925,35 @@ TOV_Copy(i3D, gxx_p_p, gxx); TOV_Copy(i3D, gyy_p_p, gyy); TOV_Copy(i3D, gzz_p_p, gzz); + TOV_Copy(i3D, gxy_p_p, gxy); + TOV_Copy(i3D, gxz_p_p, gxz); + TOV_Copy(i3D, gyz_p_p, gyz); TOV_Copy(i3D, rho_p_p, rho); TOV_Copy(i3D, eps_p_p, eps); TOV_Copy(i3D, velx_p_p, velx); TOV_Copy(i3D, vely_p_p, vely); TOV_Copy(i3D, velz_p_p, velz); TOV_Copy(i3D, w_lorentz_p_p, w_lorentz); + // fall through case 2: TOV_Copy(i3D, gxx_p, gxx); TOV_Copy(i3D, gyy_p, gyy); TOV_Copy(i3D, gzz_p, gzz); + TOV_Copy(i3D, gxy_p, gxy); + TOV_Copy(i3D, gxz_p, gxz); + TOV_Copy(i3D, gyz_p, gyz); TOV_Copy(i3D, rho_p, rho); TOV_Copy(i3D, eps_p, eps); TOV_Copy(i3D, velx_p, velx); TOV_Copy(i3D, vely_p, vely); TOV_Copy(i3D, velz_p, velz); TOV_Copy(i3D, w_lorentz_p, w_lorentz); + break: + default: + CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, + "Unsupported number of TOV_Populate_TimelevelsL: %d", + TOV_Populate_Timelevels); + break; } CCTK_INFO("Done interpolation.");

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1231)
by schnetter＠cct.lsu.edu 30 Apr '14

30 Apr '14

User: eschnett Date: 2014/04/30 02:13 PM Removed: /release-info/ kraken__1_6.log, kraken__2_6.log Log: Remove Kraken File Changes: Directory: /release-info/ ========================= File [removed]: kraken__1_6.log Delta lines: <Unavailable> File [removed]: kraken__2_6.log Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] Multipole/trunk/test/ (Rev. 113)
by ian.hinder＠aei.mpg.de 30 Apr '14

30 Apr '14

User: hinder Date: 2014/04/30 10:36 AM Added: /trunk/test/test_22/ test_midpoint_result_high..asc, test_midpoint_result_low..asc /trunk/test/test_simpson/ test_simpson_result_high..asc, test_simpson_result_low..asc /trunk/test/test_trapezoidal/ test_trapezoidal_result_high..asc, test_trapezoidal_result_low..asc Log: Add test data for integration results File Changes: Directory: /trunk/test/test_22/ =============================== File [added]: test_midpoint_result_high..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_22/test_midpoint_result_high..asc (rev 0) +++ trunk/test/test_22/test_midpoint_result_high..asc 2014-04-30 15:36:19 UTC (rev 113) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 0.0438758519305692 + File [added]: test_midpoint_result_low..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_22/test_midpoint_result_low..asc (rev 0) +++ trunk/test/test_22/test_midpoint_result_low..asc 2014-04-30 15:36:19 UTC (rev 113) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 0.0445039784737103 + Directory: /trunk/test/test_simpson/ ==================================== File [added]: test_simpson_result_high..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_simpson/test_simpson_result_high..asc (rev 0) +++ trunk/test/test_simpson/test_simpson_result_high..asc 2014-04-30 15:36:19 UTC (rev 113) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 0.0432498097495223 + File [added]: test_simpson_result_low..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_simpson/test_simpson_result_low..asc (rev 0) +++ trunk/test/test_simpson/test_simpson_result_low..asc 2014-04-30 15:36:19 UTC (rev 113) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 0.0432498035606782 + Directory: /trunk/test/test_trapezoidal/ ======================================== File [added]: test_trapezoidal_result_high..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_trapezoidal/test_trapezoidal_result_high..asc (rev 0) +++ trunk/test/test_trapezoidal/test_trapezoidal_result_high..asc 2014-04-30 15:36:19 UTC (rev 113) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 0.0432508519305692 + File [added]: test_trapezoidal_result_low..asc Delta lines: +4 -0 =================================================================== --- trunk/test/test_trapezoidal/test_trapezoidal_result_low..asc (rev 0) +++ trunk/test/test_trapezoidal/test_trapezoidal_result_low..asc 2014-04-30 15:36:19 UTC (rev 113) @@ -0,0 +1,4 @@ +# 0D ASCII output created by CarpetIOASCII +# +0 0 0 0 0 0 0 0 0 0 0 0 0.0432539784737104 +

1 0

[svn:einsteintoolkit] Multipole/trunk/test/ (Rev. 112)
by ian.hinder＠aei.mpg.de 30 Apr '14

30 Apr '14

User: hinder Date: 2014/04/30 10:36 AM Modified: /trunk/test/ test.ccl Log: test.ccl: Do not require a very accurate convergence order The convergence order is extremely sensitive to roundoff, as its computation includes subtracting two very similar numbers. Instead, we output the integration results for the purpose of regression testing, as these are less sensitive to roundoff. File Changes: Directory: /trunk/test/ ======================= File [modified]: test.ccl Delta lines: +6 -0 =================================================================== --- trunk/test/test.ccl 2014-04-30 15:35:53 UTC (rev 111) +++ trunk/test/test.ccl 2014-04-30 15:36:08 UTC (rev 112) @@ -1,2 +1,8 @@ ABSTOL 1e-8 RELTOL 1e-8 + +# The convergence order tests are very sensitive to roundoff, because +# the integration has a very small relative error (1e-7). Hence +# subtracting the numerical result from the exact result loses ~7 +# digits of precision. +ABSTOL 1e-3 ^test_.*_convergence_order\.asc$

1 0

[svn:einsteintoolkit] Multipole/trunk/ (Rev. 111)
by ian.hinder＠aei.mpg.de 30 Apr '14

30 Apr '14

User: hinder Date: 2014/04/30 10:35 AM Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ tests.cc /trunk/test/ test_22.par, test_simpson.par, test_trapezoidal.par Log: Output the integration results in the tests Previously only the convergence order was output, and this is very sensitive to roundoff error due to the numerical results being very close to the exact result. File Changes: Directory: /trunk/src/ ====================== File [modified]: tests.cc Delta lines: +9 -4 =================================================================== --- trunk/src/tests.cc 2014-04-25 18:14:18 UTC (rev 110) +++ trunk/src/tests.cc 2014-04-30 15:35:53 UTC (rev 111) @@ -72,13 +72,15 @@ return result; } -CCTK_REAL integration_convergence_order(CCTK_REAL (*integration_fn) (const CCTK_REAL *, int, int, CCTK_REAL, CCTK_REAL)) +CCTK_REAL integration_convergence_order(CCTK_REAL (*integration_fn) (const CCTK_REAL *, int, int, CCTK_REAL, CCTK_REAL), CCTK_REAL *store_low, CCTK_REAL *store_high) { const int n1 = 100; const int n2 = 200; const CCTK_REAL PI = acos(-1.0); const CCTK_REAL result1 = test_integral(100, integration_fn); + *store_low = result1; const CCTK_REAL result2 = test_integral(200, integration_fn); + *store_high = result2; const CCTK_REAL exact = 1./24 + 1./(64 * pow(PI,2)); const CCTK_REAL error1 = fabs(result1 - exact); const CCTK_REAL error2 = fabs(result2 - exact); @@ -88,9 +90,12 @@ void Multipole_TestIntegrationConvergence(CCTK_ARGUMENTS) { 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); + *test_simpson_convergence_order = integration_convergence_order( + &Simpson2DIntegral, test_simpson_result_low, test_simpson_result_high); + *test_trapezoidal_convergence_order = integration_convergence_order( + &Trapezoidal2DIntegral, test_trapezoidal_result_low, test_trapezoidal_result_high); + *test_midpoint_convergence_order = integration_convergence_order( + &Midpoint2DIntegral, test_midpoint_result_low, test_midpoint_result_high); } void Multipole_TestIntegrationSymmetry(CCTK_ARGUMENTS) Directory: /trunk/test/ ======================= File [modified]: test_22.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_22.par 2014-04-25 18:14:18 UTC (rev 110) +++ trunk/test/test_22.par 2014-04-30 15:35:53 UTC (rev 111) @@ -88,5 +88,5 @@ # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes -CarpetIOASCII::out0d_vars = "Multipole::test_midpoint_convergence_order Multipole::test_midpoint_pi_symmetry" +CarpetIOASCII::out0d_vars = "Multipole::test_midpoint_convergence_order Multipole::test_midpoint_pi_symmetry Multipole::test_midpoint_result_low Multipole::test_midpoint_result_high" CarpetIOASCII::out0d_every = 1 File [modified]: test_simpson.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_simpson.par 2014-04-25 18:14:18 UTC (rev 110) +++ trunk/test/test_simpson.par 2014-04-30 15:35:53 UTC (rev 111) @@ -88,5 +88,5 @@ # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes -CarpetIOASCII::out0d_vars = "Multipole::test_simpson_convergence_order Multipole::test_simpson_pi_symmetry" +CarpetIOASCII::out0d_vars = "Multipole::test_simpson_convergence_order Multipole::test_simpson_pi_symmetry Multipole::test_simpson_result_low Multipole::test_simpson_result_high" CarpetIOASCII::out0d_every = 1 File [modified]: test_trapezoidal.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_trapezoidal.par 2014-04-25 18:14:18 UTC (rev 110) +++ trunk/test/test_trapezoidal.par 2014-04-30 15:35:53 UTC (rev 111) @@ -88,5 +88,5 @@ # CarpetIOASCII::out1d_y = yes # CarpetIOASCII::out1d_z = yes -CarpetIOASCII::out0d_vars = "Multipole::test_trapezoidal_convergence_order Multipole::test_trapezoidal_pi_symmetry" +CarpetIOASCII::out0d_vars = "Multipole::test_trapezoidal_convergence_order Multipole::test_trapezoidal_pi_symmetry Multipole::test_trapezoidal_result_low Multipole::test_trapezoidal_result_high" CarpetIOASCII::out0d_every = 1 Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +8 -0 =================================================================== --- trunk/interface.ccl 2014-04-25 18:14:18 UTC (rev 110) +++ trunk/interface.ccl 2014-04-30 15:35:53 UTC (rev 111) @@ -21,6 +21,14 @@ test_simpson_convergence_order } "Test integration convergence orders" +CCTK_REAL test_integration_results type=SCALAR +{ + test_midpoint_result_low, test_midpoint_result_high, + test_trapezoidal_result_low, test_trapezoidal_result_high, + test_simpson_result_low, test_simpson_result_high +} "Test integration results" + + CCTK_REAL test_integration_symmetries type=SCALAR { test_midpoint_pi_symmetry, File [modified]: schedule.ccl Delta lines: +1 -0 =================================================================== --- trunk/schedule.ccl 2014-04-25 18:14:18 UTC (rev 110) +++ trunk/schedule.ccl 2014-04-30 15:35:53 UTC (rev 111) @@ -4,6 +4,7 @@ { STORAGE: harmonics[1] STORAGE: test_integration_convergence_orders + STORAGE: test_integration_results STORAGE: test_integration_symmetries }

1 0

[Carpet] branch, master, updated. ET_2013_11_v0-61-gbaf2333
by Carpet git repositories 30 Apr '14

30 Apr '14

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 baf2333c5b909d6daa93056b1c63b35040796b66 (commit) from f73efa0164d8296c361e486fabdd95c88469766a (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 baf2333c5b909d6daa93056b1c63b35040796b66 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Apr 30 17:28:02 2014 +0200 CarpetProlongateTest: Correct absolute tolerance for test_o9 to 1e-9 The previous commit incorrectly changed it to 1e-11. ----------------------------------------------------------------------- Summary of changes: CarpetExtra/CarpetProlongateTest/test/test.ccl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. ET_2013_11_v0-60-gf73efa0
by Carpet git repositories 30 Apr '14

30 Apr '14

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 f73efa0164d8296c361e486fabdd95c88469766a (commit) from 4eb42d62c2196356b2037bbb27ca730ea81ef48f (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 f73efa0164d8296c361e486fabdd95c88469766a Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Apr 30 16:04:09 2014 +0200 CarpetProlongateTest test.ccl: Increase absolute and relative tolerance for test_o9 to 1e-11 See https://trac.einsteintoolkit.org/ticket/1603. High order prolongation is more sensitive to roundoff error than low order, and on some machines, the current tolerances are slightly larger than the differences we see. ----------------------------------------------------------------------- Summary of changes: CarpetExtra/CarpetProlongateTest/test/test.ccl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1230)
by ian.hinder＠aei.mpg.de 30 Apr '14

30 Apr '14

User: hinder Date: 2014/04/30 06:42 AM Added: /release-info/ datura__1_12.log Removed: /release-info/ datura__1_6.log Modified: /release-info/ datura__2_6.log Log: Update Datura test results - all tests pass File Changes: Directory: /release-info/ ========================= File [added]: datura__1_12.log Delta lines: <Unavailable> File [removed]: datura__1_6.log Delta lines: <Unavailable> File [modified]: datura__2_6.log Delta lines: <Unavailable>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits April 2014