From ea70d0ee2becfeabce8fbc261779c571da1572e0 Mon Sep 17 00:00:00 2001 From: cott Date: Sun, 7 Jul 2013 05:34:05 +0000 Subject: * 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. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TOVSolver/trunk@137 1bdb13ef-5d69-4035-bb54-08abeb3aa7f1 --- src/tov.c | 5 +++++ test/test_one_boost_max.par | 4 ++-- test/test_one_static_max.par | 4 ++-- test/test_tov_carpet.par | 4 ++-- test/test_two_av.par | 8 ++++---- test/test_two_max.par | 8 ++++---- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/tov.c b/src/tov.c index 7fbbcd8..fa65e58 100644 --- a/src/tov.c +++ b/src/tov.c @@ -829,6 +829,10 @@ void TOV_C_Exact(CCTK_ARGUMENTS) (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 @@ void TOV_C_Exact(CCTK_ARGUMENTS) (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) diff --git a/test/test_one_boost_max.par b/test/test_one_boost_max.par index d949733..6dd2846 100644 --- a/test/test_one_boost_max.par +++ b/test/test_one_boost_max.par @@ -41,8 +41,8 @@ ADMBase::initial_lapse = "tov" 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 diff --git a/test/test_one_static_max.par b/test/test_one_static_max.par index c65b2e7..6cb4b5b 100644 --- a/test/test_one_static_max.par +++ b/test/test_one_static_max.par @@ -41,8 +41,8 @@ ADMBase::initial_lapse = "tov" 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 diff --git a/test/test_tov_carpet.par b/test/test_tov_carpet.par index ab4c26e..4073448 100644 --- a/test/test_tov_carpet.par +++ b/test/test_tov_carpet.par @@ -52,8 +52,8 @@ ADMBase::initial_lapse = "tov" 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 diff --git a/test/test_two_av.par b/test/test_two_av.par index 0b5725e..8f074b0 100644 --- a/test/test_two_av.par +++ b/test/test_two_av.par @@ -45,13 +45,13 @@ tovsolver::TOV_Num_Radial = 200000 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" diff --git a/test/test_two_max.par b/test/test_two_max.par index 39761a3..4a2819a 100644 --- a/test/test_two_max.par +++ b/test/test_two_max.par @@ -45,13 +45,13 @@ tovsolver::TOV_Num_Radial = 200000 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" -- cgit v1.2.3