diff options
| author | rhaas <rhaas@1bdb13ef-5d69-4035-bb54-08abeb3aa7f1> | 2013-07-08 06:45:43 +0000 |
|---|---|---|
| committer | rhaas <rhaas@1bdb13ef-5d69-4035-bb54-08abeb3aa7f1> | 2013-07-08 06:45:43 +0000 |
| commit | 7337d16bc3e4866f5011dd5a88ea76fb3c5f29da (patch) | |
| tree | cefff6c089825423ae0f58966de784959c64c69e | |
| parent | f1e06328a789a6c203ae9043258cc815b0e047ef (diff) | |
remove duplicate parameter from test_two_max test
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/TOVSolver/trunk@140 1bdb13ef-5d69-4035-bb54-08abeb3aa7f1
| -rw-r--r-- | src/tov.c | 13 | ||||
| -rw-r--r-- | test/test_two_av.par | 5 | ||||
| -rw-r--r-- | test/test_two_max.par | 5 |
3 files changed, 11 insertions, 12 deletions
@@ -844,20 +844,21 @@ 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[star_i] * pow(rho[i3D],TOV_Gamma[star_i]); - eps[i3D] = press[i3D]/(TOV_Gamma[star_i]-1.0)/rho[i3D]; - } */ + press[i3D] = TOV_K * pow(rho[i3D],TOV_Gamma); + eps[i3D] = press[i3D]/(TOV_Gamma-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 8f074b0..597e96e 100644 --- a/test/test_two_av.par +++ b/test/test_two_av.par @@ -44,14 +44,13 @@ 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" diff --git a/test/test_two_max.par b/test/test_two_max.par index 4a2819a..8aed875 100644 --- a/test/test_two_max.par +++ b/test/test_two_max.par @@ -44,14 +44,13 @@ tovsolver::TOV_Num_TOVs = 2 tovsolver::TOV_Num_Radial = 200000 tovsolver::TOV_Combine_Method = "maximum" -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" |