Commits July 2013

commits@lists.einsteintoolkit.org

7 participants
90 discussions

[svn:einsteintoolkit] TOVSolver/trunk/test/test_two_av/ (Rev. 144)
by rhaas＠tapir.caltech.edu 19 Jul '13

19 Jul '13

User: rhaas Date: 2013/07/19 10:49 AM Modified: /trunk/test/test_two_av/ dens_maximum.xg, dens_norm1.xg, dens_norm2.xg, dens_x_[16][16].xg, eps_maximum.xg, eps_norm1.xg, eps_norm2.xg, eps_x_[16][16].xg, ham_norm1.xg, ham_norm2.xg, ham_x_[16][16].xg, press_maximum.xg, press_norm1.xg, press_norm2.xg, press_x_[16][16].xg, rho_maximum.xg, rho_norm1.xg, rho_norm2.xg, rho_x_[16][16].xg, tau_maximum.xg, tau_norm1.xg, tau_norm2.xg, tau_x_[16][16].xg, test_two_av.par Log: udpate test data after unifying atmosphere treatment in average combination File Changes: Directory: /trunk/test/test_two_av/ =================================== File [modified]: dens_maximum.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/dens_maximum.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/dens_maximum.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "dens v time -0.0000000000000 0.0004649000051 +0.0000000000000 0.0004647549144 File [modified]: dens_norm1.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/dens_norm1.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/dens_norm1.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "dens v time -0.0000000000000 0.0000044992504 +0.0000000000000 0.0000044963867 File [modified]: dens_norm2.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/dens_norm2.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/dens_norm2.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "dens v time -0.0000000000000 0.0000274983526 +0.0000000000000 0.0000274847996 File [modified]: dens_x_[16][16].xg Delta lines: +11 -11 =================================================================== --- trunk/test/test_two_av/dens_x_[16][16].xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/dens_x_[16][16].xg 2013-07-19 15:49:00 UTC (rev 144) @@ -20,17 +20,17 @@ 5.0000000000e-04 1.2073042319e-07 1.8755312500e+00 1.2190265289e-07 3.7505625000e+00 1.2396537727e-07 -5.6255937500e+00 5.8548948115e-05 -7.5006250000e+00 1.5003153361e-04 -9.3756562500e+00 2.5588735518e-04 -1.1250687500e+01 3.5936991305e-04 -1.3125718750e+01 4.3658107966e-04 -1.5000750000e+01 4.6490000511e-04 -1.6875781250e+01 4.3499731773e-04 -1.8750812500e+01 3.5669346432e-04 -2.0625843750e+01 2.5290573054e-04 -2.2500875000e+01 1.4756560089e-04 -2.4375906250e+01 5.7248638962e-05 +5.6255937500e+00 5.8421836611e-05 +7.5006250000e+00 1.4990005996e-04 +9.3756562500e+00 2.5575100345e-04 +1.1250687500e+01 3.5922902377e-04 +1.3125718750e+01 4.3643699583e-04 +1.5000750000e+01 4.6475491443e-04 +1.6875781250e+01 4.3485374366e-04 +1.8750812500e+01 3.5655359807e-04 +2.0625843750e+01 2.5277092584e-04 +2.2500875000e+01 1.4743622243e-04 +2.4375906250e+01 5.7124215842e-05 2.6250937500e+01 1.2060588939e-07 2.8125968750e+01 1.1776120498e-07 3.0001000000e+01 1.1776120498e-07 File [modified]: eps_maximum.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/eps_maximum.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/eps_maximum.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "eps v time -0.0000000000000 0.0320099894159 +0.0000000000000 0.0319999994159 File [modified]: eps_norm1.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/eps_norm1.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/eps_norm1.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "eps v time -0.0000000000000 0.0003511801893 +0.0000000000000 0.0003509580781 File [modified]: eps_norm2.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/eps_norm2.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/eps_norm2.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "eps v time -0.0000000000000 0.0020680892683 +0.0000000000000 0.0020670757862 File [modified]: eps_x_[16][16].xg Delta lines: +11 -11 =================================================================== --- trunk/test/test_two_av/eps_x_[16][16].xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/eps_x_[16][16].xg 2013-07-19 15:49:00 UTC (rev 144) @@ -20,17 +20,17 @@ 5.0000000000e-04 1.0000000000e-05 1.8755312500e+00 1.0000000000e-05 3.7505625000e+00 1.0000000000e-05 -5.6255937500e+00 4.6015032040e-03 -7.5006250000e+00 1.1400117181e-02 -9.3756562500e+00 1.8747944755e-02 -1.1250687500e+01 2.5481751564e-02 -1.3125718750e+01 3.0270190125e-02 -1.5000750000e+01 3.2009989416e-02 -1.6875781250e+01 3.0267465190e-02 -1.8750812500e+01 2.5476967135e-02 -2.0625843750e+01 1.8742137541e-02 -2.2500875000e+01 1.1394325671e-02 -2.4375906250e+01 4.5965243893e-03 +5.6255937500e+00 4.5915132040e-03 +7.5006250000e+00 1.1390127181e-02 +9.3756562500e+00 1.8737954755e-02 +1.1250687500e+01 2.5471761564e-02 +1.3125718750e+01 3.0260200125e-02 +1.5000750000e+01 3.1999999416e-02 +1.6875781250e+01 3.0257475190e-02 +1.8750812500e+01 2.5466977135e-02 +2.0625843750e+01 1.8732147541e-02 +2.2500875000e+01 1.1384335671e-02 +2.4375906250e+01 4.5865343893e-03 2.6250937500e+01 1.0000000000e-05 2.8125968750e+01 1.0000000000e-05 3.0001000000e+01 1.0000000000e-05 File [modified]: ham_norm1.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/ham_norm1.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/ham_norm1.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "ham v time -0.0000000000000 0.0002065731534 +0.0000000000000 0.0002064880522 File [modified]: ham_norm2.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/ham_norm2.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/ham_norm2.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "ham v time -0.0000000000000 0.0005588307312 +0.0000000000000 0.0005587818772 File [modified]: ham_x_[16][16].xg Delta lines: +11 -11 =================================================================== --- trunk/test/test_two_av/ham_x_[16][16].xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/ham_x_[16][16].xg 2013-07-19 15:49:00 UTC (rev 144) @@ -20,17 +20,17 @@ 5.0000000000e-04 -1.0161714130e-04 1.8755312500e+00 -1.2719754600e-04 3.7505625000e+00 4.6387122419e-05 -5.6255937500e+00 -2.3335795239e-04 -7.5006250000e+00 -4.3992347983e-04 -9.3756562500e+00 -6.4509496563e-04 -1.1250687500e+01 -8.2579210467e-04 -1.3125718750e+01 -9.4286518880e-04 -1.5000750000e+01 -9.5648570113e-04 -1.6875781250e+01 -8.5507729978e-04 -1.8750812500e+01 -6.7024883546e-04 -2.0625843750e+01 -4.5721308716e-04 -2.2500875000e+01 -2.6248913245e-04 -2.4375906250e+01 -1.0707279652e-04 +5.6255937500e+00 -2.2829026777e-04 +7.5006250000e+00 -4.3478751643e-04 +9.3756562500e+00 -6.3988520768e-04 +1.1250687500e+01 -8.2051471880e-04 +1.3125718750e+01 -9.3753971243e-04 +1.5000750000e+01 -9.5114275189e-04 +1.6875781250e+01 -8.4975185079e-04 +1.8750812500e+01 -6.6497149764e-04 +2.0625843750e+01 -4.5200338753e-04 +2.2500875000e+01 -2.5735322721e-04 +2.4375906250e+01 -1.0200516190e-04 2.6250937500e+01 1.1169394323e-04 2.8125968750e+01 -6.2553258798e-03 3.0001000000e+01 0.0000000000e+00 File [modified]: press_maximum.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/press_maximum.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/press_maximum.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "press v time -0.0000000000000 0.0000102463942 +0.0000000000000 0.0000102399996 File [modified]: press_norm1.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/press_norm1.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/press_norm1.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "press v time -0.0000000000000 0.0000000427699 +0.0000000000000 0.0000000427280 File [modified]: press_norm2.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/press_norm2.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/press_norm2.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "press v time -0.0000000000000 0.0000003848704 +0.0000000000000 0.0000003845451 File [modified]: press_x_[16][16].xg Delta lines: +11 -11 =================================================================== --- trunk/test/test_two_av/press_x_[16][16].xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/press_x_[16][16].xg 2013-07-19 15:49:00 UTC (rev 144) @@ -20,17 +20,17 @@ 5.0000000000e-04 1.0000000000e-12 1.8755312500e+00 1.0000000000e-12 3.7505625000e+00 1.0000000000e-12 -5.6255937500e+00 2.1173831737e-07 -7.5006250000e+00 1.2996267175e-06 -9.3756562500e+00 3.5148543253e-06 -1.1250687500e+01 6.4931966279e-06 -1.3125718750e+01 9.1628441022e-06 -1.5000750000e+01 1.0246394224e-05 -1.6875781250e+01 9.1611944900e-06 -1.8750812500e+01 6.4907585438e-06 -2.0625843750e+01 3.5126771961e-06 -2.2500875000e+01 1.2983065751e-06 -2.4375906250e+01 2.1128036462e-07 +5.6255937500e+00 2.1081993503e-07 +7.5006250000e+00 1.2973499721e-06 +9.3756562500e+00 3.5111094839e-06 +1.1250687500e+01 6.4881063719e-06 +1.3125718750e+01 9.1567971162e-06 +1.5000750000e+01 1.0239999626e-05 +1.6875781250e+01 9.1551480485e-06 +1.8750812500e+01 6.4856692438e-06 +2.0625843750e+01 3.5089335151e-06 +2.2500875000e+01 1.2960309868e-06 +2.4375906250e+01 2.1036297704e-07 2.6250937500e+01 1.0000000000e-12 2.8125968750e+01 1.0000000000e-12 3.0001000000e+01 1.0000000000e-12 File [modified]: rho_maximum.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/rho_maximum.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/rho_maximum.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "rho v time -0.0000000000000 0.0003200998942 +0.0000000000000 0.0003199999942 File [modified]: rho_norm1.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/rho_norm1.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/rho_norm1.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "rho v time -0.0000000000000 0.0000035118019 +0.0000000000000 0.0000035095808 File [modified]: rho_norm2.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/rho_norm2.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/rho_norm2.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "rho v time -0.0000000000000 0.0000206808927 +0.0000000000000 0.0000206707579 File [modified]: rho_x_[16][16].xg Delta lines: +11 -11 =================================================================== --- trunk/test/test_two_av/rho_x_[16][16].xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/rho_x_[16][16].xg 2013-07-19 15:49:00 UTC (rev 144) @@ -20,17 +20,17 @@ 5.0000000000e-04 1.0000000000e-07 1.8755312500e+00 1.0000000000e-07 3.7505625000e+00 1.0000000000e-07 -5.6255937500e+00 4.6015032040e-05 -7.5006250000e+00 1.1400117181e-04 -9.3756562500e+00 1.8747944755e-04 -1.1250687500e+01 2.5481751564e-04 -1.3125718750e+01 3.0270190125e-04 -1.5000750000e+01 3.2009989416e-04 -1.6875781250e+01 3.0267465190e-04 -1.8750812500e+01 2.5476967135e-04 -2.0625843750e+01 1.8742137541e-04 -2.2500875000e+01 1.1394325671e-04 -2.4375906250e+01 4.5965243893e-05 +5.6255937500e+00 4.5915132040e-05 +7.5006250000e+00 1.1390127181e-04 +9.3756562500e+00 1.8737954755e-04 +1.1250687500e+01 2.5471761564e-04 +1.3125718750e+01 3.0260200125e-04 +1.5000750000e+01 3.1999999416e-04 +1.6875781250e+01 3.0257475190e-04 +1.8750812500e+01 2.5466977135e-04 +2.0625843750e+01 1.8732147541e-04 +2.2500875000e+01 1.1384335671e-04 +2.4375906250e+01 4.5865343893e-05 2.6250937500e+01 1.0000000000e-07 2.8125968750e+01 1.0000000000e-07 3.0001000000e+01 1.0000000000e-07 File [modified]: tau_maximum.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/tau_maximum.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/tau_maximum.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "tau v time -0.0000000000000 0.0000148814442 +0.0000000000000 0.0000148721570 File [modified]: tau_norm1.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/tau_norm1.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/tau_norm1.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "tau v time -0.0000000000000 0.0000000567820 +0.0000000000000 0.0000000567261 File [modified]: tau_norm2.xg Delta lines: +1 -1 =================================================================== --- trunk/test/test_two_av/tau_norm2.xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/tau_norm2.xg 2013-07-19 15:49:00 UTC (rev 144) @@ -1,2 +1,2 @@ "tau v time -0.0000000000000 0.0000005313045 +0.0000000000000 0.0000005308563 File [modified]: tau_x_[16][16].xg Delta lines: +11 -11 =================================================================== --- trunk/test/test_two_av/tau_x_[16][16].xg 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/tau_x_[16][16].xg 2013-07-19 15:49:00 UTC (rev 144) @@ -20,17 +20,17 @@ 5.0000000000e-04 1.2073042319e-12 1.8755312500e+00 1.2190265289e-12 3.7505625000e+00 1.2396537727e-12 -5.6255937500e+00 2.6941317234e-07 -7.5006250000e+00 1.7103770640e-06 -9.3756562500e+00 4.7973619983e-06 -1.1250687500e+01 9.1573748440e-06 -1.3125718750e+01 1.3215392287e-05 -1.5000750000e+01 1.4881444243e-05 -1.6875781250e+01 1.3166266172e-05 -1.8750812500e+01 9.0874676676e-06 -2.0625843750e+01 4.7399939867e-06 -2.2500875000e+01 1.6814105144e-06 -2.4375906250e+01 2.6314476524e-07 +5.6255937500e+00 2.6824463420e-07 +7.5006250000e+00 1.7073807474e-06 +9.3756562500e+00 4.7922507311e-06 +1.1250687500e+01 9.1501960406e-06 +1.3125718750e+01 1.3206670836e-05 +1.5000750000e+01 1.4872156990e-05 +1.6875781250e+01 1.3157576360e-05 +1.8750812500e+01 9.0803423294e-06 +2.0625843750e+01 4.7349422769e-06 +2.2500875000e+01 1.6784634462e-06 +2.4375906250e+01 2.6200218042e-07 2.6250937500e+01 1.2060588939e-12 2.8125968750e+01 1.1776120498e-12 3.0001000000e+01 1.1776120498e-12 File [modified]: test_two_av.par Delta lines: +2 -4 =================================================================== --- trunk/test/test_two_av/test_two_av.par 2013-07-19 15:46:05 UTC (rev 143) +++ trunk/test/test_two_av/test_two_av.par 2013-07-19 15:49:00 UTC (rev 144) @@ -43,15 +43,13 @@ tovsolver::TOV_Num_TOVs = 2 tovsolver::TOV_Num_Radial = 200000 tovsolver::TOV_Combine_Method = "average" +tovsolver::TOV_Gamma = 2.0 +tovsolver::TOV_K = 100.0 tovsolver::TOV_Rho_Central[0] = 0.16e-3 -tovsolver::TOV_Gamma[0] = 2.0 -tovsolver::TOV_K[0] = 100.0 tovsolver::TOV_Position_x[0] = -15.0 tovsolver::TOV_Rho_Central[1] = 0.32e-3 -tovsolver::TOV_Gamma[1] = 2.0 -tovsolver::TOV_K[1] = 100.0 tovsolver::TOV_Position_x[1] = 15.0 IO::out_fileinfo="none"

1 0

[svn:einsteintoolkit] TOVSolver/trunk/ (Rev. 143)
by rhaas＠tapir.caltech.edu 19 Jul '13

19 Jul '13

User: rhaas Date: 2013/07/19 10:46 AM Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ external.inc, tov.c, utils.inc /trunk/test/ test_two_max.par Log: do not set conservatives, remove TOV_Atmosphere remove TOV_Atmosphere[] from the code and no longer set the conservative variables. Instead TOVSolver relies on GRHydro to set the conservatives in InitialPrim2Con and to enforce atmosphere in initialatmospherereset. This also fixes any asymmetry in atmosphere handling between the stars. File Changes: Directory: /trunk/src/ ====================== File [modified]: external.inc Delta lines: +0 -4 =================================================================== --- trunk/src/external.inc 2013-07-11 13:27:33 UTC (rev 142) +++ trunk/src/external.inc 2013-07-19 15:46:05 UTC (rev 143) @@ -57,7 +57,6 @@ assert(TOV_Surface!=0); assert(TOV_R_Surface!=0); - assert(TOV_Atmosphere!=0); assert(TOV_r_1d!=0); assert(TOV_rbar_1d!=0); @@ -130,7 +129,6 @@ assert(TOV_Surface!=0); assert(TOV_R_Surface!=0); - assert(TOV_Atmosphere!=0); assert(TOV_r_1d!=0); assert(TOV_rbar_1d!=0); @@ -200,7 +198,6 @@ assert(TOV_Surface!=0); assert(TOV_R_Surface!=0); - assert(TOV_Atmosphere!=0); assert(TOV_r_1d!=0); assert(TOV_rbar_1d!=0); @@ -587,7 +584,6 @@ ); } - /* FIXME: check for Atmosphere */ } } if (debug) File [modified]: tov.c Delta lines: +3 -90 =================================================================== --- trunk/src/tov.c 2013-07-11 13:27:33 UTC (rev 142) +++ trunk/src/tov.c 2013-07-19 15:46:05 UTC (rev 143) @@ -42,7 +42,6 @@ CCTK_REAL * TOV_Surface=0; CCTK_REAL * TOV_R_Surface=0; CCTK_REAL * TOV_RProp_Surface=0; -CCTK_REAL * TOV_Atmosphere=0; CCTK_REAL * TOV_r_1d=0; CCTK_REAL * TOV_rbar_1d=0; @@ -200,7 +199,6 @@ assert(TOV_Surface!=0); assert(TOV_R_Surface!=0); assert(TOV_RProp_Surface!=0); - assert(TOV_Atmosphere!=0); assert(TOV_r_1d!=0); assert(TOV_rbar_1d!=0); @@ -222,20 +220,6 @@ else rho_central=TOV_Rho_Central[star]; - if (rho_abs_min > 0.0) - TOV_Atmosphere[star] = rho_abs_min; - else - TOV_Atmosphere[star] = rho_central * rho_rel_min; - - if (initial_rho_abs_min > 0.0) - TOV_Atmosphere[star] = initial_rho_abs_min; - else - if (initial_rho_rel_min > 0.0) - TOV_Atmosphere[star] = rho_central * initial_rho_rel_min; - - if (initial_atmosphere_factor > 0.0) - TOV_Atmosphere[star] *= initial_atmosphere_factor; - /* Set conformal state like set in parameter file if we do not use * the old initial data. In this case we have to use what we get */ if (!TOV_Use_Old_Initial_Data) @@ -526,10 +510,9 @@ CCTK_INT i,j,k, i3D, star; CCTK_REAL *r_to_star; - CCTK_REAL g_diag, max_g_diag, max_rho, det, sqrt_det; + CCTK_REAL g_diag, max_g_diag, max_rho; CCTK_REAL my_velx, my_vely, my_velz, my_psi4; - CCTK_REAL vlowx, vlowy, vlowz; - CCTK_REAL D_h_w, PI, local_tiny; + CCTK_REAL PI, local_tiny; CCTK_INT tov_lapse; @@ -543,7 +526,6 @@ assert(TOV_Surface!=0); assert(TOV_R_Surface!=0); - assert(TOV_Atmosphere!=0); assert(TOV_r_1d!=0); assert(TOV_rbar_1d!=0); @@ -608,14 +590,9 @@ { CCTK_INFO("Not using old matter initial data"); TOV_C_fill(rho, LSH_MAX_I+1, 0.0); - TOV_C_fill(dens, LSH_MAX_I+1, 0.0); TOV_C_fill(eps, LSH_MAX_I+1, 0.0); TOV_C_fill(press, LSH_MAX_I+1, 0.0); - TOV_C_fill(tau, LSH_MAX_I+1, 0.0); TOV_C_fill(w_lorentz, LSH_MAX_I+1, 0.0); - TOV_C_fill(sx, LSH_MAX_I+1, 0.0); - TOV_C_fill(sy, LSH_MAX_I+1, 0.0); - TOV_C_fill(sz, LSH_MAX_I+1, 0.0); TOV_C_fill(velx, LSH_MAX_I+1, 0.0); TOV_C_fill(vely, LSH_MAX_I+1, 0.0); TOV_C_fill(velz, LSH_MAX_I+1, 0.0); @@ -789,12 +766,6 @@ rho[i3D] = max_rho; eps[i3D] = eps_point[star]; press[i3D] = press_point[star]; - /* Set atmosphere according to chosen star */ - if(rho[i3D] <= TOV_Atmosphere[star]) { - rho[i3D] = TOV_Atmosphere[star]; - press[i3D] = TOV_K * pow(rho[i3D],TOV_Gamma); - eps[i3D] = press[i3D]/(TOV_Gamma-1.0)/rho[i3D]; - } } else if (CCTK_EQUALS(TOV_Combine_Method, "average")) @@ -832,33 +803,13 @@ eps[i3D] += eps_point[star_i]; press[i3D] += press_point[star_i]; /* we still have to know if we are inside one star - and which */ - if ( (rho_point[star_i] > max_rho) && - (rho_point[star_i] > TOV_Atmosphere[star_i])) + if (rho_point[star_i] > max_rho) { max_rho=rho_point[star_i]; star=star_i; } - - - /* Reset atmosphere according to chosen star */ - /* It is absolutely idiotic to have different - atmosphere thresholds for different stars that are placed - on the same goddamn grid. This also screws symmetry, so - we get rid of it /* - /* if(rho[i3D] <= TOV_Atmosphere[star_i]) { - rho[i3D] = TOV_Atmosphere[star_i]; - press[i3D] = TOV_K[star_i] * pow(rho[i3D],TOV_Gamma[star_i]); - eps[i3D] = press[i3D]/(TOV_Gamma[star_i]-1.0)/rho[i3D]; - } */ - } - if(rho[i3D] <= TOV_Atmosphere[0]) { - rho[i3D] = TOV_Atmosphere[0]; - press[i3D] = TOV_K * pow(rho[i3D],TOV_Gamma); - eps[i3D] = press[i3D]/(TOV_Gamma-1.0)/rho[i3D]; - } - if (TOV_Conformal_Flat_Three_Metric) { my_psi4 -= ((TOV_Num_TOVs+TOV_Use_Old_Initial_Data-1)/my_psi4); @@ -888,34 +839,6 @@ 2*gxz[i3D] * velx[i3D] * velz[i3D]+ 2*gyz[i3D] * vely[i3D] * velz[i3D]) * my_psi4); } - /* now all combine methods are doing the same */ - if ((TOV_Num_TOVs==1) && (rho[i3D] <= TOV_Atmosphere[0])) - { - velx[i3D] = vely[i3D] = velz[i3D] = 0.0; - w_lorentz[i3D] = 1.0; - } - - SpatialDet(gxx[i3D],gxy[i3D],gxz[i3D],gyy[i3D],gyz[i3D],gzz[i3D],&det); - - sqrt_det=sqrt(det) * pow(my_psi4, 1.5); - dens[i3D] = sqrt_det * w_lorentz[i3D] * rho[i3D]; - - /* this variable is only for temporal storage */ - D_h_w = dens[i3D] * (1 + eps[i3D] + press[i3D]/rho[i3D]) * w_lorentz[i3D]; - - vlowx = gxx[i3D]*velx[i3D] + gxy[i3D]*vely[i3D] + gxz[i3D]*velz[i3D]; - vlowy = gxy[i3D]*velx[i3D] + gyy[i3D]*vely[i3D] + gyz[i3D]*velz[i3D]; - vlowz = gxz[i3D]*velx[i3D] + gyz[i3D]*vely[i3D] + gzz[i3D]*velz[i3D]; - - sx[i3D] = D_h_w * vlowx; - sy[i3D] = D_h_w * vlowy; - sz[i3D] = D_h_w * vlowz; - - /* One could use D_h_w here, but it would introduce more error */ - tau[i3D] = sqrt_det * (rho[i3D] *w_lorentz[i3D]*w_lorentz[i3D] * - (1.0 + eps[i3D]) + - press[i3D]*(w_lorentz[i3D]*w_lorentz[i3D]-1.0) ) - - dens[i3D]; } @@ -976,11 +899,6 @@ TOV_Copy(i3D, velx_p_p, velx); TOV_Copy(i3D, vely_p_p, vely); TOV_Copy(i3D, velz_p_p, velz); - TOV_Copy(i3D, dens_p_p, dens); - TOV_Copy(i3D, tau_p_p, tau); - TOV_Copy(i3D, sx_p_p, sx); - TOV_Copy(i3D, sy_p_p, sy); - TOV_Copy(i3D, sz_p_p, sz); TOV_Copy(i3D, w_lorentz_p_p, w_lorentz); case 2: TOV_Copy(i3D, gxx_p, gxx); @@ -991,11 +909,6 @@ TOV_Copy(i3D, velx_p, velx); TOV_Copy(i3D, vely_p, vely); TOV_Copy(i3D, velz_p, velz); - TOV_Copy(i3D, dens_p, dens); - TOV_Copy(i3D, tau_p, tau); - TOV_Copy(i3D, sx_p, sx); - TOV_Copy(i3D, sy_p, sy); - TOV_Copy(i3D, sz_p, sz); TOV_Copy(i3D, w_lorentz_p, w_lorentz); } CCTK_INFO("Done interpolation."); File [modified]: utils.inc Delta lines: +0 -5 =================================================================== --- trunk/src/utils.inc 2013-07-11 13:27:33 UTC (rev 142) +++ trunk/src/utils.inc 2013-07-19 15:46:05 UTC (rev 143) @@ -7,7 +7,6 @@ assert(TOV_Surface==0); assert(TOV_R_Surface==0); assert(TOV_RProp_Surface==0); - assert(TOV_Atmosphere==0); assert(TOV_r_1d==0); assert(TOV_rbar_1d==0); @@ -20,7 +19,6 @@ TOV_Surface = malloc(TOV_Num_TOVs * sizeof(CCTK_REAL)); TOV_R_Surface = malloc(TOV_Num_TOVs * sizeof(CCTK_REAL)); TOV_RProp_Surface = malloc(TOV_Num_TOVs * sizeof(CCTK_REAL)); - TOV_Atmosphere = malloc(TOV_Num_TOVs * sizeof(CCTK_REAL)); TOV_r_1d = malloc(TOV_Num_Radial * TOV_Num_TOVs * sizeof(CCTK_REAL)); TOV_rbar_1d = malloc(TOV_Num_Radial * TOV_Num_TOVs * sizeof(CCTK_REAL)); @@ -39,7 +37,6 @@ assert(TOV_Surface!=0); assert(TOV_R_Surface!=0); assert(TOV_RProp_Surface!=0); - assert(TOV_Atmosphere!=0); assert(TOV_r_1d!=0); assert(TOV_rbar_1d!=0); @@ -50,7 +47,6 @@ free(TOV_Surface); free(TOV_R_Surface); free(TOV_RProp_Surface); - free(TOV_Atmosphere); free(TOV_r_1d); free(TOV_rbar_1d); @@ -63,7 +59,6 @@ TOV_Surface=0; TOV_R_Surface=0; TOV_RProp_Surface=0; - TOV_Atmosphere=0; TOV_r_1d=0; TOV_rbar_1d=0; Directory: /trunk/test/ ======================= File [modified]: test_two_max.par Delta lines: +2 -3 =================================================================== --- trunk/test/test_two_max.par 2013-07-11 13:27:33 UTC (rev 142) +++ trunk/test/test_two_max.par 2013-07-19 15:46:05 UTC (rev 143) @@ -43,10 +43,9 @@ tovsolver::TOV_Num_TOVs = 2 tovsolver::TOV_Num_Radial = 200000 tovsolver::TOV_Combine_Method = "maximum" +tovsolver::TOV_Gamma = 2.0 +tovsolver::TOV_K = 100.0 -tovsolver::TOV_Gamma = 2.0 -tovsolver::TOV_K = 100.0 - tovsolver::TOV_Rho_Central[0] = 0.16e-3 tovsolver::TOV_Position_x[0] = -15.0 Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -7 =================================================================== --- trunk/interface.ccl 2013-07-11 13:27:33 UTC (rev 142) +++ trunk/interface.ccl 2013-07-19 15:46:05 UTC (rev 143) @@ -1,18 +1,12 @@ # Interface definition for thorn TOVSolver implements: TOVSolver -inherits: GRHydro, Constants +inherits: ADMBase, HydroBase, Constants, StaticConformal USES INCLUDE: constants.h public: -void FUNCTION SpatialDet(CCTK_REAL IN gxx, CCTK_REAL IN gxy, \ - CCTK_REAL IN gxz, CCTK_REAL IN gyy, \ - CCTK_REAL IN gyz, CCTK_REAL IN gzz, \ - CCTK_REAL OUT det) -USES FUNCTION SpatialDet - CCTK_INT FUNCTION Set_Rho_ADM( \ CCTK_POINTER_TO_CONST IN cctkGH, \ CCTK_INT IN size, \ File [modified]: schedule.ccl Delta lines: +0 -3 =================================================================== --- trunk/schedule.ccl 2013-07-11 13:27:33 UTC (rev 142) +++ trunk/schedule.ccl 2013-07-19 15:46:05 UTC (rev 143) @@ -30,9 +30,6 @@ SYNC: press SYNC: eps SYNC: vel - SYNC: dens - SYNC: tau - SYNC: scon SYNC: w_lorentz } "Group for the TOV initial data"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 562)
by rhaas＠tapir.caltech.edu 15 Jul '13

15 Jul '13

User: rhaas Date: 2013/07/15 05:33 PM Modified: /trunk/ schedule.ccl Log: GRHydro: always set up SqrtDetg GF in INITIAL rather than only when evolution_method == "GRHydro" so that ID only runs (or static) runs can use InitialAtmosphereReset From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +5 -5 =================================================================== --- trunk/schedule.ccl 2013-07-07 20:58:28 UTC (rev 561) +++ trunk/schedule.ccl 2013-07-15 22:33:13 UTC (rev 562) @@ -383,6 +383,11 @@ } +schedule GRHydro_SqrtSpatialDeterminant AT CCTK_INITIAL AFTER (HydroBase_Initial,GRHydroTransformADMToLocalBasis) BEFORE HydroBase_Prim2ConInitial +{ + LANG: Fortran +} "Calculate sdetg" + if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { @@ -1079,12 +1084,7 @@ LANG: Fortran } "Calculate sdetg" -schedule GRHydro_SqrtSpatialDeterminant AT CCTK_INITIAL AFTER (HydroBase_Initial,GRHydroTransformADMToLocalBasis) BEFORE HydroBase_Prim2ConInitial -{ - LANG: Fortran -} "Calculate sdetg" - #debug ###schedule GRHydro_Debug IN HydroBase_PostStep ###{

1 0

[Carpet] branch, master, updated. carpet-6-init-296-gc4ed131
by Carpet git repositories 11 Jul '13

11 Jul '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 c4ed131c8190db169ae911e9ec65f8ad0e5a8d55 (commit) via 1221068097e23952a22e6a4c962f5b4e55511ec9 (commit) via e6e3f56a902da271e13b151aa4388b5bee325b0e (commit) via 3bd10ccb63673b78023687ae05505f62df20c12d (commit) via 1c675b70943bfa44111cb3629c7df8b5be258ee9 (commit) via f807a4b7c526141dcac08a582feb1dba52cbe6ff (commit) via 306327851d0f3f28b33459ac29b4318a6ee4bcfc (commit) via c024f7e97655c2daf25fdcd18ddc8ee48b7bd412 (commit) via fb8888e0a686e1cec2351cd52631d2c838f4a87a (commit) from 9882933435d2c7edc3423fc4d884d97c44caa2f4 (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 c4ed131c8190db169ae911e9ec65f8ad0e5a8d55 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:18:13 2013 -0400 LoopControl: Add example parameter file for dynamic optimizations commit 1221068097e23952a22e6a4c962f5b4e55511ec9 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:17:58 2013 -0400 LoopControl: Correct example parameter file descriptions commit e6e3f56a902da271e13b151aa4388b5bee325b0e Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:17:31 2013 -0400 LoopControl: Correct logic that chooses tile sizes commit 3bd10ccb63673b78023687ae05505f62df20c12d Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:17:06 2013 -0400 LoopControl: Improve error output handling commit 1c675b70943bfa44111cb3629c7df8b5be258ee9 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:16:38 2013 -0400 LoopControl: Describe unoptimized time with respect to actual time, not vice versa commit f807a4b7c526141dcac08a582feb1dba52cbe6ff Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:16:02 2013 -0400 LoopControl: Sort statistics output commit 306327851d0f3f28b33459ac29b4318a6ee4bcfc Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:15:21 2013 -0400 LoopControl: Use random() instead of rand() commit c024f7e97655c2daf25fdcd18ddc8ee48b7bd412 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:14:41 2013 -0400 LoopControl: Turn hard-coded parameters into Cactus parameters commit fb8888e0a686e1cec2351cd52631d2c838f4a87a Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Jul 11 15:13:46 2013 -0400 LoopControl: Do not output statistics by default ----------------------------------------------------------------------- Summary of changes: ....par => bench-minkowski-carpet-1lev-dynopt.par} | 8 +- .../par/bench-minkowski-carpet-1lev-legacy.par | 2 +- .../par/bench-minkowski-carpet-1lev-test.par | 2 +- .../par/bench-minkowski-carpet-1lev-tiled.par | 2 +- Carpet/LoopControl/param.ccl | 28 +++++ Carpet/LoopControl/schedule.ccl | 4 +- Carpet/LoopControl/src/loopcontrol.cc | 110 ++++++++++++++------ 7 files changed, 115 insertions(+), 41 deletions(-) copy Carpet/LoopControl/par/{bench-minkowski-carpet-1lev-tiled.par => bench-minkowski-carpet-1lev-dynopt.par} (93%) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] TwoPunctures/trunk/test/ (Rev. 134)
by knarf＠cct.lsu.edu 11 Jul '13

11 Jul '13

User: knarf Date: 2013/07/11 08:30 AM Modified: /trunk/test/ bhns_eval.par, bhns_interp.par Log: fix par file of testsuite File Changes: Directory: /trunk/test/ ======================= File [modified]: bhns_eval.par Delta lines: +2 -2 =================================================================== --- trunk/test/bhns_eval.par 2013-06-11 05:44:21 UTC (rev 133) +++ trunk/test/bhns_eval.par 2013-07-11 13:30:09 UTC (rev 134) @@ -77,8 +77,8 @@ TOVSolver::TOV_dr[0] = 5.e-5 TOVSolver::TOV_Position_x[0] = -30 TOVSolver::TOV_Rho_Central[0] = 5.e-4 -TOVSolver::TOV_Gamma[0] = 2.0 -TOVSolver::TOV_K[0] = 100.0 +TOVSolver::TOV_Gamma = 2.0 +TOVSolver::TOV_K = 100.0 IO::out_dir = $parfile IO::out_fileinfo= "axis labels" File [modified]: bhns_interp.par Delta lines: +2 -2 =================================================================== --- trunk/test/bhns_interp.par 2013-06-11 05:44:21 UTC (rev 133) +++ trunk/test/bhns_interp.par 2013-07-11 13:30:09 UTC (rev 134) @@ -77,8 +77,8 @@ TOVSolver::TOV_dr[0] = 5.e-5 TOVSolver::TOV_Position_x[0] = -30 TOVSolver::TOV_Rho_Central[0] = 5.e-4 -TOVSolver::TOV_Gamma[0] = 2.0 -TOVSolver::TOV_K[0] = 100.0 +TOVSolver::TOV_Gamma = 2.0 +TOVSolver::TOV_K = 100.0 IO::out_dir = $parfile IO::out_fileinfo= "axis labels"

1 0

[svn:einsteintoolkit] TOVSolver/trunk/test/ (Rev. 142)
by knarf＠cct.lsu.edu 11 Jul '13

11 Jul '13

User: knarf Date: 2013/07/11 08:27 AM Modified: /trunk/test/ test_two_av.par Log: fix par file of testsuite File Changes: Directory: /trunk/test/ ======================= File [modified]: test_two_av.par Delta lines: +2 -4 =================================================================== --- trunk/test/test_two_av.par 2013-07-08 06:48:44 UTC (rev 141) +++ trunk/test/test_two_av.par 2013-07-11 13:27:33 UTC (rev 142) @@ -43,15 +43,13 @@ tovsolver::TOV_Num_TOVs = 2 tovsolver::TOV_Num_Radial = 200000 tovsolver::TOV_Combine_Method = "average" - -tovsolver::TOV_Rho_Central[0] = 0.16e-3 tovsolver::TOV_Gamma = 2.0 tovsolver::TOV_K = 100.0 + +tovsolver::TOV_Rho_Central[0] = 0.16e-3 tovsolver::TOV_Position_x[0] = -15.0 tovsolver::TOV_Rho_Central[1] = 0.32e-3 -tovsolver::TOV_Gamma = 2.0 -tovsolver::TOV_K = 100.0 tovsolver::TOV_Position_x[1] = 15.0 IO::out_fileinfo="none"

1 0

[svn:einsteintoolkit] incoming/ (Rev. 97)
by reisswig＠tapir.caltech.edu 11 Jul '13

11 Jul '13

User: reisswig Date: 2013/07/11 02:13 AM Modified: / README Log: Updated README File Changes: Directory: / ============ File [modified]: README Delta lines: +4 -4 =================================================================== --- README 2013-07-11 07:10:33 UTC (rev 96) +++ README 2013-07-11 07:13:56 UTC (rev 97) @@ -1,12 +1,12 @@ contribution status -ADMDerivatives Christian Reisswig; needs testsuites -CartesianCoordinates Christian Reisswig; IanH: against inclusion, use Llama instead +ADMDerivatives deleted; is included in Llama +CartesianCoordinates deleted; is included in CTGamma CoreCollapseControl Roland Haas; needs documentation and testsuites IDFileHydro Roland Haas; analog to IDFileADM MemSpeed Erik Schnetter, accepted into CactusUtils -SphericalHarmonicReconGen (PITTNull), Christian Reisswig -SphericalSlice Christian Reisswig; needs testsuites +SphericalHarmonicReconGen (PITTNull), Christian Reisswig; ready to be included. Roland provided testcases. Christian R. still needs to write basic doc. +SphericalSlice Christian Reisswig; needs testsuites. This is currently included in Llama. ParitySymmetry Erik Schnetter, Zlochower TOVSolverHot ? ZelmaniQuadWaveExtract Christian D. Ott; needs a bit cleanup, testsuites, documentation

1 0

[svn:einsteintoolkit] incoming/ (Rev. 96)
by reisswig＠tapir.caltech.edu 11 Jul '13

11 Jul '13

User: reisswig Date: 2013/07/11 02:10 AM Removed: /ADMDerivatives/ /CartesianCoordinates/ Log: Delete thorns that are included with Llama/CTGamma.

1 0

[McLachlan]McLachlan branch, rewrite, updated. ET_2013_05_v0-14-g80a0628
by Carpet git repositories 09 Jul '13

09 Jul '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 "McLachlan". The branch, rewrite has been updated via 80a0628ce41c1f30397a34f050267efc1c184578 (commit) from f276fe35ebf2b9e3a100b7b403a7e8c4995bf2ee (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 80a0628ce41c1f30397a34f050267efc1c184578 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Tue Jul 9 11:25:43 2013 -0400 Correct schedule for radiative RHS boundary conditions ----------------------------------------------------------------------- Summary of changes: m/prototype/ML_BSSN_Helper/schedule.ccl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- McLachlan

1 0

[McLachlan]McLachlan branch, rewrite, updated. ET_2013_05_v0-13-gf276fe3
by Carpet git repositories 08 Jul '13

08 Jul '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 "McLachlan". The branch, rewrite has been updated via f276fe35ebf2b9e3a100b7b403a7e8c4995bf2ee (commit) via 173b4fe035b4c69eb446b74b690066fecbf3c397 (commit) via c8c612bd9f709a89a21dce0e1ceaff2a69bee9ea (commit) via 6e2750020c36083d204afe8d9f14f68e020a1bc4 (commit) from e8471a88c5c758df6b8f25df4069a4b3363e1e9d (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 f276fe35ebf2b9e3a100b7b403a7e8c4995bf2ee Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Jul 8 23:59:03 2013 -0400 Calculate constraints commit 173b4fe035b4c69eb446b74b690066fecbf3c397 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Jul 8 23:58:43 2013 -0400 Generate 4 thorns: BSSN, CCZ4, BSSN_CL, BSSN_NV commit c8c612bd9f709a89a21dce0e1ceaff2a69bee9ea Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Jul 8 23:57:55 2013 -0400 Rename phi to phiW, following new convention in BSSN commit 6e2750020c36083d204afe8d9f14f68e020a1bc4 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Jul 8 23:57:24 2013 -0400 Allow specifying log file in runmath script ----------------------------------------------------------------------- Summary of changes: m/Makefile | 48 +++++++++++++++++++++----- m/McLachlan_ADMQuantities.m | 6 ++-- m/McLachlan_BSSN.m | 80 +++++++++++++++++++++++++++++++++++++------ m/runmath.sh | 10 ++++- 4 files changed, 119 insertions(+), 25 deletions(-) hooks/post-receive -- McLachlan

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 July 2013