Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] HydroBase/trunk/doc/ (Rev. 41)
by bcmsma＠astro.rit.edu 15 Sep '11

15 Sep '11

User: bmundim Date: 2011/09/15 03:48 PM Modified: /trunk/doc/ documentation.tex Log: Add a few lines about units adopted, in particular the conversion factors for your convenience. Please review these numbers though. File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: +15 -1 =================================================================== --- trunk/doc/documentation.tex 2011-04-21 04:46:32 UTC (rev 40) +++ trunk/doc/documentation.tex 2011-09-15 20:48:00 UTC (rev 41) @@ -132,7 +132,7 @@ a common set of variables by different hydrodynamics codes creates the possibility to share parts of the code, e.g.\ initial data solvers or analysis routines. -Currently the defined primitive variables are (see~\cite{livrevgrfd} for +Currently the defined primitive variables are (see~\cite{livrevgrrfd} for details): \begin{itemize} \item \verb|rho|: rest mass density $\varrho$ @@ -185,6 +185,8 @@ M_\mathrm{sun} = 1 &;& c = G = 1 \end{eqnarray} which are commonly used in astrophysics and in relativity. +The former sets the mass scale to the solar one and the latter +adopts the same units for time, length and mass. We assume the following definitions and constants of nature: \begin{eqnarray} @@ -211,6 +213,18 @@ [B] & = & 1/[L]\; / \sqrt{\epsilon_0 G / c^2} \end{eqnarray} +Inserting the SI units into the above unit correspondences, +we find the following conversion factors: +\begin{equation} + M_\mathrm{sun} \equiv 1.477\, \mathrm{km} + \equiv 4.92673\, \mathrm{\mu s} + \equiv 8.344956\cdot 10^{15}\, \mathrm{T}, +\end{equation} +where T (Tesla) is the magnetic field unit in SI, +$1\,\mathrm{T}=1\,\mathrm{N/(A\cdot m)}$, or in its cgs equivalent, +$1\,\mathrm{Tesla} = 10^4\,\mathrm{Gauss}$. + + \section{Acknowledgments} This thorn was produced by Tanja Bode, Roland Haas, Frank L\"offler, and Erik Schnetter.

1 0

[svn:einsteintoolkit] manifest/branches/ET_2011_05/ (Rev. 110)
by knarf＠cct.lsu.edu 15 Sep '11

15 Sep '11

User: knarf Date: 2011/09/15 12:19 PM Modified: /branches/ET_2011_05/ einsteintoolkit.th Log: reflect move of two Cactus thorns File Changes: Directory: /branches/ET_2011_05/ ================================ File [modified]: einsteintoolkit.th Delta lines: +2 -2 =================================================================== --- branches/ET_2011_05/einsteintoolkit.th 2011-09-06 21:01:51 UTC (rev 109) +++ branches/ET_2011_05/einsteintoolkit.th 2011-09-15 17:19:41 UTC (rev 110) @@ -73,8 +73,6 @@ CactusBase/IOASCII CactusBase/IOBasic CactusBase/IOUtil -CactusBase/LocalInterp -CactusBase/LocalReduce CactusBase/SymBase CactusBase/Time @@ -91,6 +89,8 @@ CactusNumerical/Cartoon2D CactusNumerical/Dissipation CactusNumerical/InterpToArray +CactusNumerical/LocalInterp +CactusNumerical/LocalReduce CactusNumerical/MoL CactusNumerical/Noise CactusNumerical/Norms

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 274)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:51 AM Added: /trunk/src/ GRHydro_TransformTensorBasis.c Removed: /trunk/src/ GRHydro_TransformTensorBasis.F90 Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90, GRHydro_EoSChangeGamma.F90, GRHydro_HLLE.F90, GRHydro_Jacobian_state.c, GRHydro_PPMMReconstruct_drv.F90, GRHydro_PPMReconstruct_drv.F90, GRHydro_ParamCheck.F90, GRHydro_Prim2Con.F90, GRHydro_RegisterVars.cc, GRHydro_Source.F90, GRHydro_TVDReconstruct_drv.F90, GRHydro_UpdateMask.F90, make.code.defn Log: remove explicit dependence on Multipatch thorns GRHydro now compiles and runs without MP thorns present and behaves identical to the old version File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLE.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Jacobian_state.c Delta lines: <Unavailable> File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_PPMReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2Con.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RegisterVars.cc Delta lines: <Unavailable> File [modified]: GRHydro_Source.F90 Delta lines: <Unavailable> File [modified]: GRHydro_TVDReconstruct_drv.F90 Delta lines: <Unavailable> File [removed]: GRHydro_TransformTensorBasis.F90 Delta lines: <Unavailable> File [added]: GRHydro_TransformTensorBasis.c Delta lines: <Unavailable> File [modified]: GRHydro_UpdateMask.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 273)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:49 AM Added: /trunk/src/ GRHydro_Jacobian_state.c, GRHydro_TransformTensorBasis.F90 Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90, GRHydro_ENOReconstruct_drv.F90, GRHydro_EoSChangeGamma.F90, GRHydro_HLLE.F90, GRHydro_PPMMReconstruct_drv.F90, GRHydro_PPMReconstruct_drv.F90, GRHydro_Prim2Con.F90, GRHydro_RegisterVars.cc, GRHydro_Source.F90, GRHydro_TVDReconstruct_drv.F90, GRHydro_UpdateMask.F90, make.code.defn Log: add Multipatch support to GRHydro * not all features of GRHydro are supported yet, in particular only the HLLE solver supports Mulitpatch yet. Original commit by Christian Reisswig and Christian Ott File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ENOReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLE.F90 Delta lines: <Unavailable> File [added]: GRHydro_Jacobian_state.c Delta lines: <Unavailable> File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_PPMReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2Con.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RegisterVars.cc Delta lines: <Unavailable> File [modified]: GRHydro_Source.F90 Delta lines: <Unavailable> File [modified]: GRHydro_TVDReconstruct_drv.F90 Delta lines: <Unavailable> File [added]: GRHydro_TransformTensorBasis.F90 Delta lines: <Unavailable> File [modified]: GRHydro_UpdateMask.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 272)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:47 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Eigenproblem_Marquina.F90 Log: clean up variable definitions in Eigenproblem_Marquina File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:47:00 UTC (rev 271) +++ trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:47:44 UTC (rev 272) @@ -148,7 +148,7 @@ rho(i,j,k),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& press(i,j,k),keyerr,anyerr) else - ! use polytropic EOS + ! w_lorentz=1, so the expression for tau reduces to: keytemp = 0 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) File [modified]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: +20 -16 =================================================================== --- trunk/src/GRHydro_Eigenproblem_Marquina.F90 2011-09-15 16:47:00 UTC (rev 271) +++ trunk/src/GRHydro_Eigenproblem_Marquina.F90 2011-09-15 16:47:44 UTC (rev 272) @@ -91,15 +91,17 @@ CCTK_REAL invulpfac, invulmfac, invurpfac, invurmfac ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + integer :: n + integer :: keytemp + integer :: anyerr + integer :: keyerr(1) + real*8 :: xpress + real*8 :: xeps + real*8 :: xtemp + real*8 :: xye ! end EOS Omni vars + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xeps=0.0d0;xtemp=0.0d0;xye=0.0d0 one = 1.0d0 two = 2.0d0 @@ -816,15 +818,17 @@ ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + integer :: n + integer :: keytemp + integer :: anyerr + integer :: keyerr(1) + real*8 :: xpress + real*8 :: xeps + real*8 :: xtemp + real*8 :: xye ! end EOS Omni vars + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xeps=0.0d0;xtemp=0.0d0;xye=0.0d0 one = 1.0d0 two = 2.0d0

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 271)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:47 AM Modified: /trunk/ interface.ccl Log: make evolve_* scalars accessable File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +2 -2 =================================================================== --- trunk/interface.ccl 2011-09-15 16:46:26 UTC (rev 270) +++ trunk/interface.ccl 2011-09-15 16:47:00 UTC (rev 271) @@ -422,14 +422,14 @@ psidcflux } "Fluxes for the divergence cleaning parameter" -private: - int evolve_Y_e type = SCALAR tags='checkpoint="no"' "Are we evolving Y_e? Set in Paramcheck" int evolve_temper type = SCALAR tags='checkpoint="no"' "Are we evolving temperature? Set in Paramcheck" int evolve_MHD type = SCALAR tags='checkpoint="no"' "Are we doing MHD? Set in ParamCheck" +private: + int GRHydro_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now" real GRHydro_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 270)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:46 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2Prim.F90 Log: * improve behavior of CoreCollapseControl upon recovery * improve handling of too-low temperatures in GRHydro File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +43 -6 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:45:26 UTC (rev 269) +++ trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:46:26 UTC (rev 270) @@ -628,8 +628,8 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) - if(nf.gt.nfudgemax) then - call CCTK_WARN(failinfomode,"EOS error in c2p 0a: injected heat too many times") + if(nf.gt.nfudgemax.and.GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then + call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye @@ -639,6 +639,19 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + else + call CCTK_WARN(failinfomode,"EOS error in c2p 1: LAST RESORT -- reset eps and tau based on old temp") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + keytemp = 1 + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& + rho,epsilon,temp,ye,xpress,keyerr,anyerr) + tau = ( (rho + rho*epsilon) + xpress ) * w_lorentz**2 - xpress - rho*w_lorentz + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + keytemp = 0 endif else call CCTK_WARN(failinfomode,"EOS error in c2p 0") @@ -706,7 +719,7 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) - if(nf.gt.nfudgemax) then + if(nf.gt.nfudgemax.and.GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -717,6 +730,19 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + else + call CCTK_WARN(failinfomode,"EOS error in c2p 1: LAST RESORT -- reset eps and tau based on old temp") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + keytemp = 1 + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& + rho,epsilon,temp,ye,xpress,keyerr,anyerr) + tau = ( (rho + rho*epsilon) + xpress ) * w_lorentz**2 - xpress - rho*w_lorentz + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + keytemp = 0 endif else call CCTK_WARN(failinfomode,"EOS error in c2p 1") @@ -789,8 +815,6 @@ ! found for a given epsilon. The amount of times ! we get to this place should be monitored, as this ! 'failsafe' mode creates artificial heat. - write(warnline,"(4i5,1P10E15.6)") GRHydro_reflevel,ii,jj,kk,x,y,z - call CCTK_WARN(0,warnline) nf = 0 do while(anyerr.ne.0.and.nf.le.nfudgemax) anyerr = 0 @@ -804,7 +828,7 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) - if(nf.gt.nfudgemax) then + if(nf.gt.nfudgemax.and.GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -815,6 +839,19 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") + else + call CCTK_WARN(failinfomode,"EOS error in c2p 1: LAST RESORT -- reset eps and tau based on old temp") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + keytemp = 1 + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& + rho,epsilon,temp,ye,xpress,keyerr,anyerr) + tau = ( (rho + rho*epsilon) + xpress ) * w_lorentz**2 - xpress - rho*w_lorentz + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + keytemp = 0 endif else call CCTK_WARN(failinfomode,"EOS error in c2p 2") Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2011-09-15 16:45:26 UTC (rev 269) +++ trunk/param.ccl 2011-09-15 16:46:26 UTC (rev 270) @@ -267,6 +267,10 @@ boolean GRHydro_eos_hot_eps_fix "Activate quasi-failsafe mode for hot EOSs" STEERABLE=ALWAYS { } "no" + +boolean GRHydro_c2p_reset_eps_tau_hot_eos "As a last resort, reset tau" STEERABLE=ALWAYS +{ +} "no" REAL GRHydro_hot_atmo_temp "Temperature of the hot atmosphere in MeV" STEERABLE=ALWAYS {

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 269)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:45 AM Modified: /trunk/ param.ccl, schedule.ccl Log: introduce optimization that allows to turn off the additional sync/settmunu after MoL is done. This will work only in runs that do not use an atmosphere. original commit by Christian Ott File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +7 -0 =================================================================== --- trunk/param.ccl 2011-09-15 16:44:26 UTC (rev 268) +++ trunk/param.ccl 2011-09-15 16:45:26 UTC (rev 269) @@ -558,3 +558,10 @@ { 0: :: "Greater or equal to 0" } 0 + +# The following parameter is to reduce the number of syncs/boundary calls done +# it will lead to correct results when set to yes ONLY when the simulation does not use +# an atmosphere at all. +boolean disable_sync_and_tmunu_after_MoL "Do not sync/prolongate and reset Tmunu after MoL integration is done" STEERABLE=ALWAYS +{ +} "no" File [modified]: schedule.ccl Delta lines: +9 -7 =================================================================== --- trunk/schedule.ccl 2011-09-15 16:44:26 UTC (rev 268) +++ trunk/schedule.ccl 2011-09-15 16:45:26 UTC (rev 269) @@ -986,14 +986,16 @@ } "Reset the atmosphere" } -schedule group HydroBase_Boundaries AT EVOL AFTER MoL_Evolution AFTER (GRHydro_AtmosphereReset GRHydro_AtmosphereResetM) -{ -} "HydroBase Boundary conditions group" +if(!disable_sync_and_tmunu_after_MoL) { + schedule group HydroBase_Boundaries AT EVOL AFTER MoL_Evolution AFTER (GRHydro_AtmosphereReset GRHydro_AtmosphereResetM) + { + } "HydroBase Boundary conditions group" + + schedule GROUP SetTmunu AT EVOL AFTER HydroBase_Boundaries BEFORE MoL_PseudoEvolution + { + } "Calculate the stress-energy tensor" +} -schedule GROUP SetTmunu AT EVOL AFTER HydroBase_Boundaries BEFORE MoL_PseudoEvolution -{ -} "Calculate the stress-energy tensor" - } # end of if (CCTK_EQUALS(hydrobase::evolution_method, "GRHydro")) if (set_trivial_rp_grid_function)

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 268)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:44 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_UpdateMask.F90 Log: include Y_e_con in atmosphere handling original commit by Christian Ott (cott) File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +7 -5 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:43:29 UTC (rev 267) +++ trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:44:26 UTC (rev 268) @@ -49,6 +49,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + integer :: CCTK_MyProc integer :: i, j, k, itracer, nx, ny, nz CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, pmin, epsmin logical :: epsnegative @@ -62,7 +63,7 @@ ! begin EOS Omni vars integer :: n,keytemp,anyerr,keyerr(1) - real*8 :: xpress,xeps,xtemp,xye + real*8 :: xpress(1),xeps(1),xtemp(1),xye(1) n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 xpress = 0.0d0;xeps = 0.0d0;xtemp = 0.0d0;xye = 0.0d0 ! end EOS Omni vars @@ -171,7 +172,7 @@ GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) else call Con2Prim_pt_hot(i,j,k,GRHydro_eos_handle, dens(i,j,k),scon(i,j,k,1),& - scon(i,j,k,2),scon(i,j,k,3),tau(i,j,k),rho(i,j,k),vel(i,j,k,1),& + scon(i,j,k,2),scon(i,j,k,3),tau(i,j,k),Y_e_con(i,j,k),rho(i,j,k),vel(i,j,k,1),& vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& press(i,j,k),w_lorentz(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det,x(i,j,k),y(i,j,k), & @@ -184,7 +185,7 @@ GRHydro_C2P_failed(i,j,k) = 0 local_perc_ptol = GRHydro_perc_ptol*100.0d0 call Con2Prim_pt_hot(i,j,k,GRHydro_eos_handle, dens(i,j,k),scon(i,j,k,1),& - scon(i,j,k,2),scon(i,j,k,3),tau(i,j,k),rho(i,j,k),& + scon(i,j,k,2),scon(i,j,k,3),tau(i,j,k),Y_e_con(i,j,k),rho(i,j,k),& vel(i,j,k,1),vel(i,j,k,2), vel(i,j,k,3),eps(i,j,k),& temperature(i,j,k),y_e(i,j,k),press(i,j,k),w_lorentz(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det,x(i,j,k),y(i,j,k), & @@ -539,7 +540,7 @@ end subroutine Con2Prim_pt -subroutine Con2Prim_pt_hot(ii,jj,kk,handle, dens, sx, sy, sz, tau, rho, velx, vely, & +subroutine Con2Prim_pt_hot(ii,jj,kk,handle, dens, sx, sy, sz, tau, ye_con, rho, velx, vely, & velz, epsilon, temp, ye, press, w_lorentz, uxx, uxy, uxz, uyy, & uyz, uzz, det, x, y, z, r, epsnegative, GRHydro_rho_min, pmin, epsmin, & GRHydro_reflevel, GRHydro_C2P_failed, local_perc_ptol) @@ -548,7 +549,7 @@ DECLARE_CCTK_PARAMETERS - CCTK_REAL dens, sx, sy, sz, tau, rho, velx, vely, velz, epsilon, & + CCTK_REAL dens, sx, sy, sz, tau, ye_con, rho, velx, vely, velz, epsilon, & press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, & y, z, r, GRHydro_rho_min CCTK_REAL temp, ye @@ -895,6 +896,7 @@ dens = sqrt(det) * rho temp = GRHydro_hot_atmo_temp ye = GRHydro_hot_atmo_Y_e + ye_con = dens * ye keytemp=1 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n, & rho,epsilon,temp,ye,xpress,keyerr,anyerr) File [modified]: GRHydro_UpdateMask.F90 Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2011-09-15 16:43:29 UTC (rev 267) +++ trunk/src/GRHydro_UpdateMask.F90 2011-09-15 16:44:26 UTC (rev 268) @@ -41,7 +41,7 @@ frac = CCTK_DELTA_TIME - if(evolve_temper.ne.1) then + if(evolve_temper.ne.1.and.evolve_Y_e.ne.1) then !$OMP PARALLEL DO PRIVATE(k,j,i) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) @@ -72,6 +72,7 @@ (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, \ type_bits, atmosphere)) .or. & (dens(i,j,k) + frac * densrhs(i,j,k) .le. 0.d0) ) then + y_e_con_rhs(i,j,k) = 0.0d0 densrhs(i,j,k) = 0.0d0 srhs(i,j,k,:) = 0.0d0 taurhs(i,j,k) = 0.0d0

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 267)
by roland.haas＠physics.gatech.edu 15 Sep '11

15 Sep '11

User: rhaas Date: 2011/09/15 11:43 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Prim2Con.F90 Log: add more workarounds in Con2Prim for hot EOS * fix con2prim issues (pertaining to error messages) * fix OMP CRITICAL issues in Prim2Con and Con2Prim original commits by Christian Ott (cott) File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +88 -45 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:42:47 UTC (rev 266) +++ trunk/src/GRHydro_Con2Prim.F90 2011-09-15 16:43:29 UTC (rev 267) @@ -52,7 +52,7 @@ integer :: i, j, k, itracer, nx, ny, nz CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, pmin, epsmin logical :: epsnegative - character(len=100) warnline + character*256 :: warnline CCTK_INT :: type_bits, atmosphere CCTK_INT :: type2_bits @@ -88,7 +88,8 @@ GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) !$OMP PARALLEL DO PRIVATE(i,j,k,itracer,& - !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, anyerr, keyerr, keytemp) + !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, anyerr, keyerr, keytemp,& + !$OMP warnline) do k = 1, nz do j = 1, ny do i = 1, nx @@ -147,6 +148,7 @@ press(i,j,k),keyerr,anyerr) else ! use polytropic EOS + keytemp = 0 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) @@ -189,7 +191,7 @@ z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & GRHydro_reflevel, GRHydro_C2P_failed(i,j,k), local_perc_ptol) if(GRHydro_C2P_failed(i,j,k).eq.2) then - !$OMP CRITICAL(c2po1) + !$OMP CRITICAL if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then call CCTK_WARN(1,"Convergence problem in c2p") write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel @@ -201,7 +203,7 @@ call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") endif - !$OMP END CRITICAL(c2po1) + !$OMP END CRITICAL endif endif endif @@ -263,6 +265,38 @@ #endif end if + + +#if 1 + ! this is needed in the current implementation of refluxing -- in this implementation, + ! the entire correction is applied to the coarse grid cell. + ! This leads to the cell getting too cold. + ! We work around this issue by enforcing that the temperature be + ! above 1.2 MeV at a density above 3.0e11. If this is the case, we inject heat. + if(evolve_temper.ne.0) then + if(GRHydro_eos_hot_eps_fix.ne.0.and.& + rho(i,j,k).gt.5.0d-7 .and. temperature(i,j,k).lt.1.2d0) then + !$OMP CRITICAL +! write(warnline,"(A40)") "Fixing temperature at:" +! call CCTK_WARN(1,warnline) + write(warnline,"(A10,4i6,1P3E15.6)") "fixtemp:", GRHydro_reflevel,i,j,k,& + x(i,j,k),y(i,j,k),z(i,j,k) + call CCTK_WARN(1,warnline) + !$OMP END CRITICAL + keytemp = 1 + temperature(i,j,k) = 1.5d0 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),press(i,j,k),keyerr,anyerr) + tau(i,j,k) = sqrt(det) * (rho(i,j,k)+rho(i,j,k)*eps(i,j,k) +press(i,j,k))& + * w_lorentz(i,j,k)**2 - dens(i,j,k) - press(i,j,k) + keytemp = 0 + + endif + endif +#endif + + + end do end do end do @@ -526,7 +560,7 @@ CCTK_REAL epsminl,pminl CCTK_REAL local_perc_ptol - character(len=200) warnline + character(len=256) warnline logical epsnegative integer :: failwarnmode @@ -538,7 +572,7 @@ integer :: nfudgemax,nf n=1;keytemp=0;anyerr=0;keyerr(1)=0 temp0 = 0.0d0;xpress = 0.0d0 - nf=0;nfudgemax=15 + nf=0;nfudgemax=30 ! end EOS Omni vars failinfomode = 1 @@ -553,7 +587,7 @@ y .lt. -1.0d-12 .or.& z .lt. -1.0d-12)) then failwarnmode = 2 - failinfomode = 2 + failinfomode = 2 endif !!$ Undensitize the variables @@ -573,17 +607,8 @@ pold = max(1.d-15,xpress) ! error handling if(anyerr.ne.0) then - !$OMP CRITICAL(c2p0) + !$OMP CRITICAL if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then - call CCTK_WARN(failinfomode,"EOS error in c2p 0") - write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(1P10E15.6)") rho,dens,epsilon,temp,temp0,ye - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A7,i8)") "code: ",keyerr(1) - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(failinfomode,warnline) if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -592,6 +617,7 @@ nf = 0 do while(anyerr.ne.0.and.nf.le.nfudgemax) anyerr = 0 + utau = utau + rho*abs(epsilon)*0.05d0*w_lorentz**2 epsilon = epsilon + abs(epsilon)*0.05d0 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,temp,ye,xpress,keyerr,anyerr) @@ -602,7 +628,7 @@ write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) if(nf.gt.nfudgemax) then - call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") + call CCTK_WARN(failinfomode,"EOS error in c2p 0a: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye @@ -614,12 +640,19 @@ call CCTK_WARN(failwarnmode,"Aborting!!!") endif else + call CCTK_WARN(failinfomode,"EOS error in c2p 0") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,dens,epsilon,temp,temp0,ye + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - endif endif - !$OMP END CRITICAL(c2p0) + !$OMP END CRITICAL endif !!$ Check that the variables have a chance of being physical @@ -652,17 +685,8 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then - !$OMP CRITICAL(c2p1) + !$OMP CRITICAL if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then - call CCTK_WARN(failinfomode,"EOS error in c2p 1") - write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A7,i8)") "code: ",keyerr(1) - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(failinfomode,warnline) if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -671,6 +695,7 @@ nf = 0 do while(anyerr.ne.0.and.nf.le.nfudgemax) anyerr = 0 + utau = utau + rho*abs(epsilon)*0.05d0*w_lorentz**2 epsilon = epsilon + abs(epsilon)*0.05d0 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,temp,ye,xpress,keyerr,anyerr) @@ -693,11 +718,19 @@ call CCTK_WARN(failwarnmode,"Aborting!!!") endif else + call CCTK_WARN(failinfomode,"EOS error in c2p 1") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") endif endif - !$OMP END CRITICAL(c2p1) + !$OMP END CRITICAL endif f = pold - xpress @@ -748,25 +781,19 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then - !$OMP CRITICAL(c2p2) + !$OMP CRITICAL if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then - call CCTK_WARN(failinfomode,"EOS error in c2p 2") - write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A7,i8)") "code: ",keyerr(1) - call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(failinfomode,warnline) if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times ! we get to this place should be monitored, as this ! 'failsafe' mode creates artificial heat. + write(warnline,"(4i5,1P10E15.6)") GRHydro_reflevel,ii,jj,kk,x,y,z + call CCTK_WARN(0,warnline) nf = 0 do while(anyerr.ne.0.and.nf.le.nfudgemax) anyerr = 0 + utau = utau + rho*abs(epsilon)*0.05d0*w_lorentz**2 epsilon = epsilon + abs(epsilon)*0.05d0 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,temp,ye,xpress,keyerr,anyerr) @@ -789,12 +816,19 @@ call CCTK_WARN(failwarnmode,"Aborting!!!") endif else + call CCTK_WARN(failinfomode,"EOS error in c2p 2") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - endif endif - !$OMP END CRITICAL(c2p2) + !$OMP END CRITICAL endif f = pnew - xpress @@ -833,7 +867,7 @@ ! error handling if(anyerr.ne.0) then - !$OMP CRITICAL(c2p3) + !$OMP CRITICAL if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then call CCTK_WARN(failinfomode,"EOS error in c2p 3") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z @@ -846,7 +880,7 @@ call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") endif - !$OMP END CRITICAL(c2p3) + !$OMP END CRITICAL endif f = pold - xpress @@ -1767,6 +1801,7 @@ implicit none + DECLARE_CCTK_PARAMETERS DECLARE_CCTK_ARGUMENTS integer :: i, j, k, nx, ny, nz @@ -1785,6 +1820,14 @@ if (GRHydro_C2P_failed(i,j,k) == 1) then + if(con2prim_oct_hack.ne.0.and.& + (x(i,j,k) .lt. -1.0d-12 .or.& + y(i,j,k) .lt. -1.0d-12 .or.& + z(i,j,k) .lt. -1.0d-12)) then + cycle + endif + + !$OMP CRITICAL call CCTK_WARN(1,'Con2Prim failed; stopping the code.') call CCTK_WARN(1,'Even with mesh refinement, this point is not restricted from a finer level, so this is really an error') File [modified]: GRHydro_Prim2Con.F90 Delta lines: +6 -6 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2011-09-15 16:42:47 UTC (rev 266) +++ trunk/src/GRHydro_Prim2Con.F90 2011-09-15 16:43:29 UTC (rev 267) @@ -254,7 +254,7 @@ drho,deps,temp,ye,dpress,keyerr,anyerr) keytemp=0 if(anyerr.ne.0) then - !$OMP CRITICAL(p2c1) + !$OMP CRITICAL call CCTK_WARN(1,"EOS error in prim2con_hot: lev 2") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -264,13 +264,13 @@ call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) - !$OMP END CRITICAL(p2c1) + !$OMP END CRITICAL endif else ! This is a way of recovering even on finer refinement levels: ! Use the average temperature at the interface instead of the ! reconstructed specific internal energy. - !$OMP CRITICAL(p2c2) + !$OMP CRITICAL call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -280,14 +280,14 @@ call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) - !$OMP END CRITICAL(p2c2) + !$OMP END CRITICAL keytemp=1 temp = temp0 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,deps,temp,ye,dpress,keyerr,anyerr) keytemp=0 if(anyerr.ne.0) then - !$OMP CRITICAL(p2c3) + !$OMP CRITICAL call CCTK_WARN(1,"EOS error in prim2con_hot") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -298,7 +298,7 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") - !$OMP END CRITICAL(p2c3) + !$OMP END CRITICAL endif endif endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits