Revert "* improve handling of cs2 < 0 in the "standard" (non-MHD, non-hot EOS) eigenvalue routine."

actually this introduce the real valued atmosphere mask.

This reverts commit deccf528b463820b615dfa73e46e137cd59c65be.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@372 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

1 files changed, 7 insertions, 11 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 37cb55b..1bd3721 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -477,7 +477,6 @@ schedule GRHydro_Scalar_Setup IN CCTK_POSTINITIAL BEFORE HydroBase_RHS
 if (CCTK_EQUALS(evolution_method, "GRHydro")) {
 
 STORAGE:GRHydro_atmosphere_mask
-STORAGE:GRHydro_atmosphere_mask_real
 STORAGE:GRHydro_atmosphere_descriptors
 
 schedule GRHydro_SetupMask AT CCTK_Initial BEFORE HydroBase_Initial
@@ -1025,7 +1024,6 @@ if (!sync_conserved_only)
       SYNC: Y_e_con
       SYNC: lvel
       SYNC: lBvec
-      SYNC: GRHydro_atmosphere_mask_real  # Must be synced otherwise we get inconsistent results when using multiple procs
    } "Select GRHydro boundary conditions"
 }
 else
@@ -1041,7 +1039,6 @@ else
       SYNC: psidc
       SYNC: GRHydro_cons_tracers
       SYNC: Y_e_con
-      SYNC: GRHydro_atmosphere_mask_real  # Must be synced otherwise we get inconsistent results when using multiple procs
     } "Select GRHydro boundary conditions"
 
     # after a regrid Cactus relies on the boundary thorns to fill in the outer
@@ -1053,6 +1050,11 @@ else
     {
     } "Apply boundary conditions to primitives"
     
+    # This is necessary to provide initial guesses for Con2Prim after atmo reset (which happens only at last MoL post-step)!
+    schedule group GRHydro_PrimitiveBoundaries IN HydroBase_PostStep BEFORE HydroBase_Boundaries IF GRHydro::InLastMoLPostStep
+    {
+    } "Apply boundary conditions to primitives"
+    
 
     if(CCTK_IsImplementationActive("Coordinates")) {
     
@@ -1158,20 +1160,14 @@ schedule GRHydro_ClearLastMoLPostStep IN CCTK_WRAGH
 ### This is executed in the last MoL_PosStep                 ###
 ################################################################
 
-# First we need to convert real (and synchronized mask) to an integer mask!
-schedule GRHydroPostSyncAtmosphereMask IN HydroBase_PostStep AFTER HydroBase_Boundaries
-{
-  LANG: Fortran
-} "Set integer atmosphere mask from synchronized real atmosphere mask"
-
 if (CCTK_Equals(Bvec_evolution_method,"GRHydro"))
 {
-  schedule GRHydro_AtmosphereResetM IN HydroBase_PostStep BEFORE HydroBase_Con2Prim IF GRHydro::InLastMoLPostStep
+  schedule GRHydro_AtmosphereResetM IN MoL_PostStep AFTER ADMBase_SetADMVars AFTER GRHydro_SetLastMoLPostStep BEFORE HydroBase_PostStep IF GRHydro::InLastMoLPostStep
   {
     LANG: Fortran
   } "Reset the atmosphere - MHD version"
 } else {
-  schedule GRHydro_AtmosphereReset IN HydroBase_PostStep BEFORE HydroBase_Con2Prim IF GRHydro::InLastMoLPostStep
+  schedule GRHydro_AtmosphereReset IN MoL_PostStep AFTER ADMBase_SetADMVars BEFORE HydroBase_PostStep IF GRHydro::InLastMoLPostStep
   {
     LANG: Fortran
   } "Reset the atmosphere"