User: rhaas Date: 2013/07/08 01:48 AM
Modified: /trunk/src/ tov.c /trunk/test/ test_two_av.par
Log: revert accidentically committed changes in rev 140
File Changes:
Directory: /trunk/src/ ======================
File [modified]: tov.c Delta lines: +6 -7 =================================================================== --- trunk/src/tov.c 2013-07-08 06:45:43 UTC (rev 140) +++ trunk/src/tov.c 2013-07-08 06:48:44 UTC (rev 141) @@ -844,21 +844,20 @@ /* 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]) { + we get rid of it /* + /* if(rho[i3D] <= TOV_Atmosphere[star_i]) { rho[i3D] = TOV_Atmosphere[star_i]; - press[i3D] = TOV_K * pow(rho[i3D],TOV_Gamma); - eps[i3D] = press[i3D]/(TOV_Gamma-1.0)/rho[i3D]; - } /**/ + 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 0 + 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]; } -#endif
if (TOV_Conformal_Flat_Three_Metric) {
Directory: /trunk/test/ =======================
File [modified]: test_two_av.par Delta lines: +3 -2 =================================================================== --- trunk/test/test_two_av.par 2013-07-08 06:45:43 UTC (rev 140) +++ trunk/test/test_two_av.par 2013-07-08 06:48:44 UTC (rev 141) @@ -44,13 +44,14 @@ 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"