User: cott Date: 2013/07/07 12:34 AM

Modified: /trunk/src/ tov.c /trunk/test/ test_one_boost_max.par, test_one_static_max.par, test_tov_carpet.par, test_two_av.par, test_two_max.par

Log: * remove option to have different gamma and K for different stars. That's physically impossible. * adjust test par files (will do so with GRHydro next) * modify the way solutions are added so that atmosphere cuts are applied after solutions are added. Otherwise one of the stars will have the atmosphere added to it. This breaks symmetry.

File Changes:

Directory: /trunk/src/ ======================

File [modified]: tov.c Delta lines: +5 -0 =================================================================== --- trunk/src/tov.c 2013-05-27 22:33:05 UTC (rev 136) +++ trunk/src/tov.c 2013-07-07 05:34:05 UTC (rev 137) @@ -829,6 +829,10 @@ (r_to_star[star_i] * r_to_star[star_i] + 1.0e-30)) / my_psi4; rho[i3D] += rho_point[star_i]; + if( fabs(x[i3D]-15.0) <= 1.0e-10 || + fabs(x[i3D]+15.0) <= 1.0e-10 ) { + fprintf(stderr,"%22.14E %22.14E\n",x[i3D],rho[i3D]); + } 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 */ @@ -904,6 +908,7 @@ (1.0 + eps[i3D]) + press[i3D]*(w_lorentz[i3D]*w_lorentz[i3D]-1.0) ) - dens[i3D]; + abort(); } /* if used, recalculate the derivatives of the conformal factor */ if (*conformal_state > 1)

Directory: /trunk/test/ =======================

File [modified]: test_one_boost_max.par Delta lines: +2 -2 =================================================================== --- trunk/test/test_one_boost_max.par 2013-05-27 22:33:05 UTC (rev 136) +++ trunk/test/test_one_boost_max.par 2013-07-07 05:34:05 UTC (rev 137) @@ -41,8 +41,8 @@ ADMBase::initial_shift = "tov"

tovsolver::TOV_Rho_Central[0] = 1.28e-3 -tovsolver::TOV_Gamma[0] = 2.0 -tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Gamma = 2.0 +tovsolver::TOV_K = 100.0 tovsolver::TOV_Velocity_x[0] = 0.1 tovsolver::TOV_Velocity_y[0] = 0.2 tovsolver::TOV_Velocity_z[0] = 0.3

File [modified]: test_one_static_max.par Delta lines: +2 -2 =================================================================== --- trunk/test/test_one_static_max.par 2013-05-27 22:33:05 UTC (rev 136) +++ trunk/test/test_one_static_max.par 2013-07-07 05:34:05 UTC (rev 137) @@ -41,8 +41,8 @@ ADMBase::initial_shift = "tov"

tovsolver::TOV_Rho_Central[0] = 1.28e-3 -tovsolver::TOV_Gamma[0] = 2.0 -tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Gamma = 2.0 +tovsolver::TOV_K = 100.0 tovsolver::TOV_Combine_Method = "maximum"

IO::out_dir = $parfile

File [modified]: test_tov_carpet.par Delta lines: +2 -2 =================================================================== --- trunk/test/test_tov_carpet.par 2013-05-27 22:33:05 UTC (rev 136) +++ trunk/test/test_tov_carpet.par 2013-07-07 05:34:05 UTC (rev 137) @@ -52,8 +52,8 @@ ADMBase::initial_shift = "tov"

tovsolver::TOV_Rho_Central[0] = 1.28e-3 -tovsolver::TOV_Gamma[0] = 2.0 -tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Gamma = 2.0 +tovsolver::TOV_K = 100.0 tovsolver::TOV_Combine_Method = "maximum"

Carpet::prolongation_order_space = 3

File [modified]: test_two_av.par Delta lines: +4 -4 =================================================================== --- trunk/test/test_two_av.par 2013-05-27 22:33:05 UTC (rev 136) +++ trunk/test/test_two_av.par 2013-07-07 05:34:05 UTC (rev 137) @@ -45,13 +45,13 @@ tovsolver::TOV_Combine_Method = "average"

tovsolver::TOV_Rho_Central[0] = 0.16e-3 -tovsolver::TOV_Gamma[0] = 2.0 -tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Gamma = 2.0 +tovsolver::TOV_K = 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_Gamma = 2.0 +tovsolver::TOV_K = 100.0 tovsolver::TOV_Position_x[1] = 15.0

IO::out_fileinfo="none"

File [modified]: test_two_max.par Delta lines: +4 -4 =================================================================== --- trunk/test/test_two_max.par 2013-05-27 22:33:05 UTC (rev 136) +++ trunk/test/test_two_max.par 2013-07-07 05:34:05 UTC (rev 137) @@ -45,13 +45,13 @@ tovsolver::TOV_Combine_Method = "maximum"

tovsolver::TOV_Rho_Central[0] = 0.16e-3 -tovsolver::TOV_Gamma[0] = 2.0 -tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Gamma = 2.0 +tovsolver::TOV_K = 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_Gamma = 2.0 +tovsolver::TOV_K = 100.0 tovsolver::TOV_Position_x[1] = 15.0

IO::out_fileinfo="none"