[Commits] [svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 117)
knarf at cct.lsu.edu
knarf at cct.lsu.edu
Tue Jul 13 10:47:07 CDT 2010
User: knarf
Date: 2010/07/13 10:47 AM
Modified:
/trunk/src/
external.inc, tov.c
Log:
fix compiler warnings
File Changes:
Directory: /trunk/src/
======================
File [modified]: external.inc
Delta lines: +6 -7
===================================================================
--- trunk/src/external.inc 2010-07-13 15:41:27 UTC (rev 116)
+++ trunk/src/external.inc 2010-07-13 15:47:07 UTC (rev 117)
@@ -367,10 +367,10 @@
*vel0_p_p, *vel1_p_p, *vel2_p_p, *scon0_p_p, *scon1_p_p, *scon2_p_p;
CCTK_REAL *u, *source, *mom_source[3];
CCTK_REAL psip, my_psi4, sqrt_det, vx, vy, vz, v_2,
- w_lorentz_2, d_w_lorentz_2, D_h_w;
+ w_lorentz_2, D_h_w;
CCTK_REAL vlowx, vlowy, vlowz;
- CCTK_INT i, type;
- CCTK_REAL rhoold, rhonew, f, df;
+ CCTK_INT type;
+ CCTK_REAL rhoold, rhonew;
int i3D;
static int debug = 1;
FILE *debugfile = NULL;
@@ -440,7 +440,6 @@
{
if (source[i3D]>0.0)
{
- int count=0;
if (debug && (fabs(z[i3D])<1.e-15))
{
fprintf(debugfile,
@@ -464,8 +463,10 @@
rho[i3D] = 1.e-10;
rhoold = rhonew = rho[i3D];
#ifdef OLD_NR
+ int count=0;
do
{
+ CCTK_REAL f, df;
count++;
vx = mom_source[0][i3D]/my_psi4/
(source[i3D]/my_psi4/my_psi4+TOV_K[0] * pow(rhonew, TOV_Gamma[0]));
@@ -498,7 +499,7 @@
TOV_K[0] * TOV_Gamma[0] * pow(rhonew, TOV_Gamma[0]-1.);
*/
/* d_w_lorentz_2/drhonew */
- d_w_lorentz_2 =
+ CCTK_REAL d_w_lorentz_2 =
-2 * w_lorentz_2*w_lorentz_2 *
v_2 * TOV_K[0]*TOV_Gamma[0]*pow(rhonew, TOV_Gamma[0]-1) /
(source[i3D]/my_psi4/my_psi4 + TOV_K[0]*pow(rhonew, TOV_Gamma[0]));
@@ -647,8 +648,6 @@
void TOVSolverC_export_local_variables(CCTK_REAL **exported_TOV_press_1d, CCTK_REAL **exported_TOV_m_1d, CCTK_REAL **exported_TOV_phi_1d, CCTK_REAL **exported_TOV_rbar_1d, CCTK_REAL **exported_TOV_r_1d)
{
- int i;
-
*exported_TOV_press_1d = TOV_press_1d;
*exported_TOV_m_1d = TOV_m_1d;
*exported_TOV_phi_1d = TOV_phi_1d;
File [modified]: tov.c
Delta lines: +4 -4
===================================================================
--- trunk/src/tov.c 2010-07-13 15:41:27 UTC (rev 116)
+++ trunk/src/tov.c 2010-07-13 15:47:07 UTC (rev 117)
@@ -149,7 +149,7 @@
r_minus_two_m = r - 2.0 * m;
- if ((r==0.0) && (m==0.0))
+ if ((r<=0.0) && (m<=0.0))
{
source_data[1] = 0.0;
source_data[2] = 0.0;
@@ -219,7 +219,7 @@
star_i = star * TOV_Num_Radial;
/* check for parameters */
- if ((TOV_Rho_Central[star]==0.0) && (GRHydro_rho_central>0.0))
+ if ((TOV_Rho_Central[star]<=0.0) && (GRHydro_rho_central>0.0))
rho_central=GRHydro_rho_central;
else
rho_central=TOV_Rho_Central[star];
@@ -283,7 +283,7 @@
old_data[0] = TOV_press_1d[i];
old_data[1] = TOV_m_1d[i];
old_data[2] = TOV_phi_1d[i];
- if (TOV_rbar_1d[i]==TOV_r_1d[i])
+ if (fabs(TOV_rbar_1d[i] - TOV_r_1d[i]) < LOCAL_TINY)
old_data[3] = 0.0;
else
old_data[3] = log(TOV_rbar_1d[i] / TOV_r_1d[i]);
@@ -377,7 +377,7 @@
CCTK_VInfo(CCTK_THORNSTRING, "Information about the TOVs used:");
CCTK_VInfo("", "TOV radius mass bary_mass mass(g) cent.rho rho(cgi) K K(cgi) Gamma");
for (i=0; i<TOV_Num_TOVs; i++)
- if (TOV_Gamma[i]==2.0)
+ if (fabs(TOV_Gamma[i] - 2.0) < LOCAL_TINY)
CCTK_VInfo(""," %d %8g %8g %8g %8.3g %8g %8.3g %8g %8.3g %8g",
i+1, TOV_R_Surface[i],
TOV_m_1d[(i+1)*TOV_Num_Radial-1],
More information about the Commits
mailing list