From e49156de33bd089d3c0e11422330eb0cf3c13858 Mon Sep 17 00:00:00 2001 From: rhaas Date: Mon, 8 Jul 2013 06:48:44 +0000 Subject: revert accidentically committed changes in rev 140 git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TOVSolver/trunk@141 1bdb13ef-5d69-4035-bb54-08abeb3aa7f1 --- src/tov.c | 13 ++++++------- test/test_two_av.par | 5 +++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tov.c b/src/tov.c index fd06768..a5d206d 100644 --- a/src/tov.c +++ b/src/tov.c @@ -844,21 +844,20 @@ void TOV_C_Exact(CCTK_ARGUMENTS) /* 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) { diff --git a/test/test_two_av.par b/test/test_two_av.par index 597e96e..8f074b0 100644 --- a/test/test_two_av.par +++ b/test/test_two_av.par @@ -44,13 +44,14 @@ 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" -- cgit v1.2.3