Commits December 2010

commits@lists.einsteintoolkit.org

5 participants
41 discussions

[svn:einsteintoolkit] EOS_Omni/trunk/src/ (Rev. 32)
by cott＠tapir.caltech.edu 22 Dec '10

22 Dec '10

User: cott Date: 2010/12/22 03:44 PM Modified: /trunk/src/ EOS_Omni_MultiVarCalls.F90 /trunk/src/nuc_eos/ nuc_eos.F90 Log: * make nuc_eos thread safe * fix a bug in MultiVarCalls File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: nuc_eos.F90 Delta lines: +18 -7 =================================================================== --- trunk/src/nuc_eos/nuc_eos.F90 2010-12-16 21:02:36 UTC (rev 31) +++ trunk/src/nuc_eos/nuc_eos.F90 2010-12-22 21:44:39 UTC (rev 32) @@ -38,9 +38,12 @@ real*8 :: lr,lt,y,xx,xeps,leps,xs,xpressure real*8 :: d1,d2,d3 real*8 :: ff(nvars) - integer :: keyerrt = 0 - integer :: keyerrr = 0 + integer :: keyerrt + integer :: keyerrr + keyerrt = 0 + keyerrr = 0 + if(xrho.gt.eos_rhomax) then stop "nuc_eos: rho > rhomax" endif @@ -158,7 +161,8 @@ implicit none real*8 xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe - real*8,parameter :: idealK1 = 1.2435d15 * (0.5d0**(4.d0/3.d0)) + real*8,parameter :: idealK1 = 4.93483302030614d14 +! real*8,parameter :: idealK1 = 1.2435d15 * (0.5d0**(4.d0/3.d0)) real*8,parameter :: idealgamma = 1.41d0 integer keytemp @@ -195,9 +199,12 @@ ! local variables real*8 :: lr,lt,y,xx,xeps,leps,xs,xpressure real*8 :: d1,d2,d3,ff(8) - integer :: keyerrt = 0 - integer :: keyerrr = 0 + integer :: keyerrt + integer :: keyerrr + keyerrt = 0 + keyerrr = 0 + if(xrho.gt.eos_rhomax) then stop "nuc_eos: rho > rhomax" endif @@ -317,8 +324,10 @@ real*8 :: xcs2,xdpderho,xdpdrhoe real*8 :: lr,lt,y,xx,xeps,leps,xs real*8 :: d1,d2,d3,ff(8) - integer :: keyerrt = 0 + integer :: keyerrt + keyerrt = 0 + if(xrho.gt.eos_rhomax) then stop "nuc_eos: rho > rhomax" endif @@ -394,8 +403,10 @@ real*8 :: xcs2,xprs real*8 :: lr,lt,y,xx,xeps,leps,xs real*8 :: d1,d2,d3,ff(8) - integer :: keyerrt = 0 + integer :: keyerrt + keyerrt = 0 + if(xrho.gt.eos_rhomax) then stop "nuc_eos: rho > rhomax" endif Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/EOS_Omni_MultiVarCalls.F90 2010-12-16 21:02:36 UTC (rev 31) +++ trunk/src/EOS_Omni_MultiVarCalls.F90 2010-12-22 21:44:39 UTC (rev 32) @@ -62,7 +62,7 @@ anyerr = 1 endif - if(keytemp.eq.1.or.keytemp.eq.2) then + if(keytemp.eq.1) then eps(i) = xenr * eps_gf else if(keytemp.eq.2) then eps(i) = xenr * eps_gf

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 197)
by cott＠tapir.caltech.edu 21 Dec '10

21 Dec '10

User: cott Date: 2010/12/22 12:52 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * fix warn level in hot c2p routine File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-12-22 05:35:43 UTC (rev 196) +++ trunk/src/GRHydro_Con2Prim.F90 2010-12-22 06:52:38 UTC (rev 197) @@ -496,9 +496,10 @@ temp0 = 0.0d0;xpress = 0.0d0 ! end EOS Omni vars + failinfomode = 1 failwarnmode = 0 - failinfomode = 0 + ! set pmin and epsmin to something sensible: pminl = 1.0d-28 epsminl = 1.0e-5

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 196)
by bcmsma＠astro.rit.edu 21 Dec '10

21 Dec '10

User: bmundim Date: 2010/12/21 11:35 PM Added: /trunk/src/ GRHydro_DivergenceClean.F90 Removed: /trunk/src/ GRHydro_ParamCheckM.F90 Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_CalcUpdateM.F90, GRHydro_HLLEM.F90, GRHydro_HLLE_EOSGM.F90, GRHydro_ParamCheck.F90, GRHydro_RiemannSolveM.F90, GRHydro_SourceM.F90, make.code.defn Log: RIT MHD development: an update. Several bugfixes, including properly isolating divergence cleaning code and initialization of the "psidc" gridfunction in GRHydro_DivergenceClean.F90, as well as properly initializing rhoenth in GRHydro_HLLEM (thanks to Roland for catching that). Minor changes to scheduler to properly call MHD and non-MHD routines in parallel for Riemann solving. Remove GRHydro_ParamCheckM.F90 and add GRHydro_DivergenceClean.F90. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CalcUpdateM.F90 Delta lines: +10 -7 =================================================================== --- trunk/src/GRHydro_CalcUpdateM.F90 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/GRHydro_CalcUpdateM.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -89,10 +89,11 @@ Bvecrhs(i,j,k,3) = Bvecrhs(i,j,k,3) + & (alp_l * Bveczflux(i-xoffset,j-yoffset,k-zoffset) - & alp_r * Bveczflux(i,j,k)) * idx - psidcrhs(i,j,k) = psidcrhs(i,j,k) + & - (alp_l * psidcflux(i-xoffset,j-yoffset,k-zoffset) - & - alp_r * psidcflux(i,j,k)) * idx - + if(clean_divergence.ne.0) then + psidcrhs(i,j,k) = psidcrhs(i,j,k) + & + (alp_l * psidcflux(i-xoffset,j-yoffset,k-zoffset) - & + alp_r * psidcflux(i,j,k)) * idx + endif if (evolve_tracer .ne. 0) then do itracer=1,number_of_tracers @@ -236,9 +237,11 @@ Bvecrhs(i,j,k,3) = Bvecrhs(i,j,k,3) + & (Bveczflux(i-xoffset,j-yoffset,k-zoffset) - & Bveczflux(i,j,k)) * idx - psidcrhs(i,j,k) = psidcrhs(i,j,k) + & - (psidcflux(i-xoffset,j-yoffset,k-zoffset) - & - psidcflux(i,j,k)) * idx + if(clean_divergence.ne.0) then + psidcrhs(i,j,k) = psidcrhs(i,j,k) + & + (psidcflux(i-xoffset,j-yoffset,k-zoffset) - & + psidcflux(i,j,k)) * idx + endif enddo enddo File [added]: GRHydro_DivergenceClean.F90 Delta lines: +40 -0 =================================================================== --- trunk/src/GRHydro_DivergenceClean.F90 (rev 0) +++ trunk/src/GRHydro_DivergenceClean.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -0,0 +1,40 @@ + /*@@ + @file GRHydro_DivergenceClean.F90 + @date Nov 24, 2010 + @author + @desc + Routines controlling divergence cleaning + @enddesc + @@*/ + +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" + + /*@@ + @routine GRHydro_InitDivergenceClean + @date Nov 24, 2010 + @author Joshua Faber + @desc + Set Psi=0 initially for use with divergence cleaning + @enddesc + @calls + @calledby + @history + + @endhistory + +@@*/ + +subroutine GRHydro_InitDivergenceClean(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + + psidc=0.0 + +end subroutine GRHydro_InitDivergenceClean + + + File [modified]: GRHydro_HLLEM.F90 Delta lines: +6 -1 =================================================================== --- trunk/src/GRHydro_HLLEM.F90 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/GRHydro_HLLEM.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -187,6 +187,9 @@ prim_m(2),prim_m(3),prim_m(4),cons_m(6),cons_m(7),cons_m(8), & velxlowm,velylowm,velzlowm,Bvecxlowm,Bvecylowm,Bveczlowm, & bdotvm,b2m,v2m,wm,bxlowm,bylowm,bzlowm) + + rhoenth_p = prim_p(1)*(1.d0+prim_p(5))+prim_p(6) + rhoenth_m = prim_m(1)*(1.d0+prim_m(5))+prim_m(6) ab0p = wp*bdotvp ab0m = wm*bdotvm @@ -400,7 +403,9 @@ Bvecxflux(i, j, k) = f1(6) Bvecyflux(i, j, k) = f1(7) Bveczflux(i, j, k) = f1(8) - psidcflux(i,j,k) = psidcf + if(clean_divergence.ne.0) then + psidcflux(i,j,k) = psidcf + endif if(evolve_Y_e.ne.0) then if (densflux(i, j, k) > 0.d0) then File [modified]: GRHydro_HLLE_EOSGM.F90 Delta lines: +4 -1 =================================================================== --- trunk/src/GRHydro_HLLE_EOSGM.F90 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/GRHydro_HLLE_EOSGM.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -438,7 +438,10 @@ Bvecxflux(i, j, k) = f1(6) Bvecyflux(i, j, k) = f1(7) Bveczflux(i, j, k) = f1(8) - psidcflux(i,j,k) = psidcf + if(clean_divergence.ne.0) then + psidcflux(i,j,k) = psidcf + endif + if(evolve_Y_e.ne.0) then if (densflux(i, j, k) > 0.d0) then File [modified]: GRHydro_ParamCheck.F90 Delta lines: +9 -2 =================================================================== --- trunk/src/GRHydro_ParamCheck.F90 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/GRHydro_ParamCheck.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -87,9 +87,9 @@ end if if (CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then - MHD = 1 + evolve_MHD = 1 else - MHD = 0 + evolve_MHD = 0 endif if (CCTK_EQUALS(Y_e_evolution_method,"GRHydro")) then @@ -104,6 +104,13 @@ evolve_temper = 0 endif + if (CCTK_EQUALS(riemann_solver,"Roe").and.CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then + call CCTK_PARAMWARN("Roe solver is not implemented yet for MHD") + end if + if (CCTK_EQUALS(riemann_solver,"Marquina").and.CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then + call CCTK_PARAMWARN("Marquina solver is not implemented yet for MHD") + end if + end subroutine GRHydro_ParamCheck File [removed]: GRHydro_ParamCheckM.F90 Delta lines: +0 -50 =================================================================== --- trunk/src/GRHydro_ParamCheckM.F90 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/GRHydro_ParamCheckM.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -1,50 +0,0 @@ - /*@@ - @file GRHydro_ParamCheckM.F90 - @date Sep 23, 2010 - @author - @desc - Parameter checking routine. - @enddesc - @@*/ - -#include "cctk.h" -#include "cctk_Parameters.h" -#include "cctk_Arguments.h" -#include "cctk_Functions.h" - - /*@@ - @routine GRHydro_ParamCheckM - @date Sep 23, 2010 - @author Joshua Faber, Scott Noble, Bruno Mundim - @desc - Checks the parameters. - @enddesc - @calls - @calledby - @history - - @endhistory - -@@*/ - -subroutine GRHydro_ParamCheckM(CCTK_ARGUMENTS) - - implicit none - - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS - DECLARE_CCTK_FUNCTIONS - - - - if (CCTK_EQUALS(riemann_solver,"Roe").and.CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then - call CCTK_PARAMWARN("Roe solver is not implemented yet for MHD") - end if - - if (CCTK_EQUALS(riemann_solver,"Marquina").and.CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then - call CCTK_PARAMWARN("Marquina solver is not implemented yet for MHD") - end if - - -end subroutine GRHydro_ParamCheckM - File [modified]: GRHydro_RiemannSolveM.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_RiemannSolveM.F90 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/GRHydro_RiemannSolveM.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -362,7 +362,6 @@ Bvecxflux(i,j,k)= Bvecxflux(i,j,k)+ 0.5d0 * tmp_flux(6) Bvecyflux(i,j,k)= Bvecyflux(i,j,k)+ 0.5d0 * tmp_flux(7) Bveczflux(i,j,k)= Bveczflux(i,j,k)+ 0.5d0 * tmp_flux(8) - psidcflux(i,j,k)= psidcflux(i,j,k)+ 0.5d0 * psidcf if(clean_divergence.ne.0) then psidcf = cons_m(6) File [modified]: GRHydro_SourceM.F90 Delta lines: +32 -24 =================================================================== --- trunk/src/GRHydro_SourceM.F90 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/GRHydro_SourceM.F90 2010-12-22 05:35:43 UTC (rev 196) @@ -9,18 +9,18 @@ ! Second order f.d. -#define DIFF_X_2(q) 0.5d0 * (q(i+1,j,k) - q(i-1,j,k)) * idx -#define DIFF_Y_2(q) 0.5d0 * (q(i,j+1,k) - q(i,j-1,k)) * idy -#define DIFF_Z_2(q) 0.5d0 * (q(i,j,k+1) - q(i,j,k-1)) * idz +#define DIFF_X_2(q) (0.5d0 * (q(i+1,j,k) - q(i-1,j,k)) * idx) +#define DIFF_Y_2(q) (0.5d0 * (q(i,j+1,k) - q(i,j-1,k)) * idy) +#define DIFF_Z_2(q) (0.5d0 * (q(i,j,k+1) - q(i,j,k-1)) * idz) ! Fourth order f.d. -#define DIFF_X_4(q) (-q(i+2,j,k) + 8.d0 * q(i+1,j,k) - 8.d0 * q(i-1,j,k) + \ - q(i-2,j,k)) / 12.d0 * idx -#define DIFF_Y_4(q) (-q(i,j+2,k) + 8.d0 * q(i,j+1,k) - 8.d0 * q(i,j-1,k) + \ - q(i,j-2,k)) / 12.d0 * idy -#define DIFF_Z_4(q) (-q(i,j,k+2) + 8.d0 * q(i,j,k+1) - 8.d0 * q(i,j,k-1) + \ - q(i,j,k-2)) / 12.d0 * idz +#define DIFF_X_4(q) ((-q(i+2,j,k) + 8.d0 * q(i+1,j,k) - 8.d0 * q(i-1,j,k) + \ + q(i-2,j,k)) / 12.d0 * idx) +#define DIFF_Y_4(q) ((-q(i,j+2,k) + 8.d0 * q(i,j+1,k) - 8.d0 * q(i,j-1,k) + \ + q(i,j-2,k)) / 12.d0 * idy) +#define DIFF_Z_4(q) ((-q(i,j,k+2) + 8.d0 * q(i,j,k+1) - 8.d0 * q(i,j,k-1) + \ + q(i,j,k-2)) / 12.d0 * idz) #include "cctk.h" #include "cctk_Parameters.h" @@ -103,6 +103,7 @@ densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 + Bvecrhs=0.d0 if (evolve_tracer .ne. 0) then cons_tracerrhs = 0.d0 @@ -113,7 +114,6 @@ endif if (clean_divergence .ne. 0) then - Bvecrhs=0.d0 psidcrhs=0.d0 endif @@ -294,19 +294,23 @@ dx_alp = DIFF_X_2(alp) dy_alp = DIFF_Y_2(alp) dz_alp = DIFF_Z_2(alp) - dx_psidc = DIFF_X_2(psidc) - dy_psidc = DIFF_Y_2(psidc) - dz_psidc = DIFF_Z_2(psidc) + if(clean_divergence.ne.0) then + dx_psidc = DIFF_X_2(psidc) + dy_psidc = DIFF_Y_2(psidc) + dz_psidc = DIFF_Z_2(psidc) + endif + else dx_alp = DIFF_X_4(alp) dy_alp = DIFF_Y_4(alp) dz_alp = DIFF_Z_4(alp) - dx_psidc = DIFF_X_4(psidc) - dy_psidc = DIFF_Y_4(psidc) - dz_psidc = DIFF_Z_4(psidc) - + if(clean_divergence.ne.0) then + dx_psidc = DIFF_X_4(psidc) + dy_psidc = DIFF_Y_4(psidc) + dz_psidc = DIFF_Z_4(psidc) + endif end if if (local_spatial_order .eq. 2) then @@ -432,19 +436,23 @@ rhohstarW2*invalp*(vlowx*dz_betax + vlowy*dz_betay + vlowz*dz_betaz) -& bt*(bxlow*dz_betax + bylow*dz_betay + bzlow*dz_betaz) - bvcx_source = uxx*dx_psidc+uxy*dy_psidc+uxz*dz_psidc - bvcy_source = uxy*dx_psidc+uyy*dy_psidc+uyz*dz_psidc - bvcz_source = uxz*dx_psidc+uyz*dy_psidc+uzz*dz_psidc + if(clean_divergence.ne.0) then + bvcx_source = uxx*dx_psidc+uxy*dy_psidc+uxz*dz_psidc + bvcy_source = uxy*dx_psidc+uyy*dy_psidc+uyz*dz_psidc + bvcz_source = uxz*dx_psidc+uyz*dy_psidc+uzz*dz_psidc + endif densrhs(i,j,k) = 0.d0 srhs(i,j,k,1) = alp(i,j,k)*sqrtdet*sx_source srhs(i,j,k,2) = alp(i,j,k)*sqrtdet*sy_source srhs(i,j,k,3) = alp(i,j,k)*sqrtdet*sz_source taurhs(i,j,k) = alp(i,j,k)*sqrtdet*tau_source - Bvecrhs(i,j,k,1) = alp(i,j,k)*sqrtdet*bvcx_source - Bvecrhs(i,j,k,2) = alp(i,j,k)*sqrtdet*bvcy_source - Bvecrhs(i,j,k,3) = alp(i,j,k)*sqrtdet*bvcz_source - psidcrhs(i,j,k) = -1.d0*ch_dc*ch_dc/cp_dc/cp_dc*psidc(i,j,k) + if(clean_divergence.ne.0) then + Bvecrhs(i,j,k,1) = alp(i,j,k)*sqrtdet*bvcx_source + Bvecrhs(i,j,k,2) = alp(i,j,k)*sqrtdet*bvcy_source + Bvecrhs(i,j,k,3) = alp(i,j,k)*sqrtdet*bvcz_source + psidcrhs(i,j,k) = -1.d0*ch_dc*ch_dc/cp_dc/cp_dc*psidc(i,j,k) + endif enddo enddo File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- trunk/src/make.code.defn 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/src/make.code.defn 2010-12-22 05:35:43 UTC (rev 196) @@ -7,6 +7,7 @@ GRHydro_Boundaries.F90 \ GRHydro_CalcUpdate.F90 \ GRHydro_Con2Prim.F90 \ + GRHydro_DivergenceClean.F90 \ GRHydro_Eigenproblem.F90 \ GRHydro_Eigenproblem_Marquina.F90 \ GRHydro_ENOReconstruct.F90 \ @@ -55,7 +56,6 @@ GRHydro_HLLE_EOSGM.F90 \ GRHydro_HLLEM.F90 \ GRHydro_PPMM.F90 \ - GRHydro_ParamCheckM.F90 \ GRHydro_Prim2ConM.F90 \ GRHydro_RiemannSolveM.F90 \ GRHydro_ReconstructM.F90 \ Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/interface.ccl 2010-12-22 05:35:43 UTC (rev 196) @@ -392,7 +392,7 @@ int evolve_temper type = SCALAR tags='checkpoint="no"' "Are we evolving temperature? Set in Paramcheck" -int MHD type = SCALAR tags='checkpoint="no"' "Are we doing MHD? Set in ParamCheck" +int evolve_MHD type = SCALAR tags='checkpoint="no"' "Are we doing MHD? Set in ParamCheck" int GRHydro_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now" File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/param.ccl 2010-12-22 05:35:43 UTC (rev 196) @@ -76,7 +76,7 @@ CCTK_INT GRHydro_MaxNumEvolvedVars "The maximum number of evolved variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars { - 5:9 :: "dens scon[3] tau Bvec[3] ye" + 5:10 :: "dens scon[3] tau Bvec[3] psidc ye" } 5 CCTK_INT GRHydro_MaxNumConstrainedVars "The maximum number of constrained variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars File [modified]: schedule.ccl Delta lines: +18 -18 =================================================================== --- trunk/schedule.ccl 2010-12-21 10:58:39 UTC (rev 195) +++ trunk/schedule.ccl 2010-12-22 05:35:43 UTC (rev 196) @@ -31,11 +31,11 @@ if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { STORAGE: HydroBase::Bvec[3] + if (clean_divergence) + { + STORAGE:psidc[3] + } } - if (clean_divergence) - { - STORAGE:psidc[3] - } } else { @@ -57,13 +57,13 @@ if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { STORAGE: HydroBase::Bvec[2] + if (clean_divergence) + { + STORAGE:psidc[2] + } } - if (clean_divergence) - { - STORAGE:psidc[2] - } } -STORAGE:MHD +STORAGE:evolve_MHD STORAGE:evolve_Y_e STORAGE:evolve_temper STORAGE:GRHydro_reflevel @@ -99,6 +99,14 @@ { } "GRHydro initial data group" +if(CCTK_Equals(Bvec_evolution_method,"GRHydro") && clean_divergence) +{ + schedule GRHydro_InitDivergenceClean IN HydroBase_Initial + { + LANG: Fortran + } "Set psi for divergence cleaning initially to zero" +} + ################################################# ### Storage for the extra timelevels for the ### ### use of MoL with Einstein ### @@ -188,14 +196,6 @@ LANG: Fortran } "Check parameters" -if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) -{ - schedule GRHydro_ParamCheckM AT PARAMCHECK AFTER GRHydro_ParamCheck - { - LANG: Fortran - } "Check parameters - MHD version" -} - ###################################### ### Standard symmetry registration ### ###################################### @@ -733,7 +733,7 @@ else if (CCTK_Equals(GRHydro_eos_type,"General")) { if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - schedule RiemannSolve IN FluxTerms AFTER Reconstruct AS Riemann + schedule RiemannSolveM IN FluxTerms AFTER Reconstruct AS Riemann { LANG: Fortran STORAGE: EOS_temps

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 195)
by cott＠tapir.caltech.edu 21 Dec '10

21 Dec '10

User: cott Date: 2010/12/21 04:58 AM Modified: /trunk/src/ GRHydro_HLLE.F90 Log: * add OMP for HLLE solver File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_HLLE.F90 Delta lines: +7 -1 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2010-12-21 10:26:24 UTC (rev 194) +++ trunk/src/GRHydro_HLLE.F90 2010-12-21 10:58:39 UTC (rev 195) @@ -66,6 +66,12 @@ call CCTK_WARN(0, "Flux direction not x,y,z") end if + !$OMP PARALLEL DO PRIVATE(j,i,f1,lamminus,lamplus,consp,consm_i, & + !$OMP fplus,fminus,qdiff,avg_beta,avg_alp, & + !$OMP avg_det,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & + !$OMP uxxh,uxyh,uxzh,uyyh,uyzh,uzzh, & + !$OMP usendh, xtemp, charmin, charmax, charpm, & + !$OMP m) do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil @@ -387,7 +393,7 @@ end do end do end do - + !$OMP END PARALLEL DO end subroutine GRHydro_HLLE

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 194)
by cott＠tapir.caltech.edu 21 Dec '10

21 Dec '10

User: cott Date: 2010/12/21 04:26 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Con2PrimM.F90, GRHydro_Eigenproblem.F90, GRHydro_EigenproblemM.F90, GRHydro_EoSChangeGamma.F90, GRHydro_Prim2Con.F90, GRHydro_Prim2ConM.F90, GRHydro_Source.F90, GRHydro_UpdateMask.F90, GRHydro_UpdateMaskM.F90 Log: * make EOS Omni calls thread safe File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +23 -35 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_Con2Prim.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -60,14 +60,10 @@ CCTK_REAL :: local_min_tracer ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere") @@ -270,17 +266,12 @@ character(len=200) warnline logical epsnegative - ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xtemp,xye + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xtemp=0.0d0;xye=0.0d0 ! end EOS Omni vars - !!$ Undensitize the variables @@ -495,23 +486,23 @@ character(len=200) warnline logical epsnegative - integer :: failwarnmode = 0 - integer :: failinfomode = 1 + integer :: failwarnmode + integer :: failinfomode ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: temp0 = 0.0d0 + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,temp0 + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + temp0 = 0.0d0;xpress = 0.0d0 ! end EOS Omni vars + failwarnmode = 0 + failinfomode = 0 + ! set pmin and epsmin to something sensible: pminl = 1.0d-28 epsminl = 1.0e-5 - if(con2prim_oct_hack.ne.0.and.& x .lt. 0.0d0 .or.& y .lt. 0.0d0 .or.& @@ -816,15 +807,12 @@ CCTK_REAL :: local_min_tracer -! begin EOS omni - CCTK_INT :: keyerr(1) = 0 - CCTK_INT :: anyerr = 0 - CCTK_INT :: keytemp = 0 - CCTK_INT :: n = 1 - CCTK_REAL :: xye = 0.0d0 - CCTK_REAL :: xeps = 0.0d0 - CCTK_REAL :: xtemp = 0.0d0 -! end EOS omni +! begin EOS Omni vars + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xtemp,xye,xeps + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xtemp=0.0d0;xye=0.0d0;xeps=0.0d0 +! end EOS Omni vars ! this is a poly call call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +12 -22 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_Con2PrimM.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -60,16 +60,12 @@ CCTK_REAL :: local_min_tracer -! 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 -! end EOS Omni vars +! begin EOS Omni vars + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xtemp,xye,xeps + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xtemp=0.0d0;xye=0.0d0;xeps=0.0d0 +! end EOS Omni vars call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere") call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere") @@ -289,19 +285,13 @@ CCTK_REAL :: local_min_tracer +! begin EOS Omni vars + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xtemp,xye,xeps + 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 -! begin EOS omni - CCTK_INT :: keyerr(1) = 0 - CCTK_INT :: anyerr = 0 - CCTK_INT :: keytemp = 0 - CCTK_INT :: n = 1 - CCTK_REAL :: xye = 0.0d0 - CCTK_REAL :: xeps = 0.0d0 - CCTK_REAL :: xtemp = 0.0d0 -! end EOS omni - - - ! this is a poly call call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr) File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +8 -15 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_Eigenproblem.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -59,14 +59,10 @@ CCTK_REAL dpdrho,dpdeps,press ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 one = 1.0d0 @@ -137,15 +133,12 @@ CCTK_REAL dpdrho,dpdeps,press ! 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 + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xeps=0.0d0 ! end EOS Omni vars - one = 1.0d0 two = 2.0d0 File [modified]: GRHydro_EigenproblemM.F90 Delta lines: +5 -9 =================================================================== --- trunk/src/GRHydro_EigenproblemM.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_EigenproblemM.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -63,15 +63,11 @@ CCTK_REAL Bdotv,b2 ! 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 -! end EOS Omni vars + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 one = 1.0d0 two = 2.0d0 File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: +14 -26 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -53,14 +53,10 @@ !!$ Set up the fluid constants ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr) @@ -134,14 +130,10 @@ !!$ Set up the fluid constants ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr) @@ -220,18 +212,14 @@ CCTK_REAL, dimension(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)) :: Q character(len=100) infoline - -!!$ Set up the fluid constants ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 + +!!$ Set up the fluid constants call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.0d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr) File [modified]: GRHydro_Prim2Con.F90 Delta lines: +11 -25 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_Prim2Con.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -93,7 +93,7 @@ end do !$OMP END PARALLEL DO else - !$OMP PARALLEL DO PRIVATE(i, j, avg_detl, avg_detr, xtemp,& + !$OMP PARALLEL DO PRIVATE(i, j, k, avg_detl, avg_detr, xtemp,& !$OMP gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr) do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 @@ -149,7 +149,6 @@ velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& w_lorentzplus(i,j,k),xtemp, & y_e_plus(i,j,k)) - end do end do @@ -187,14 +186,10 @@ CCTK_INT :: handle ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xye,xtemp + n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 + xtemp = 0.0d0; xye = 0.0d0 ! end EOS Omni vars w = 1.d0 / sqrt(1.d0 - (gxx*dvelx*dvelx + gyy*dvely*dvely + gzz & @@ -234,15 +229,10 @@ character(len=512) warnline ! 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 + integer :: n,keytemp,anyerr,keyerr(1) + n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 ! end EOS Omni vars - w = 1.d0 / sqrt(1.d0 - (gxx*dvelx*dvelx + gyy*dvely*dvely + gzz & *dvelz*dvelz + 2*gxy*dvelx*dvely + 2*gxz*dvelx *dvelz + 2*gyz& *dvely*dvelz)) @@ -489,14 +479,10 @@ character(len=256) NaN_WarnLine ! 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, keytemp, anyerr, keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 w_tmp = gxx*dvelx*dvelx + gyy*dvely*dvely + gzz *dvelz*dvelz + & File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +8 -16 =================================================================== --- trunk/src/GRHydro_Prim2ConM.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_Prim2ConM.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -126,14 +126,10 @@ character(len=256) NaN_WarnLine ! 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, keytemp, anyerr, keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 w = 1.d0 / sqrt(1.d0 - DOT2(dvelx,dvely,dvelz)) @@ -349,14 +345,10 @@ character(len=256) NaN_WarnLine ! 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, keytemp, anyerr, keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + 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 w_tmp = DOT2(dvelx,dvely,dvelz) File [modified]: GRHydro_Source.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Source.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_Source.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -103,7 +103,7 @@ if (evolve_Y_e .ne. 0) then y_e_con_rhs = 0.0d0 endif - + !!$ Set up the array for checking the order. We switch to second order !!$ differencing at boundaries and near excision regions. !!$ Copied straight from BSSN. File [modified]: GRHydro_UpdateMask.F90 Delta lines: +4 -8 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_UpdateMask.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -283,14 +283,10 @@ CCTK_INT :: eos_handle ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xye=0.0d0;xeps=0.0d0;xtemp=0.0d0 ! end EOS Omni vars eos_handle = GRHydro_polytrope_handle File [modified]: GRHydro_UpdateMaskM.F90 Delta lines: +4 -9 =================================================================== --- trunk/src/GRHydro_UpdateMaskM.F90 2010-12-21 06:53:01 UTC (rev 193) +++ trunk/src/GRHydro_UpdateMaskM.F90 2010-12-21 10:26:24 UTC (rev 194) @@ -108,17 +108,12 @@ CCTK_INT :: eos_handle ! 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,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xye=0.0d0;xeps=0.0d0;xtemp=0.0d0 ! end EOS Omni vars - eos_handle = GRHydro_polytrope_handle call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 193)
by cott＠tapir.caltech.edu 20 Dec '10

20 Dec '10

User: cott Date: 2010/12/21 12:53 AM Modified: /trunk/src/ GRHydro_Prim2Con.F90 Log: * improve thread safety File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2Con.F90 Delta lines: +8 -1 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2010-12-21 06:52:27 UTC (rev 192) +++ trunk/src/GRHydro_Prim2Con.F90 2010-12-21 06:53:01 UTC (rev 193) @@ -49,6 +49,9 @@ CCTK_REAL :: xtemp if(evolve_temper.ne.1) then + !$OMP PARALLEL DO PRIVATE(i, j, avg_detl, avg_detr,& + !$OMP gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & + !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr) do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 @@ -88,7 +91,11 @@ end do end do end do + !$OMP END PARALLEL DO else + !$OMP PARALLEL DO PRIVATE(i, j, avg_detl, avg_detr, xtemp,& + !$OMP gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & + !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr) do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 @@ -147,7 +154,7 @@ end do end do end do - + !$OMP END PARALLEL DO endif end subroutine primitive2conservative

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 192)
by cott＠tapir.caltech.edu 20 Dec '10

20 Dec '10

User: cott Date: 2010/12/21 12:52 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * improve thread safety of hot c2p routine File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +10 -8 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-12-18 12:00:43 UTC (rev 191) +++ trunk/src/GRHydro_Con2Prim.F90 2010-12-21 06:52:27 UTC (rev 192) @@ -490,6 +490,8 @@ CCTK_REAL GRHydro_C2P_failed CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin + CCTK_REAL epsminl,pminl + character(len=200) warnline logical epsnegative @@ -506,8 +508,8 @@ ! end EOS Omni vars ! set pmin and epsmin to something sensible: - pmin = 1.0d-28 - epsmin = 1.0e-5 + pminl = 1.0d-28 + epsminl = 1.0e-5 if(con2prim_oct_hack.ne.0.and.& @@ -622,10 +624,10 @@ rho = GRHydro_rho_min udens = rho dens = sqrt(det) * rho - pnew = pmin - epsilon = epsmin + pnew = pminl + epsilon = epsminl ! w_lorentz=1, so the expression for utau reduces to: - utau = rho + rho*epsmin - udens + utau = rho + rho*epsminl - udens sx = 0.d0 sy = 0.d0 sz = 0.d0 @@ -650,7 +652,7 @@ dpressbydeps*depsbydpress pold = pnew - pnew = max(pold - f/df, pmin) + pnew = max(pold - f/df, pminl) !!$ Recalculate primitive variables and function @@ -740,9 +742,9 @@ udens = rho dens = sqrt(det) * rho ! epsilon = (sqrt( (utau + pnew + udens)**2) - pnew - udens)/udens - epsilon = epsmin + epsilon = epsminl ! w_lorentz=1, so the expression for utau reduces to: - utau = rho + rho*epsmin - udens + utau = rho + rho*epsminl - udens sx = 0.d0 sy = 0.d0 sz = 0.d0

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 191)
by cott＠tapir.caltech.edu 18 Dec '10

18 Dec '10

User: cott Date: 2010/12/18 06:00 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * remove unused variables File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +7 -9 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-12-17 21:30:18 UTC (rev 190) +++ trunk/src/GRHydro_Con2Prim.F90 2010-12-18 12:00:43 UTC (rev 191) @@ -50,7 +50,7 @@ DECLARE_CCTK_PARAMETERS integer :: i, j, k, itracer, nx, ny, nz - CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt, pmin, epsmin + CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, pmin, epsmin logical :: epsnegative character(len=100) warnline @@ -91,7 +91,7 @@ GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) !$OMP PARALLEL DO PRIVATE(i,j,itracer,& - !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt, epsnegative) + !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative) do k = 1, nz do j = 1, ny do i = 1, nx @@ -805,7 +805,7 @@ CCTK_REAL :: uxxl, uxyl, uxzl, uyyl, uyzl, uzzl,& uxxr, uxyr, uxzr, uyyr, uyzr, uzzr, pmin, epsmin CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& - gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l + gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr logical :: epsnegative character(len=100) warnline @@ -1020,7 +1020,7 @@ DECLARE_CCTK_PARAMETERS integer :: i, j, k, itracer, nx, ny, nz - CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt + CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det CCTK_INT :: type_bits, atmosphere CCTK_INT :: type2_bits @@ -1048,7 +1048,7 @@ !!$ do j = GRHydro_stencil + 1, ny - GRHydro_stencil !!$ do i = GRHydro_stencil + 1, nx - GRHydro_stencil !$OMP PARALLEL DO PRIVATE(i,j,itracer,& - !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt) + !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det) do k = 1, nz do j = 1, ny do i = 1, nx @@ -1385,7 +1385,7 @@ CCTK_REAL :: uxxl, uxyl, uxzl, uyyl, uyzl, uzzl,& uxxr, uxyr, uxzr, uyyr, uyzr, uzzr CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& - gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l + gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr CCTK_INT :: type_bits, atmosphere CCTK_INT :: type2_bits @@ -1482,7 +1482,7 @@ CCTK_REAL :: uxxl, uxyl, uxzl, uyyl, uyzl, uzzl,& uxxr, uxyr, uxzr, uyyr, uyzr, uzzr CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& - gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l + gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr nx = cctk_lsh(1) ny = cctk_lsh(2) @@ -1643,7 +1643,6 @@ DECLARE_CCTK_FUNCTIONS CCTK_INT :: i, j, k, itracer, nx, ny, nz, ierr - CCTK_REAL :: psi4pt character(len=100) warnline integer :: maxerrloc(3) @@ -2143,7 +2142,6 @@ DECLARE_CCTK_FUNCTIONS CCTK_INT :: i, j, k, itracer, nx, ny, nz - CCTK_REAL :: psi4pt character(len=100) warnline CCTK_INT :: count, ierr

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 190)
by schnetter＠cct.lsu.edu 17 Dec '10

17 Dec '10

User: eschnett Date: 2010/12/17 03:30 PM Modified: /trunk/src/ GRHydro_Prim2Con.F90 Log: Correct OpenMP errors File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2Con.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2010-12-06 21:13:20 UTC (rev 189) +++ trunk/src/GRHydro_Prim2Con.F90 2010-12-17 21:30:18 UTC (rev 190) @@ -320,7 +320,7 @@ character(len=512) :: warnline if(evolve_temper.ne.1) then - !$OMP PARALLEL DO PRIVATE(i, j) + !$OMP PARALLEL DO PRIVATE(i, j, det) do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 @@ -339,7 +339,7 @@ end do !$OMP END PARALLEL DO else - !$OMP PARALLEL DO PRIVATE(i, j) + !$OMP PARALLEL DO PRIVATE(i, j, det) do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 @@ -557,7 +557,7 @@ CCTK_INT :: i, j, k CCTK_REAL :: det - !$OMP PARALLEL DO PRIVATE(i, j) + !$OMP PARALLEL DO PRIVATE(i, j, det) do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 31)
by knarf＠cct.lsu.edu 16 Dec '10

16 Dec '10

User: knarf Date: 2010/12/16 03:02 PM Modified: /trunk/src/nuc_eos/ nuc_eos.F90 Log: remove some usage of uninitialized memory. Tidy up code a bit File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: nuc_eos.F90 Delta lines: +12 -16 =================================================================== --- trunk/src/nuc_eos/nuc_eos.F90 2010-12-06 19:47:12 UTC (rev 30) +++ trunk/src/nuc_eos/nuc_eos.F90 2010-12-16 21:02:36 UTC (rev 31) @@ -233,13 +233,13 @@ lr = log10(xrho) lt = log10(xtemp) y = xye - xeps = xenr + energy_shift - leps = log10(max(xeps,1.0d0)) keyerr = 0 if(keytemp.eq.0) then !need to find temperature based on xeps + xeps = xenr + energy_shift + leps = log10(max(xeps,1.0d0)) call findtemp(lr,lt,y,leps,keyerrt,rfeps) if(keyerrt.ne.0) then keyerr = keyerrt @@ -349,35 +349,31 @@ endif endif - lr = log10(xrho) - lt = log10(xtemp) - y = xye - xeps = xenr + energy_shift - leps = log10(max(xeps,1.0d0)) - keyerr = 0 + if(keytemp.gt.1) then + stop "eos_nuc_press does not support keytemp other than 0 and 1" + endif + + lr = log10(xrho) + lt = log10(xtemp) + y = xye if(keytemp.eq.0) then !need to find temperature based on xeps + xeps = xenr + energy_shift + leps = log10(max(xeps,1.0d0)) call findtemp(lr,lt,y,leps,keyerrt,rfeps) if(keyerrt.ne.0) then keyerr = keyerrt return endif xtemp = 10.0d0**lt - - elseif(keytemp.gt.1) then - stop "eos_nuc_press does not support keytemp other than 0 and 1" endif - ! have temperature, proceed: call findall_press_eps(lr,lt,y,ff) xprs = 10.0d0**ff(1) + xenr = 10.0d0**ff(2) - energy_shift - if(keytemp.eq.1) then - xenr = 10.0d0**ff(2) - energy_shift - endif - end subroutine nuc_eos_press_eps subroutine nuc_eos_dpdr_dpde(xrho,xtemp,xye,xenr,xdpdrhoe,&

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits December 2010