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"