[Commits] [svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 128)

[cott at tapir.caltech.edu]

User: cott
Date: 2011/05/17 09:53 PM

Modified:
 /trunk/src/
  tov.c

Log:
 * set up consistent values of press and eps in 
   the atmosphere.

File Changes:

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

File [modified]: tov.c
Delta lines: +10 -4
===================================================================
--- trunk/src/tov.c	2011-04-21 04:47:01 UTC (rev 127)
+++ trunk/src/tov.c	2011-05-18 02:53:28 UTC (rev 128)
@@ -773,11 +773,14 @@
                                 my_psi4);
 
         rho[i3D] = max_rho;
+        eps[i3D] = eps_point[star];
+        press[i3D] = press_point[star];
         /* Set atmosphere according to chosen star */
-        if(rho[i3D] <= TOV_Atmosphere[star])
+        if(rho[i3D] <= TOV_Atmosphere[star]) {
           rho[i3D] = TOV_Atmosphere[star];
-        eps[i3D] = eps_point[star];
-        press[i3D] = press_point[star];
+	  press[i3D] = TOV_K[star] * pow(rho[i3D],TOV_Gamma[star]);
+          eps[i3D] = press[i3D]/(TOV_Gamma[star]-1.0)/rho[i3D];
+	}
 
       }
       else if (CCTK_EQUALS(TOV_Combine_Method, "average"))
@@ -823,8 +826,11 @@
           }
 
           /* Reset atmosphere according to chosen star */
-          if(rho[i3D] <= TOV_Atmosphere[star_i])
+          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];
+	  }
         }
 
         if (TOV_Conformal_Flat_Three_Metric)