[Commits] [svn:einsteintoolkit] GRHydro/trunk/ (Rev. 218)
cott at tapir.caltech.edu
cott at tapir.caltech.edu
Mon Feb 21 11:16:59 CST 2011
User: cott
Date: 2011/02/21 11:16 AM
Modified:
/trunk/
interface.ccl, schedule.ccl
/trunk/src/
GRHydro_Boundaries.F90, GRHydro_BoundariesM.F90, GRHydro_Con2Prim.F90, GRHydro_Prim2Con.F90, GRHydro_RegisterGZ.cc, GRHydro_RegisterGZM.cc, GRHydro_RegisterVars.cc, GRHydro_RegisterVarsM.cc
Log:
* changes to go along with the move of the
Lorentz factor variable from GRHydro to HydroBase
File Changes:
Directory: /trunk/src/
======================
File [modified]: GRHydro_Boundaries.F90
Delta lines: +3 -3
===================================================================
--- trunk/src/GRHydro_Boundaries.F90 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_Boundaries.F90 2011-02-21 17:16:59 UTC (rev 218)
@@ -64,7 +64,7 @@
call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press")
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::w_lorentz")
call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps")
call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed")
if(evolve_mhd.ne.0.and.clean_divergence.ne.0) then
@@ -157,7 +157,7 @@
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"GRHydro::scon", "Flat")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
- "GRHydro::w_lorentz", "Flat")
+ "HydroBase::w_lorentz", "Flat")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"HydroBase::rho", "Flat")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
@@ -207,7 +207,7 @@
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"GRHydro::scon", "None")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
- "GRHydro::w_lorentz", "None")
+ "HydroBase::w_lorentz", "None")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"HydroBase::rho", "None")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
File [modified]: GRHydro_BoundariesM.F90
Delta lines: +3 -3
===================================================================
--- trunk/src/GRHydro_BoundariesM.F90 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_BoundariesM.F90 2011-02-21 17:16:59 UTC (rev 218)
@@ -64,7 +64,7 @@
call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press")
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::w_lorentz")
call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps")
call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed")
if(clean_divergence.ne.0) then
@@ -152,7 +152,7 @@
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"GRHydro::scon", "Flat")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
- "GRHydro::w_lorentz", "Flat")
+ "HydroBase::w_lorentz", "Flat")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"HydroBase::rho", "Flat")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
@@ -192,7 +192,7 @@
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"GRHydro::scon", "None")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
- "GRHydro::w_lorentz", "None")
+ "HydroBase::w_lorentz", "None")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
"HydroBase::rho", "None")
ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
File [modified]: GRHydro_Con2Prim.F90
Delta lines: +27 -0
===================================================================
--- trunk/src/GRHydro_Con2Prim.F90 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_Con2Prim.F90 2011-02-21 17:16:59 UTC (rev 218)
@@ -561,6 +561,7 @@
! error handling
if(anyerr.ne.0) then
if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,"EOS error in c2p 0")
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
@@ -569,6 +570,8 @@
write(warnline,"(A7,i8)") "code: ",keyerr(1)
call CCTK_WARN(failinfomode,warnline)
write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
+ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
+ !OMP END CRITICAL
if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then
! Handling of the case when no new temperature can be
! found for a given epsilon. The amount of times
@@ -582,11 +585,14 @@
rho,epsilon,temp,ye,xpress,keyerr,anyerr)
nf = nf + 1
enddo
+ !OMP CRITICAL
write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf
call CCTK_WARN(failinfomode,warnline)
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
+ !OMP END CRITICAL
if(nf.gt.nfudgemax) then
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times")
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
@@ -597,10 +603,13 @@
write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
call CCTK_WARN(failinfomode,warnline)
call CCTK_WARN(failwarnmode,"Aborting!!!")
+ !OMP END CRITICAL
endif
else
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,warnline)
call CCTK_WARN(failwarnmode,"Aborting!!!")
+ !OMP END CRITICAL
endif
endif
endif
@@ -636,6 +645,7 @@
! error handling
if(anyerr.ne.0) then
if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,"EOS error in c2p 1")
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
@@ -644,6 +654,8 @@
write(warnline,"(A7,i8)") "code: ",keyerr(1)
call CCTK_WARN(failinfomode,warnline)
write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
+ call CCTK_WARN(failinfomode,warnline)
+ !OMP END CRITICAL
if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then
! Handling of the case when no new temperature can be
! found for a given epsilon. The amount of times
@@ -657,11 +669,14 @@
rho,epsilon,temp,ye,xpress,keyerr,anyerr)
nf = nf + 1
enddo
+ !OMP CRITICAL
write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf
call CCTK_WARN(failinfomode,warnline)
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
+ !OMP END CRITICAL
if(nf.gt.nfudgemax) then
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times")
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
@@ -672,10 +687,13 @@
write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
call CCTK_WARN(failinfomode,warnline)
call CCTK_WARN(failwarnmode,"Aborting!!!")
+ !OMP END CRITICAL
endif
else
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,warnline)
call CCTK_WARN(failwarnmode,"Aborting!!!")
+ !OMP END CRITICAL
endif
endif
endif
@@ -729,6 +747,7 @@
! error handling
if(anyerr.ne.0) then
if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,"EOS error in c2p 2")
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
@@ -737,6 +756,8 @@
write(warnline,"(A7,i8)") "code: ",keyerr(1)
call CCTK_WARN(failinfomode,warnline)
write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
+ call CCTK_WARN(failinfomode,warnline)
+ !OMP END CRITICAL
if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then
! Handling of the case when no new temperature can be
! found for a given epsilon. The amount of times
@@ -750,11 +771,14 @@
rho,epsilon,temp,ye,xpress,keyerr,anyerr)
nf = nf + 1
enddo
+ !OMP CRITICAL
write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf
call CCTK_WARN(failinfomode,warnline)
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
+ !OMP END CRITICAL
if(nf.gt.nfudgemax) then
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times")
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(failinfomode,warnline)
@@ -765,10 +789,13 @@
write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
call CCTK_WARN(failinfomode,warnline)
call CCTK_WARN(failwarnmode,"Aborting!!!")
+ !OMP END CRITICAL
endif
else
+ !OMP CRITICAL
call CCTK_WARN(failinfomode,warnline)
call CCTK_WARN(failwarnmode,"Aborting!!!")
+ !OMP END CRITICAL
endif
endif
endif
File [modified]: GRHydro_Prim2Con.F90
Delta lines: +4 -2
===================================================================
--- trunk/src/GRHydro_Prim2Con.F90 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_Prim2Con.F90 2011-02-21 17:16:59 UTC (rev 218)
@@ -269,7 +269,8 @@
! This is a way of recovering even on finer refinement levels:
! Use the average temperature at the interface instead of the
! reconstructed specific internal energy.
- !OMP CRITICAL
+!! !OMP CRITICAL
+#if 0
call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!")
write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
call CCTK_WARN(1,warnline)
@@ -279,7 +280,8 @@
call CCTK_WARN(1,warnline)
write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
call CCTK_WARN(1,warnline)
- !OMP END CRITICAL
+#endif
+!!! !OMP END CRITICAL
keytemp=1
temp = temp0
call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,&
File [modified]: GRHydro_RegisterGZ.cc
Delta lines: +6 -6
===================================================================
--- trunk/src/GRHydro_RegisterGZ.cc 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_RegisterGZ.cc 2011-02-21 17:16:59 UTC (rev 218)
@@ -39,7 +39,7 @@
if(clean_divergence) {
string var[10] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc"};
for (int i = 0; i < 10; i++)
{
@@ -58,7 +58,7 @@
} else {
string var[9] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec"};
for (int i = 0; i < 9; i++)
{
@@ -78,7 +78,7 @@
} else {
string var[8] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon"};
for (int i = 0; i < 8; i++)
{
@@ -110,7 +110,7 @@
if(clean_divergence) {
string var[13] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc",
"ADMBase::metric", "ADMBase::curv", "ADMBase::shift"};
for (int i = 0; i < 13; i++)
@@ -131,7 +131,7 @@
} else {
string var[12] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec",
"ADMBase::metric", "ADMBase::curv", "ADMBase::shift"};
for (int i = 0; i < 12; i++)
@@ -154,7 +154,7 @@
} else {
string var[11] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon",
"ADMBase::metric", "ADMBase::curv", "ADMBase::shift"};
for (int i = 0; i < 11; i++)
File [modified]: GRHydro_RegisterGZM.cc
Delta lines: +4 -4
===================================================================
--- trunk/src/GRHydro_RegisterGZM.cc 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_RegisterGZM.cc 2011-02-21 17:16:59 UTC (rev 218)
@@ -38,7 +38,7 @@
if(clean_divergence) {
string var[10] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc"};
for (int i = 0; i < 10; i++)
{
@@ -57,7 +57,7 @@
} else {
string var[9] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec"};
for (int i = 0; i < 9; i++)
{
@@ -89,7 +89,7 @@
if(clean_divergence) {
string var[13] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec", "GRHydro::psidc",
"ADMBase::metric", "ADMBase::curv", "ADMBase::shift"};
for (int i = 0; i < 13; i++)
@@ -110,7 +110,7 @@
} else {
string var[12] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
"HydroBase::vel",
- "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+ "GRHydro::dens", "GRHydro::tau", "HydroBase::w_lorentz",
"GRHydro::scon", "HydroBase::Bvec",
"ADMBase::metric", "ADMBase::curv", "ADMBase::shift"};
for (int i = 0; i < 12; i++)
File [modified]: GRHydro_RegisterVars.cc
Delta lines: +1 -1
===================================================================
--- trunk/src/GRHydro_RegisterVars.cc 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_RegisterVars.cc 2011-02-21 17:16:59 UTC (rev 218)
@@ -54,7 +54,7 @@
register_constrained("HydroBase::press");
register_constrained("HydroBase::eps");
register_constrained("HydroBase::vel");
- register_constrained("GRHydro::w_lorentz");
+ register_constrained("HydroBase::w_lorentz");
if (CCTK_EQUALS(evolution_method, "GRHydro"))
{
File [modified]: GRHydro_RegisterVarsM.cc
Delta lines: +1 -1
===================================================================
--- trunk/src/GRHydro_RegisterVarsM.cc 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/src/GRHydro_RegisterVarsM.cc 2011-02-21 17:16:59 UTC (rev 218)
@@ -54,7 +54,7 @@
register_constrained("HydroBase::press");
register_constrained("HydroBase::eps");
register_constrained("HydroBase::vel");
- register_constrained("GRHydro::w_lorentz");
+ register_constrained("HydroBase::w_lorentz");
if (CCTK_EQUALS(evolution_method, "GRHydro"))
{
Directory: /trunk/
==================
File [modified]: interface.ccl
Delta lines: +1 -1
===================================================================
--- trunk/interface.ccl 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/interface.ccl 2011-02-21 17:16:59 UTC (rev 218)
@@ -345,7 +345,7 @@
tracer
} "Tracers"
-real w_lorentz type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "Lorentz factor"
+#real w_lorentz type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "Lorentz factor"
real psidc type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "Psi parameter for divergence cleaning"
File [modified]: schedule.ccl
Delta lines: +2 -4
===================================================================
--- trunk/schedule.ccl 2011-02-10 15:23:57 UTC (rev 217)
+++ trunk/schedule.ccl 2011-02-21 17:16:59 UTC (rev 218)
@@ -16,7 +16,6 @@
STORAGE:dens[3]
STORAGE:tau[3]
STORAGE:scon[3]
- STORAGE:w_lorentz[3]
if (number_of_particles)
{
STORAGE:particles[3]
@@ -42,7 +41,6 @@
STORAGE:dens[2]
STORAGE:tau[2]
STORAGE:scon[2]
- STORAGE:w_lorentz[2]
if (number_of_particles)
{
STORAGE:particles[2]
@@ -375,7 +373,7 @@
SYNC: dens
SYNC: tau
SYNC: scon
- SYNC: w_lorentz
+ SYNC: hydrobase::w_lorentz
SYNC: hydrobase::rho
SYNC: hydrobase::press
SYNC: hydrobase::eps
@@ -1024,7 +1022,7 @@
SYNC: dens
SYNC: tau
SYNC: scon
- SYNC: w_lorentz
+ SYNC: HydroBase::w_lorentz
SYNC: HydroBase::rho
SYNC: HydroBase::press
SYNC: HydroBase::eps
More information about the Commits
mailing list