User: rhaas Date: 2012/05/13 02:12 PM

Modified: /trunk/src/ GRHydro_Con2PrimM_pt_EOSOmni.c

Log: Adding Josh's latest changes to the general EOS Con2PrimM routine.

patch by Philipp Moesta

File Changes:

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

File [modified]: GRHydro_Con2PrimM_pt_EOSOmni.c Delta lines: +5 -5 =================================================================== --- trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c 2012-05-13 19:10:12 UTC (rev 323) +++ trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c 2012-05-13 19:12:00 UTC (rev 324) @@ -89,7 +89,7 @@ CCTK_REAL [], CCTK_REAL [][2], CCTK_REAL *, CCTK_REAL *, CCTK_REAL, struct LocGlob *) );

-static CCTK_INT threed_newton_raphson( CCTK_REAL x[], struct eosomnivars *eosvars, struct LocGlob *lgp, +static CCTK_INT threed_newton_raphson_omni( CCTK_REAL x[], struct eosomnivars *eosvars, struct LocGlob *lgp, void (*funcd) (CCTK_REAL [], CCTK_REAL [], CCTK_REAL [], CCTK_REAL [][3], CCTK_REAL *, CCTK_REAL *, @@ -386,7 +386,7 @@ } else { //USE 3d NR for non-polytropes! x_3d[2] = u; - *retval = 1.0*threed_newton_raphson( x_3d, &eosvars, &lg, func_vsq_eosomni ) ; + *retval = 1.0*threed_newton_raphson_omni( x_3d, &eosvars, &lg, func_vsq_eosomni ) ; }

W = x_3d[0]; @@ -646,14 +646,14 @@

/************************************************************

- threed_newton_raphson(): + threed_newton_raphson_omni():

-- performs Newton-Rapshon method on an 2d system for polytropes.

-- inspired in part by Num. Rec.'s routine newt();

*****************************************************************/ -static CCTK_INT threed_newton_raphson( CCTK_REAL x[], struct eosomnivars *eosvars, struct LocGlob *lgp, +static CCTK_INT threed_newton_raphson_omni( CCTK_REAL x[], struct eosomnivars *eosvars, struct LocGlob *lgp, void (*funcd) (CCTK_REAL [], CCTK_REAL [], CCTK_REAL [], CCTK_REAL [][3], CCTK_REAL *, CCTK_REAL *, struct eosomnivars *, struct LocGlob *) ) @@ -900,7 +900,7 @@ j01 = -1.0*B2plusW_sq;

- //Eq. 5: Qdotn + B^2(1+vsq)/2 - QdotBsq/2/W^2 + vsq W + rho_0(vsq) + u = 0 + //Eq. 5: -Qdotn - B^2(1+vsq)/2 + QdotBsq/2/W^2 - vsq W - rho_0(vsq) - u = 0 //rho0 = D * sqrt(1-vsq)

resid[1] = -lgp->Qdotn - lgp->half_Bsq*(1.0+vsq) + 0.5*QB2Winv2 - vsq*W - rho0 - u;