User: bmundim Date: 2012/05/17 02:29 PM
Modified: /trunk/src/ GRHydro_Con2PrimM_polytype_pt.c, GRHydro_Con2PrimM_pt.c, GRHydro_Jacobian_state.c
Log: GRHydro: a bit of a clean-up of unused variables to avoid compiler complaints
File Changes:
Directory: /trunk/src/ ======================
File [modified]: GRHydro_Con2PrimM_polytype_pt.c Delta lines: +9 -12 =================================================================== --- trunk/src/GRHydro_Con2PrimM_polytype_pt.c 2012-05-16 16:28:21 UTC (rev 335) +++ trunk/src/GRHydro_Con2PrimM_polytype_pt.c 2012-05-17 19:29:58 UTC (rev 336) @@ -206,14 +206,14 @@ CCTK_REAL usx, usy, usz; CCTK_REAL dens, gammaeos; CCTK_REAL QdotB,utsq,gamma_sq; - CCTK_REAL rho0,u,p,w,gammasq,gamma,gtmp,W_last,W,vsq; + CCTK_REAL rho0,u,p,w,gammasq,gamma,W_last,W,vsq; CCTK_REAL g_o_WBsq, QdB_o_W; CCTK_REAL rho_g, x_rho[1]; CCTK_REAL detg = (*det); CCTK_REAL sqrt_detg = sqrt(detg); CCTK_REAL inv_sqrt_detg = 1./sqrt_detg; CCTK_REAL t2, rho_gm1; - CCTK_INT i,j, i_increase,ntries ; + CCTK_INT i_increase,ntries ;
struct LocGlob lg;
@@ -492,10 +492,9 @@ CCTK_REAL f, df, dx[1], x_old[1], resid[1], jac[1][1]; CCTK_REAL errx, x_orig[1]; - CCTK_INT n_iter, id, jd, i_extra, doing_extra; - CCTK_REAL dW,W,W_old; + CCTK_INT n_iter, i_extra, doing_extra;
- CCTK_INT keep_iterating, i_increase; + CCTK_INT keep_iterating;
// Initialize various parameters and variables: @@ -505,8 +504,6 @@ //-fast for( id = 0; id < n ; id++) x_old[id] = x_orig[id] = x[id] ; x_old[0] = x_orig[0] = x[0] ;
- W = W_old = 0.; - n_iter = 0;
@@ -590,7 +587,7 @@ return(1); }
- return(0); +
}
@@ -696,8 +693,8 @@ CCTK_REAL f, df, dx[1], x_old[1], resid[1], jac[1][1]; CCTK_REAL errx, x_orig[1]; - CCTK_INT n_iter, id,jd, i_extra, doing_extra; - CCTK_REAL dW,W,W_old; + CCTK_INT n_iter, i_extra, doing_extra; +
CCTK_INT keep_iterating;
@@ -776,7 +773,7 @@ return(1); }
- return(0); +
}
@@ -802,7 +799,7 @@ struct LocGlob *lgp) {
- CCTK_REAL A, B, C, rho, W, B0; + CCTK_REAL rho, W; CCTK_REAL t40,t14;
CCTK_REAL gm1 = gammaeos-1.;
File [modified]: GRHydro_Con2PrimM_pt.c Delta lines: +8 -10 =================================================================== --- trunk/src/GRHydro_Con2PrimM_pt.c 2012-05-16 16:28:21 UTC (rev 335) +++ trunk/src/GRHydro_Con2PrimM_pt.c 2012-05-17 19:29:58 UTC (rev 336) @@ -216,7 +216,7 @@ CCTK_REAL detg = (*det); CCTK_REAL sqrt_detg = sqrt(detg); CCTK_REAL inv_sqrt_detg = 1./sqrt_detg; - CCTK_INT i,j, i_increase; + CCTK_INT i_increase;
DECLARE_CCTK_PARAMETERS;
@@ -458,7 +458,7 @@
static CCTK_REAL x1_of_x0(CCTK_REAL x0, struct LocGlob *lgp ) { - CCTK_REAL x1,vsq; + CCTK_REAL vsq; CCTK_REAL dv = 1.e-15;
vsq = fabs(vsq_calc(x0,lgp)) ; // guaranteed to be positive @@ -509,8 +509,8 @@ CCTK_REAL f, df, dx[2], x_old[2]; CCTK_REAL resid[2], jac[2][2]; CCTK_REAL errx, x_orig[2]; - CCTK_INT n_iter, id, jd, i_extra, doing_extra; - CCTK_REAL dW,dvsq,vsq_old,vsq,W,W_old; + CCTK_INT n_iter, i_extra, doing_extra; + CCTK_REAL vsq,W,W_old; const CCTK_REAL dv = (1.-1.e-15);
CCTK_INT keep_iterating; @@ -523,7 +523,7 @@ x_old[0] = x_orig[0] = x[0] ; x_old[1] = x_orig[1] = x[1] ;
- vsq_old = vsq = W = W_old = 0.; + vsq = W = W_old = 0.; n_iter = 0;
/* Start the Newton-Raphson iterations : */ @@ -598,7 +598,7 @@ return(1); }
- return(0); +
}
@@ -626,15 +626,13 @@ {
- CCTK_REAL W, vsq, Wsq, p_tmp, dPdvsq, dPdW; - CCTK_REAL t11, t16,t18,t2,t21, t23, t24, t25, t3, t35, t36, t4, t40; + CCTK_REAL W, vsq, p_tmp, dPdvsq, dPdW; + CCTK_REAL t11, t16,t18,t2,t21, t23, t24, t25, t3, t35, t4, t40;
W = x[0]; vsq = x[1];
- Wsq = W*W; - p_tmp = eos_info(W, vsq, &dPdW, &dPdvsq, gammaeos, lgp);
// These expressions were calculated using Mathematica, but made into efficient
File [modified]: GRHydro_Jacobian_state.c Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Jacobian_state.c 2012-05-16 16:28:21 UTC (rev 335) +++ trunk/src/GRHydro_Jacobian_state.c 2012-05-17 19:29:58 UTC (rev 336) @@ -16,7 +16,6 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS
- int ierr; static CCTK_INT idxJacobian_state = -1, idxiJacobian_state = -1;
if (!CCTK_IsImplementationActive("Coordinates"))