diff options
| author | bmundim <bmundim@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-05-02 20:59:32 +0000 |
|---|---|---|
| committer | bmundim <bmundim@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2010-05-02 20:59:32 +0000 |
| commit | 74fb1e6ea34d6e03a35ff6c158f455c39904bf5a (patch) | |
| tree | d8f9b95f30517e9bafd8c67301c7383bc8beb76e /src | |
| parent | 291e94d06b30046227fb075cbfa97b9656339d5a (diff) | |
file/parameter string replacement from whisky to GRHydro
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@112 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
Diffstat (limited to 'src')
| -rw-r--r-- | src/GRHydro_Boundaries.F90 (renamed from src/Whisky_Boundaries.F90) | 110 | ||||
| -rw-r--r-- | src/GRHydro_CalcUpdate.F90 (renamed from src/Whisky_CalcUpdate.F90) | 20 | ||||
| -rw-r--r-- | src/GRHydro_CarpetWeights.cc (renamed from src/Whisky_CarpetWeights.cc) | 24 | ||||
| -rw-r--r-- | src/GRHydro_Con2Prim.F90 (renamed from src/Whisky_Con2Prim.F90) | 556 | ||||
| -rw-r--r-- | src/GRHydro_Differences.F90 (renamed from src/Whisky_Differences.F90) | 6 | ||||
| -rw-r--r-- | src/GRHydro_ENOReconstruct.F90 (renamed from src/Whisky_ENOReconstruct.F90) | 28 | ||||
| -rw-r--r-- | src/GRHydro_ENOScalars.F90 (renamed from src/Whisky_ENOScalars.F90) | 6 | ||||
| -rw-r--r-- | src/GRHydro_EOS.c (renamed from src/Whisky_EOS.c) | 28 | ||||
| -rw-r--r-- | src/GRHydro_Eigenproblem.F90 (renamed from src/Whisky_Eigenproblem.F90) | 28 | ||||
| -rw-r--r-- | src/GRHydro_Eigenproblem_Marquina.F90 (renamed from src/Whisky_Eigenproblem_Marquina.F90) | 14 | ||||
| -rw-r--r-- | src/GRHydro_EoSChangeGamma.F90 (renamed from src/Whisky_EoSChangeGamma.F90) | 40 | ||||
| -rw-r--r-- | src/GRHydro_Flux.F90 (renamed from src/Whisky_Flux.F90) | 2 | ||||
| -rw-r--r-- | src/GRHydro_FluxSplit.F90 (renamed from src/Whisky_FluxSplit.F90) | 80 | ||||
| -rw-r--r-- | src/GRHydro_HLLE.F90 (renamed from src/Whisky_HLLE.F90) | 28 | ||||
| -rw-r--r-- | src/GRHydro_HLLEPoly.F90 (renamed from src/Whisky_HLLEPoly.F90) | 54 | ||||
| -rw-r--r-- | src/GRHydro_Loop.F90 (renamed from src/Whisky_Loop.F90) | 12 | ||||
| -rw-r--r-- | src/GRHydro_Marquina.F90 (renamed from src/Whisky_Marquina.F90) | 56 | ||||
| -rw-r--r-- | src/GRHydro_Minima.F90 (renamed from src/Whisky_Minima.F90) | 46 | ||||
| -rw-r--r-- | src/GRHydro_Minima.cc (renamed from src/Whisky_Minima.cc) | 30 | ||||
| -rw-r--r-- | src/GRHydro_PPM.F90 (renamed from src/Whisky_PPM.F90) | 24 | ||||
| -rw-r--r-- | src/GRHydro_ParamCheck.F90 (renamed from src/Whisky_ParamCheck.F90) | 34 | ||||
| -rw-r--r-- | src/GRHydro_Particle.F90 (renamed from src/Whisky_Particle.F90) | 26 | ||||
| -rw-r--r-- | src/GRHydro_PreLoop.F90 (renamed from src/Whisky_PreLoop.F90) | 10 | ||||
| -rw-r--r-- | src/GRHydro_Prim2Con.F90 (renamed from src/Whisky_Prim2Con.F90) | 62 | ||||
| -rw-r--r-- | src/GRHydro_Reconstruct.F90 (renamed from src/Whisky_Reconstruct.F90) | 124 | ||||
| -rw-r--r-- | src/GRHydro_ReconstructPoly.F90 (renamed from src/Whisky_ReconstructPoly.F90) | 112 | ||||
| -rw-r--r-- | src/GRHydro_RegisterGZ.cc (renamed from src/Whisky_RegisterGZ.cc) | 16 | ||||
| -rw-r--r-- | src/GRHydro_RegisterMask.c (renamed from src/Whisky_RegisterMask.c) | 8 | ||||
| -rw-r--r-- | src/GRHydro_RegisterVars.cc (renamed from src/Whisky_RegisterVars.cc) | 32 | ||||
| -rw-r--r-- | src/GRHydro_RiemannSolve.F90 (renamed from src/Whisky_RiemannSolve.F90) | 40 | ||||
| -rw-r--r-- | src/GRHydro_RoeAverage.F90 (renamed from src/Whisky_RoeAverage.F90) | 2 | ||||
| -rw-r--r-- | src/GRHydro_RoeSolver.F90 (renamed from src/Whisky_RoeSolver.F90) | 52 | ||||
| -rw-r--r-- | src/GRHydro_Scalars.F90 (renamed from src/Whisky_Scalars.F90) | 6 | ||||
| -rw-r--r-- | src/GRHydro_Set_TP_GF.c (renamed from src/Whisky_Set_TP_GF.c) | 12 | ||||
| -rw-r--r-- | src/GRHydro_Shift.F90 (renamed from src/Whisky_Shift.F90) | 36 | ||||
| -rw-r--r-- | src/GRHydro_SlopeLimiter.F90 (renamed from src/Whisky_SlopeLimiter.F90) | 4 | ||||
| -rw-r--r-- | src/GRHydro_Source.F90 (renamed from src/Whisky_Source.F90) | 14 | ||||
| -rw-r--r-- | src/GRHydro_Startup.F90 (renamed from src/Whisky_Startup.F90) | 88 | ||||
| -rw-r--r-- | src/GRHydro_TVDReconstruct.F90 (renamed from src/Whisky_TVDReconstruct.F90) | 16 | ||||
| -rw-r--r-- | src/GRHydro_Tmunu.F90 (renamed from src/Whisky_Tmunu.F90) | 6 | ||||
| -rw-r--r-- | src/GRHydro_UpdateMask.F90 (renamed from src/Whisky_UpdateMask.F90) | 36 | ||||
| -rw-r--r-- | src/GRHydro_Weights.c (renamed from src/Whisky_Weights.c) | 12 | ||||
| -rw-r--r-- | src/Utils.F90 | 24 | ||||
| -rw-r--r-- | src/include/GRHydro_EMTensor.inc (renamed from src/include/Whisky_EMTensor.inc) | 2 | ||||
| -rw-r--r-- | src/include/GRHydro_EMTensor_temps.inc (renamed from src/include/Whisky_EMTensor_temps.inc) | 4 | ||||
| -rw-r--r-- | src/make.code.defn | 82 | ||||
| -rw-r--r-- | src/make.code.deps | 14 | ||||
| -rw-r--r-- | src/make.configuration.defn | 2 | ||||
| -rw-r--r-- | src/make.configuration.deps | 12 |
49 files changed, 1040 insertions, 1040 deletions
diff --git a/src/Whisky_Boundaries.F90 b/src/GRHydro_Boundaries.F90 index 7a0b280..5e8c093 100644 --- a/src/Whisky_Boundaries.F90 +++ b/src/GRHydro_Boundaries.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Boundaries.F90 + @file GRHydro_Boundaries.F90 @date Sat Jan 26 01:01:14 2002 @author @desc @@ -22,7 +22,7 @@ #define sz(i,j,k) scon(i,j,k,3) /*@@ - @routine Whisky_InitSymBound + @routine GRHydro_InitSymBound @date Sat Jan 26 01:03:04 2002 @author Ian Hawke @desc @@ -37,7 +37,7 @@ @@*/ -subroutine Whisky_InitSymBound(CCTK_ARGUMENTS) +subroutine GRHydro_InitSymBound(CCTK_ARGUMENTS) implicit none @@ -57,16 +57,16 @@ subroutine Whisky_InitSymBound(CCTK_ARGUMENTS) call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::rho") call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press") - call SetCartSymVN(ierr, cctkGH, sym, "Whisky::dens") - call SetCartSymVN(ierr, cctkGH, sym, "Whisky::tau") - call SetCartSymVN(ierr, cctkGH, sym, "Whisky::w_lorentz") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::dens") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::tau") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::w_lorentz") call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps") - call SetCartSymVN(ierr, cctkGH, sym, "Whisky::whisky_C2P_failed") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed") !!$ handle multiple tracer variables if(evolve_tracer.eq.1) then - call SetCartSymGN(ierr, cctkGH, sym, "Whisky::whisky_tracers") - call SetCartSymGN(ierr, cctkGH, sym, "Whisky::whisky_cons_tracers") + call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::GRHydro_tracers") + call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::GRHydro_cons_tracers") endif sym(1) = -1 @@ -74,26 +74,26 @@ subroutine Whisky_InitSymBound(CCTK_ARGUMENTS) sym(3) = 1 call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[0]") - call SetCartSymVN(ierr, cctkGH, sym, "Whisky::scon[0]") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[0]") sym(1) = 1 sym(2) = -1 sym(3) = 1 call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[1]") - call SetCartSymVN(ierr, cctkGH, sym, "Whisky::scon[1]") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[1]") sym(1) = 1 sym(2) = 1 sym(3) = -1 call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[2]") - call SetCartSymVN(ierr, cctkGH, sym, "Whisky::scon[2]") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[2]") -end subroutine Whisky_InitSymBound +end subroutine GRHydro_InitSymBound /*@@ - @routine Whisky_Boundaries + @routine GRHydro_Boundaries @date Sat Jan 26 01:04:04 2002 @author @desc @@ -107,7 +107,7 @@ end subroutine Whisky_InitSymBound @@*/ -subroutine Whisky_Boundaries(CCTK_ARGUMENTS) +subroutine GRHydro_Boundaries(CCTK_ARGUMENTS) implicit none @@ -123,60 +123,60 @@ subroutine Whisky_Boundaries(CCTK_ARGUMENTS) CCTK_INT, parameter :: faces=CCTK_ALL_FACES CCTK_INT, parameter :: ione=1 - sw = Whisky_stencil + sw = GRHydro_stencil !!$Flat boundaries if required if (CCTK_EQUALS(bound,"flat")) then - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::dens", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::tau", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::scon", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::w_lorentz", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::dens", "Flat") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::tau", "Flat") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::scon", "Flat") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::w_lorentz", "Flat") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::rho", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::press", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::eps", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::vel", "Flat") if(evolve_tracer .ne. 0) then - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::Whisky_tracers", "Flat") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::Whisky_cons_tracers", "Flat") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_tracers", "Flat") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_cons_tracers", "Flat") endif endif if (CCTK_EQUALS(bound,"none")) then - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::dens", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::tau", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::scon", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::w_lorentz", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::dens", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::tau", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::scon", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::w_lorentz", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::rho", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::press", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::eps", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::vel", "None") if(evolve_tracer .ne. 0) then - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::Whisky_tracers", "None") - ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, & - "Whisky::Whisky_cons_tracers", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_tracers", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_cons_tracers", "None") endif end if @@ -187,11 +187,11 @@ subroutine Whisky_Boundaries(CCTK_ARGUMENTS) if (ierr < 0) call CCTK_WARN(0, "problems with applying the chosen boundary condition") -end subroutine Whisky_Boundaries +end subroutine GRHydro_Boundaries /*@@ - @routine Whisky_OutflowBoundaries + @routine GRHydro_OutflowBoundaries @date Tue May 17 16:58:06 2005 @author Ian Hawke @desc @@ -206,7 +206,7 @@ end subroutine Whisky_Boundaries @@*/ -subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS) +subroutine GRHydro_OutflowBoundaries(CCTK_ARGUMENTS) implicit none @@ -222,7 +222,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS) CCTK_REAL :: det,psi4pt - sw = Whisky_stencil + sw = GRHydro_stencil if (r(1,1,1) < r(1,1,cctk_lsh(3))) then @@ -256,7 +256,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS) psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),& psi4pt*gzz(i,j,k),det) end if - call prim2con(whisky_eos_handle,psi4pt*gxx(i,j,k),& + call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& @@ -303,7 +303,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS) psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),& psi4pt*gzz(i,j,k),det) end if - call prim2con(whisky_eos_handle,psi4pt*gxx(i,j,k),& + call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& @@ -320,7 +320,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS) end if -end subroutine Whisky_OutflowBoundaries +end subroutine GRHydro_OutflowBoundaries diff --git a/src/Whisky_CalcUpdate.F90 b/src/GRHydro_CalcUpdate.F90 index e10866c..fb6fdd1 100644 --- a/src/Whisky_CalcUpdate.F90 +++ b/src/GRHydro_CalcUpdate.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_CalcUpdate.F90 + @file GRHydro_CalcUpdate.F90 @date Thu Jan 11 11:03:32 2002 @author Ian Hawke @desc @@ -56,9 +56,9 @@ subroutine UpdateCalculation(CCTK_ARGUMENTS) if (use_weighted_fluxes == 0) then !$OMP PARALLEL DO PRIVATE(i,j,itracer,alp_l, alp_r) - do k = whisky_stencil + 1, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil + 1, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil + 1, cctk_lsh(1) - whisky_stencil + do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil + do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil + do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil alp_l = 0.5d0 * (alp(i,j,k) + & alp(i-xoffset,j-yoffset,k-zoffset)) @@ -140,9 +140,9 @@ subroutine UpdateCalculation(CCTK_ARGUMENTS) call CCTK_WARN(0, "Not supported") -!!$ do k = whisky_stencil + 1, cctk_lsh(3) - whisky_stencil -!!$ do j = whisky_stencil + 1, cctk_lsh(2) - whisky_stencil -!!$ do i = whisky_stencil + 1, cctk_lsh(1) - whisky_stencil +!!$ do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil +!!$ do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil +!!$ do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil !!$ !!$ alp_l = 0.5d0 * (alp(i,j,k) + & !!$ alp(i-xoffset,j-yoffset,k-zoffset)) @@ -193,9 +193,9 @@ subroutine UpdateCalculation(CCTK_ARGUMENTS) else if (CCTK_EQUALS(method_type, "Flux split FD")) then - do k = whisky_stencil + 1, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil + 1, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil + 1, cctk_lsh(1) - whisky_stencil + do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil + do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil + do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil densrhs(i,j,k) = densrhs(i,j,k) + & (densflux(i-xoffset,j-yoffset,k-zoffset) - & diff --git a/src/Whisky_CarpetWeights.cc b/src/GRHydro_CarpetWeights.cc index 8afdd12..3fb7fcf 100644 --- a/src/Whisky_CarpetWeights.cc +++ b/src/GRHydro_CarpetWeights.cc @@ -1,9 +1,9 @@ /*@@ - @file Whisky_CarpetWeights.cc + @file GRHydro_CarpetWeights.cc @date Wed Aug 20 23:08:28 2008 @author Luca Baiotti @desc - Copy the variable CarpetReduce::weight in a Whisky variable. + Copy the variable CarpetReduce::weight in a GRHydro variable. Written with the help of Thomas. @enddesc @@*/ @@ -23,14 +23,14 @@ #endif /* Scheduled functions */ - void Whisky_CarpetWeights(CCTK_ARGUMENTS); + void GRHydro_CarpetWeights(CCTK_ARGUMENTS); #ifdef __cplusplus } /* extern "C" */ #endif -void Whisky_CarpetWeights(CCTK_ARGUMENTS) +void GRHydro_CarpetWeights(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; @@ -39,26 +39,26 @@ void Whisky_CarpetWeights(CCTK_ARGUMENTS) int i; // Define the variable we will use in Con2Prim (F90) as a pointer to itself - Whisky_CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"Whisky::Whisky_CarpetWeights")); + GRHydro_CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"GRHydro::GRHydro_CarpetWeights")); if (CCTK_IsThornActive("CarpetReduce")!=0){ // If we use Carpet then obtain a pointer to rhe carpet variable. This will be CarpetWeights const CCTK_REAL *CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"CarpetReduce::weight")); - // Then assign the values of the carpet variable to the whisky variable + // Then assign the values of the carpet variable to the GRHydro variable for (i=0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) { - Whisky_CarpetWeights[i] = CarpetWeights[i]; - //printf("%13.12e\n",Whisky_CarpetWeights[i]); + GRHydro_CarpetWeights[i] = CarpetWeights[i]; + //printf("%13.12e\n",GRHydro_CarpetWeights[i]); } } else{ - // Then assign the values of the carpet variable to the whisky variable - CCTK_INFO("We are not using Carpet, so I set Whisky_CarpetWeights equal to 1"); + // Then assign the values of the carpet variable to the GRHydro variable + CCTK_INFO("We are not using Carpet, so I set GRHydro_CarpetWeights equal to 1"); for (i=0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) { - Whisky_CarpetWeights[i] = 1; //if we do not use Carpet then we set this variable to be equal to 1 - //printf("%13.12e\n",Whisky_CarpetWeights[i]); + GRHydro_CarpetWeights[i] = 1; //if we do not use Carpet then we set this variable to be equal to 1 + //printf("%13.12e\n",GRHydro_CarpetWeights[i]); } } diff --git a/src/Whisky_Con2Prim.F90 b/src/GRHydro_Con2Prim.F90 index f66eedb..8e13501 100644 --- a/src/Whisky_Con2Prim.F90 +++ b/src/GRHydro_Con2Prim.F90 @@ -1,7 +1,7 @@ /*@@ - @file Whisky_RegisterVars.c + @file GRHydro_RegisterVars.c @date Sat Jan 26 01:06:01 2002 - @author The Whisky Developers + @author The GRHydro Developers @desc The routines for converting conservative to primitive variables. @enddesc @@ -31,8 +31,8 @@ module Con2Prim_fortran_interfaces det, & x, y, z, r, & epsnegative, & - whisky_rho_min, pmin, epsmin, & - whisky_reflevel, whisky_C2P_failed) + GRHydro_rho_min, pmin, epsmin, & + GRHydro_reflevel, GRHydro_C2P_failed) implicit none CCTK_INT handle @@ -48,12 +48,12 @@ module Con2Prim_fortran_interfaces CCTK_REAL det CCTK_REAL x, y, z, r logical epsnegative - CCTK_REAL whisky_rho_min, pmin, epsmin - CCTK_INT whisky_reflevel - CCTK_REAL whisky_C2P_failed + CCTK_REAL GRHydro_rho_min, pmin, epsmin + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed end subroutine Con2Prim_pt - subroutine Con2Prim_ptPolytype(whisky_polytrope_handle, & + subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, & dens, & sx, sy, sz, & tau, & @@ -64,11 +64,11 @@ module Con2Prim_fortran_interfaces uxx, uxy, uxz, uyy, uyz, uzz, & det, & x, y, z, r, & - whisky_rho_min, & - whisky_reflevel, whisky_C2P_failed) + GRHydro_rho_min, & + GRHydro_reflevel, GRHydro_C2P_failed) implicit none - CCTK_INT whisky_polytrope_handle + CCTK_INT GRHydro_polytrope_handle CCTK_REAL dens CCTK_REAL sx, sy, sz CCTK_REAL tau @@ -80,9 +80,9 @@ module Con2Prim_fortran_interfaces CCTK_REAL uyy, uyz, uzz CCTK_REAL det CCTK_REAL x, y, z, r - CCTK_REAL whisky_rho_min - CCTK_INT whisky_reflevel - CCTK_REAL whisky_C2P_failed + CCTK_REAL GRHydro_rho_min + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed end subroutine Con2Prim_ptPolytype subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) @@ -164,8 +164,8 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) local_min_tracer = 0d0 end if - pmin = EOS_Pressure(whisky_polytrope_handle, whisky_rho_min, 1.0d0) - epsmin = EOS_SpecificIntEnergy(whisky_polytrope_handle, whisky_rho_min, pmin) + pmin = EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0) + epsmin = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, GRHydro_rho_min, pmin) !$OMP PARALLEL DO PRIVATE(i,j,itracer,& !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt, epsnegative) @@ -214,15 +214,15 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) endif - if ( dens(i,j,k) .le. sqrt(det)*whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then + if ( dens(i,j,k) .le. sqrt(det)*GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then - dens(i,j,k) = sqrt(det)*whisky_rho_min !/(1.d0+whisky_atmo_tolerance) - rho(i,j,k) = whisky_rho_min + dens(i,j,k) = sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance) + rho(i,j,k) = GRHydro_rho_min scon(i,j,k,:) = 0.d0 vel(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 - press(i,j,k) = EOS_Pressure(whisky_polytrope_handle, rho(i,j,k), eps(i,j,k)) - eps(i,j,k) = EOS_SpecificIntEnergy(whisky_polytrope_handle, rho(i,j,k), press(i,j,k)) + press(i,j,k) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,j,k), eps(i,j,k)) + eps(i,j,k) = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, rho(i,j,k), press(i,j,k)) ! w_lorentz=1, so the expression for tau reduces to: tau(i,j,k) = sqrt(det) * (rho(i,j,k)+rho(i,j,k)*eps(i,j,k)) - dens(i,j,k) @@ -231,11 +231,11 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) end if - call Con2Prim_pt(whisky_eos_handle, dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2), & + call Con2Prim_pt(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),vel(i,j,k,2), & vel(i,j,k,3),eps(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), & - z(i,j,k),r(i,j,k),epsnegative,whisky_rho_min,pmin, epsmin, whisky_reflevel, whisky_C2P_failed(i,j,k)) + z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) if (epsnegative) then @@ -247,28 +247,28 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) ! but will allow the job to continue if it happens in the atmosphere or in a ! zone that contains garbage (i.e. boundary, buffer zones) ! Ultimately, we want this fixed via a new carpet mask presently under development -! whisky_C2P_failed(i,j,k) = 1 +! GRHydro_C2P_failed(i,j,k) = 1 !$OMP CRITICAL - call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel - call CCTK_WARN(Whisky_NaN_verbose+2,warnline) + call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0! ') + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel + call CCTK_WARN(GRHydro_NaN_verbose+2,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',& x(i,j,k),y(i,j,k),z(i,j,k) - call CCTK_WARN(Whisky_NaN_verbose+2,warnline) + call CCTK_WARN(GRHydro_NaN_verbose+2,warnline) write(warnline,'(a20,g16.7)') 'radius: ',r(i,j,k) - call CCTK_WARN(Whisky_NaN_verbose+2,warnline) - call CCTK_WARN(Whisky_NaN_verbose+2,"Setting the point to atmosphere") + call CCTK_WARN(GRHydro_NaN_verbose+2,warnline) + call CCTK_WARN(GRHydro_NaN_verbose+2,"Setting the point to atmosphere") !$OMP END CRITICAL ! for safety, let's set the point to atmosphere - dens(i,j,k) = sqrt(det)*whisky_rho_min !/(1.d0+whisky_atmo_tolerance) - rho(i,j,k) = whisky_rho_min + dens(i,j,k) = sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance) + rho(i,j,k) = GRHydro_rho_min scon(i,j,k,:) = 0.d0 vel(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 - press(i,j,k) = EOS_Pressure(whisky_polytrope_handle, rho(i,j,k), eps(i,j,k)) - eps(i,j,k) = EOS_SpecificIntEnergy(whisky_polytrope_handle, rho(i,j,k), press(i,j,k)) + press(i,j,k) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,j,k), eps(i,j,k)) + eps(i,j,k) = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, rho(i,j,k), press(i,j,k)) ! w_lorentz=1, so the expression for tau reduces to: tau(i,j,k) = sqrt(det) * (rho(i,j,k)+rho(i,j,k)*eps(i,j,k)) - dens(i,j,k) @@ -278,14 +278,14 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS) ! this happened as having led to failing con2prim. !$OMP CRITICAL - call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype.') + call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype.') !$OMP END CRITICAL - call Con2Prim_ptPolytype(whisky_polytrope_handle, & + call Con2Prim_ptPolytype(GRHydro_polytrope_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), vel(i,j,k,2), & vel(i,j,k,3), eps(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), & - z(i,j,k), r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k)) + z(i,j,k), r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) #endif end if @@ -301,7 +301,7 @@ end subroutine Conservative2Primitive /*@@ @routine Con2Prim_pt @date Sat Jan 26 01:09:39 2002 -@author The Whisky Develpoers +@author The GRHydro Develpoers @desc Given all the appropriate data, recover the primitive variables at a single point. @@ -315,7 +315,7 @@ a single point. subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & velz, epsilon, press, w_lorentz, uxx, uxy, uxz, uyy, & - uyz, uzz, det, x, y, z, r, epsnegative, whisky_rho_min, pmin, epsmin, whisky_reflevel, whisky_C2P_failed) + uyz, uzz, det, x, y, z, r, epsnegative, GRHydro_rho_min, pmin, epsmin, GRHydro_reflevel, GRHydro_C2P_failed) implicit none @@ -323,10 +323,10 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & CCTK_REAL dens, sx, sy, sz, tau, rho, velx, vely, velz, epsilon, & press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, & - y, z, r, whisky_rho_min + y, z, r, GRHydro_rho_min CCTK_REAL s2, c0, c1, c2, c3, c4, f, df, ftol, v2, w, vlowx, vlowy, vlowz - CCTK_INT count, i, handle, whisky_reflevel, whisky_C2P_failed + CCTK_INT count, i, handle, GRHydro_reflevel, GRHydro_C2P_failed CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin character(len=200) warnline @@ -359,8 +359,8 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & pold = sqrt(s2 + c2p_reset_pressure_to_value) - utau - udens else !$OMP CRITICAL - call CCTK_WARN(Whisky_NaN_verbose, "c2p failed and being told not to reset the pressure") - whisky_C2P_failed = 1 + call CCTK_WARN(GRHydro_NaN_verbose, "c2p failed and being told not to reset the pressure") + GRHydro_C2P_failed = 1 !$OMP END CRITICAL endif @@ -379,7 +379,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & if (rho .ne. rho) then !$OMP CRITICAL write(warnline,'(a70,7g15.6)') 'NaN produced in sqrt(): (utau, pold, udens, s2, x, y, z)', utau, pold, udens, s2, x, y, z - call CCTK_WARN(Whisky_NaN_verbose, warnline) + call CCTK_WARN(GRHydro_NaN_verbose, warnline) !$OMP END CRITICAL endif !!$ END: Check for NaN value (1st check) @@ -392,17 +392,17 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & count = 0 pnew = pold - do while ( ((abs(pnew - pold)/abs(pnew) .gt. whisky_perc_ptol) .and. & - (abs(pnew - pold) .gt. whisky_del_ptol)) .or. & - (count .lt. whisky_countmin)) + do while ( ((abs(pnew - pold)/abs(pnew) .gt. GRHydro_perc_ptol) .and. & + (abs(pnew - pold) .gt. GRHydro_del_ptol)) .or. & + (count .lt. GRHydro_countmin)) count = count + 1 - if (count > whisky_countmax) then - whisky_C2P_failed = 1 + if (count > GRHydro_countmax) then + GRHydro_C2P_failed = 1 !$OMP CRITICAL - call CCTK_WARN(1, 'count > Whisky_countmax! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + call CCTK_WARN(1, 'count > GRHydro_countmax! ') + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z call CCTK_WARN(1,warnline) @@ -412,7 +412,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & !$OMP END CRITICAL ! for safety, let's set the point to atmosphere - rho = whisky_rho_min + rho = GRHydro_rho_min udens = rho dens = sqrt(det) * rho pnew = pmin @@ -455,7 +455,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & if (rho .ne. rho) then !$OMP CRITICAL write(warnline,'(a20,g20.7)') 'rho is NaN: ',rho - call CCTK_WARN(Whisky_NaN_verbose,warnline) + call CCTK_WARN(GRHydro_NaN_verbose,warnline) !$OMP END CRITICAL goto 51 end if @@ -464,7 +464,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & !!$ Polish the root - do i=1,whisky_polish + do i=1,GRHydro_polish dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon) dpressbydeps = EOS_DPressByDEps(handle,rho,epsilon) @@ -492,15 +492,15 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, & if (rho .ne. rho) then !$OMP CRITICAL write(warnline,'(a70,7g15.6)') 'NaN produced in sqrt(): (utau, pold, udens, s2, x, y, z)', utau, pold, udens, s2, x, y, z - call CCTK_WARN(Whisky_NaN_verbose, warnline) + call CCTK_WARN(GRHydro_NaN_verbose, warnline) !$OMP END CRITICAL endif !!$ END: Check for NaN value (2nd check) !!$ Calculate primitive variables from root - if (rho .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then - rho = whisky_rho_min + if (rho .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + rho = GRHydro_rho_min udens = rho dens = sqrt(det) * rho ! epsilon = (sqrt( (utau + pnew + udens)**2) - pnew - udens)/udens @@ -536,7 +536,7 @@ end subroutine Con2Prim_pt /*@@ @routine Conservative2PrimitiveBoundaries @date Tue Mar 12 18:04:40 2002 - @author The Whisky Developers + @author The GRHydro Developers @desc This routine is used only if the reconstruction is performed on the conserved variables. It computes the primitive variables on cell boundaries. @@ -581,8 +581,8 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) #endif #include "EOS_Base.inc" - pmin=EOS_Pressure(whisky_polytrope_handle, whisky_rho_min, 1.0d0) - epsmin = EOS_SpecificIntEnergy(whisky_polytrope_handle, whisky_rho_min, pmin) + pmin=EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0) + epsmin = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, GRHydro_rho_min, pmin) call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere") call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere") @@ -598,13 +598,13 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) local_min_tracer = 0d0 end if - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, ny - whisky_stencil + 1 - do i = whisky_stencil, nx - whisky_stencil + 1 + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, ny - GRHydro_stencil + 1 + do i = GRHydro_stencil, nx - GRHydro_stencil + 1 !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -658,7 +658,7 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) endif - call Con2Prim_pt(whisky_eos_handle, densminus(i,j,k),& + call Con2Prim_pt(GRHydro_eos_handle, densminus(i,j,k),& sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k),& tauminus(i,j,k),rhominus(i,j,k),velxminus(i,j,k),& velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),& @@ -667,12 +667,12 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),& y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), & z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),& - epsnegative,whisky_rho_min,pmin, epsmin, whisky_reflevel, whisky_C2P_failed(i,j,k)) + epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) if (epsnegative) then !$OMP CRITICAL - call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!') + call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!') !$OMP END CRITICAL - call Con2Prim_ptPolytype(whisky_polytrope_handle, densminus(i,j,k),& + call Con2Prim_ptPolytype(GRHydro_polytrope_handle, densminus(i,j,k),& sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k),& tauminus(i,j,k),rhominus(i,j,k),velxminus(i,j,k),& velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),& @@ -680,15 +680,15 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl,& x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),& y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k)) + z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) end if if (epsminus(i,j,k) .lt. 0.0d0) then - if (whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then + if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then !$OMP CRITICAL call CCTK_WARN(1,'Con2Prim: stopping the code.') call CCTK_WARN(1, ' specific internal energy just went below 0! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',& x(i,j,k),y(i,j,k),z(i,j,k) @@ -698,14 +698,14 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) write(warnline,'(a20,3g16.7)') 'velocities: ',& velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k) call CCTK_WARN(1,warnline) - call CCTK_WARN(whisky_c2p_warnlevel, "Specific internal energy negative") + call CCTK_WARN(GRHydro_c2p_warnlevel, "Specific internal energy negative") !$OMP END CRITICAL exit endif endif epsnegative = .false. - call Con2Prim_pt(whisky_eos_handle, densplus(i,j,k),& + call Con2Prim_pt(GRHydro_eos_handle, densplus(i,j,k),& sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k),& tauplus(i,j,k),rhoplus(i,j,k),velxplus(i,j,k),& velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),& @@ -714,12 +714,12 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),& y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), & z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),& - epsnegative,whisky_rho_min,pmin, epsmin, whisky_reflevel,whisky_C2P_failed(i,j,k)) + epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel,GRHydro_C2P_failed(i,j,k)) if (epsnegative) then !$OMP CRITICAL - call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!!') + call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!!') !$OMP END CRITICAL - call Con2Prim_ptPolytype(whisky_polytrope_handle, densplus(i,j,k),& + call Con2Prim_ptPolytype(GRHydro_polytrope_handle, densplus(i,j,k),& sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k),& tauplus(i,j,k),rhoplus(i,j,k),velxplus(i,j,k),& velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),& @@ -727,15 +727,15 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr,& x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),& y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k)) + z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) end if if (epsplus(i,j,k) .lt. 0.0d0) then - if (whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then + if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then !$OMP CRITICAL call CCTK_WARN(1,'Con2Prim: stopping the code.') call CCTK_WARN(1, ' specific internal energy just went below 0! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',& x(i,j,k),y(i,j,k),z(i,j,k) @@ -745,7 +745,7 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS) write(warnline,'(a20,3g16.7)') 'velocities: ',& velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k) call CCTK_WARN(1,warnline) - call CCTK_WARN(whisky_c2p_warnlevel, "Specific internal energy negative") + call CCTK_WARN(GRHydro_c2p_warnlevel, "Specific internal energy negative") write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',& x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k) call CCTK_WARN(1,warnline) @@ -807,9 +807,9 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS) local_min_tracer = 0d0 end if -!!$ do k = whisky_stencil + 1, nz - whisky_stencil -!!$ do j = whisky_stencil + 1, ny - whisky_stencil -!!$ do i = whisky_stencil + 1, nx - whisky_stencil +!!$ do k = GRHydro_stencil + 1, nz - GRHydro_stencil +!!$ 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) do k = 1, nz @@ -818,7 +818,7 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS) !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle if (conformal_state .eq. 0) then call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& @@ -850,12 +850,12 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS) endif - call Con2Prim_ptPolytype(whisky_eos_handle, dens(i,j,k),& + call Con2Prim_ptPolytype(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),vel(i,j,k,2), & vel(i,j,k,3),eps(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), & - z(i,j,k),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k)) + z(i,j,k),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) end do end do @@ -871,7 +871,7 @@ end subroutine Conservative2PrimitivePolytype /*@@ @routine Con2Prim_ptPolytype @date Sat Jan 26 01:09:39 2002 -@author The Whisky Developers +@author The GRHydro Developers @desc Given all the appropriate data, recover the primitive variables at a single point. @@ -886,7 +886,7 @@ a single point. subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & velx, vely, velz, epsilon, press, w_lorentz, uxx, uxy, uxz, uyy, & - uyz, uzz, det, x, y, z, r, whisky_rho_min, whisky_reflevel, whisky_C2P_failed) + uyz, uzz, det, x, y, z, r, GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed) implicit none @@ -894,12 +894,12 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & CCTK_REAL dens, sx, sy, sz, tau, rho, velx, vely, velz, epsilon, & press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, & - y, z, r, whisky_rho_min + y, z, r, GRHydro_rho_min CCTK_REAL s2, f, df, vlowx, vlowy, vlowz - CCTK_INT count, handle, whisky_reflevel + CCTK_INT count, handle, GRHydro_reflevel CCTK_REAL udens, usx, usy, usz, rhoold, rhonew, epsold, epsnew, & - enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, whisky_C2P_failed + enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, GRHydro_C2P_failed character(len=200) warnline #ifdef _EOS_BASE_INC_ @@ -920,7 +920,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & !!$ Set initial guess for rho: - rhoold = max(whisky_rho_min,rho) + rhoold = max(GRHydro_rho_min,rho) enthalpy = 1.d0 + EOS_SpecificIntEnergy(handle, rhoold, press) + & EOS_Pressure(handle, rhoold, epsilon) / rhoold w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 )) @@ -929,7 +929,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & if (w_lorentz .ne. w_lorentz) then !$OMP CRITICAL write(warnline,'(a70,8g15.6)') 'NaN produced in sqrt(): (dens, det, s2, udens, enthalpy, x, y, z)', dens, det, s2, udens, enthalpy, x, y, z - call CCTK_WARN(Whisky_NaN_verbose, warnline) + call CCTK_WARN(GRHydro_NaN_verbose, warnline) !$OMP END CRITICAL endif !!$ END: Check for NaN value (1st check) @@ -945,17 +945,17 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & count = 0 rhonew = rhoold - do while ( ((abs(rhonew - rhoold)/abs(rhonew) .gt. whisky_perc_ptol) .and. & - (abs(rhonew - rhoold) .gt. whisky_del_ptol)) .or. & - (count .lt. whisky_countmin)) + do while ( ((abs(rhonew - rhoold)/abs(rhonew) .gt. GRHydro_perc_ptol) .and. & + (abs(rhonew - rhoold) .gt. GRHydro_del_ptol)) .or. & + (count .lt. GRHydro_countmin)) count = count + 1 - if (count > whisky_countmax) then - whisky_C2P_failed = 1 + if (count > GRHydro_countmax) then + GRHydro_C2P_failed = 1 !$OMP CRITICAL - call CCTK_WARN(1, 'count > Whisky_countmax! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + call CCTK_WARN(1, 'count > GRHydro_countmax! ') + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z call CCTK_WARN(1,warnline) @@ -965,7 +965,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & !$OMP END CRITICAL ! for safety, let's set the point to atmosphere - rhonew = whisky_rho_min + rhonew = GRHydro_rho_min udens = rhonew dens = sqrtdet * rhonew press = EOS_Pressure(handle, rhonew, 1.d0) @@ -995,12 +995,12 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & if (rhonew .lt. 0.d0) then #if 0 - whisky_C2P_failed = 1 + GRHydro_C2P_failed = 1 !$OMP CRITICAL - call CCTK_WARN(Whisky_NaN_verbose, 'rhonew went below 0') + call CCTK_WARN(GRHydro_NaN_verbose, 'rhonew went below 0') !$OMP END CRITICAL #else - rhonew = whisky_rho_min/100; + rhonew = GRHydro_rho_min/100; #endif end if @@ -1019,8 +1019,8 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & !!$ Calculate primitive variables from root - if (rhonew .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then - rhonew = whisky_rho_min + if (rhonew .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + rhonew = GRHydro_rho_min udens = rhonew ! before 2009/10/07 dens was not reset and was used with its negative value below; this has since been changed, but the change produces significant changes in the results dens = sqrtdet * rhonew @@ -1048,7 +1048,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & if (w_lorentz .ne. w_lorentz) then !$OMP CRITICAL write(warnline,'(a70,6g15.6)') 'NaN produced in sqrt(): (s2, udens, enthalpy, x, y, z)', s2, udens, enthalpy, x, y, z - call CCTK_WARN(Whisky_NaN_verbose, warnline) + call CCTK_WARN(GRHydro_NaN_verbose, warnline) !$OMP END CRITICAL endif !!$ END: Check for NaN value (2nd check) @@ -1058,11 +1058,11 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & tau = sqrtdet * ((rho * enthalpy) * w_lorentz**2 - press) - dens if (epsilon .lt. 0.0d0) then - whisky_C2P_failed = 1 + GRHydro_C2P_failed = 1 !$OMP CRITICAL call CCTK_WARN(1, 'epsilon < 0! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z call CCTK_WARN(1,warnline) @@ -1071,7 +1071,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, & call CCTK_WARN(1,"Setting the point to atmosphere") !$OMP END CRITICAL - rho = whisky_rho_min + rho = GRHydro_rho_min dens = sqrtdet * rho press = EOS_Pressure(handle, rhonew, 1.d0) epsilon = EOS_SpecificIntEnergy(handle, rhonew, press) @@ -1100,7 +1100,7 @@ end subroutine Con2Prim_ptPolytype /*@@ @routine Cons2PrimBoundsPolytype @date Tue Mar 12 18:04:40 2002 - @author The Whisky Developers + @author The GRHydro Developers @desc This routine is used only if the reconstruction is performed on the conserved variables. It computes the primitive variables on cell boundaries. @@ -1140,13 +1140,13 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS) ny = cctk_lsh(2) nz = cctk_lsh(3) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, ny - whisky_stencil + 1 - do i = whisky_stencil, nx - whisky_stencil + 1 + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, ny - GRHydro_stencil + 1 + do i = GRHydro_stencil, nx - GRHydro_stencil + 1 !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -1184,7 +1184,7 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS) psi4r*gzzr) end if - call Con2Prim_ptPolytype(whisky_eos_handle, densminus(i,j,k),& + call Con2Prim_ptPolytype(GRHydro_eos_handle, densminus(i,j,k),& sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k),& tauminus(i,j,k),rhominus(i,j,k),velxminus(i,j,k),& velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),& @@ -1192,8 +1192,8 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS) uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl,& x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),& y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k)) - call Con2Prim_ptPolytype(whisky_eos_handle, densplus(i,j,k),& + z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) + call Con2Prim_ptPolytype(GRHydro_eos_handle, densplus(i,j,k),& sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k),& tauplus(i,j,k),rhoplus(i,j,k),velxplus(i,j,k),& velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),& @@ -1201,7 +1201,7 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS) uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr,& x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),& y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k)) + z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) end do end do @@ -1242,9 +1242,9 @@ subroutine Con2PrimBoundsTracer(CCTK_ARGUMENTS) ny = cctk_lsh(2) nz = cctk_lsh(3) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, ny - whisky_stencil + 1 - do i = whisky_stencil, nx - whisky_stencil + 1 + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, ny - GRHydro_stencil + 1 + do i = GRHydro_stencil, nx - GRHydro_stencil + 1 gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -1404,7 +1404,7 @@ end subroutine Con2Prim_ptBoundsTracer subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -1482,43 +1482,43 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) enddo endif - if ( (dens(i,j,k).le.sqrt(Whisky_Det(i,j,k)) * & - whisky_rho_min*(1.0d0+whisky_atmo_tolerance)) & + if ( (dens(i,j,k).le.sqrt(GRHydro_Det(i,j,k)) * & + GRHydro_rho_min*(1.0d0+GRHydro_atmo_tolerance)) & .or.(tau(i,j,k) .le. 0d0)) then - rho(i,j,k) = whisky_rho_min - dens(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k) + rho(i,j,k) = GRHydro_rho_min + dens(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k) scon(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 press(i,j,k) = 0.1d0 * eosgeneral_pmin ! eps(i,j,k) = press(i,j,k) / rho(i,j,k) ! Note that this should be improved eps(i,j,k) = 1.0e-12 - tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k) * eps(i,j,k) + tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k) * eps(i,j,k) SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) atmosphere_mask(i,j,k) = 1 end if - udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) - usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k)) - usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k)) - usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k)) - utau = tau(i,j,k) / sqrt(Whisky_det(i,j,k)) - s2 = usx*usx*Whisky_uxx(i,j,k) + & - usy*usy*Whisky_uyy(i,j,k) + & - usz*usz*Whisky_uzz(i,j,k) + & - 2.d0*usx*usy*Whisky_uxy(i,j,k) + & - 2.d0*usx*usz*Whisky_uxz(i,j,k) + & - 2.d0*usy*usz*Whisky_uyz(i,j,k) + udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) + usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k)) + usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k)) + usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k)) + utau = tau(i,j,k) / sqrt(GRHydro_det(i,j,k)) + s2 = usx*usx*GRHydro_uxx(i,j,k) + & + usy*usy*GRHydro_uyy(i,j,k) + & + usz*usz*GRHydro_uzz(i,j,k) + & + 2.d0*usx*usy*GRHydro_uxy(i,j,k) + & + 2.d0*usx*usz*GRHydro_uxz(i,j,k) + & + 2.d0*usy*usz*GRHydro_uyz(i,j,k) !!$ Check that the variables have a chance of being physical if( (utau + press_old(i,j,k) + udens)**2 - s2 .le. 0.0d0) then - if(whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then + if(GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then !$OMP CRITICAL call CCTK_WARN(1,'Con2PrimGeneral: variables unphysical!') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a25,g15.6)') 'undensitized energy: ',utau call CCTK_WARN(1,warnline) @@ -1528,17 +1528,17 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) call CCTK_WARN(1,warnline) write(warnline,'(a25,g15.6)') 'pressure guess: ',press_old(i,j,k) call CCTK_WARN(1,warnline) - write(warnline,'(a25,i4)') 'refinement level: ',whisky_reflevel + write(warnline,'(a25,i4)') 'refinement level: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',& x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k) call CCTK_WARN(1,warnline) - call CCTK_WARN(whisky_c2p_warnlevel, "Unphysical variables") + call CCTK_WARN(GRHydro_c2p_warnlevel, "Unphysical variables") !$OMP END CRITICAL exit else !$OMP CRITICAL - write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',whisky_reflevel + write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',& x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k) @@ -1567,15 +1567,15 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) ierr = EOS_SetGFs(cctkGH, EOS_Con2PrimCall) where (press .le. eosgeneral_pmin) press = eosgeneral_pmin - rho = whisky_rho_min - dens = sqrt(Whisky_det) * rho + rho = GRHydro_rho_min + dens = sqrt(GRHydro_det) * rho scon(:,:,:,1) = 0.d0 scon(:,:,:,2) = 0.d0 scon(:,:,:,3) = 0.d0 w_lorentz = 1d0 ! eps = press / rho eps = 1.0e-12 - tau = sqrt(Whisky_det) * rho * eps + tau = sqrt(GRHydro_det) * rho * eps end where f = press_old - press press_new = press_old @@ -1584,14 +1584,14 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) count = count + 1 - if (count > whisky_countmax) then - if(whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then + if (count > GRHydro_countmax) then + if(GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then !$OMP CRITICAL call CCTK_WARN(1, 'Con2PrimGeneral: error: did not converge in ') write(warnline,'(a20,i12,a10)') ' ',& - whisky_countmax,' steps' + GRHydro_countmax,' steps' call CCTK_WARN(1,warnline) - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) maxerr = maxval(abs(press_new - press_old) & / abs(press_new)) @@ -1616,7 +1616,7 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) else !$OMP CRITICAL write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',& - whisky_reflevel + GRHydro_reflevel call CCTK_WARN(1,warnline) !$OMP END CRITICAL exit @@ -1629,7 +1629,7 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) & + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) & then press_new(i,j,k) = press(i,j,k) press_old(i,j,k) = press(i,j,k) @@ -1639,29 +1639,29 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) ! All right, is this point already converged?!? loop_condition = abs(press_new(i,j,k)-press_old(i,j,k)) / abs(press_new(i,j,k)) > & - whisky_perc_ptol + GRHydro_perc_ptol loop_condition = loop_condition .and. & - abs(press_new(i,j,k)-press_old(i,j,k)) > whisky_del_ptol + abs(press_new(i,j,k)-press_old(i,j,k)) > GRHydro_del_ptol - loop_condition = loop_condition .or. (count < whisky_countmin) & + loop_condition = loop_condition .or. (count < GRHydro_countmin) & .or. (count < 2) ! we have to at least go once through c2p. point_loop_condition(i,j,k) = loop_condition if(.not.loop_condition) cycle - udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) - usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k)) - usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k)) - usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k)) - utau = tau(i,j,k) / sqrt(Whisky_det(i,j,k)) - s2 = usx*usx*Whisky_uxx(i,j,k) + & - usy*usy*Whisky_uyy(i,j,k) + & - usz*usz*Whisky_uzz(i,j,k) + & - 2.d0*usx*usy*Whisky_uxy(i,j,k) + & - 2.d0*usx*usz*Whisky_uxz(i,j,k) + & - 2.d0*usy*usz*Whisky_uyz(i,j,k) + udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) + usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k)) + usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k)) + usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k)) + utau = tau(i,j,k) / sqrt(GRHydro_det(i,j,k)) + s2 = usx*usx*GRHydro_uxx(i,j,k) + & + usy*usy*GRHydro_uyy(i,j,k) + & + usz*usz*GRHydro_uzz(i,j,k) + & + 2.d0*usx*usy*GRHydro_uxy(i,j,k) + & + 2.d0*usx*usz*GRHydro_uxz(i,j,k) + & + 2.d0*usy*usz*GRHydro_uyz(i,j,k) temp1 = (utau + udens + press_new(i,j,k)) temp2 = temp1**2 - s2 @@ -1678,12 +1678,12 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) press_new(i,j,k) = press_old(i,j,k) - f(i,j,k) / df if (press_new(i,j,k) .le. eosgeneral_pmin) then press_new(i,j,k) = eosgeneral_pmin - rho(i,j,k) = whisky_rho_min - dens(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k) + rho(i,j,k) = GRHydro_rho_min + dens(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k) scon(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1d0 eps(i,j,k) = press(i,j,k) / rho(i,j,k) - tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k) * eps(i,j,k) + tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k) * eps(i,j,k) udens = rho(i,j,k) utau = rho(i,j,k) * eps(i,j,k) s2 = 0.d0 @@ -1701,10 +1701,10 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) point_loop_condition(i,j,k) = & (abs(press_new(i,j,k) - press_old(i,j,k)) / abs(press_new(i,j,k)) > & - whisky_perc_ptol) + GRHydro_perc_ptol) point_loop_condition(i,j,k) = point_loop_condition(i,j,k) .and. & (abs(press_new(i,j,k) - press_old(i,j,k)) > & - whisky_del_ptol) + GRHydro_del_ptol) end do end do @@ -1718,14 +1718,14 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) loop_condition = any(point_loop_condition) loop_condition = loop_condition .or. & - (count < whisky_countmin) + (count < GRHydro_countmin) end do deallocate(point_loop_condition) - do count = 1, whisky_polish + do count = 1, GRHydro_polish do k = 1, nz do j = 1, ny @@ -1733,21 +1733,21 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle f = press_new(i,j,k) - press(i,j,k) - udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) - usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k)) - usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k)) - usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k)) - utau = tau(i,j,k) / sqrt(Whisky_det(i,j,k)) - s2 = usx*usx*Whisky_uxx(i,j,k) + & - usy*usy*Whisky_uyy(i,j,k) + & - usz*usz*Whisky_uzz(i,j,k) + & - 2.d0*usx*usy*Whisky_uxy(i,j,k) + & - 2.d0*usx*usz*Whisky_uxz(i,j,k) + & - 2.d0*usy*usz*Whisky_uyz(i,j,k) + udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) + usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k)) + usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k)) + usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k)) + utau = tau(i,j,k) / sqrt(GRHydro_det(i,j,k)) + s2 = usx*usx*GRHydro_uxx(i,j,k) + & + usy*usy*GRHydro_uyy(i,j,k) + & + usz*usz*GRHydro_uzz(i,j,k) + & + 2.d0*usx*usy*GRHydro_uxy(i,j,k) + & + 2.d0*usx*usz*GRHydro_uxz(i,j,k) + & + 2.d0*usy*usz*GRHydro_uyz(i,j,k) temp1 = (utau + udens + press_new(i,j,k)) temp2 = temp1**2 - s2 @@ -1787,18 +1787,18 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle !!$ Note that in the following we enforce eps > 0 !!$ This makes the later check redundant - if ( (rho(i,j,k) .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) .or. & + if ( (rho(i,j,k) .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) .or. & (eps(i,j,k) .lt. 0d0) ) then - rho(i,j,k) = whisky_rho_min + rho(i,j,k) = GRHydro_rho_min udens = rho(i,j,k) - utau = tau(i,j,k) / sqrt(Whisky_det(i,j,k)) - dens(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k) + utau = tau(i,j,k) / sqrt(GRHydro_det(i,j,k)) + dens(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k) eps(i,j,k) = utau / udens scon(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 @@ -1808,11 +1808,11 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) else - udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) - usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k)) - usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k)) - usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k)) - utau = tau(i,j,k) / sqrt(Whisky_det(i,j,k)) + udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) + usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k)) + usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k)) + usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k)) + utau = tau(i,j,k) / sqrt(GRHydro_det(i,j,k)) end if @@ -1825,24 +1825,24 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) vlowz = usz / & ( (rho(i,j,k) + rho(i,j,k) * eps(i,j,k) + press(i,j,k)) * & w_lorentz(i,j,k)**2) - vel(i,j,k,1) = Whisky_uxx(i,j,k) * vlowx + & - Whisky_uxy(i,j,k) * vlowy + & - Whisky_uxz(i,j,k) * vlowz - vel(i,j,k,2) = Whisky_uxy(i,j,k) * vlowx + & - Whisky_uyy(i,j,k) * vlowy + & - Whisky_uyz(i,j,k) * vlowz - vel(i,j,k,3) = Whisky_uxz(i,j,k) * vlowx + & - Whisky_uyz(i,j,k) * vlowy + & - Whisky_uzz(i,j,k) * vlowz + vel(i,j,k,1) = GRHydro_uxx(i,j,k) * vlowx + & + GRHydro_uxy(i,j,k) * vlowy + & + GRHydro_uxz(i,j,k) * vlowz + vel(i,j,k,2) = GRHydro_uxy(i,j,k) * vlowx + & + GRHydro_uyy(i,j,k) * vlowy + & + GRHydro_uyz(i,j,k) * vlowz + vel(i,j,k,3) = GRHydro_uxz(i,j,k) * vlowx + & + GRHydro_uyz(i,j,k) * vlowy + & + GRHydro_uzz(i,j,k) * vlowz !!$ If eps negative then complain vociferously if (eps(i,j,k) .le. 0.d0) then - if(whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then + if(GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then !$OMP CRITICAL call CCTK_WARN(1,'Con2PrimGeneral: stopping the code.') call CCTK_WARN(1, ' specific internal energy just went below 0! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,3i6)') 'ijk location: ',& i,j,k @@ -1850,21 +1850,21 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS) write(warnline,'(a20,1P10E15.6)') 'xyz location: ',& x(i,j,k),y(i,j,k),z(i,j,k) call CCTK_WARN(1,warnline) - write(warnline,'(a25,i5)') 'refinement level: ',whisky_reflevel + write(warnline,'(a25,i5)') 'refinement level: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,1P1E15.6)') 'radius: ',r(i,j,k) call CCTK_WARN(1,warnline) write(warnline,'(a20,1P1E15.6)') 'velocities: ',& vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3) call CCTK_WARN(1,warnline) - call CCTK_WARN(whisky_c2p_warnlevel, \ + call CCTK_WARN(GRHydro_c2p_warnlevel, \ "Specific internal energy negative") !$OMP END CRITICAL exit else !$OMP CRITICAL write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but \ - I was told to ignore level: ',whisky_reflevel + I was told to ignore level: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',& x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k) @@ -1900,7 +1900,7 @@ end subroutine Conservative2PrimitiveGeneral subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -1942,7 +1942,7 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) !!$ In what follows press_temp is really rho_temp count = 0 - press_new = max(whisky_rho_min, rho) + press_new = max(GRHydro_rho_min, rho) loop_condition = .true. @@ -1968,16 +1968,16 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) enddo end if - udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) - usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k)) - usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k)) - usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k)) - s2 = usx*usx*Whisky_uxx(i,j,k) + & - usy*usy*Whisky_uyy(i,j,k) + & - usz*usz*Whisky_uzz(i,j,k) + & - 2.d0*usx*usy*Whisky_uxy(i,j,k) + & - 2.d0*usx*usz*Whisky_uxz(i,j,k) + & - 2.d0*usy*usz*Whisky_uyz(i,j,k) + udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) + usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k)) + usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k)) + usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k)) + s2 = usx*usx*GRHydro_uxx(i,j,k) + & + usy*usy*GRHydro_uyy(i,j,k) + & + usz*usz*GRHydro_uzz(i,j,k) + & + 2.d0*usx*usy*GRHydro_uxy(i,j,k) + & + 2.d0*usx*usz*GRHydro_uxz(i,j,k) + & + 2.d0*usy*usz*GRHydro_uyz(i,j,k) enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / press_new(i,j,k) w_lorentz(i,j,k) = sqrt( 1.d0 + s2 / ( (udens*enthalpy)**2 ) ) @@ -1990,21 +1990,21 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) count = count + 1 - if (count > whisky_countmax) then - if (whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then + if (count > GRHydro_countmax) then + if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then !$OMP CRITICAL call CCTK_WARN(1, 'Con2PrimPolytypeGeneral: error: did not converge in ') write(warnline,'(a20,g12.7,a10)') ' ',& - whisky_countmax,' steps' + GRHydro_countmax,' steps' call CCTK_WARN(1,warnline) - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) - call CCTK_WARN(whisky_c2p_warnlevel, "Did not converge") + call CCTK_WARN(GRHydro_c2p_warnlevel, "Did not converge") !$OMP END CRITICAL exit else !$OMP CRITICAL - write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',whisky_reflevel + write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',GRHydro_reflevel call CCTK_WARN(1,warnline) !$OMP END CRITICAL exit @@ -2017,24 +2017,24 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / press_new(i,j,k) - tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * & + tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * & ( press_new(i,j,k) * enthalpy * w_lorentz(i,j,k)**2 - & press(i,j,k) ) - dens(i,j,k) - udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) - usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k)) - usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k)) - usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k)) - s2 = usx*usx*Whisky_uxx(i,j,k) + & - usy*usy*Whisky_uyy(i,j,k) + & - usz*usz*Whisky_uzz(i,j,k) + & - 2.d0*usx*usy*Whisky_uxy(i,j,k) + & - 2.d0*usx*usz*Whisky_uxz(i,j,k) + & - 2.d0*usy*usz*Whisky_uyz(i,j,k) + udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) + usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k)) + usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k)) + usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k)) + s2 = usx*usx*GRHydro_uxx(i,j,k) + & + usy*usy*GRHydro_uyy(i,j,k) + & + usz*usz*GRHydro_uzz(i,j,k) + & + 2.d0*usx*usy*GRHydro_uxy(i,j,k) + & + 2.d0*usx*usz*GRHydro_uxz(i,j,k) + & + 2.d0*usy*usz*GRHydro_uyz(i,j,k) f = press_new(i,j,k) * w_lorentz(i,j,k) - udens @@ -2044,7 +2044,7 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) ( w_lorentz(i,j,k) * (udens**2) * (enthalpy**3) ) rho(i,j,k) = press_new(i,j,k) - press_new(i,j,k) = max(press_new(i,j,k) - f / df, whisky_rho_min) + press_new(i,j,k) = max(press_new(i,j,k) - f / df, GRHydro_rho_min) enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / press_new(i,j,k) w_lorentz(i,j,k) = sqrt( 1.d0 + s2 / ( (udens*enthalpy)**2 ) ) @@ -2056,11 +2056,11 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) ierr = EOS_SetGFs(cctkGH, EOS_Con2PrimCall) loop_condition = (maxval(abs(rho - press_new) / abs(press_new)) > & - whisky_perc_ptol) + GRHydro_perc_ptol) loop_condition = loop_condition .and. & - (maxval(abs(rho - press_new)) > whisky_del_ptol) + (maxval(abs(rho - press_new)) > GRHydro_del_ptol) loop_condition = loop_condition .or. & - (count < whisky_countmin) + (count < GRHydro_countmin) end do @@ -2070,13 +2070,13 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle - udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) + udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k)) - if (rho(i,j,k) .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then + if (rho(i,j,k) .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then - rho(i,j,k) = whisky_rho_min + rho(i,j,k) = GRHydro_rho_min scon(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 usx = 0.d0 @@ -2086,21 +2086,21 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) else - usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k)) - usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k)) - usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k)) - s2 = usx*usx*Whisky_uxx(i,j,k) + & - usy*usy*Whisky_uyy(i,j,k) + & - usz*usz*Whisky_uzz(i,j,k) + & - 2.d0*usx*usy*Whisky_uxy(i,j,k) + & - 2.d0*usx*usz*Whisky_uxz(i,j,k) + & - 2.d0*usy*usz*Whisky_uyz(i,j,k) + usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k)) + usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k)) + usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k)) + s2 = usx*usx*GRHydro_uxx(i,j,k) + & + usy*usy*GRHydro_uyy(i,j,k) + & + usz*usz*GRHydro_uzz(i,j,k) + & + 2.d0*usx*usy*GRHydro_uxy(i,j,k) + & + 2.d0*usx*usz*GRHydro_uxz(i,j,k) + & + 2.d0*usy*usz*GRHydro_uyz(i,j,k) end if enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / rho(i,j,k) w_lorentz(i,j,k) = sqrt( 1.d0 + s2 / ( (udens*enthalpy)**2 ) ) - tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * & + tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * & ( (rho(i,j,k) * enthalpy) * w_lorentz(i,j,k)**2 - & press(i,j,k) ) - dens(i,j,k) vlowx = usx / & @@ -2112,21 +2112,21 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) vlowz = usz / & ( (rho(i,j,k) + rho(i,j,k) * eps(i,j,k) + press(i,j,k)) * & w_lorentz(i,j,k)**2) - vel(i,j,k,1) = Whisky_uxx(i,j,k) * vlowx + & - Whisky_uxy(i,j,k) * vlowy + & - Whisky_uxz(i,j,k) * vlowz - vel(i,j,k,2) = Whisky_uxy(i,j,k) * vlowx + & - Whisky_uyy(i,j,k) * vlowy + & - Whisky_uyz(i,j,k) * vlowz - vel(i,j,k,3) = Whisky_uxz(i,j,k) * vlowx + & - Whisky_uyz(i,j,k) * vlowy + & - Whisky_uzz(i,j,k) * vlowz + vel(i,j,k,1) = GRHydro_uxx(i,j,k) * vlowx + & + GRHydro_uxy(i,j,k) * vlowy + & + GRHydro_uxz(i,j,k) * vlowz + vel(i,j,k,2) = GRHydro_uxy(i,j,k) * vlowx + & + GRHydro_uyy(i,j,k) * vlowy + & + GRHydro_uyz(i,j,k) * vlowz + vel(i,j,k,3) = GRHydro_uxz(i,j,k) * vlowx + & + GRHydro_uyz(i,j,k) * vlowy + & + GRHydro_uzz(i,j,k) * vlowz !!$ If eps negative then complain vociferously if (eps(i,j,k) .lt. 0.0d0) then call CCTK_WARN(1, "c2p failed: eps went negative") - whisky_C2P_failed(i,j,k) = 1 + GRHydro_C2P_failed(i,j,k) = 1 endif end do @@ -2136,31 +2136,31 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS) end subroutine Con2PrimPolytypeGeneral ! subroutines to manage the C2P failure mask -subroutine reset_whisky_C2P_failed(CCTK_ARGUMENTS) +subroutine reset_GRHydro_C2P_failed(CCTK_ARGUMENTS) implicit none DECLARE_CCTK_ARGUMENTS - whisky_C2P_failed = 0 + GRHydro_C2P_failed = 0 return -end subroutine reset_whisky_C2P_failed +end subroutine reset_GRHydro_C2P_failed -subroutine sync_whisky_C2P_failed(CCTK_ARGUMENTS) -! a dummy routine to syncronise whisky_C2P_failed +subroutine sync_GRHydro_C2P_failed(CCTK_ARGUMENTS) +! a dummy routine to syncronise GRHydro_C2P_failed implicit none DECLARE_CCTK_ARGUMENTS return -end subroutine sync_whisky_C2P_failed +end subroutine sync_GRHydro_C2P_failed -subroutine check_whisky_C2P_failed(CCTK_ARGUMENTS) +subroutine check_GRHydro_C2P_failed(CCTK_ARGUMENTS) implicit none @@ -2180,12 +2180,12 @@ subroutine check_whisky_C2P_failed(CCTK_ARGUMENTS) do j = 1, ny do i = 1, nx - if (whisky_C2P_failed(i,j,k) == 1) then + if (GRHydro_C2P_failed(i,j,k) == 1) then !$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') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(1,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',& x(i,j,k),y(i,j,k),z(i,j,k) @@ -2206,4 +2206,4 @@ subroutine check_whisky_C2P_failed(CCTK_ARGUMENTS) return -end subroutine check_whisky_C2P_failed +end subroutine check_GRHydro_C2P_failed diff --git a/src/Whisky_Differences.F90 b/src/GRHydro_Differences.F90 index 1cf5a03..91383e5 100644 --- a/src/Whisky_Differences.F90 +++ b/src/GRHydro_Differences.F90 @@ -5,7 +5,7 @@ #include "SpaceMask.h" /*@@ - @routine Whisky_DiffRho + @routine GRHydro_DiffRho @date Fri Feb 18 10:02:31 2005 @author Ian Hawke @desc @@ -19,7 +19,7 @@ @@*/ -subroutine Whisky_DiffRho(CCTK_ARGUMENTS) +subroutine GRHydro_DiffRho(CCTK_ARGUMENTS) implicit none @@ -149,4 +149,4 @@ subroutine Whisky_DiffRho(CCTK_ARGUMENTS) call CCTK_WARN(0, "Value of gradient_method not recognized") end if -end subroutine Whisky_DiffRho +end subroutine GRHydro_DiffRho diff --git a/src/Whisky_ENOReconstruct.F90 b/src/GRHydro_ENOReconstruct.F90 index 6e73b21..a4a9e10 100644 --- a/src/Whisky_ENOReconstruct.F90 +++ b/src/GRHydro_ENOReconstruct.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_ENOReconstruct.F90 + @file GRHydro_ENOReconstruct.F90 @date Sat Apr 6 17:37:56 2002 @author Ian Hawke @desc @@ -13,7 +13,7 @@ #include "cctk_Arguments.h" /*@@ - @routine Whisky_ENOSetup + @routine GRHydro_ENOSetup @date Sat Apr 6 17:42:13 2002 @author Ian Hawke @desc @@ -31,9 +31,9 @@ @@*/ -subroutine Whisky_ENOSetup(CCTK_ARGUMENTS) +subroutine GRHydro_ENOSetup(CCTK_ARGUMENTS) - USE Whisky_ENOScalars + USE GRHydro_ENOScalars implicit none @@ -101,10 +101,10 @@ subroutine Whisky_ENOSetup(CCTK_ARGUMENTS) end do end do -end subroutine Whisky_ENOSetup +end subroutine GRHydro_ENOSetup /*@@ - @routine Whisky_ENOShutdown + @routine GRHydro_ENOShutdown @date Mon Apr 8 12:40:44 2002 @author Ian Hawke @desc @@ -118,9 +118,9 @@ end subroutine Whisky_ENOSetup @@*/ -subroutine Whisky_ENOShutdown(CCTK_ARGUMENTS) +subroutine GRHydro_ENOShutdown(CCTK_ARGUMENTS) - USE Whisky_ENOScalars + USE GRHydro_ENOScalars implicit none @@ -131,10 +131,10 @@ subroutine Whisky_ENOShutdown(CCTK_ARGUMENTS) deallocate(eno_coeffs, STAT = deallocstat) if (deallocstat .ne. 0) call CCTK_WARN(0, "Failed to deallocate ENO coefficients.") -end subroutine Whisky_ENOShutdown +end subroutine GRHydro_ENOShutdown /*@@ - @routine Whisky_ENOReconstruct1d + @routine GRHydro_ENOReconstruct1d @date Sat Apr 6 18:15:29 2002 @author Ian Hawke @desc @@ -152,9 +152,9 @@ end subroutine Whisky_ENOShutdown #define SpaceMask_CheckStateBitsF90_1D(mask,i,type_bits,state_bits) \ (iand(mask((i)),(type_bits)).eq.(state_bits)) -subroutine Whisky_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, & +subroutine GRHydro_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, & hydro_excision_mask) - USE Whisky_ENOScalars + USE GRHydro_ENOScalars implicit none @@ -181,7 +181,7 @@ subroutine Whisky_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, & !!$ Initialize excision do i = 1, nx - if (whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i) .ne. 0)) then + if (GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i) .ne. 0)) then vdiff(1, i) = large * (-1.d0*(1.d0+mod(i,10)))**i trivial_rp(i) = .true. excise(i) = .true. @@ -256,4 +256,4 @@ subroutine Whisky_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, & end if end do -end subroutine Whisky_ENOReconstruct1d +end subroutine GRHydro_ENOReconstruct1d diff --git a/src/Whisky_ENOScalars.F90 b/src/GRHydro_ENOScalars.F90 index 8c8e872..7815347 100644 --- a/src/Whisky_ENOScalars.F90 +++ b/src/GRHydro_ENOScalars.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_ENOScalars.F90 + @file GRHydro_ENOScalars.F90 @date Sat Apr 6 17:35:42 2002 @author Ian Hawke @desc @@ -11,7 +11,7 @@ #include "cctk_Parameters.h" #include "cctk_Arguments.h" - module Whisky_ENOScalars + module GRHydro_ENOScalars implicit none @@ -19,4 +19,4 @@ logical, save :: coeffs_allocated = .false. - end module Whisky_ENOScalars + end module GRHydro_ENOScalars diff --git a/src/Whisky_EOS.c b/src/GRHydro_EOS.c index fd86bb0..4452609 100644 --- a/src/Whisky_EOS.c +++ b/src/GRHydro_EOS.c @@ -1,10 +1,10 @@ /*@@ - @file Whisky_EOS.c + @file GRHydro_EOS.c @date Wed Feb 6 18:25:33 2002 @author @desc Sets the EOS handle number from EOS_Base for use by - all the Whisky routines + all the GRHydro routines @enddesc @@*/ @@ -18,7 +18,7 @@ #include "EOS_Base.h" /*@@ - @routine Whisky_EOSHandle + @routine GRHydro_EOSHandle @date Wed Feb 6 18:28:01 2002 @author Ian Hawke @desc @@ -32,7 +32,7 @@ @@*/ -void Whisky_EOSHandle(CCTK_ARGUMENTS) +void GRHydro_EOSHandle(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; @@ -41,27 +41,27 @@ void Whisky_EOSHandle(CCTK_ARGUMENTS) int ierr = 0; char *infoline; - *whisky_eos_handle = EOS_Handle(whisky_eos_table); + *GRHydro_eos_handle = EOS_Handle(GRHydro_eos_table); - if (*whisky_eos_handle < 0) { - ierr = *whisky_eos_handle; + if (*GRHydro_eos_handle < 0) { + ierr = *GRHydro_eos_handle; CCTK_WARN(0, "Table handle is incorrect"); } - *whisky_polytrope_handle = EOS_Handle("2D_Polytrope"); + *GRHydro_polytrope_handle = EOS_Handle("2D_Polytrope"); - if (*whisky_polytrope_handle < 0) { - ierr = *whisky_polytrope_handle; - CCTK_WARN(0, "Whisky requires the 2D_Polytrope or the 2D_HybridPolytrope EoSs to be registered, for the atmosphere"); + if (*GRHydro_polytrope_handle < 0) { + ierr = *GRHydro_polytrope_handle; + CCTK_WARN(0, "GRHydro requires the 2D_Polytrope or the 2D_HybridPolytrope EoSs to be registered, for the atmosphere"); } infoline = (char *)malloc(100*sizeof(char)); if (!infoline) { - CCTK_WARN(0, "Failed to malloc an array of 100 chars in Whisky_EOS."); + CCTK_WARN(0, "Failed to malloc an array of 100 chars in GRHydro_EOS."); } else { - sprintf(infoline,"Whisky will use the %s equation of state.", - whisky_eos_table); + sprintf(infoline,"GRHydro will use the %s equation of state.", + GRHydro_eos_table); CCTK_INFO(infoline); } free(infoline); diff --git a/src/Whisky_Eigenproblem.F90 b/src/GRHydro_Eigenproblem.F90 index e971e1d..194ba72 100644 --- a/src/Whisky_Eigenproblem.F90 +++ b/src/GRHydro_Eigenproblem.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Eigenproblem.F90 + @file GRHydro_Eigenproblem.F90 @date Sat Jan 26 01:25:44 2002 @author Ian Hawke, Pedro Montero, Joachim Frieben @desc @@ -19,7 +19,7 @@ #include "cctk_Parameters.h" #include "cctk_Arguments.h" -module Whisky_Eigenproblem +module GRHydro_Eigenproblem implicit none @@ -123,7 +123,7 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,& alp,beta,qdiff1,qdiff2,qdiff3,qdiff4,qdiff5,& roeflux1,roeflux2,roeflux3,roeflux4,roeflux5) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -191,7 +191,7 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,& !!$ BEGIN: Check for NaN value (1st check) if (lamm_nobeta .ne. lamm_nobeta) then write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (1st check) @@ -224,7 +224,7 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,& !!$ BEGIN: Check for NaN value (2nd check) if (kappa .ne. kappa) then write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (dpdeps, rho, cs2)', dpdeps, rho, cs2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (2nd check) @@ -492,7 +492,7 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,& w_lorentz,gxx,gxy,gxz,gyy,gyz,gzz,u,& alp,beta,lambda,levec,revec) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -556,7 +556,7 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,& !!$ BEGIN: Check for NaN value (1st check) if (lamm_nobeta .ne. lamm_nobeta) then write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (1st check) @@ -589,7 +589,7 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,& !!$ BEGIN: Check for NaN value (2nd check) if (kappa .ne. kappa) then write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (dpdeps, rho, cs2)', dpdeps, rho, cs2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (2nd check) @@ -745,7 +745,7 @@ subroutine eigenvalues_general(& !!$ BEGIN: Check for NaN value (1st check) if (w .ne. w) then write(NaN_WarnLine,'(a50,2g15.6)') 'NaN produced: (one, v2)', one, v2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (1st check) @@ -762,7 +762,7 @@ subroutine eigenvalues_general(& !!$ BEGIN: Check for NaN value (2nd check) if (lamm_nobeta .ne. lamm_nobeta) then write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (2nd check) @@ -801,7 +801,7 @@ subroutine eigenproblem_general(& qdiff1,qdiff2,qdiff3,qdiff4,qdiff5,& roeflux1,roeflux2,roeflux3,roeflux4,roeflux5) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -843,7 +843,7 @@ subroutine eigenproblem_general(& !!$ BEGIN: Check for NaN value (1st check) if (w .ne. w) then write(NaN_WarnLine,'(a50,2g15.6)') 'NaN produced: (one, v2)', one, v2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (1st check) @@ -861,7 +861,7 @@ subroutine eigenproblem_general(& !!$ BEGIN: Check for NaN value (2nd check) if (lamm_nobeta .ne. lamm_nobeta) then write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (2nd check) @@ -1136,5 +1136,5 @@ subroutine eigenproblem_general(& end subroutine eigenproblem_general -end module Whisky_Eigenproblem +end module GRHydro_Eigenproblem diff --git a/src/Whisky_Eigenproblem_Marquina.F90 b/src/GRHydro_Eigenproblem_Marquina.F90 index c618c2a..443329e 100644 --- a/src/Whisky_Eigenproblem_Marquina.F90 +++ b/src/GRHydro_Eigenproblem_Marquina.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Eigenproblem_Marquina.F90 + @file GRHydro_Eigenproblem_Marquina.F90 @date Wed Feb 13 12:30 2002 @author Pedro Montero, Toni Font, Joachim Frieben @desc @@ -43,7 +43,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& gyy,gyz,gzz,u,det,alp,beta,densl,sxl,syl,szl,taul,& densr,sxr,syr,szr,taur,flux1,flux2,flux3,flux4,flux5) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -130,7 +130,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& !!$ BEGIN: Check for NaN value (1st check) if (wl .ne. wl) then write(NaN_WarnLine,'(a100,2g15.6)') 'NaN produced: (one, v2l)', one, v2l - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (1st check) @@ -151,7 +151,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& !!$ BEGIN: Check for NaN value (2nd check) if (lamp_nobetal .ne. lamp_nobetal) then write(NaN_WarnLine,'(a150,5g15.6)') 'NaN produced: (cs2l, one, v2l, u, velxl)', cs2l, one, v2l, u, velxl - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (2nd check) @@ -185,7 +185,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& !!$ BEGIN: Check for NaN value (3rd check) if (wr .ne. wr) then write(NaN_WarnLine,'(a100,2g15.6)') 'NaN produced: (one, v2r)', one, v2r - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (3rd check) @@ -205,7 +205,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,& !!$ BEGIN: Check for NaN value (4th check) if (lamp_nobetar .ne. lamp_nobetar) then write(NaN_WarnLine,'(a150,5g15.6)') 'NaN produced: (cs2r, one, v2r, u, velxr)', cs2r, one, v2r, u, velxr - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value (4th check) @@ -801,7 +801,7 @@ subroutine eigenproblem_marquina_general(& densr,sxr,syr,szr,taur,& flux1,flux2,flux3,flux4,flux5) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none diff --git a/src/Whisky_EoSChangeGamma.F90 b/src/GRHydro_EoSChangeGamma.F90 index fba28a9..5c854a6 100644 --- a/src/Whisky_EoSChangeGamma.F90 +++ b/src/GRHydro_EoSChangeGamma.F90 @@ -1,5 +1,5 @@ /*@@ -@file Whisky_EOSResetHydro.F90 +@file GRHydro_EOSResetHydro.F90 @date Sat Jan 26 01:36:57 2002 @author Ian Hawke @desc @@ -21,7 +21,7 @@ #define sz(i,j,k) scon(i,j,k,3) /*@@ - @routine Whisky_EOSResetHydro + @routine GRHydro_EOSResetHydro @date Sat Jan 26 01:38:12 2002 @author Ian Hawke @desc @@ -36,7 +36,7 @@ @@*/ -subroutine Whisky_EoSChangeGamma(CCTK_ARGUMENTS) +subroutine GRHydro_EoSChangeGamma(CCTK_ARGUMENTS) USE EOS_Polytrope_Scalars @@ -54,8 +54,8 @@ subroutine Whisky_EoSChangeGamma(CCTK_ARGUMENTS) !!$ Set up the fluid constants - local_Gamma = 1.d0 + EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) / & - EOS_SpecificIntEnergy(whisky_polytrope_handle, 1.d0, 1.d0) + local_Gamma = 1.d0 + EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) / & + EOS_SpecificIntEnergy(GRHydro_polytrope_handle, 1.d0, 1.d0) !!$ Change the pressure and specific internal energy @@ -72,7 +72,7 @@ subroutine Whisky_EoSChangeGamma(CCTK_ARGUMENTS) call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det) - call prim2conpolytype(whisky_polytrope_handle,gxx(i,j,k),gxy(i,j,k),& + call prim2conpolytype(GRHydro_polytrope_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& tau(i,j,k),rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),& @@ -83,10 +83,10 @@ subroutine Whisky_EoSChangeGamma(CCTK_ARGUMENTS) end do -end subroutine Whisky_EoSChangeGamma +end subroutine GRHydro_EoSChangeGamma /*@@ - @routine Whisky_EoSChangeK + @routine GRHydro_EoSChangeK @date Mon Oct 20 12:56:14 2003 @author Ian Hawke @desc @@ -106,7 +106,7 @@ end subroutine Whisky_EoSChangeGamma @@*/ -subroutine Whisky_EoSChangeK(CCTK_ARGUMENTS) +subroutine GRHydro_EoSChangeK(CCTK_ARGUMENTS) USE EOS_Polytrope_Scalars @@ -126,10 +126,10 @@ subroutine Whisky_EoSChangeK(CCTK_ARGUMENTS) !!$ Set up the fluid constants - local_Gamma = 1.d0 + EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) / & - EOS_SpecificIntEnergy(whisky_polytrope_handle, 1.d0, 1.d0) + local_Gamma = 1.d0 + EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) / & + EOS_SpecificIntEnergy(GRHydro_polytrope_handle, 1.d0, 1.d0) - local_K = EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) + local_K = EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) if (abs(local_Gamma - 2.d0) < 1.d-10) then @@ -156,12 +156,12 @@ subroutine Whisky_EoSChangeK(CCTK_ARGUMENTS) call Primitive2ConservativePolyCells(CCTK_ARGUMENTS) -end subroutine Whisky_EoSChangeK +end subroutine GRHydro_EoSChangeK /*@@ - @routine Whisky_EoSChangeGammaK_Shibata + @routine GRHydro_EoSChangeGammaK_Shibata @date Jan. 2005 @author Christian D. Ott @desc @@ -182,7 +182,7 @@ end subroutine Whisky_EoSChangeK @@*/ -subroutine Whisky_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS) +subroutine GRHydro_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS) USE EOS_Polytrope_Scalars @@ -206,10 +206,10 @@ subroutine Whisky_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS) call CCTK_INFO("Pulling the rug...by changing K and Gamma") - local_Gamma = 1.d0 + EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) / & - EOS_SpecificIntEnergy(whisky_polytrope_handle, 1.d0, 1.d0) + local_Gamma = 1.d0 + EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) / & + EOS_SpecificIntEnergy(GRHydro_polytrope_handle, 1.d0, 1.d0) - local_K = EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) + local_K = EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) eos_k_initial_cgs = initial_k * rho_geom_factor**initial_Gamma / p_geom_factor @@ -226,7 +226,7 @@ subroutine Whisky_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS) call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det) - call prim2con(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),& + call prim2con(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& tau(i,j,k),rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),& @@ -237,4 +237,4 @@ subroutine Whisky_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS) end do -end subroutine Whisky_EoSChangeGammaK_Shibata +end subroutine GRHydro_EoSChangeGammaK_Shibata diff --git a/src/Whisky_Flux.F90 b/src/GRHydro_Flux.F90 index 62866d2..f467e1c 100644 --- a/src/Whisky_Flux.F90 +++ b/src/GRHydro_Flux.F90 @@ -1,5 +1,5 @@ /*@@ -@file Whisky_Flux.F90 +@file GRHydro_Flux.F90 @date Sat Jan 26 01:36:57 2002 @author Pedro Montero, Ian Hawke @desc diff --git a/src/Whisky_FluxSplit.F90 b/src/GRHydro_FluxSplit.F90 index f08c301..c5fe6d7 100644 --- a/src/Whisky_FluxSplit.F90 +++ b/src/GRHydro_FluxSplit.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_FluxSplit.F90 + @file GRHydro_FluxSplit.F90 @date Wed Mar 3 22:16:00 2004 @author Ian Hawke @desc @@ -13,7 +13,7 @@ #include "cctk_Functions.h" /*@@ - @routine Whisky_FSAlpha + @routine GRHydro_FSAlpha @date Sun Jan 9 12:25:43 2005 @author Ian Hawke @desc @@ -28,9 +28,9 @@ @@*/ -subroutine Whisky_FSAlpha(CCTK_ARGUMENTS) +subroutine GRHydro_FSAlpha(CCTK_ARGUMENTS) - use Whisky_Eigenproblem + use GRHydro_Eigenproblem implicit none @@ -89,7 +89,7 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS) beta = betax(i,j,k) end if - call eigenvalues(whisky_eos_handle, & + call eigenvalues(GRHydro_eos_handle, & rho (i,j,k), & vel (i,j,k,1), & vel (i,j,k,2), & @@ -146,7 +146,7 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS) beta = betay(i,j,k) end if - call eigenvalues(whisky_eos_handle, & + call eigenvalues(GRHydro_eos_handle, & rho (i,j,k), & vel (i,j,k,1), & vel (i,j,k,2), & @@ -203,7 +203,7 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS) beta = betaz(i,j,k) end if - call eigenvalues(whisky_eos_handle, & + call eigenvalues(GRHydro_eos_handle, & rho (i,j,k), & vel (i,j,k,1), & vel (i,j,k,2), & @@ -301,10 +301,10 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS) !!$ write(*,*) 'fs_alpha: final',fs_alpha1,fs_alpha2,fs_alpha3,fs_alpha4,fs_alpha5 -end subroutine Whisky_FSAlpha +end subroutine GRHydro_FSAlpha /*@@ - @routine Whisky_SplitFlux + @routine GRHydro_SplitFlux @date Wed Mar 3 22:17:14 2004 @author Ian Hawke @desc @@ -320,7 +320,7 @@ end subroutine Whisky_FSAlpha @@*/ -subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) +subroutine GRHydro_SplitFlux(CCTK_ARGUMENTS) implicit none @@ -339,8 +339,8 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) if (flux_direction == 1) then allocate(upper(nx), det(nx), dummy(nx)) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 2 - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 2 + do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 2 + do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 2 if (shift_state .eq. 0) then dummy = 0.d0 @@ -370,7 +370,7 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) end do end if - call Whisky_SplitFlux_1D(whisky_eos_handle, nx,& + call GRHydro_SplitFlux_1D(GRHydro_eos_handle, nx,& fs_alpha1, fs_alpha2, fs_alpha3, fs_alpha4, fs_alpha5, & gxx(:,j,k),gxy(:,j,k),gxz(:,j,k),& gyy(:,j,k),gyz(:,j,k),gzz(:,j,k),& @@ -390,8 +390,8 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) deallocate(upper, det, dummy) else if (flux_direction == 2) then allocate(upper(ny), det(ny), dummy(ny)) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 2 - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 2 + do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 2 + do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 2 if (shift_state .eq. 0) then dummy = 0.d0 @@ -421,7 +421,7 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) end do end if - call Whisky_SplitFlux_1D(whisky_eos_handle, ny,& + call GRHydro_SplitFlux_1D(GRHydro_eos_handle, ny,& fs_alpha1, fs_alpha2, fs_alpha3, fs_alpha4, fs_alpha5, & gyy(i,:,k),gyz(i,:,k),gxy(i,:,k),& gzz(i,:,k),gxz(i,:,k),gxx(i,:,k),& @@ -441,8 +441,8 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) deallocate(upper, det, dummy) else if (flux_direction == 3) then allocate(upper(nz), det(nz), dummy(nz)) - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 2 - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 2 + do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 2 + do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 2 if (shift_state .eq. 0) then dummy = 0.d0 @@ -473,7 +473,7 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) end do end if - call Whisky_SplitFlux_1D(whisky_eos_handle, nz,& + call GRHydro_SplitFlux_1D(GRHydro_eos_handle, nz,& fs_alpha1, fs_alpha2, fs_alpha3, fs_alpha4, fs_alpha5, & gzz(i,j,:),gxz(i,j,:),gyz(i,j,:),& gxx(i,j,:),gxy(i,j,:),gyy(i,j,:),& @@ -497,10 +497,10 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS) return -end subroutine Whisky_SplitFlux +end subroutine GRHydro_SplitFlux /*@@ - @routine Whisky_SplitFlux_1D + @routine GRHydro_SplitFlux_1D @date Wed Mar 3 22:55:36 2004 @author Ian Hawke @desc @@ -517,7 +517,7 @@ end subroutine Whisky_SplitFlux @@*/ -subroutine Whisky_SplitFlux_1D(handle, nx, & +subroutine GRHydro_SplitFlux_1D(handle, nx, & alpha1, alpha2, alpha3, alpha4, alpha5, & gxx, gxy, gxz, gyy, gyz, gzz, u, det, alp, beta, & rho, velx1, vely1, velz1, press, w_lorentz, eps, & @@ -526,7 +526,7 @@ subroutine Whisky_SplitFlux_1D(handle, nx, & densfminus, sxfminus, syfminus, szfminus, taufminus, & densflux, sxflux, syflux, szflux, tauflux) - use Whisky_Eigenproblem + use GRHydro_Eigenproblem implicit none @@ -707,33 +707,33 @@ subroutine Whisky_SplitFlux_1D(handle, nx, & !!$ Reconstruct the characteristic split fluxes !!$ After reconstruction, combine to get the characteristic flux - call Whisky_WENO5_Left(5, char_f1_plus(i-2:i+2), tmp(i-2:i+2)) + call GRHydro_WENO5_Left(5, char_f1_plus(i-2:i+2), tmp(i-2:i+2)) char_f1(i) = tmp(i) - call Whisky_WENO5_Right(5, char_f1_minus(i-1:i+3), & + call GRHydro_WENO5_Right(5, char_f1_minus(i-1:i+3), & tmp(i-1:i+3)) char_f1(i) = char_f1(i) + tmp(i+1) - call Whisky_WENO5_Left(5, char_f2_plus(i-2:i+2), tmp(i-2:i+2)) + call GRHydro_WENO5_Left(5, char_f2_plus(i-2:i+2), tmp(i-2:i+2)) char_f2(i) = tmp(i) - call Whisky_WENO5_Right(5, char_f2_minus(i-1:i+3), & + call GRHydro_WENO5_Right(5, char_f2_minus(i-1:i+3), & tmp(i-1:i+3)) char_f2(i) = char_f2(i) + tmp(i+1) - call Whisky_WENO5_Left(5, char_f3_plus(i-2:i+2), tmp(i-2:i+2)) + call GRHydro_WENO5_Left(5, char_f3_plus(i-2:i+2), tmp(i-2:i+2)) char_f3(i) = tmp(i) - call Whisky_WENO5_Right(5, char_f3_minus(i-1:i+3), & + call GRHydro_WENO5_Right(5, char_f3_minus(i-1:i+3), & tmp(i-1:i+3)) char_f3(i) = char_f3(i) + tmp(i+1) - call Whisky_WENO5_Left(5, char_f4_plus(i-2:i+2), tmp(i-2:i+2)) + call GRHydro_WENO5_Left(5, char_f4_plus(i-2:i+2), tmp(i-2:i+2)) char_f4(i) = tmp(i) - call Whisky_WENO5_Right(5, char_f4_minus(i-1:i+3), & + call GRHydro_WENO5_Right(5, char_f4_minus(i-1:i+3), & tmp(i-1:i+3)) char_f4(i) = char_f4(i) + tmp(i+1) - call Whisky_WENO5_Left(5, char_f5_plus(i-2:i+2), tmp(i-2:i+2)) + call GRHydro_WENO5_Left(5, char_f5_plus(i-2:i+2), tmp(i-2:i+2)) char_f5(i) = tmp(i) - call Whisky_WENO5_Right(5, char_f5_minus(i-1:i+3), & + call GRHydro_WENO5_Right(5, char_f5_minus(i-1:i+3), & tmp(i-1:i+3)) char_f5(i) = char_f5(i) + tmp(i+1) @@ -770,10 +770,10 @@ subroutine Whisky_SplitFlux_1D(handle, nx, & deallocate(evals, levecs, revecs, tmp) -end subroutine Whisky_SplitFlux_1D +end subroutine GRHydro_SplitFlux_1D /*@@ - @routine Whisky_WENO5_Left + @routine GRHydro_WENO5_Left @date Wed Mar 3 22:57:54 2004 @author Ian Hawke @desc @@ -787,7 +787,7 @@ end subroutine Whisky_SplitFlux_1D @@*/ -subroutine Whisky_WENO5_Left(nx, v, vminus) +subroutine GRHydro_WENO5_Left(nx, v, vminus) implicit none @@ -861,10 +861,10 @@ subroutine Whisky_WENO5_Left(nx, v, vminus) end do -end subroutine Whisky_WENO5_Left +end subroutine GRHydro_WENO5_Left /*@@ - @routine Whisky_WENO5_Right + @routine GRHydro_WENO5_Right @date Wed Mar 3 22:58:10 2004 @author Ian Hawke @desc @@ -878,7 +878,7 @@ end subroutine Whisky_WENO5_Left @@*/ -subroutine Whisky_WENO5_Right(nx, v, vplus) +subroutine GRHydro_WENO5_Right(nx, v, vplus) implicit none @@ -953,4 +953,4 @@ subroutine Whisky_WENO5_Right(nx, v, vplus) end do -end subroutine Whisky_WENO5_Right +end subroutine GRHydro_WENO5_Right diff --git a/src/Whisky_HLLE.F90 b/src/GRHydro_HLLE.F90 index 2e4fd68..d32f4a7 100644 --- a/src/Whisky_HLLE.F90 +++ b/src/GRHydro_HLLE.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_HLLE.F90 + @file GRHydro_HLLE.F90 @date Sat Jan 26 01:40:14 2002 @author Ian Hawke, Pedro Montero, Toni Font @desc @@ -16,7 +16,7 @@ #include "SpaceMask.h" /*@@ - @routine Whisky_HLLEGeneral + @routine GRHydro_HLLEGeneral @date Sat Jan 26 01:41:02 2002 @author Ian Hawke, Pedro Montero, Toni Font @desc @@ -31,9 +31,9 @@ @@*/ -subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS) +subroutine GRHydro_HLLEGeneral(CCTK_ARGUMENTS) - USE Whisky_Eigenproblem + USE GRHydro_Eigenproblem implicit none DECLARE_CCTK_ARGUMENTS @@ -77,9 +77,9 @@ subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS) call CCTK_WARN(0, "Flux direction not x,y,z") end if - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 f1 = 0.d0 lamminus = 0.d0 @@ -338,12 +338,12 @@ subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS) end do end do -end subroutine Whisky_HLLEGeneral +end subroutine GRHydro_HLLEGeneral -subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS) +subroutine GRHydro_HLLE_TracerGeneral(CCTK_ARGUMENTS) - USE Whisky_Eigenproblem + USE GRHydro_Eigenproblem implicit none @@ -370,9 +370,9 @@ subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS) endif - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 f1 = 0.d0 lamminus = 0.d0 @@ -572,5 +572,5 @@ subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS) end do end do -end subroutine Whisky_HLLE_TracerGeneral +end subroutine GRHydro_HLLE_TracerGeneral diff --git a/src/Whisky_HLLEPoly.F90 b/src/GRHydro_HLLEPoly.F90 index ad250f7..084fb33 100644 --- a/src/Whisky_HLLEPoly.F90 +++ b/src/GRHydro_HLLEPoly.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_HLLE.F90 + @file GRHydro_HLLE.F90 @date Sat Jan 26 01:40:14 2002 @author Ian Hawke, Pedro Montero, Toni Font @desc @@ -16,7 +16,7 @@ #include "SpaceMask.h" /*@@ - @routine Whisky_HLLE + @routine GRHydro_HLLE @date Sat Jan 26 01:41:02 2002 @author Ian Hawke, Pedro Montero, Toni Font @desc @@ -30,8 +30,8 @@ @@*/ -subroutine Whisky_HLLE(CCTK_ARGUMENTS) - USE Whisky_Eigenproblem +subroutine GRHydro_HLLE(CCTK_ARGUMENTS) + USE GRHydro_Eigenproblem implicit none @@ -64,9 +64,9 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) call CCTK_WARN(0, "Flux direction not x,y,z") end if - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 f1 = 0.d0 lamminus = 0.d0 @@ -184,7 +184,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) !!$ Eigenvalues and fluxes either side of the cell interface if (flux_direction == 1) then - call eigenvalues(whisky_eos_handle,& + call eigenvalues(GRHydro_eos_handle,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& @@ -194,7 +194,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) lamminus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,& psi4h*gyzh,psi4h*gzzh,& usendh,avg_alp,avg_beta) - call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),& + call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),& velxplus(i,j,k),velyplus(i,j,k),& velzplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),& lamplus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,& @@ -211,7 +211,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) pressminus(i+xoffset,j+yoffset,k+zoffset),& avg_det,avg_alp,avg_beta) else if (flux_direction == 2) then - call eigenvalues(whisky_eos_handle,& + call eigenvalues(GRHydro_eos_handle,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& @@ -221,7 +221,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) lamminus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,& psi4h*gxzh,psi4h*gxxh,& usendh,avg_alp,avg_beta) - call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),& + call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),& velyplus(i,j,k),velzplus(i,j,k),& velxplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),& lamplus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,& @@ -238,7 +238,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) pressminus(i+xoffset,j+yoffset,k+zoffset),& avg_det,avg_alp,avg_beta) else if (flux_direction == 3) then - call eigenvalues(whisky_eos_handle,& + call eigenvalues(GRHydro_eos_handle,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& @@ -248,7 +248,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) lamminus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,& psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,& usendh,avg_alp,avg_beta) - call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),& + call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),& velzplus(i,j,k),velxplus(i,j,k),& velyplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),& lamplus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,& @@ -303,10 +303,10 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS) end do end do -end subroutine Whisky_HLLE +end subroutine GRHydro_HLLE /*@@ - @routine Whisky_HLLE_Tracer + @routine GRHydro_HLLE_Tracer @date Mon Mar 8 13:47:13 2004 @author Ian Hawke @desc @@ -320,9 +320,9 @@ end subroutine Whisky_HLLE @@*/ -subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) +subroutine GRHydro_HLLE_Tracer(CCTK_ARGUMENTS) - USE Whisky_Eigenproblem + USE GRHydro_Eigenproblem implicit none @@ -355,9 +355,9 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) call CCTK_WARN(0, "Flux direction not x,y,z") end if - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 f1 = 0.d0 lamminus = 0.d0 @@ -434,7 +434,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) !!$ Eigenvalues and fluxes either side of the cell interface if (flux_direction == 1) then - call eigenvalues(whisky_eos_handle,& + call eigenvalues(GRHydro_eos_handle,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& @@ -444,7 +444,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) lamminus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,& psi4h*gyzh,psi4h*gzzh,& usendh,avg_alp,avg_beta) - call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),& + call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),& velxplus(i,j,k),velyplus(i,j,k),& velzplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),& lamplus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,& @@ -455,7 +455,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) fminus(:) = (velxminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * & cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else if (flux_direction == 2) then - call eigenvalues(whisky_eos_handle,& + call eigenvalues(GRHydro_eos_handle,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& @@ -465,7 +465,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) lamminus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,& psi4h*gxzh,psi4h*gxxh,& usendh,avg_alp,avg_beta) - call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),& + call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),& velyplus(i,j,k),velzplus(i,j,k),& velxplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),& lamplus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,& @@ -476,7 +476,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) fminus(:) = (velyminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * & cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else if (flux_direction == 3) then - call eigenvalues(whisky_eos_handle,& + call eigenvalues(GRHydro_eos_handle,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& @@ -486,7 +486,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) lamminus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,& psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,& usendh,avg_alp,avg_beta) - call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),& + call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),& velzplus(i,j,k),velxplus(i,j,k),& velyplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),& lamplus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,& @@ -537,5 +537,5 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS) end do -end subroutine Whisky_HLLE_Tracer +end subroutine GRHydro_HLLE_Tracer diff --git a/src/Whisky_Loop.F90 b/src/GRHydro_Loop.F90 index 7dd3a90..bd7e948 100644 --- a/src/Whisky_Loop.F90 +++ b/src/GRHydro_Loop.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Loop.F90 + @file GRHydro_Loop.F90 @date Sat Jan 26 01:50:14 2002 @author @desc @@ -12,7 +12,7 @@ #include "cctk_Arguments.h" /*@@ - @routine WhiskyStartLoop + @routine GRHydroStartLoop @date Sat Jan 26 01:50:46 2002 @author Ian Hawke @desc @@ -26,7 +26,7 @@ @@*/ -subroutine WhiskyStartLoop(CCTK_ARGUMENTS) +subroutine GRHydroStartLoop(CCTK_ARGUMENTS) implicit none @@ -38,7 +38,7 @@ subroutine WhiskyStartLoop(CCTK_ARGUMENTS) yoffset = 0 zoffset = 1 -end subroutine WhiskyStartLoop +end subroutine GRHydroStartLoop /*@@ @routine Advance the counters whilst in the loop @@ -55,7 +55,7 @@ end subroutine WhiskyStartLoop @@*/ -subroutine WhiskyAdvanceLoop(CCTK_ARGUMENTS) +subroutine GRHydroAdvanceLoop(CCTK_ARGUMENTS) implicit none @@ -83,4 +83,4 @@ subroutine WhiskyAdvanceLoop(CCTK_ARGUMENTS) end if -end subroutine WhiskyAdvanceLoop +end subroutine GRHydroAdvanceLoop diff --git a/src/Whisky_Marquina.F90 b/src/GRHydro_Marquina.F90 index 35b240a..a4196cf 100644 --- a/src/Whisky_Marquina.F90 +++ b/src/GRHydro_Marquina.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Marquina.f90 + @file GRHydro_Marquina.f90 @date Thu Jan 11 11:03:32 2002 @author Pedro Montero, Toni Font @desc @@ -18,7 +18,7 @@ #include "SpaceMask.h" /*@@ - @routine Whisky_Marquina.f90 + @routine GRHydro_Marquina.f90 @date Wed Feb 13 11:03:32 2002 @author Pedro Montero, Toni Font @desc @@ -33,7 +33,7 @@ @@*/ -subroutine Whisky_Marquina(CCTK_ARGUMENTS) +subroutine GRHydro_Marquina(CCTK_ARGUMENTS) implicit none @@ -80,9 +80,9 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) !$OMP psi4h,f_marquina,uxxh,uxyh,uxzh,uyyh,uyzh,uzzh,usendh,& !$OMP tmp_w_lorentzp, tmp_w_lorentzm_i,w_lorentzp,w_lorentzm_i,& !$OMP fplus,fminus,m,avg_det) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 !!$ Set the left (p for plus) and right (m_i for minus, i+1) states @@ -205,7 +205,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) 2*gxyh*primp(2)*primp(3) + 2*gxzh*primp(2) *primp(4) + & 2*gyzh*primp(3)*primp(4) if (tmp_w_lorentzp .ge. 1.d0) then - w_lorentzp = Whisky_lorentz_overshoot_cutoff + w_lorentzp = GRHydro_lorentz_overshoot_cutoff else w_lorentzp = 1.d0 / sqrt(1.d0 - tmp_w_lorentzp); endif @@ -215,12 +215,12 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) if (w_lorentzp .ne. w_lorentzp) then !$OMP CRITICAL write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (primp(2), primp(3), primp(4))', primp(2), primp(3), primp(4) - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) !$OMP END CRITICAL endif !!$ END: Check for NaN value (1st check) -!!$ pressp = EOS_Pressure(whisky_eos_handle,primp(1),primp(5)) +!!$ pressp = EOS_Pressure(GRHydro_eos_handle,primp(1),primp(5)) !!$right state @@ -230,7 +230,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) 2*gxzh*primm_i(2) *primm_i(4)+ & 2*gyzh*primm_i(3)*primm_i(4) if (tmp_w_lorentzm_i .ge. 1.d0) then - w_lorentzm_i = Whisky_lorentz_overshoot_cutoff + w_lorentzm_i = GRHydro_lorentz_overshoot_cutoff else w_lorentzm_i = 1.d0 / sqrt(1.d0 - tmp_w_lorentzm_i); endif @@ -239,18 +239,18 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) if (w_lorentzm_i .ne. w_lorentzm_i) then !$OMP CRITICAL write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (primm_i(2), primm_i(3), primm_i(4))', primm_i(2), primm_i(3), primm_i(4) - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) !$OMP END CRITICAL endif !!$ END: Check for NaN value (2nd check) -!!$ pressm_i = EOS_Pressure(whisky_eos_handle,primm_i(1),primm_i(5)) +!!$ pressm_i = EOS_Pressure(GRHydro_eos_handle,primm_i(1),primm_i(5)) !!$eigenvalues and right eigenvectors if (flux_direction == 1) then - call eigenproblem_marquina(whisky_eos_handle,& + call eigenproblem_marquina(GRHydro_eos_handle,& primm_i(1),primm_i(2), & primm_i(3),primm_i(4),primm_i(5),primp(1), & primp(2),primp(3),primp(4),primp(5), & @@ -263,7 +263,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) else if (flux_direction == 2) then - call eigenproblem_marquina(whisky_eos_handle,& + call eigenproblem_marquina(GRHydro_eos_handle,& primm_i(1),primm_i(3), & primm_i(4),primm_i(2),primm_i(5),primp(1), & primp(3),primp(4),primp(2),primp(5), & @@ -276,7 +276,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) else - call eigenproblem_marquina(whisky_eos_handle,& + call eigenproblem_marquina(GRHydro_eos_handle,& primm_i(1),primm_i(4), & primm_i(2),primm_i(3),primm_i(5),primp(1), & primp(4),primp(2),primp(3),primp(5), & @@ -362,9 +362,9 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) if (evolve_tracer .ne. 0) then !$OMP PARALLEL DO PRIVATE(i,j) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 if (densflux(i, j, k) > 0.d0) then @@ -388,10 +388,10 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS) end if return -end subroutine Whisky_Marquina +end subroutine GRHydro_Marquina /*@@ - @routine Whisky_MarquinaGeneral + @routine GRHydro_MarquinaGeneral @date Wed Feb 13 11:03:32 2002 @author Pedro Montero, Toni Font @desc @@ -406,7 +406,7 @@ end subroutine Whisky_Marquina @@*/ -subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS) +subroutine GRHydro_MarquinaGeneral(CCTK_ARGUMENTS) implicit none @@ -441,9 +441,9 @@ subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS) call CCTK_WARN(0, "Flux direction not x,y,z") end if - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 !!$ Set the left (p for plus) and right (m_i for minus, i+1) states @@ -620,9 +620,9 @@ subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS) if (evolve_tracer .ne. 0) then - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 if (densflux(i, j, k) > 0.d0) then @@ -644,7 +644,7 @@ subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS) end if -end subroutine Whisky_MarquinaGeneral +end subroutine GRHydro_MarquinaGeneral diff --git a/src/Whisky_Minima.F90 b/src/GRHydro_Minima.F90 index df13600..d3e2897 100644 --- a/src/Whisky_Minima.F90 +++ b/src/GRHydro_Minima.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Minima.F90 + @file GRHydro_Minima.F90 @date Mon Feb 25 11:43:36 2002 @author @desc @@ -12,11 +12,11 @@ #include "cctk_Arguments.h" /*@@ - @routine Whisky_Minima_Setup + @routine GRHydro_Minima_Setup @date Mon Feb 25 11:25:27 2002 @author Ian Hawke @desc - Before initial data, set up the scalar whisky_rho_min used for the atmosphere. + Before initial data, set up the scalar GRHydro_rho_min used for the atmosphere. This is computed only from parameters. @enddesc @calls @@ -27,7 +27,7 @@ @@*/ -subroutine Whisky_Rho_Minima_Setup(CCTK_ARGUMENTS) +subroutine GRHydro_Rho_Minima_Setup(CCTK_ARGUMENTS) implicit none @@ -35,28 +35,28 @@ subroutine Whisky_Rho_Minima_Setup(CCTK_ARGUMENTS) DECLARE_CCTK_PARAMETERS if (initial_rho_abs_min > 0.0) then - whisky_rho_min = initial_rho_abs_min + GRHydro_rho_min = initial_rho_abs_min else if (initial_rho_rel_min > 0.0) then - whisky_rho_min = whisky_rho_central * initial_rho_rel_min + GRHydro_rho_min = GRHydro_rho_central * initial_rho_rel_min else if (rho_abs_min > 0.d0) then - whisky_rho_min = rho_abs_min + GRHydro_rho_min = rho_abs_min else - whisky_rho_min = whisky_rho_central * rho_rel_min + GRHydro_rho_min = GRHydro_rho_central * rho_rel_min end if - if (initial_atmosphere_factor > 0.0) whisky_rho_min = whisky_rho_min * initial_atmosphere_factor + if (initial_atmosphere_factor > 0.0) GRHydro_rho_min = GRHydro_rho_min * initial_atmosphere_factor return -end subroutine Whisky_Rho_Minima_Setup +end subroutine GRHydro_Rho_Minima_Setup /*@@ - @routine Whisky_Check_Rho_Minimum + @routine GRHydro_Check_Rho_Minimum @date Mon Jul 7 16:35:45 2008 @author Luca Baiotti @desc - Check whether at some point rho < whisky_rho_min and print a warning in case. + Check whether at some point rho < GRHydro_rho_min and print a warning in case. @enddesc @calls @calledby @@ -64,7 +64,7 @@ end subroutine Whisky_Rho_Minima_Setup @endhistory @@*/ -subroutine Whisky_Check_Rho_Minimum(CCTK_ARGUMENTS) +subroutine GRHydro_Check_Rho_Minimum(CCTK_ARGUMENTS) implicit none @@ -78,11 +78,11 @@ subroutine Whisky_Check_Rho_Minimum(CCTK_ARGUMENTS) do j=1,cctk_lsh(2) do k=1,cctk_lsh(3) - if (rho(i,j,k) < whisky_rho_min) then - call CCTK_WARN(2,"rho<whisky_rho_min!!!") - write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel + if (rho(i,j,k) < GRHydro_rho_min) then + call CCTK_WARN(2,"rho<GRHydro_rho_min!!!") + write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(2,warnline) - write(warnline,'(a25,g15.6)') 'whisky_rho_min: ',whisky_rho_min + write(warnline,'(a25,g15.6)') 'GRHydro_rho_min: ',GRHydro_rho_min call CCTK_WARN(2,warnline) write(warnline,'(a25,g15.6)') 'rho: ',rho(i,j,k) call CCTK_WARN(2,warnline) @@ -96,15 +96,15 @@ subroutine Whisky_Check_Rho_Minimum(CCTK_ARGUMENTS) return -end subroutine Whisky_Check_Rho_Minimum +end subroutine GRHydro_Check_Rho_Minimum /*@@ - @routine Whisky__Change_Rho_Minimum_At_Recovery + @routine GRHydro__Change_Rho_Minimum_At_Recovery @date Thu Aug 14 17:11:32 2008 @author Luca Baiotti @desc - Change, via a parameter, the value of whisky_rho_min at recovery. + Change, via a parameter, the value of GRHydro_rho_min at recovery. @enddesc @calls @calledby @@ -112,15 +112,15 @@ end subroutine Whisky_Check_Rho_Minimum @endhistory @@*/ -subroutine Whisky_Change_Rho_Minimum_At_Recovery(CCTK_ARGUMENTS) +subroutine GRHydro_Change_Rho_Minimum_At_Recovery(CCTK_ARGUMENTS) implicit none DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - whisky_rho_min = rho_abs_min_after_recovery + GRHydro_rho_min = rho_abs_min_after_recovery return -end subroutine Whisky_Change_Rho_Minimum_At_Recovery +end subroutine GRHydro_Change_Rho_Minimum_At_Recovery diff --git a/src/Whisky_Minima.cc b/src/GRHydro_Minima.cc index da33a3f..08a06b9 100644 --- a/src/Whisky_Minima.cc +++ b/src/GRHydro_Minima.cc @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Minima.cc + @file GRHydro_Minima.cc @date Tue Aug 29 18:52:10 2006 @author @desc @@ -23,20 +23,20 @@ using namespace Carpet; #endif /* Scheduled functions */ - void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS); + void GRHydro_Rho_Minima_Setup_Final(CCTK_ARGUMENTS); - void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS); + void GRHydro_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS); #ifdef __cplusplus } /* extern "C" */ #endif /*@@ - @routine Whisky_Rho_Minima_Setup_Final + @routine GRHydro_Rho_Minima_Setup_Final @date Tue Aug 29 18:54:05 2006 @author Luca Baiotti @desc - After initial data, set up the scalar whisky_rho_min used for checking the atmosphere. + After initial data, set up the scalar GRHydro_rho_min used for checking the atmosphere. This is computed taking into account the actual maximum rest-mass density on the grid. Version for Carpet. @enddesc @@ -47,7 +47,7 @@ using namespace Carpet; @endhistory @@*/ -void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS) +void GRHydro_Rho_Minima_Setup_Final(CCTK_ARGUMENTS) { #ifdef HAVE_CARPET @@ -63,7 +63,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS) { if (rho_abs_min > 0.0) { - *whisky_rho_min = rho_abs_min; + *GRHydro_rho_min = rho_abs_min; } else { @@ -91,7 +91,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS) CCTK_WARN(0, "Failed to compute the global maximum of rho"); } - *whisky_rho_min = max_rho * rho_rel_min; + *GRHydro_rho_min = max_rho * rho_rel_min; // Go back to local mode } END_GLOBAL_MODE; @@ -110,12 +110,12 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS) //Debug stuff // char warnline; - //CCTK_VInfo (CCTK_THORNSTRING, "STEP 2: compute rho max; rho min: %13.12e \n",*whisky_rho_min); + //CCTK_VInfo (CCTK_THORNSTRING, "STEP 2: compute rho max; rho min: %13.12e \n",*GRHydro_rho_min); - // printf(warnline,"STEP 2: compute rho max; rho min: %13.12e \n",*whisky_rho_min); + // printf(warnline,"STEP 2: compute rho max; rho min: %13.12e \n",*GRHydro_rho_min); //CCTK_WARN(1,warnline); - // printf(warnline,"STEP 3: recompute ID with new atmosphere; rho min: ', whisky_rho_min, 'reflev: ',%i), whisky_rho_min, whisky_reflevel); + // printf(warnline,"STEP 3: recompute ID with new atmosphere; rho min: ', GRHydro_rho_min, 'reflev: ',%i), GRHydro_rho_min, GRHydro_reflevel); @@ -123,7 +123,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS) /*@@ - @routine Whisky_Rho_Minima_Setup_Final_PUGH + @routine GRHydro_Rho_Minima_Setup_Final_PUGH @date Tue Aug 29 18:57:42 2006 @author Luca Baiotti @desc @@ -136,7 +136,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS) @endhistory @@*/ -void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS) +void GRHydro_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -145,7 +145,7 @@ void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS) if (rho_abs_min > 0.0) { - *whisky_rho_min = rho_abs_min; + *GRHydro_rho_min = rho_abs_min; } else { @@ -169,7 +169,7 @@ void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS) CCTK_WARN(0, "Failed to compute the global maximum of rho"); } - *whisky_rho_min = max_rho * rho_rel_min; + *GRHydro_rho_min = max_rho * rho_rel_min; } } diff --git a/src/Whisky_PPM.F90 b/src/GRHydro_PPM.F90 index 4dbeb97..dc40274 100644 --- a/src/Whisky_PPM.F90 +++ b/src/GRHydro_PPM.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_PPM.F90 + @file GRHydro_PPM.F90 @date Sun Feb 10 16:53:29 2002 @author Ian Hawke, Toni Font, Luca Baiotti, Frank Loeffler @desc @@ -57,8 +57,8 @@ subroutine SimplePPM_1d(handle,poly,& gxx, gxy, gxz, gyy, gyz, gzz, psi4, beta, alp, w_lorentz, & dir, ni, nj, nrx, nry, nrz, ev_l, ev_r, xw) - USE Whisky_Scalars - USE Whisky_Eigenproblem + USE GRHydro_Scalars + USE GRHydro_Eigenproblem implicit none @@ -388,7 +388,7 @@ trivial_rp = .true. !!$ Monotonicity. See (1.10) of C&W. -do i = whisky_stencil, nx - whisky_stencil + 1 +do i = GRHydro_stencil, nx - GRHydro_stencil + 1 #define MON(xminus,x,xplus) \ if (.not.( (xplus(i).eq.x(i)) .and. (x(i).eq.xminus(i)) ) \ .and. ((xplus(i)-x(i))*(x(i)-xminus(i)) .le. 0.d0)) then&&\ @@ -420,7 +420,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1 MON(velzminus,velz,velzplus) end do if (poly .eq. 0) then - do i = whisky_stencil, nx - whisky_stencil + 1 + do i = GRHydro_stencil, nx - GRHydro_stencil + 1 MON(epsminus,eps,epsplus) end do end if @@ -431,7 +431,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1 !!$ excision do i = 1, nx - if (whisky_enable_internal_excision /= 0 .and. & + if (GRHydro_enable_internal_excision /= 0 .and. & (hydro_excision_mask(i) .ne. 0)) then if (i .gt. 1) then trivial_rp(i-1)=.true. @@ -442,7 +442,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1 !!$ have to follow the order of sub-expressions given here and might !!$ access outside the array range cond = i .gt. 1 - if (cond .and. whisky_enable_internal_excision /= 0) then + if (cond .and. GRHydro_enable_internal_excision /= 0) then cond = hydro_excision_mask(i-1) .ne. 0 end if if (cond) then @@ -470,7 +470,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1 end if else cond = (i.gt.2) .and. (i.lt.nx) - if (cond .and. whisky_enable_internal_excision /= 0) then + if (cond .and. GRHydro_enable_internal_excision /= 0) then cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i-2) .ne. 0) end if if (cond) then @@ -484,7 +484,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1 end if end if cond = i.lt.nx - if (cond .and. whisky_enable_internal_excision /= 0) then + if (cond .and. GRHydro_enable_internal_excision /= 0) then cond = hydro_excision_mask(i+1) .ne. 0 end if if (cond) then @@ -512,7 +512,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1 endif else cond = (i.lt.nx-1) .and. (i.gt.1) - if (cond .and. whisky_enable_internal_excision /= 0) then + if (cond .and. GRHydro_enable_internal_excision /= 0) then cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i+2) .ne. 0) end if if (cond) then @@ -536,7 +536,7 @@ end subroutine SimplePPM_1d subroutine SimplePPM_tracer_1d(nx,dx,rho,velx,vely,velz, & tracer,tracerminus,tracerplus,press) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -724,7 +724,7 @@ subroutine SimplePPM_tracer_1d(nx,dx,rho,velx,vely,velz, & do itracer=1,number_of_tracers - do i = whisky_stencil, nx - whisky_stencil + 1 + do i = GRHydro_stencil, nx - GRHydro_stencil + 1 if (((tracerplus(i,itracer)-tracer(i,itracer))* & (tracer(i,itracer)-tracerminus(i,itracer)) .le. 0.d0)) then tracerminus(i,itracer) = tracer(i,itracer) diff --git a/src/Whisky_ParamCheck.F90 b/src/GRHydro_ParamCheck.F90 index a6032de..51da4f0 100644 --- a/src/Whisky_ParamCheck.F90 +++ b/src/GRHydro_ParamCheck.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_ParamCheck.F90 + @file GRHydro_ParamCheck.F90 @date Sat Feb 9 23:48:01 2002 @author @desc @@ -13,7 +13,7 @@ #include "cctk_Functions.h" /*@@ - @routine Whisky_ParamCheck + @routine GRHydro_ParamCheck @date Sat Feb 9 23:48:43 2002 @author Ian Hawke @desc @@ -27,7 +27,7 @@ @@*/ -subroutine Whisky_ParamCheck(CCTK_ARGUMENTS) +subroutine GRHydro_ParamCheck(CCTK_ARGUMENTS) implicit none @@ -35,49 +35,49 @@ subroutine Whisky_ParamCheck(CCTK_ARGUMENTS) DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - if (whisky_stencil > minval(cctk_nghostzones)) then + if (GRHydro_stencil > minval(cctk_nghostzones)) then call CCTK_PARAMWARN("The stencil is larger than the number of ghost zones. Answer will be dependent on processor number...") end if - if (CCTK_EQUALS(recon_method,"tvd").and.(whisky_stencil < 2)) then + if (CCTK_EQUALS(recon_method,"tvd").and.(GRHydro_stencil < 2)) then call CCTK_PARAMWARN("The stencil size must be at least 2 to use TVD reconstruction") end if if (CCTK_EQUALS(recon_method,"ppm")) then - if (CCTK_EQUALS(ppm_flatten,"stencil_3").and.(whisky_stencil < 3)) then + if (CCTK_EQUALS(ppm_flatten,"stencil_3").and.(GRHydro_stencil < 3)) then call CCTK_PARAMWARN("The stencil size must be at least 3 to use PPM reconstruction with the stencil-3 variant of the flattening procedure") - else if (CCTK_EQUALS(ppm_flatten,"stencil_4").and.(whisky_stencil < 4)) then + else if (CCTK_EQUALS(ppm_flatten,"stencil_4").and.(GRHydro_stencil < 4)) then call CCTK_PARAMWARN("The stencil size must be at least 4 to use PPM reconstruction with the stencil-4 (original) flattening procedure") end if end if - if (CCTK_EQUALS(recon_method,"eno").and.(whisky_stencil < eno_order)) then + if (CCTK_EQUALS(recon_method,"eno").and.(GRHydro_stencil < eno_order)) then call CCTK_PARAMWARN("The stencil size must be at least the order of the reconstruction to use ENO reconstruction") end if - if (CCTK_EQUALS(whisky_eos_table,"2D_Polytrope").and.& - (.not.CCTK_EQUALS(whisky_eos_type,"Polytype"))) then + if (CCTK_EQUALS(GRHydro_eos_table,"2D_Polytrope").and.& + (.not.CCTK_EQUALS(GRHydro_eos_type,"Polytype"))) then call CCTK_PARAMWARN("When using the 2D_Polytrope EOS you need to set eos_type to Polytype") end if - if (CCTK_EQUALS(whisky_eos_table,"Ideal_Fluid").and.& - (.not.CCTK_EQUALS(whisky_eos_type,"General"))) then + if (CCTK_EQUALS(GRHydro_eos_table,"Ideal_Fluid").and.& + (.not.CCTK_EQUALS(GRHydro_eos_type,"General"))) then call CCTK_PARAMWARN("When using the Ideal_Fluid EOS you need to set eos_type to General") end if if (.not.(CCTK_EQUALS(metric_type, "Physical").or.& CCTK_EQUALS(metric_type, "Static Conformal"))) then - call CCTK_PARAMWARN("Whisky only knows how to deal with physical metric type at the moment. Complain to the maintainers...") + call CCTK_PARAMWARN("GRHydro only knows how to deal with physical metric type at the moment. Complain to the maintainers...") end if if (.not.CCTK_EQUALS(metric_type, "Static Conformal")) then - call CCTK_INFO("Whisky will use the physical metric and set conformal_state=0.") + call CCTK_INFO("GRHydro will use the physical metric and set conformal_state=0.") conformal_state = 0 end if if (use_mask .eq. 0) then - call CCTK_PARAMWARN("Whisky now requires you to set SpaceMask::use_mask = ""yes""") + call CCTK_PARAMWARN("GRHydro now requires you to set SpaceMask::use_mask = ""yes""") end if if (number_of_particles .gt. 0) then @@ -88,7 +88,7 @@ subroutine Whisky_ParamCheck(CCTK_ARGUMENTS) ! This check and 'static' as valid keyword option can be removed after the ! year 2010 if (CCTK_EQUALS(bound,"static")) then - call CCTK_PARAMWARN("Whisky::bound = 'static' is no longer supported, use 'none' instead"); + call CCTK_PARAMWARN("GRHydro::bound = 'static' is no longer supported, use 'none' instead"); end if -end subroutine Whisky_ParamCheck +end subroutine GRHydro_ParamCheck diff --git a/src/Whisky_Particle.F90 b/src/GRHydro_Particle.F90 index 9e78004..464bf78 100644 --- a/src/Whisky_Particle.F90 +++ b/src/GRHydro_Particle.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Particle.F90 + @file GRHydro_Particle.F90 @date Wed Mar 31 11:10:52 2004 @author Ian Hawke @desc @@ -13,7 +13,7 @@ #include "cctk_Functions.h" /*@@ - @routine WhiskyParticleRHS + @routine GRHydroParticleRHS @date Wed Mar 31 11:11:26 2004 @author Ian Hawke @desc @@ -28,7 +28,7 @@ @@*/ -subroutine WhiskyParticleRHS(CCTK_ARGUMENTS) +subroutine GRHydroParticleRHS(CCTK_ARGUMENTS) implicit none @@ -92,7 +92,7 @@ subroutine WhiskyParticleRHS(CCTK_ARGUMENTS) endif ! Find out how many interpolation points are located on this processor. - call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'whisky::particles' ) + call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'GRHydro::particles' ) if ( status .lt. 0 ) then call CCTK_WARN ( 0, 'cannot get local size for particles' ) end if @@ -112,9 +112,9 @@ subroutine WhiskyParticleRHS(CCTK_ARGUMENTS) interp_coords(3) = CCTK_PointerTo(particle_z) ! Set the indices to the input grid functions. - call CCTK_VarIndex ( in_arrays(1), 'whisky::velx' ) - call CCTK_VarIndex ( in_arrays(2), 'whisky::vely' ) - call CCTK_VarIndex ( in_arrays(3), 'whisky::velz' ) + call CCTK_VarIndex ( in_arrays(1), 'GRHydro::velx' ) + call CCTK_VarIndex ( in_arrays(2), 'GRHydro::vely' ) + call CCTK_VarIndex ( in_arrays(3), 'GRHydro::velz' ) call CCTK_VarIndex ( in_arrays(4), 'admbase::alp' ) call CCTK_VarIndex ( in_arrays(5), 'admbase::betax' ) call CCTK_VarIndex ( in_arrays(6), 'admbase::betay' ) @@ -162,10 +162,10 @@ subroutine WhiskyParticleRHS(CCTK_ARGUMENTS) return -end subroutine WhiskyParticleRHS +end subroutine GRHydroParticleRHS /*@@ - @routine WhiskyParticleInitial + @routine GRHydroParticleInitial @date Wed Mar 31 11:53:25 2004 @author Ian Hawke @desc @@ -180,7 +180,7 @@ end subroutine WhiskyParticleRHS @@*/ -subroutine WhiskyParticleInitial(CCTK_ARGUMENTS) +subroutine GRHydroParticleInitial(CCTK_ARGUMENTS) implicit none @@ -197,11 +197,11 @@ subroutine WhiskyParticleInitial(CCTK_ARGUMENTS) if (number_of_particles .gt. 0) then ! Find out how many interpolation points are located on this processor. - call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'whisky::particles' ) + call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'GRHydro::particles' ) if ( status .lt. 0 ) then call CCTK_WARN ( 0, 'cannot get local size for particles' ) end if - call CCTK_GrouplbndGN ( status, cctkGH, 1, lbnd, 'whisky::particles' ) + call CCTK_GrouplbndGN ( status, cctkGH, 1, lbnd, 'GRHydro::particles' ) if ( status .lt. 0 ) then call CCTK_WARN ( 0, 'cannot get lower bounds for particles' ) end if @@ -245,4 +245,4 @@ subroutine WhiskyParticleInitial(CCTK_ARGUMENTS) end if -end subroutine WhiskyParticleInitial +end subroutine GRHydroParticleInitial diff --git a/src/Whisky_PreLoop.F90 b/src/GRHydro_PreLoop.F90 index c2c5366..4750840 100644 --- a/src/Whisky_PreLoop.F90 +++ b/src/GRHydro_PreLoop.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_PreLoop.F90 + @file GRHydro_PreLoop.F90 @date Mon Feb 25 11:43:36 2002 @author @desc @@ -13,7 +13,7 @@ #include "cctk_Functions.h" /*@@ - @routine Whisky_Scalar_Setup + @routine GRHydro_Scalar_Setup @date Mon Feb 25 11:25:27 2002 @author @desc @@ -28,9 +28,9 @@ @@*/ -subroutine Whisky_Scalar_Setup(CCTK_ARGUMENTS) +subroutine GRHydro_Scalar_Setup(CCTK_ARGUMENTS) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -92,4 +92,4 @@ subroutine Whisky_Scalar_Setup(CCTK_ARGUMENTS) call CCTK_WARN(0, "Numerical Viscosity Mode not recognized!") end if -end subroutine Whisky_Scalar_Setup +end subroutine GRHydro_Scalar_Setup diff --git a/src/Whisky_Prim2Con.F90 b/src/GRHydro_Prim2Con.F90 index b93c618..9710a60 100644 --- a/src/Whisky_Prim2Con.F90 +++ b/src/GRHydro_Prim2Con.F90 @@ -46,9 +46,9 @@ subroutine primitive2conservative(CCTK_ARGUMENTS) CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4l,psi4r - do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1 - do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1 - do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1 + 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 gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -83,13 +83,13 @@ subroutine primitive2conservative(CCTK_ARGUMENTS) call SpatialDeterminant(gxxl,gxyl,gxzl,gyyl, gyzl,gzzl,avg_detl) call SpatialDeterminant(gxxr,gxyr,gxzr,gyyr, gyzr,gzzr,avg_detr) - call prim2con(whisky_eos_handle, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & + call prim2con(GRHydro_eos_handle, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & avg_detl,densminus(i,j,k),sxminus(i,j,k),& syminus(i,j,k),szminus(i,j,k),tauminus(i,j,k),rhominus(i,j,k), & velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),& epsminus(i,j,k),pressminus(i,j,k),w_lorentzminus(i, j, k)) - call prim2con(whisky_eos_handle, gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, & + call prim2con(GRHydro_eos_handle, gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, & avg_detr, densplus(i,j,k),sxplus(i,j,k),& syplus(i,j,k),szplus(i,j ,k),tauplus(i,j,k),& rhoplus(i,j,k),velxplus(i,j,k),velyplus(i,j,k),& @@ -140,7 +140,7 @@ subroutine prim2con(handle, gxx, gxy, gxz, gyy, gyz, gzz, det, ddens, & if (w .ne. w) then !$OMP CRITICAL write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (dvelx,dvely,dvelz)', dvelx, dvely, dvelz - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) !$OMP END CRITICAL endif !!$ END: Check for NaN value @@ -187,9 +187,9 @@ subroutine Primitive2ConservativeCells(CCTK_ARGUMENTS) CCTK_INT :: i, j, k CCTK_REAL :: det,psi4pt - do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1 - do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1 - do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1 + 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 if (conformal_state .eq. 0) then psi4pt = 1d0 @@ -201,7 +201,7 @@ subroutine Primitive2ConservativeCells(CCTK_ARGUMENTS) psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),& psi4pt*gzz(i,j,k),det) end if - call prim2con(whisky_eos_handle,psi4pt*gxx(i,j,k),& + call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& @@ -244,9 +244,9 @@ subroutine Prim2ConservativePolytype(CCTK_ARGUMENTS) !$OMP PARALLEL DO PRIVATE(i, j, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l) - do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1 - do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1 - do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1 + 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 gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -281,14 +281,14 @@ subroutine Prim2ConservativePolytype(CCTK_ARGUMENTS) call SpatialDeterminant(gxxl,gxyl,gxzl,gyyl, gyzl,gzzl,avg_detl) call SpatialDeterminant(gxxr,gxyr,gxzr,gyyr, gyzr,gzzr,avg_detr) - call prim2conpolytype(whisky_eos_handle, gxxl,gxyl,gxzl,& + call prim2conpolytype(GRHydro_eos_handle, gxxl,gxyl,gxzl,& gyyl,gyzl,gzzl, & avg_detl,densminus(i,j,k),sxminus(i,j,k),& syminus(i,j,k),szminus(i,j,k),tauminus(i,j,k),rhominus(i,j,k), & velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),& epsminus(i,j,k),pressminus(i,j,k),w_lorentzminus(i, j, k)) - call prim2conpolytype(whisky_eos_handle, gxxr,gxyr,gxzr,& + call prim2conpolytype(GRHydro_eos_handle, gxxr,gxyr,gxzr,& gyyr,gyzr,gzzr, & avg_detr, densplus(i,j,k),sxplus(i,j,k),& syplus(i,j,k),szplus(i,j ,k),tauplus(i,j,k),& @@ -351,7 +351,7 @@ subroutine prim2conpolytype(handle, gxx, gxy, gxz, gyy, gyz, & ! all bad choices. !$OMP CRITICAL write(NaN_WarnLine,'(a80,2g15.6)') 'Infinite Lorentz factor reset. rho, w_tmp: ', drho, w_tmp - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) !$OMP END CRITICAL w = 1.d-20 else @@ -404,13 +404,13 @@ subroutine Primitive2ConservativePolyCells(CCTK_ARGUMENTS) CCTK_INT :: i, j, k CCTK_REAL :: det - do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1 - do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1 - do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1 + 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 call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det) - call prim2conpolytype(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),& + call prim2conpolytype(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& tau(i,j,k),rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),& @@ -448,9 +448,9 @@ subroutine Prim2ConservativeTracer(CCTK_ARGUMENTS) CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l - do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1 - do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1 - do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1 + 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 gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -527,7 +527,7 @@ end subroutine Prim2ConservativeTracer subroutine primitive2conservativegeneral(CCTK_ARGUMENTS) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -545,9 +545,9 @@ subroutine primitive2conservativegeneral(CCTK_ARGUMENTS) !$OMP PARALLEL DO PRIVATE(i, j, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l) - do k = whisky_stencil , cctk_lsh(3) - whisky_stencil + 1 - do j = whisky_stencil , cctk_lsh(2) - whisky_stencil + 1 - do i = whisky_stencil , cctk_lsh(1) - whisky_stencil + 1 + 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 gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -625,7 +625,7 @@ end subroutine primitive2conservativegeneral subroutine Primitive2ConservativeCellsGeneral(CCTK_ARGUMENTS) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -639,9 +639,9 @@ subroutine Primitive2ConservativeCellsGeneral(CCTK_ARGUMENTS) ierr = EOS_SetGFs(cctkGH, EOS_Prim2ConCellsCall) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1 - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1 - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1 + 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 gxxpt = gxx(i,j,k) gxypt = gxy(i,j,k) diff --git a/src/Whisky_Reconstruct.F90 b/src/GRHydro_Reconstruct.F90 index 7b2365d..d7af59a 100644 --- a/src/Whisky_Reconstruct.F90 +++ b/src/GRHydro_Reconstruct.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Reconstruct.F90 + @file GRHydro_Reconstruct.F90 @date Sat Jan 26 02:13:25 2002 @author @desc @@ -202,9 +202,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS) if (flux_direction == 1) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, ny - whisky_stencil + 1 - call SimplePPM_1d(whisky_eos_handle,0,nx,CCTK_DELTA_SPACE(1),& + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, ny - GRHydro_stencil + 1 + call SimplePPM_1d(GRHydro_eos_handle,0,nx,CCTK_DELTA_SPACE(1),& rho(:,j,k),velx(:,j,k),vely(:,j,k),velz(:,j,k),eps(:,j,k),& press(:,j,k),rhominus(:,j,k),velxminus(:,j,k),velyminus(:,j,k),& velzminus(:,j,k),epsminus(:,j,k),rhoplus(:,j,k),& @@ -213,9 +213,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS) gxx(:,j,k), gxy(:,j,k), gxz(:,j,k), gyy(:,j,k), gyz(:,j,k), & gzz(:,j,k), psi4(:,j,k), lbetax(:,j,k), alp(:,j,k),& w_lorentz(:,j,k), & - 1, j, k, nx, ny, nz, whisky_mppm_eigenvalue_x_left, & - whisky_mppm_eigenvalue_x_right, & - whisky_mppm_xwind) + 1, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_x_left, & + GRHydro_mppm_eigenvalue_x_right, & + GRHydro_mppm_xwind) do i = 1, nx if (trivial_rp(i,j,k)) then SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bitsx, trivialx) @@ -228,8 +228,8 @@ subroutine Reconstruction(CCTK_ARGUMENTS) !$OMP END PARALLEL DO if(evolve_tracer.ne.0) then !$OMP PARALLEL DO PRIVATE(j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, ny - whisky_stencil + 1 + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, ny - GRHydro_stencil + 1 call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), & velx(:,j,k),vely(:,j,k),velz(:,j,k), & tracer(:,j,k,:),tracerminus(:,j,k,:),tracerplus(:,j,k,:), & @@ -241,9 +241,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS) else if (flux_direction == 2) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 - call SimplePPM_1d(whisky_eos_handle,0,ny,CCTK_DELTA_SPACE(2),& + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 + call SimplePPM_1d(GRHydro_eos_handle,0,ny,CCTK_DELTA_SPACE(2),& rho(j,:,k),vely(j,:,k),velz(j,:,k),velx(j,:,k),eps(j,:,k),& press(j,:,k),rhominus(j,:,k),velyminus(j,:,k),velzminus(j,:,k),& velxminus(j,:,k),epsminus(j,:,k),rhoplus(j,:,k),& @@ -252,9 +252,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS) gyy(j,:,k), gyz(j,:,k), gxy(j,:,k), gzz(j,:,k), gxz(j,:,k), & gxx(j,:,k), psi4(j,:,k), lbetay(j,:,k), alp(j,:,k),& w_lorentz(j,:,k), & - 2, j, k, nx, ny, nz, whisky_mppm_eigenvalue_y_left, & - whisky_mppm_eigenvalue_y_right, & - whisky_mppm_xwind) + 2, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_y_left, & + GRHydro_mppm_eigenvalue_y_right, & + GRHydro_mppm_xwind) do i = 1, ny if (trivial_rp(j,i,k)) then SpaceMask_SetStateBitsF90(space_mask, j, i, k, type_bitsy, trivialy) @@ -267,8 +267,8 @@ subroutine Reconstruction(CCTK_ARGUMENTS) !$OMP END PARALLEL DO if(evolve_tracer.ne.0) then !$OMP PARALLEL DO PRIVATE(j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), & vely(j,:,k),velz(j,:,k),velx(j,:,k), & tracer(j,:,k,:),tracerminus(j,:,k,:),tracerplus(j,:,k,:), & @@ -280,9 +280,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS) else if (flux_direction == 3) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, ny - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 - call SimplePPM_1d(whisky_eos_handle,0,nz,CCTK_DELTA_SPACE(3),& + do k = GRHydro_stencil, ny - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 + call SimplePPM_1d(GRHydro_eos_handle,0,nz,CCTK_DELTA_SPACE(3),& rho(j,k,:),velz(j,k,:),velx(j,k,:),vely(j,k,:),eps(j,k,:),& press(j,k,:),rhominus(j,k,:),velzminus(j,k,:),velxminus(j,k,:),& velyminus(j,k,:),epsminus(j,k,:),rhoplus(j,k,:),& @@ -291,9 +291,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS) gzz(j,k,:), gxz(j,k,:), gyz(j,k,:), gxx(j,k,:), gxy(j,k,:), & gyy(j,k,:), psi4(j,k,:), lbetaz(j,k,:), alp(j,k,:),& w_lorentz(j,k,:), & - 3, j, k, nx, ny, nz, whisky_mppm_eigenvalue_z_left, & - whisky_mppm_eigenvalue_z_right, & - whisky_mppm_xwind) + 3, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_z_left, & + GRHydro_mppm_eigenvalue_z_right, & + GRHydro_mppm_xwind) do i = 1, nz if (trivial_rp(j,k,i)) then SpaceMask_SetStateBitsF90(space_mask, j, k, i, type_bitsz, trivialz) @@ -306,8 +306,8 @@ subroutine Reconstruction(CCTK_ARGUMENTS) !$OMP END PARALLEL DO if(evolve_tracer.ne.0) then !$OMP PARALLEL DO PRIVATE(j) - do k = whisky_stencil, ny - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 + do k = GRHydro_stencil, ny - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 call SimplePPM_tracer_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), & velz(j,k,:),velx(j,k,:),vely(j,k,:), & @@ -334,38 +334,38 @@ subroutine Reconstruction(CCTK_ARGUMENTS) if (flux_direction == 1) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1 - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1 + do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1 + do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1 if (CCTK_EQUALS(recon_vars,"primitive")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& rho(:,j,k),rhominus(:,j,k),rhoplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& velx(:,j,k),velxminus(:,j,k),velxplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& vely(:,j,k),velyminus(:,j,k),velyplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& velz(:,j,k),velzminus(:,j,k),velzplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& eps(:,j,k),epsminus(:,j,k),epsplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) else if (CCTK_EQUALS(recon_vars,"conservative")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& dens(:,j,k),densminus(:,j,k),densplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& sx(:,j,k),sxminus(:,j,k),sxplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& sy(:,j,k),syminus(:,j,k),syplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& sz(:,j,k),szminus(:,j,k),szplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& tau(:,j,k),tauminus(:,j,k),tauplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) else @@ -385,38 +385,38 @@ subroutine Reconstruction(CCTK_ARGUMENTS) !$OMP END PARALLEL DO else if (flux_direction == 2) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1 - do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1 + do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1 + do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1 if (CCTK_EQUALS(recon_vars,"primitive")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& rho(j,:,k),rhominus(j,:,k),rhoplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& velx(j,:,k),velxminus(j,:,k),velxplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& vely(j,:,k),velyminus(j,:,k),velyplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& velz(j,:,k),velzminus(j,:,k),velzplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& eps(j,:,k),epsminus(j,:,k),epsplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) else if (CCTK_EQUALS(recon_vars,"conservative")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& dens(j,:,k),densminus(j,:,k),densplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& sx(j,:,k),sxminus(j,:,k),sxplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& sy(j,:,k),syminus(j,:,k),syplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& sz(j,:,k),szminus(j,:,k),szplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& tau(j,:,k),tauminus(j,:,k),tauplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) else @@ -436,38 +436,38 @@ subroutine Reconstruction(CCTK_ARGUMENTS) !$OMP END PARALLEL DO else if (flux_direction == 3) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1 - do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1 + do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1 + do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1 if (CCTK_EQUALS(recon_vars,"primitive")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& rho(j,k,:),rhominus(j,k,:),rhoplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& velx(j,k,:),velxminus(j,k,:),velxplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& vely(j,k,:),velyminus(j,k,:),velyplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& velz(j,k,:),velzminus(j,k,:),velzplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& eps(j,k,:),epsminus(j,k,:),epsplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) else if (CCTK_EQUALS(recon_vars,"conservative")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& dens(j,k,:),densminus(j,k,:),densplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& sx(j,k,:),sxminus(j,k,:),sxplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& sy(j,k,:),syminus(j,k,:),syplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& sz(j,k,:),szminus(j,k,:),szplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& tau(j,k,:),tauminus(j,k,:),tauplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) else @@ -496,7 +496,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS) deallocate(psi4, lbetax, lbetay, lbetaz) !$OMP WORKSHARE - where ( (rhoplus < whisky_rho_min).or.(rhominus < whisky_rho_min).or.& + where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.& (epsplus < 0.d0).or.(epsminus < 0.d0) ) rhoplus = rho rhominus = rho diff --git a/src/Whisky_ReconstructPoly.F90 b/src/GRHydro_ReconstructPoly.F90 index c7a5dfa..0467c27 100644 --- a/src/Whisky_ReconstructPoly.F90 +++ b/src/GRHydro_ReconstructPoly.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_ReconstructPoly.F90 + @file GRHydro_ReconstructPoly.F90 @date Sat Jan 26 02:13:25 2002 @author @desc @@ -201,9 +201,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) if (flux_direction == 1) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, ny - whisky_stencil + 1 - call SimplePPM_1d(whisky_eos_handle,1,nx,CCTK_DELTA_SPACE(1),& + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, ny - GRHydro_stencil + 1 + call SimplePPM_1d(GRHydro_eos_handle,1,nx,CCTK_DELTA_SPACE(1),& rho(:,j,k),velx(:,j,k),vely(:,j,k),velz(:,j,k),eps(:,j,k),& press(:,j,k),rhominus(:,j,k),velxminus(:,j,k),velyminus(:,j,k),& velzminus(:,j,k),epsminus(:,j,k),rhoplus(:,j,k),& @@ -212,9 +212,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) gxx(:,j,k), gxy(:,j,k), gxz(:,j,k), gyy(:,j,k), gyz(:,j,k), & gzz(:,j,k), psi4(:,j,k), lbetax(:,j,k), alp(:,j,k),& w_lorentz(:,j,k), & - 1, j, k, nx, ny, nz, whisky_mppm_eigenvalue_x_left, & - whisky_mppm_eigenvalue_x_right, & - whisky_mppm_xwind) + 1, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_x_left, & + GRHydro_mppm_eigenvalue_x_right, & + GRHydro_mppm_xwind) do i = 1, nx if (trivial_rp(i,j,k)) then SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bitsx, trivialx) @@ -227,8 +227,8 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) !$OMP END PARALLEL DO if(evolve_tracer.ne.0) then !$OMP PARALLEL DO PRIVATE(j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, ny - whisky_stencil + 1 + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, ny - GRHydro_stencil + 1 call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), & velx(:,j,k),vely(:,j,k),velz(:,j,k), & tracer(:,j,k,:),tracerminus(:,j,k,:),tracerplus(:,j,k,:), & @@ -240,9 +240,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) else if (flux_direction == 2) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 - call SimplePPM_1d(whisky_eos_handle,1,ny,CCTK_DELTA_SPACE(2),& + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 + call SimplePPM_1d(GRHydro_eos_handle,1,ny,CCTK_DELTA_SPACE(2),& rho(j,:,k),vely(j,:,k),velz(j,:,k),velx(j,:,k),eps(j,:,k),& press(j,:,k),rhominus(j,:,k),velyminus(j,:,k),velzminus(j,:,k),& velxminus(j,:,k),epsminus(j,:,k),rhoplus(j,:,k),& @@ -251,9 +251,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) gyy(j,:,k), gyz(j,:,k), gxy(j,:,k), gzz(j,:,k), gxz(j,:,k), & gxx(j,:,k), psi4(j,:,k), lbetay(j,:,k), alp(j,:,k),& w_lorentz(j,:,k), & - 2, j, k, nx, ny, nz, whisky_mppm_eigenvalue_y_left, & - whisky_mppm_eigenvalue_y_right, & - whisky_mppm_xwind) + 2, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_y_left, & + GRHydro_mppm_eigenvalue_y_right, & + GRHydro_mppm_xwind) do i = 1, ny if (trivial_rp(j,i,k)) then SpaceMask_SetStateBitsF90(space_mask, j, i, k, type_bitsy, trivialy) @@ -266,8 +266,8 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) !$OMP END PARALLEL DO if(evolve_tracer.ne.0) then !$OMP PARALLEL DO PRIVATE(j) - do k = whisky_stencil, nz - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 + do k = GRHydro_stencil, nz - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), & vely(j,:,k),velz(j,:,k),velx(j,:,k), & tracer(j,:,k,:),tracerminus(j,:,k,:),tracerplus(j,:,k,:), & @@ -279,9 +279,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) else if (flux_direction == 3) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, ny - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 - call SimplePPM_1d(whisky_eos_handle,1,nz,CCTK_DELTA_SPACE(3),& + do k = GRHydro_stencil, ny - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 + call SimplePPM_1d(GRHydro_eos_handle,1,nz,CCTK_DELTA_SPACE(3),& rho(j,k,:),velz(j,k,:),velx(j,k,:),vely(j,k,:),eps(j,k,:),& press(j,k,:),rhominus(j,k,:),velzminus(j,k,:),velxminus(j,k,:),& velyminus(j,k,:),epsminus(j,k,:),rhoplus(j,k,:),& @@ -290,9 +290,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) gzz(j,k,:), gxz(j,k,:), gyz(j,k,:), gxx(j,k,:), gxy(j,k,:), & gyy(j,k,:), psi4(j,k,:), lbetaz(j,k,:), alp(j,k,:),& w_lorentz(j,k,:), & - 3, j, k, nx, ny, nz, whisky_mppm_eigenvalue_z_left, & - whisky_mppm_eigenvalue_z_right, & - whisky_mppm_xwind) + 3, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_z_left, & + GRHydro_mppm_eigenvalue_z_right, & + GRHydro_mppm_xwind) do i = 1, nz if (trivial_rp(j,k,i)) then SpaceMask_SetStateBitsF90(space_mask, j, k, i, type_bitsz, trivialz) @@ -305,8 +305,8 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) !$OMP END PARALLEL DO if(evolve_tracer.ne.0) then !$OMP PARALLEL DO PRIVATE(j) - do k = whisky_stencil, ny - whisky_stencil + 1 - do j = whisky_stencil, nx - whisky_stencil + 1 + do k = GRHydro_stencil, ny - GRHydro_stencil + 1 + do j = GRHydro_stencil, nx - GRHydro_stencil + 1 call SimplePPM_tracer_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), & velz(j,k,:),velx(j,k,:),vely(j,k,:), & @@ -333,32 +333,32 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) if (flux_direction == 1) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1 - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1 + do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1 + do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1 if (CCTK_EQUALS(recon_vars,"primitive")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& rho(:,j,k),rhominus(:,j,k),rhoplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& velx(:,j,k),velxminus(:,j,k),velxplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& vely(:,j,k),velyminus(:,j,k),velyplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& velz(:,j,k),velzminus(:,j,k),velzplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) else if (CCTK_EQUALS(recon_vars,"conservative")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& dens(:,j,k),densminus(:,j,k),densplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& sx(:,j,k),sxminus(:,j,k),sxplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& sy(:,j,k),syminus(:,j,k),syplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),& sz(:,j,k),szminus(:,j,k),szplus(:,j,k),& trivial_rp(:,j,k), hydro_excision_mask(:,j,k)) else @@ -378,32 +378,32 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) !$OMP END PARALLEL DO else if (flux_direction == 2) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1 - do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1 + do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1 + do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1 if (CCTK_EQUALS(recon_vars,"primitive")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& rho(j,:,k),rhominus(j,:,k),rhoplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& velx(j,:,k),velxminus(j,:,k),velxplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& vely(j,:,k),velyminus(j,:,k),velyplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& velz(j,:,k),velzminus(j,:,k),velzplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) else if (CCTK_EQUALS(recon_vars,"conservative")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& dens(j,:,k),densminus(j,:,k),densplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& sx(j,:,k),sxminus(j,:,k),sxplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& sy(j,:,k),syminus(j,:,k),syplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),& sz(j,:,k),szminus(j,:,k),szplus(j,:,k),& trivial_rp(j,:,k), hydro_excision_mask(j,:,k)) else @@ -423,32 +423,32 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) !$OMP END PARALLEL DO else if (flux_direction == 3) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1 - do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1 + do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1 + do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1 if (CCTK_EQUALS(recon_vars,"primitive")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& rho(j,k,:),rhominus(j,k,:),rhoplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& velx(j,k,:),velxminus(j,k,:),velxplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& vely(j,k,:),velyminus(j,k,:),velyplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& velz(j,k,:),velzminus(j,k,:),velzplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) else if (CCTK_EQUALS(recon_vars,"conservative")) then - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& dens(j,k,:),densminus(j,k,:),densplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& sx(j,k,:),sxminus(j,k,:),sxplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& sy(j,k,:),syminus(j,k,:),syplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) - call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),& + call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),& sz(j,k,:),szminus(j,k,:),szplus(j,k,:),& trivial_rp(j,k,:), hydro_excision_mask(j,k,:)) else @@ -477,7 +477,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS) deallocate(psi4, lbetax, lbetay, lbetaz) !$OMP WORKSHARE - where ( (rhoplus < whisky_rho_min).or.(rhominus < whisky_rho_min).or.& + where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.& (epsplus < 0.d0).or.(epsminus < 0.d0) ) rhoplus = rho rhominus = rho diff --git a/src/Whisky_RegisterGZ.cc b/src/GRHydro_RegisterGZ.cc index e525d52..30fe5a4 100644 --- a/src/Whisky_RegisterGZ.cc +++ b/src/GRHydro_RegisterGZ.cc @@ -1,7 +1,7 @@ // register.cc -- register variables with various thorns that need-to-know // $Header$ // -// Whisky_register_GZPatchSystem - register with GZPatchSystem +// GRHydro_register_GZPatchSystem - register with GZPatchSystem // // Cut 'n paste job from BackgroundWaveToy, author J Thornburg... @@ -24,7 +24,7 @@ using namespace std; // // If we're using Carpet, this function must be called in meta mode. // -extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS) +extern "C"void GRHydro_register_GZPatchSystem(CCTK_ARGUMENTS) { if (CCTK_IsFunctionAliased("GZPatchSystem_register_sync")) @@ -35,8 +35,8 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS) string var[8] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "Whisky::dens", "Whisky::tau", "Whisky::w_lorentz", - "Whisky::scon"}; + "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::scon"}; for (int i = 0; i < 8; i++) { int status = @@ -44,7 +44,7 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS) if (status < 0) { CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, - "***** Whisky_register_GZPatchSystem():\n" + "***** GRHydro_register_GZPatchSystem():\n" " error registering var group %s to be " "interpatch-synchronized!\n" " (GZPatchSystem_register_sync() error code %d)\n", @@ -65,8 +65,8 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS) string var[11] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps", "HydroBase::vel", - "Whisky::dens", "Whisky::tau", "Whisky::w_lorentz", - "Whisky::scon", + "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz", + "GRHydro::scon", "ADMBase::metric", "ADMBase::curv", "ADMBase::shift"}; for (int i = 0; i < 11; i++) for (int j = 0; j < 3; j++) @@ -76,7 +76,7 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS) if (ps_status < 0) { CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, - "***** Whisky_register_GZPatchSystem():\n" + "***** GRHydro_register_GZPatchSystem():\n" " error registering var group %s to be " "interpatch-cxformhronized!\n" " (GZPatchSystem_register_cxform() error code %d)\n", diff --git a/src/Whisky_RegisterMask.c b/src/GRHydro_RegisterMask.c index a89a150..d440d4b 100644 --- a/src/Whisky_RegisterMask.c +++ b/src/GRHydro_RegisterMask.c @@ -1,5 +1,5 @@ /*@@ - @file Whisky_RegisterMask.c + @file GRHydro_RegisterMask.c @date Sun Jan 26 01:55:25 2003 @author Ian Hawke @desc @@ -17,7 +17,7 @@ #include <stdlib.h> /*@@ - @routine Whisky_RegisterMask + @routine GRHydro_RegisterMask @date Sun Jan 26 01:56:06 2003 @author @desc @@ -37,7 +37,7 @@ @@*/ -int Whisky_RegisterMask(void) +int GRHydro_RegisterMask(void) { DECLARE_CCTK_PARAMETERS; @@ -74,7 +74,7 @@ int Whisky_RegisterMask(void) return 0; } -void Whisky_SetupDescriptors(CCTK_ARGUMENTS) +void GRHydro_SetupDescriptors(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; diff --git a/src/Whisky_RegisterVars.cc b/src/GRHydro_RegisterVars.cc index 981b759..8720f74 100644 --- a/src/Whisky_RegisterVars.cc +++ b/src/GRHydro_RegisterVars.cc @@ -1,4 +1,4 @@ -// Whisky_RegisterVars.cc +// GRHydro_RegisterVars.cc // // converted from F90 to improve readability and maintainability // @@ -32,7 +32,7 @@ static void register_saveandrestore(string v1) // Main function called by Cactus to register variables with MoL -extern "C"void Whisky_Register(CCTK_ARGUMENTS) +extern "C"void GRHydro_Register(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -54,19 +54,19 @@ extern "C"void Whisky_Register(CCTK_ARGUMENTS) register_constrained("HydroBase::press"); register_constrained("HydroBase::eps"); register_constrained("HydroBase::vel"); - register_constrained("Whisky::w_lorentz"); + register_constrained("GRHydro::w_lorentz"); - if (CCTK_EQUALS(evolution_method, "whisky")) + if (CCTK_EQUALS(evolution_method, "GRHydro")) { // dens and scon - register_evolved("whisky::dens", "whisky::densrhs"); - register_evolved("whisky::scon", "whisky::srhs"); + register_evolved("GRHydro::dens", "GRHydro::densrhs"); + register_evolved("GRHydro::scon", "GRHydro::srhs"); // tau - if (CCTK_EQUALS(whisky_eos_type, "General")) - register_evolved("whisky::tau" , "whisky::taurhs"); - else if (CCTK_EQUALS(whisky_eos_type, "Polytype")) - register_constrained("whisky::tau"); + if (CCTK_EQUALS(GRHydro_eos_type, "General")) + register_evolved("GRHydro::tau" , "GRHydro::taurhs"); + else if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) + register_constrained("GRHydro::tau"); else CCTK_WARN(0, "Don't recognize the type of EOS!"); @@ -81,7 +81,7 @@ extern "C"void Whisky_Register(CCTK_ARGUMENTS) if (CCTK_EQUALS(shift_evolution_method, "Comoving")) { register_constrained("admbase::shift"); - register_evolved("Whisky::whisky_coords", "Whisky::whisky_coords_rhs"); + register_evolved("GRHydro::GRHydro_coords", "GRHydro::GRHydro_coords_rhs"); } else register_saveandrestore("admbase::shift"); @@ -89,17 +89,17 @@ extern "C"void Whisky_Register(CCTK_ARGUMENTS) // tracer if (evolve_tracer != 0) - register_evolved("whisky::whisky_cons_tracers", "whisky::whisky_tracer_rhs"); + register_evolved("GRHydro::GRHydro_cons_tracers", "GRHydro::GRHydro_tracer_rhs"); // particles if (number_of_particles > 0) - register_evolved("whisky::particles", "whisky::particle_rhs"); + register_evolved("GRHydro::particles", "GRHydro::particle_rhs"); } else if (CCTK_EQUALS(evolution_method, "none")) { - register_constrained("whisky::dens"); - register_constrained("whisky::scon"); - register_constrained("whisky::tau"); + register_constrained("GRHydro::dens"); + register_constrained("GRHydro::scon"); + register_constrained("GRHydro::tau"); } } diff --git a/src/Whisky_RiemannSolve.F90 b/src/GRHydro_RiemannSolve.F90 index 8288b70..76739a3 100644 --- a/src/Whisky_RiemannSolve.F90 +++ b/src/GRHydro_RiemannSolve.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_RiemannSolve.F90 + @file GRHydro_RiemannSolve.F90 @date Sat Jan 26 02:20:25 2002 @author @desc @@ -39,27 +39,27 @@ subroutine RiemannSolve(CCTK_ARGUMENTS) if (CCTK_EQUALS(riemann_solver,"HLLE")) then - call Whisky_HLLE(CCTK_PASS_FTOF) + call GRHydro_HLLE(CCTK_PASS_FTOF) if (evolve_tracer .ne. 0) then - call Whisky_HLLE_Tracer(CCTK_PASS_FTOF) + call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF) end if else if (CCTK_EQUALS(riemann_solver,"Roe")) then - call Whisky_RoeSolve(CCTK_PASS_FTOF) + call GRHydro_RoeSolve(CCTK_PASS_FTOF) if (evolve_tracer .ne. 0) then - call Whisky_HLLE_Tracer(CCTK_PASS_FTOF) + call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF) end if else if (CCTK_EQUALS(riemann_solver,"Marquina")) then - call Whisky_Marquina(CCTK_PASS_FTOF) + call GRHydro_Marquina(CCTK_PASS_FTOF) !!$ Tracers are built directly in to the Marquina solver @@ -96,27 +96,27 @@ subroutine RiemannSolvePolytype(CCTK_ARGUMENTS) if (CCTK_EQUALS(riemann_solver,"HLLE")) then - call Whisky_HLLE(CCTK_PASS_FTOF) + call GRHydro_HLLE(CCTK_PASS_FTOF) if (evolve_tracer .ne. 0) then - call Whisky_HLLE_Tracer(CCTK_PASS_FTOF) + call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF) end if else if (CCTK_EQUALS(riemann_solver,"Roe")) then - call Whisky_RoeSolve(CCTK_PASS_FTOF) + call GRHydro_RoeSolve(CCTK_PASS_FTOF) if (evolve_tracer .ne. 0) then - call Whisky_HLLE_Tracer(CCTK_PASS_FTOF) + call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF) end if else if (CCTK_EQUALS(riemann_solver,"Marquina")) then - call Whisky_Marquina(CCTK_PASS_FTOF) + call GRHydro_Marquina(CCTK_PASS_FTOF) !!$ Tracers are built directly in to the Marquina solver @@ -147,7 +147,7 @@ end subroutine RiemannSolvePolytype subroutine RiemannSolveGeneral(CCTK_ARGUMENTS) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -175,19 +175,19 @@ subroutine RiemannSolveGeneral(CCTK_ARGUMENTS) if (CCTK_EQUALS(riemann_solver,"HLLE")) then - call Whisky_HLLEGeneral(CCTK_PASS_FTOF) + call GRHydro_HLLEGeneral(CCTK_PASS_FTOF) if (evolve_tracer .ne. 0) then - call Whisky_HLLE_TracerGeneral(CCTK_PASS_FTOF) + call GRHydro_HLLE_TracerGeneral(CCTK_PASS_FTOF) end if else - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 !!$ Set the left (p for plus) and right (m for minus, i+1) states @@ -349,17 +349,17 @@ subroutine RiemannSolveGeneral(CCTK_ARGUMENTS) if (CCTK_EQUALS(riemann_solver,"Roe")) then - call Whisky_RoeSolveGeneral(CCTK_PASS_FTOF) + call GRHydro_RoeSolveGeneral(CCTK_PASS_FTOF) if (evolve_tracer .ne. 0) then - call Whisky_HLLE_TracerGeneral(CCTK_PASS_FTOF) + call GRHydro_HLLE_TracerGeneral(CCTK_PASS_FTOF) end if else if (CCTK_EQUALS(riemann_solver,"Marquina")) then - call Whisky_MarquinaGeneral(CCTK_PASS_FTOF) + call GRHydro_MarquinaGeneral(CCTK_PASS_FTOF) !!$ Tracers are built directly in to the Marquina solver diff --git a/src/Whisky_RoeAverage.F90 b/src/GRHydro_RoeAverage.F90 index 0725667..b25adc2 100644 --- a/src/Whisky_RoeAverage.F90 +++ b/src/GRHydro_RoeAverage.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_RoeAverage.F90 + @file GRHydro_RoeAverage.F90 @date Sat Jan 26 01:54:09 2002 @author @desc diff --git a/src/Whisky_RoeSolver.F90 b/src/GRHydro_RoeSolver.F90 index aaf31c2..c661ed1 100644 --- a/src/Whisky_RoeSolver.F90 +++ b/src/GRHydro_RoeSolver.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_RoeSolver.F90 + @file GRHydro_RoeSolver.F90 @date Sat Jan 26 01:55:27 2002 @author @desc @@ -15,7 +15,7 @@ #include "SpaceMask.h" /*@@ - @routine Whisky_RoeSolve + @routine GRHydro_RoeSolve @date Sat Jan 26 01:55:55 2002 @author Pedro Montero, Ian Hawke @desc @@ -30,9 +30,9 @@ @@*/ -subroutine Whisky_RoeSolve(CCTK_ARGUMENTS) +subroutine GRHydro_RoeSolve(CCTK_ARGUMENTS) - USE Whisky_Eigenproblem + USE GRHydro_Eigenproblem implicit none DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -67,9 +67,9 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS) f_roe = 0.d0 - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 !!$ Set the left (p for plus) and right (m_i for minus, i+1) states @@ -225,38 +225,38 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS) !!$ BEGIN: Check for NaN value if (w_lorentzave .ne. w_lorentzave) then write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (velxave, velyave, velzave))', velxave, velyave, velzave - call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) endif !!$ END: Check for NaN value if (flux_direction == 1) then -!!$ call prim2con(whisky_eos_handle,gxxh, gxyh, gxzh, gyyh, & +!!$ call prim2con(GRHydro_eos_handle,gxxh, gxyh, gxzh, gyyh, & !!$ gyzh, gzzh, avg_det, & !!$ consh(1), consh(2), consh(3), consh(4), consh(5), rhoave, & !!$ velxave, velyave, velzave, epsave, pressave, w_lorentzave) - call eigenproblem(whisky_eos_handle,rhoave, velxave, & + call eigenproblem(GRHydro_eos_handle,rhoave, velxave, & velyave, velzave, epsave, w_lorentzave, & gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & usendh, avg_alp,avg_beta,qdiff(1),qdiff(2), & qdiff(3),qdiff(4),qdiff(5),roeflux(1),roeflux(2),& roeflux(3),roeflux(4),roeflux(5)) else if (flux_direction == 2) then -!!$ call prim2con(whisky_eos_handle,gyyh, gyzh, gxyh, gzzh, & +!!$ call prim2con(GRHydro_eos_handle,gyyh, gyzh, gxyh, gzzh, & !!$ gxzh, gxxh, avg_det, & !!$ consh(1), consh(3), consh(4), consh(2), consh(5), rhoave, & !!$ velyave, velzave, velxave, epsave, pressave, w_lorentzave) - call eigenproblem(whisky_eos_handle,rhoave, velyave, & + call eigenproblem(GRHydro_eos_handle,rhoave, velyave, & velzave, velxave, epsave, w_lorentzave, & gyyh,gyzh,gxyh,gzzh,gxzh,gxxh, & usendh, avg_alp,avg_beta,qdiff(1),qdiff(3), & qdiff(4),qdiff(2),qdiff(5),roeflux(1),roeflux(3),& roeflux(4),roeflux(2),roeflux(5)) else if (flux_direction == 3) then -!!$ call prim2con(whisky_eos_handle,gzzh, gxzh, gyzh, gxxh, & +!!$ call prim2con(GRHydro_eos_handle,gzzh, gxzh, gyzh, gxxh, & !!$ gxyh, gyyh, avg_det, & !!$ consh(1), consh(4), consh(2), consh(3), consh(5), rhoave, & !!$ velzave, velxave, velyave, epsave, pressave, w_lorentzave) - call eigenproblem(whisky_eos_handle,rhoave, velzave, & + call eigenproblem(GRHydro_eos_handle,rhoave, velzave, & velxave, velyave, epsave, w_lorentzave, & gzzh,gxzh,gyzh,gxxh,gxyh,gyyh, & usendh, avg_alp,avg_beta,qdiff(1),qdiff(4), & @@ -328,10 +328,10 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS) enddo enddo -end subroutine Whisky_RoeSolve +end subroutine GRHydro_RoeSolve /*@@ - @routine Whisky_RoeSolveGeneral + @routine GRHydro_RoeSolveGeneral @date Sat Jan 26 01:55:55 2002 @author Pedro Montero, Ian Hawke @desc @@ -346,10 +346,10 @@ end subroutine Whisky_RoeSolve @@*/ -subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS) +subroutine GRHydro_RoeSolveGeneral(CCTK_ARGUMENTS) - USE Whisky_Scalars - use Whisky_Eigenproblem + USE GRHydro_Scalars + use GRHydro_Eigenproblem implicit none @@ -383,9 +383,9 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS) call CCTK_WARN(0, "Flux direction not x,y,z") end if - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 !!$ Set the left (p for plus) and right (m_i for minus, i+1) states @@ -433,9 +433,9 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS) ierr = EOS_SetGFs(cctkGH, EOS_RoeAverageCall) - do k = whisky_stencil, cctk_lsh(3) - whisky_stencil - do j = whisky_stencil, cctk_lsh(2) - whisky_stencil - do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 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 !!$ Set the left (p for plus) and right (m_i for minus, i+1) states @@ -584,4 +584,4 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS) enddo enddo -end subroutine Whisky_RoeSolveGeneral +end subroutine GRHydro_RoeSolveGeneral diff --git a/src/Whisky_Scalars.F90 b/src/GRHydro_Scalars.F90 index d2dfb8c..2cc245e 100644 --- a/src/Whisky_Scalars.F90 +++ b/src/GRHydro_Scalars.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Scalars.F90 + @file GRHydro_Scalars.F90 @date Mon Feb 25 11:11:23 2002 @author @desc @@ -12,7 +12,7 @@ #include "cctk_Parameters.h" #include "cctk_Arguments.h" - module Whisky_Scalars + module GRHydro_Scalars implicit none @@ -27,4 +27,4 @@ CCTK_REAL :: eosgeneral_pmin - end module Whisky_Scalars + end module GRHydro_Scalars diff --git a/src/Whisky_Set_TP_GF.c b/src/GRHydro_Set_TP_GF.c index f8c1ed7..6e9fd1a 100644 --- a/src/Whisky_Set_TP_GF.c +++ b/src/GRHydro_Set_TP_GF.c @@ -39,11 +39,11 @@ void Set_Trivial_Riemann_Problem_Grid_Function(CCTK_ARGUMENTS) point = CCTK_GFINDEX3D(cctkGH,i,j,k); if (SpaceMask_CheckStateBits(space_mask, point, type, state)) { - whisky_trivial_rp_gf_x[point]=1; + GRHydro_trivial_rp_gf_x[point]=1; } else { - whisky_trivial_rp_gf_x[point]=0; + GRHydro_trivial_rp_gf_x[point]=0; } } } @@ -58,11 +58,11 @@ void Set_Trivial_Riemann_Problem_Grid_Function(CCTK_ARGUMENTS) point = CCTK_GFINDEX3D(cctkGH,i,j,k); if (SpaceMask_CheckStateBits(space_mask, point, type, state)) { - whisky_trivial_rp_gf_y[point]=1; + GRHydro_trivial_rp_gf_y[point]=1; } else { - whisky_trivial_rp_gf_y[point]=0; + GRHydro_trivial_rp_gf_y[point]=0; } } } @@ -77,11 +77,11 @@ void Set_Trivial_Riemann_Problem_Grid_Function(CCTK_ARGUMENTS) point = CCTK_GFINDEX3D(cctkGH,i,j,k); if (SpaceMask_CheckStateBits(space_mask, point, type, state)) { - whisky_trivial_rp_gf_z[point]=1; + GRHydro_trivial_rp_gf_z[point]=1; } else { - whisky_trivial_rp_gf_z[point]=0; + GRHydro_trivial_rp_gf_z[point]=0; } } } diff --git a/src/Whisky_Shift.F90 b/src/GRHydro_Shift.F90 index 075c189..415da4f 100644 --- a/src/Whisky_Shift.F90 +++ b/src/GRHydro_Shift.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Shift.F90 + @file GRHydro_Shift.F90 @date Fri Mar 14 17:36:37 2003 @author Ian Hawke @desc @@ -14,7 +14,7 @@ #include "cctk_Functions.h" /*@@ - @routine Whisky_ComovingShift + @routine GRHydro_ComovingShift @date Fri Mar 14 17:37:30 2003 @author Ian Hawke @desc @@ -28,7 +28,7 @@ @@*/ -subroutine Whisky_ComovingShift(CCTK_ARGUMENTS) +subroutine GRHydro_ComovingShift(CCTK_ARGUMENTS) implicit none @@ -64,7 +64,7 @@ subroutine Whisky_ComovingShift(CCTK_ARGUMENTS) if (CCTK_EQUALS(comoving_v_method,"projected")) then - where (rho > 10.d0 * whisky_rho_min) + where (rho > 10.d0 * GRHydro_rho_min) betax = -comoving_factor*x*alp*(x*vel(:,:,:,1) + y*vel(:,:,:,2) + z*vel(:,:,:,3)) / & (r**2 + 1.d-10) * attenuate @@ -83,7 +83,7 @@ subroutine Whisky_ComovingShift(CCTK_ARGUMENTS) else if (CCTK_EQUALS(comoving_v_method,"components")) then - where (rho > 10.d0 * whisky_rho_min) + where (rho > 10.d0 * GRHydro_rho_min) betax = comoving_factor * alp * x / (r + 1.d-10) * sqrt( (& (vel_p(:,:,:,1) - betax_p / alp_p)**2 + & @@ -116,10 +116,10 @@ subroutine Whisky_ComovingShift(CCTK_ARGUMENTS) end if -end subroutine Whisky_ComovingShift +end subroutine GRHydro_ComovingShift /*@@ - @routine Whisky_SetUpCoords + @routine GRHydro_SetUpCoords @date Fri Mar 14 19:11:13 2003 @author Ian Hawke @desc @@ -134,20 +134,20 @@ end subroutine Whisky_ComovingShift @@*/ -subroutine Whisky_SetUpCoords(CCTK_ARGUMENTS) +subroutine GRHydro_SetUpCoords(CCTK_ARGUMENTS) implicit none DECLARE_CCTK_ARGUMENTS - whisky_x = x - whisky_y = y - whisky_z = z + GRHydro_x = x + GRHydro_y = y + GRHydro_z = z -end subroutine Whisky_SetUpCoords +end subroutine GRHydro_SetUpCoords /*@@ - @routine Whisky_EvolveCoords + @routine GRHydro_EvolveCoords @date Wed Mar 19 12:04:20 2003 @author Ian Hawke @desc @@ -161,14 +161,14 @@ end subroutine Whisky_SetUpCoords @@*/ -subroutine Whisky_EvolveCoords(CCTK_ARGUMENTS) +subroutine GRHydro_EvolveCoords(CCTK_ARGUMENTS) implicit none DECLARE_CCTK_ARGUMENTS - whisky_x_rhs = -betax - whisky_y_rhs = -betay - whisky_z_rhs = -betaz + GRHydro_x_rhs = -betax + GRHydro_y_rhs = -betay + GRHydro_z_rhs = -betaz -end subroutine Whisky_EvolveCoords +end subroutine GRHydro_EvolveCoords diff --git a/src/Whisky_SlopeLimiter.F90 b/src/GRHydro_SlopeLimiter.F90 index e0d1b41..ffdfc3a 100644 --- a/src/Whisky_SlopeLimiter.F90 +++ b/src/GRHydro_SlopeLimiter.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_SlopeLimiter.F90 + @file GRHydro_SlopeLimiter.F90 @date Sat Jan 26 02:00:32 2002 @author @desc @@ -32,7 +32,7 @@ subroutine slopelimiter(r, delta) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none diff --git a/src/Whisky_Source.F90 b/src/GRHydro_Source.F90 index e6400cb..b2833a8 100644 --- a/src/Whisky_Source.F90 +++ b/src/GRHydro_Source.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Source.F90 + @file GRHydro_Source.F90 @date Sat Jan 26 02:03:56 2002 @author Ian Hawke @desc @@ -110,9 +110,9 @@ subroutine SourceTerms(CCTK_ARGUMENTS) if (spatial_order > 2) then !$OMP PARALLEL DO PRIVATE(i, j) - do k = 1 + whisky_stencil, nz - whisky_stencil - do j = 1 + whisky_stencil, ny - whisky_stencil - do i = 1 + whisky_stencil, nx - whisky_stencil + do k = 1 + GRHydro_stencil, nz - GRHydro_stencil + do j = 1 + GRHydro_stencil, ny - GRHydro_stencil + do i = 1 + GRHydro_stencil, nx - GRHydro_stencil if ((i < 3).or.(i > cctk_lsh(1) - 2).or. & (j < 3).or.(j > cctk_lsh(2) - 2).or. & (k < 3).or.(k > cctk_lsh(3) - 2) ) then @@ -142,9 +142,9 @@ subroutine SourceTerms(CCTK_ARGUMENTS) !$OMP dx_psi4,dy_psi4,dz_psi4,shiftshiftk,shiftkx,shiftky,shiftkz,& !$OMP sumTK,halfshiftdgx,halfshiftdgy,halfshiftdgz,& !$OMP halfTdgx,halfTdgy,halfTdgz,invalp,invalp2) - do k=1 + whisky_stencil,nz - whisky_stencil - do j=1 + whisky_stencil,ny - whisky_stencil - do i=1 + whisky_stencil,nx - whisky_stencil + do k=1 + GRHydro_stencil,nz - GRHydro_stencil + do j=1 + GRHydro_stencil,ny - GRHydro_stencil + do i=1 + GRHydro_stencil,nx - GRHydro_stencil local_spatial_order = spatial_order if (force_spatial_second_order(i,j,k)) then diff --git a/src/Whisky_Startup.F90 b/src/GRHydro_Startup.F90 index 883a222..444e944 100644 --- a/src/Whisky_Startup.F90 +++ b/src/GRHydro_Startup.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Startup.F90 + @file GRHydro_Startup.F90 @date Sun Feb 10 00:02:52 2002 @author Ian Hawke @desc @@ -15,7 +15,7 @@ #include "util_Table.h" /*@@ - @routine Whisky_Startup + @routine GRHydro_Startup @date Sun Feb 10 00:03:09 2002 @author Ian Hawke @desc @@ -29,9 +29,9 @@ @@*/ -integer function Whisky_Startup() +integer function GRHydro_Startup() - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -43,10 +43,10 @@ integer function Whisky_Startup() CCTK_INT, dimension(4) :: dep_gfs character(len=256) :: eos_name_param, var_names_param, var_names, var_gfs - call CCTK_RegisterBanner(ierr, "Whisky: relativistic hydrodynamics, no ice.") + call CCTK_RegisterBanner(ierr, "GRHydro: relativistic hydrodynamics, no ice.") !!$ The number of independent variables is different in the polytropic or general case - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then n_base_indep_gfs = 1 else n_base_indep_gfs = 2 @@ -75,7 +75,7 @@ integer function Whisky_Startup() eos_name_param, "EOS Name") call CCTK_FortranString(strlen, eosgeneral_indep_names, & var_names_param) - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then var_names = "Rho "//var_names_param(1:strlen) else var_names = "Rho SpecificInternalEnergy "//var_names_param(1:strlen) @@ -86,7 +86,7 @@ integer function Whisky_Startup() call Util_TableSetString(ierr, table_handle, & "Pressure DPressureDSpecificInternalEnergy c_s^2", & "Dependent variable names") - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetInt(ierr, table_handle, & 1 + eosgeneral_n_indeps, "N independent variables") else @@ -96,13 +96,13 @@ integer function Whisky_Startup() call Util_TableSetInt(ierr, table_handle, & 3, "N dependent variables") - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then - call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus") + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus") else - call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus") - call CCTK_VarIndex(indep_gfs(2), "whisky::epsplus") + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus") + call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsplus") end if - call CCTK_VarIndex(dep_gfs(1), "whisky::pressplus") + call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressplus") call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_p") call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_cs2_p") @@ -126,7 +126,7 @@ integer function Whisky_Startup() end do - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, & indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs") else @@ -141,13 +141,13 @@ integer function Whisky_Startup() !!$ Second, "Minus" boundary extended !!$ Many of the table entries are the same - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then - call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus") + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus") else - call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus") - call CCTK_VarIndex(indep_gfs(2), "whisky::epsminus") + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus") + call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsminus") end if - call CCTK_VarIndex(dep_gfs(1), "whisky::pressminus") + call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressminus") call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_m") call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_cs2_m") @@ -171,7 +171,7 @@ integer function Whisky_Startup() end do - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, & indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs") else @@ -185,7 +185,7 @@ integer function Whisky_Startup() !!$ Third, the "Average" state for the Roe solver - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call CCTK_VarIndex(indep_gfs(1), "GRHydro::rho_ave") else call CCTK_VarIndex(indep_gfs(1), "GRHydro::rho_ave") @@ -215,7 +215,7 @@ integer function Whisky_Startup() end do - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, & indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs") else @@ -230,7 +230,7 @@ integer function Whisky_Startup() !!$ Fourth, the "Con2Prim" call. !!$ This sets different variables. - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call CCTK_VarIndex(indep_gfs(1), "HydroBase::rho") call Util_TableSetString(ierr, table_handle, & "Pressure DPressureDSpecificInternalEnergy DPressureDRho SpecificInternalEnergy", & @@ -250,7 +250,7 @@ integer function Whisky_Startup() call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_dpdrho_temp") end if - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, & indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs") call Util_TableSetIntArray(ierr, table_handle, 4, dep_gfs, & @@ -267,20 +267,20 @@ integer function Whisky_Startup() !!$ Fifth, the "Prim2Con" (boundary) calls. !!$ Again, different variables are set. - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then - call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus") + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus") call Util_TableSetString(ierr, table_handle, & "Pressure SpecificInternalEnergy", & "Dependent variable names") - call CCTK_VarIndex(dep_gfs(1), "whisky::pressminus") - call CCTK_VarIndex(dep_gfs(2), "whisky::epsminus") + call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressminus") + call CCTK_VarIndex(dep_gfs(2), "GRHydro::epsminus") else - call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus") - call CCTK_VarIndex(indep_gfs(2), "whisky::epsminus") + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus") + call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsminus") call Util_TableSetString(ierr, table_handle, & "Pressure", & "Dependent variable names") - call CCTK_VarIndex(dep_gfs(1), "whisky::pressminus") + call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressminus") end if call CCTK_FortranString(strlen, eosgeneral_indep_minus_gfs, var_gfs) @@ -303,7 +303,7 @@ integer function Whisky_Startup() end do - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, & indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs") call Util_TableSetIntArray(ierr, table_handle, 2, dep_gfs, & @@ -317,20 +317,20 @@ integer function Whisky_Startup() EOS_Prim2ConBndCallMinus = EOS_SetupCall(table_handle) - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then - call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus") + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus") call Util_TableSetString(ierr, table_handle, & "Pressure SpecificInternalEnergy", & "Dependent variable names") - call CCTK_VarIndex(dep_gfs(1), "whisky::pressplus") - call CCTK_VarIndex(dep_gfs(2), "whisky::epsplus") + call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressplus") + call CCTK_VarIndex(dep_gfs(2), "GRHydro::epsplus") else - call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus") - call CCTK_VarIndex(indep_gfs(2), "whisky::epsplus") + call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus") + call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsplus") call Util_TableSetString(ierr, table_handle, & "Pressure", & "Dependent variable names") - call CCTK_VarIndex(dep_gfs(1), "whisky::pressplus") + call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressplus") end if call CCTK_FortranString(strlen, eosgeneral_indep_plus_gfs, var_gfs) @@ -353,7 +353,7 @@ integer function Whisky_Startup() end do - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, & indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs") call Util_TableSetIntArray(ierr, table_handle, 2, dep_gfs, & @@ -369,7 +369,7 @@ integer function Whisky_Startup() !!$ Sixth, the Prim2Con (cell centre) calls - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call CCTK_VarIndex(indep_gfs(1), "HydroBase::rho") call Util_TableSetString(ierr, table_handle, & "Pressure SpecificInternalEnergy", & @@ -405,7 +405,7 @@ integer function Whisky_Startup() end do - if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then + if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, & indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs") call Util_TableSetIntArray(ierr, table_handle, 2, dep_gfs, & @@ -423,6 +423,6 @@ integer function Whisky_Startup() deallocate(indep_gfs) - Whisky_Startup = 0 + GRHydro_Startup = 0 -end function Whisky_Startup +end function GRHydro_Startup diff --git a/src/Whisky_TVDReconstruct.F90 b/src/GRHydro_TVDReconstruct.F90 index 4459da2..c6865c6 100644 --- a/src/Whisky_TVDReconstruct.F90 +++ b/src/GRHydro_TVDReconstruct.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_TVDReconstruct.F90 + @file GRHydro_TVDReconstruct.F90 @date Sat Jan 26 02:11:44 2002 @author Luca Baiotti @desc @@ -32,7 +32,7 @@ subroutine tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, & orig, bextp, bextm, trivial_rp, hydro_excision_mask) - USE Whisky_Scalars + USE GRHydro_Scalars implicit none @@ -53,21 +53,21 @@ subroutine tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, & trivial_rp = .false. !$OMP PARALLEL DO PRIVATE(i,j,dupw,dloc,delta,ratio,hdelta) - do k = whisky_stencil, nz-whisky_stencil+1 - do j = whisky_stencil, ny-whisky_stencil+1 - do i = whisky_stencil, nx-whisky_stencil+1 - if (whisky_enable_internal_excision /= 0 .and. & + do k = GRHydro_stencil, nz-GRHydro_stencil+1 + do j = GRHydro_stencil, ny-GRHydro_stencil+1 + do i = GRHydro_stencil, nx-GRHydro_stencil+1 + if (GRHydro_enable_internal_excision /= 0 .and. & (hydro_excision_mask(i,j,k) .ne. 0)) then trivial_rp(i-xoffset, j-yoffset, k-zoffset) = .true. trivial_rp(i, j, k) = .true. bextm(i, j, k) = orig(i, j, k) bextp(i, j, k) = orig(i, j, k) - if (whisky_enable_internal_excision /= 0 .and. & + if (GRHydro_enable_internal_excision /= 0 .and. & (hydro_excision_mask(i+xoffset,j+yoffset,k+zoffset) .eq. 0)) then bextm(i, j, k) = orig(i+xoffset, j+yoffset, k+zoffset) bextp(i, j, k) = orig(i+xoffset, j+yoffset, k+zoffset) end if - else if (whisky_enable_internal_excision /= 0 .and. & + else if (GRHydro_enable_internal_excision /= 0 .and. & ((hydro_excision_mask(i-xoffset,j-yoffset,k-zoffset) .ne. 0) .or. & (hydro_excision_mask(i+xoffset,j+yoffset,k+zoffset) .ne. 0))) then bextm(i, j, k) = orig(i, j, k) diff --git a/src/Whisky_Tmunu.F90 b/src/GRHydro_Tmunu.F90 index ff3b720..6ba34e3 100644 --- a/src/Whisky_Tmunu.F90 +++ b/src/GRHydro_Tmunu.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Tmunu.F90 + @file GRHydro_Tmunu.F90 @date Thu Apr 16 19:38:40 2009 @author Ian Hawke @histpry @@ -65,7 +65,7 @@ #define vely(i,j,k) vel(i,j,k,2) #define velz(i,j,k) vel(i,j,k,3) - subroutine Whisky_Tmunu(CCTK_ARGUMENTS) + subroutine GRHydro_Tmunu(CCTK_ARGUMENTS) implicit none @@ -172,4 +172,4 @@ return - end subroutine Whisky_Tmunu + end subroutine GRHydro_Tmunu diff --git a/src/Whisky_UpdateMask.F90 b/src/GRHydro_UpdateMask.F90 index d67600f..3753797 100644 --- a/src/Whisky_UpdateMask.F90 +++ b/src/GRHydro_UpdateMask.F90 @@ -1,5 +1,5 @@ /*@@ - @file Whisky_UpdateMask.F90 + @file GRHydro_UpdateMask.F90 @date Wed Mar 13 14:18:38 2002 @author @desc @@ -17,7 +17,7 @@ #define vely(i,j,k) vel(i,j,k,2) #define velz(i,j,k) vel(i,j,k,3) -subroutine WhiskyUpdateAtmosphereMask(CCTK_ARGUMENTS) +subroutine GRHydroUpdateAtmosphereMask(CCTK_ARGUMENTS) implicit none @@ -38,7 +38,7 @@ subroutine WhiskyUpdateAtmosphereMask(CCTK_ARGUMENTS) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if ( whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. & + if ( GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. & (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, \ type_bits, atmosphere)) .or. & (tau(i,j,k) + frac * taurhs(i,j,k) .le. 0.d0) .or. & @@ -55,10 +55,10 @@ subroutine WhiskyUpdateAtmosphereMask(CCTK_ARGUMENTS) end do !$OMP END PARALLEL DO -end subroutine WhiskyUpdateAtmosphereMask +end subroutine GRHydroUpdateAtmosphereMask /*@@ - @routine Whisky_SetupMask + @routine GRHydro_SetupMask @date Thu Jun 20 13:27:28 2002 @author Ian Hawke @desc @@ -72,7 +72,7 @@ end subroutine WhiskyUpdateAtmosphereMask @@*/ -subroutine Whisky_SetupMask(CCTK_ARGUMENTS) +subroutine GRHydro_SetupMask(CCTK_ARGUMENTS) implicit none @@ -111,10 +111,10 @@ subroutine Whisky_SetupMask(CCTK_ARGUMENTS) call CCTK_INFO("Setting up the atmosphere mask: all points are not_atmosphere") -end subroutine Whisky_SetupMask +end subroutine GRHydro_SetupMask /*@@ - @routine Whisky_InitAtmosMask + @routine GRHydro_InitAtmosMask @date Thu Jun 20 13:27:28 2002 @author Ian Hawke @desc @@ -128,7 +128,7 @@ end subroutine Whisky_SetupMask @@*/ -subroutine Whisky_InitAtmosMask(CCTK_ARGUMENTS) +subroutine GRHydro_InitAtmosMask(CCTK_ARGUMENTS) implicit none @@ -144,7 +144,7 @@ subroutine Whisky_InitAtmosMask(CCTK_ARGUMENTS) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if (rho(i,j,k) .le. whisky_rho_min) then + if (rho(i,j,k) .le. GRHydro_rho_min) then SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) atmosphere_mask(i,j,k) = 1 @@ -157,10 +157,10 @@ subroutine Whisky_InitAtmosMask(CCTK_ARGUMENTS) call CCTK_INFO("Setting up the atmosphere mask: points with rho<rho_min are set to be atmosphere") -end subroutine Whisky_InitAtmosMask +end subroutine GRHydro_InitAtmosMask /*@@ - @routine Whisky_AtmosphereReset + @routine GRHydro_AtmosphereReset @date Thu Jun 20 13:30:51 2002 @author Ian Hawke @desc @@ -174,7 +174,7 @@ end subroutine Whisky_InitAtmosMask @@*/ -subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS) +subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS) implicit none @@ -205,14 +205,14 @@ subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS) !!$ & (SpaceMask_CheckStateBitsF90(space_mask,i, j, k, type_bits,\ !!$ atmosphere)) - rho(i,j,k) = whisky_rho_min + rho(i,j,k) = GRHydro_rho_min velx(i,j,k) = 0.0d0 vely(i,j,k) = 0.0d0 velz(i,j,k) = 0.0d0 if (conformal_state .eq. 0) then call SpatialDeterminant(gxx(i,j,k), gxy(i,j,k), gxz(i,j,k), & gyy(i,j,k), gyz(i,j,k), gzz(i,j,k), det) - call prim2conpolytype(whisky_polytrope_handle, & + call prim2conpolytype(GRHydro_polytrope_handle, & gxx(i,j,k), gxy(i,j,k), gxz(i,j,k), & gyy(i,j,k), gyz(i,j,k), gzz(i,j,k), det, & dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), & @@ -223,7 +223,7 @@ subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS) call SpatialDeterminant(psi4pt*gxx(i,j,k), psi4pt*gxy(i,j,k), & psi4pt*gxz(i,j,k), psi4pt*gyy(i,j,k), psi4pt*gyz(i,j,k), & psi4pt*gzz(i,j,k), det) - call prim2conpolytype(whisky_polytrope_handle, & + call prim2conpolytype(GRHydro_polytrope_handle, & psi4pt*gxx(i,j,k), psi4pt*gxy(i,j,k), psi4pt*gxz(i,j,k), & psi4pt*gyy(i,j,k), psi4pt*gyz(i,j,k), psi4pt*gzz(i,j,k), & det, dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), & @@ -242,6 +242,6 @@ subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS) end do end do -!!$ call Whisky_Boundaries(CCTK_PASS_FTOF) +!!$ call GRHydro_Boundaries(CCTK_PASS_FTOF) -end subroutine Whisky_AtmosphereReset +end subroutine GRHydro_AtmosphereReset diff --git a/src/Whisky_Weights.c b/src/GRHydro_Weights.c index 25b0549..6e01c95 100644 --- a/src/Whisky_Weights.c +++ b/src/GRHydro_Weights.c @@ -1,5 +1,5 @@ /*@@ - @file Whisky_Weights.F90 + @file GRHydro_Weights.F90 @date Sat Jan 26 01:40:14 2002 @author Ian Hawke @desc @@ -18,7 +18,7 @@ #include "FishEye.h" /*@@ - @routine Whisky_Weights + @routine GRHydro_Weights @date Sat Jan 26 01:41:02 2002 @author Ian Hawke @desc @@ -32,7 +32,7 @@ @@*/ -void Whisky_Weights(CCTK_ARGUMENTS) +void GRHydro_Weights(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; @@ -194,11 +194,11 @@ void Whisky_Weights(CCTK_ARGUMENTS) /*@@ - @routine Whisky_Fisheye_Analysis + @routine GRHydro_Fisheye_Analysis @date @author Christian Ott, Ian Hawke @desc - Prepare output of Whisky variables in physical coordinates + Prepare output of GRHydro variables in physical coordinates @enddesc @calls @calledby @@ -208,7 +208,7 @@ void Whisky_Weights(CCTK_ARGUMENTS) @@*/ -int Whisky_Fisheye_Analysis(CCTK_ARGUMENTS) +int GRHydro_Fisheye_Analysis(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS diff --git a/src/Utils.F90 b/src/Utils.F90 index 446b39d..440c945 100644 --- a/src/Utils.F90 +++ b/src/Utils.F90 @@ -13,7 +13,7 @@ #include "cctk_Arguments.h" /*@@ - @routine Whisky_RefinementLevel + @routine GRHydro_RefinementLevel @date July 2005 @author @desc @@ -26,14 +26,14 @@ @endhistory @@*/ -subroutine Whisky_RefinementLevel(CCTK_ARGUMENTS) +subroutine GRHydro_RefinementLevel(CCTK_ARGUMENTS) implicit none DECLARE_CCTK_ARGUMENTS - whisky_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0)) + GRHydro_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0)) -end subroutine Whisky_RefinementLevel +end subroutine GRHydro_RefinementLevel /*@@ @@ -146,11 +146,11 @@ subroutine SetMetricTemps(CCTK_ARGUMENTS) call SpatialDeterminant(& gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& - Whisky_det(i,j,k)) + GRHydro_det(i,j,k)) call UpperMetric(& - Whisky_uxx(i,j,k),Whisky_uxy(i,j,k),Whisky_uxz(i,j,k),& - Whisky_uyy(i,j,k),Whisky_uyz(i,j,k),Whisky_uzz(i,j,k),& - Whisky_det(i,j,k),& + GRHydro_uxx(i,j,k),GRHydro_uxy(i,j,k),GRHydro_uxz(i,j,k),& + GRHydro_uyy(i,j,k),GRHydro_uyz(i,j,k),GRHydro_uzz(i,j,k),& + GRHydro_det(i,j,k),& gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) else @@ -158,11 +158,11 @@ subroutine SetMetricTemps(CCTK_ARGUMENTS) call SpatialDeterminant(& psi4pt*gxx(i,j,k),psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& - Whisky_det(i,j,k)) + GRHydro_det(i,j,k)) call UpperMetric(& - Whisky_uxx(i,j,k),Whisky_uxy(i,j,k),Whisky_uxz(i,j,k),& - Whisky_uyy(i,j,k),Whisky_uyz(i,j,k),Whisky_uzz(i,j,k),& - Whisky_det(i,j,k),& + GRHydro_uxx(i,j,k),GRHydro_uxy(i,j,k),GRHydro_uxz(i,j,k),& + GRHydro_uyy(i,j,k),GRHydro_uyz(i,j,k),GRHydro_uzz(i,j,k),& + GRHydro_det(i,j,k),& psi4pt*gxx(i,j,k),psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k)) end if diff --git a/src/include/Whisky_EMTensor.inc b/src/include/GRHydro_EMTensor.inc index e7e5e2d..4318c16 100644 --- a/src/include/Whisky_EMTensor.inc +++ b/src/include/GRHydro_EMTensor.inc @@ -1,5 +1,5 @@ /*@@ - @file Whisky_EMTensor.inc + @file GRHydro_EMTensor.inc @date Sat Jan 26 02:03:56 2002 @author Ian Hawke @desc diff --git a/src/include/Whisky_EMTensor_temps.inc b/src/include/GRHydro_EMTensor_temps.inc index 35282fb..c4d0c1d 100644 --- a/src/include/Whisky_EMTensor_temps.inc +++ b/src/include/GRHydro_EMTensor_temps.inc @@ -1,9 +1,9 @@ /*@@ - @file Whisky_EMTensor_temps.inc + @file GRHydro_EMTensor_temps.inc @date Sat Jan 26 02:03:56 2002 @author Ian Hawke @desc - The declaration of the temporaries used in Whisky_EMTensor.inc. + The declaration of the temporaries used in GRHydro_EMTensor.inc. @enddesc @@*/ #include "SpaceMask.h" diff --git a/src/make.code.defn b/src/make.code.defn index 97191a1..b3f2ccd 100644 --- a/src/make.code.defn +++ b/src/make.code.defn @@ -4,48 +4,48 @@ # Source files in this directory SRCS = Utils.F90 \ - Whisky_Boundaries.F90 \ - Whisky_CalcUpdate.F90 \ - Whisky_Con2Prim.F90 \ - Whisky_Eigenproblem.F90 \ - Whisky_Eigenproblem_Marquina.F90 \ - Whisky_ENOReconstruct.F90 \ - Whisky_ENOScalars.F90 \ - Whisky_EOS.c \ - Whisky_Flux.F90 \ - Whisky_FluxSplit.F90 \ - Whisky_HLLE.F90 \ - Whisky_HLLEPoly.F90 \ - Whisky_Loop.F90 \ - Whisky_Minima.F90 \ - Whisky_Minima.cc \ - Whisky_PPM.F90 \ - Whisky_ParamCheck.F90 \ - Whisky_Particle.F90 \ - Whisky_PreLoop.F90 \ - Whisky_Prim2Con.F90 \ - Whisky_Reconstruct.F90 \ - Whisky_ReconstructPoly.F90 \ - Whisky_RegisterMask.c \ - Whisky_RegisterGZ.cc \ - Whisky_RegisterVars.cc \ - Whisky_RiemannSolve.F90 \ - Whisky_RoeAverage.F90 \ - Whisky_RoeSolver.F90 \ - Whisky_Scalars.F90 \ - Whisky_Shift.F90 \ - Whisky_SlopeLimiter.F90 \ - Whisky_Source.F90 \ - Whisky_Startup.F90 \ - Whisky_TVDReconstruct.F90 \ - Whisky_Marquina.F90 \ - Whisky_UpdateMask.F90 \ - Whisky_Set_TP_GF.c \ - Whisky_Differences.F90 \ - Whisky_EoSChangeGamma.F90 \ - Whisky_Tmunu.F90 + GRHydro_Boundaries.F90 \ + GRHydro_CalcUpdate.F90 \ + GRHydro_Con2Prim.F90 \ + GRHydro_Eigenproblem.F90 \ + GRHydro_Eigenproblem_Marquina.F90 \ + GRHydro_ENOReconstruct.F90 \ + GRHydro_ENOScalars.F90 \ + GRHydro_EOS.c \ + GRHydro_Flux.F90 \ + GRHydro_FluxSplit.F90 \ + GRHydro_HLLE.F90 \ + GRHydro_HLLEPoly.F90 \ + GRHydro_Loop.F90 \ + GRHydro_Minima.F90 \ + GRHydro_Minima.cc \ + GRHydro_PPM.F90 \ + GRHydro_ParamCheck.F90 \ + GRHydro_Particle.F90 \ + GRHydro_PreLoop.F90 \ + GRHydro_Prim2Con.F90 \ + GRHydro_Reconstruct.F90 \ + GRHydro_ReconstructPoly.F90 \ + GRHydro_RegisterMask.c \ + GRHydro_RegisterGZ.cc \ + GRHydro_RegisterVars.cc \ + GRHydro_RiemannSolve.F90 \ + GRHydro_RoeAverage.F90 \ + GRHydro_RoeSolver.F90 \ + GRHydro_Scalars.F90 \ + GRHydro_Shift.F90 \ + GRHydro_SlopeLimiter.F90 \ + GRHydro_Source.F90 \ + GRHydro_Startup.F90 \ + GRHydro_TVDReconstruct.F90 \ + GRHydro_Marquina.F90 \ + GRHydro_UpdateMask.F90 \ + GRHydro_Set_TP_GF.c \ + GRHydro_Differences.F90 \ + GRHydro_EoSChangeGamma.F90 \ + GRHydro_Tmunu.F90 -### Whisky_Weights.c \ +### GRHydro_Weights.c \ diff --git a/src/make.code.deps b/src/make.code.deps index 23ffd9a..ac36140 100644 --- a/src/make.code.deps +++ b/src/make.code.deps @@ -1,8 +1,8 @@ -# Module dependencies for thorn Whisky +# Module dependencies for thorn GRHydro -Whisky_ENOReconstruct.F90.o: Whisky_ENOScalars.F90.o -Whisky_Eigenproblem.F90.o: Whisky_Scalars.F90.o -Whisky_Eigenproblem_Marquina.F90.o: Whisky_Scalars.F90.o -Whisky_PreLoop.F90.o: Whisky_Scalars.F90.o -Whisky_TVDReconstruct.F90.o: Whisky_Scalars.F90.o -Whisky_SlopeLimiter.F90.o: Whisky_Scalars.F90.o +GRHydro_ENOReconstruct.F90.o: GRHydro_ENOScalars.F90.o +GRHydro_Eigenproblem.F90.o: GRHydro_Scalars.F90.o +GRHydro_Eigenproblem_Marquina.F90.o: GRHydro_Scalars.F90.o +GRHydro_PreLoop.F90.o: GRHydro_Scalars.F90.o +GRHydro_TVDReconstruct.F90.o: GRHydro_Scalars.F90.o +GRHydro_SlopeLimiter.F90.o: GRHydro_Scalars.F90.o diff --git a/src/make.configuration.defn b/src/make.configuration.defn index 1d1e90b..c8b9180 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -1,4 +1,4 @@ -# make.configuration.defn for Whisky +# make.configuration.defn for GRHydro # add the utilities to the list ALL_UTILS += Riemann1d diff --git a/src/make.configuration.deps b/src/make.configuration.deps index d283562..be61b26 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -1,18 +1,18 @@ # Make sure that EOS_Polytrope is compiled first -ifneq ($(findstring Whisky/EOS_Polytrope,$(THORNS)),) -$(CCTK_LIBDIR)$(DIRSEP)libWhisky.a : $(CCTK_LIBDIR)$(DIRSEP)libEOS_Polytrope.a +ifneq ($(findstring GRHydro/EOS_Polytrope,$(THORNS)),) +$(CCTK_LIBDIR)$(DIRSEP)libGRHydro.a : $(CCTK_LIBDIR)$(DIRSEP)libEOS_Polytrope.a endif # Compile rules for the utilities -$(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)Whisky$(DIRSEP)%.o +$(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)GRHydro$(DIRSEP)%.o @echo Creating $* in $(UTIL_DIR) from $< if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi $(F90) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $(GENERAL_LIBRARIES) $< -$(BUILD_DIR)$(DIRSEP)Whisky$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)CIGR$(DIRSEP)Whisky$(DIRSEP)src$(DIRSEP)util$(DIRSEP)%.f90 +$(BUILD_DIR)$(DIRSEP)GRHydro$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)CIGR$(DIRSEP)GRHydro$(DIRSEP)src$(DIRSEP)util$(DIRSEP)%.f90 @echo Compiling $< - if [ ! -d $(BUILD_DIR)$(DIRSEP)Whisky ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)Whisky ; fi - cd $(BUILD_DIR)$(DIRSEP)Whisky + if [ ! -d $(BUILD_DIR)$(DIRSEP)GRHydro ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)GRHydro ; fi + cd $(BUILD_DIR)$(DIRSEP)GRHydro $(F90) $< $(F90FLAGS) -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(CCTK_HOME)$(DIRSEP)arrangements $(SYS_INC_DIRS:%=-I%) $(FCOMPILEONLY)$(OPTIONSEP)$@ |