* some more cleaning up in schedule.ccl -- we don't need separate

  schedule entries for the case with or without evolved tracers -- the
  tracers won't get synced if they are not evolved, because they don't
  have storage in that case.

* add entropy to the list of variables to be synced


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

1 files changed, 21 insertions, 96 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 4b67d7a..29b3f6a 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -367,8 +367,6 @@ if (EoS_Change)
   }
   if (CCTK_Equals(EoS_Change_type,"GammaKS"))
   {
-
-    if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) {
       schedule GRHydro_EoSChangeGammaK_Shibata AT CCTK_Initial AFTER HydroBase_Initial BEFORE GRHydro_IVP
       { 
         LANG: Fortran
@@ -381,24 +379,10 @@ if (EoS_Change)
         SYNC: hydrobase::eps
         SYNC: hydrobase::vel
         SYNC: hydrobase::temperature
+        SYNC: hydrobase::entropy
         SYNC: hydrobase::Y_e
         SYNC: Y_e_con
       } "Reset the hydro variables if the EoS Gamma and K change between ID and evolution"
-    } else {
-      schedule GRHydro_EoSChangeGammaK_Shibata AT CCTK_Initial AFTER HydroBase_Initial BEFORE GRHydro_IVP
-      { 
-        LANG: Fortran
-        SYNC: dens
-        SYNC: tau
-        SYNC: scon
-        SYNC: w_lorentz
-        SYNC: hydrobase::rho
-        SYNC: hydrobase::press
-        SYNC: hydrobase::eps
-        SYNC: hydrobase::vel
-        SYNC: hydrobase::temperature
-      } "Reset the hydro variables if the EoS Gamma and K change between ID and evolution"
-    }
   }
 }
 
@@ -1031,86 +1015,27 @@ schedule group Do_GRHydro_Boundaries IN HydroBase_Boundaries
 {
 } "GRHydro Boundary conditions group"
 
-if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) 
+schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound
 {
-  if (evolve_tracer)
-  {
-    schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound
-    {
-      LANG: Fortran
-      OPTIONS: LEVEL
-      SYNC: dens
-      SYNC: tau
-      SYNC: scon
-      SYNC: w_lorentz
-      SYNC: HydroBase::rho
-      SYNC: HydroBase::press
-      SYNC: HydroBase::eps
-      SYNC: HydroBase::vel
-      SYNC: HydroBase::Bvec
-      SYNC: GRHydro_cons_tracers
-      SYNC: GRHydro_tracers
-      SYNC: hydrobase::temperature
-      SYNC: hydrobase::Y_e
-      SYNC: Y_e_con
-    } "Select GRHydro boundary conditions"
-  } else {
-    schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound
-    {
-      LANG: Fortran
-      OPTIONS: LEVEL
-      SYNC: dens
-      SYNC: tau
-      SYNC: scon
-      SYNC: w_lorentz
-      SYNC: HydroBase::rho
-      SYNC: HydroBase::press
-      SYNC: HydroBase::eps
-      SYNC: HydroBase::vel
-      SYNC: HydroBase::Bvec
-      SYNC: hydrobase::temperature
-      SYNC: hydrobase::Y_e
-      SYNC: Y_e_con
-    } "Select GRHydro boundary conditions"
-  }
-} else {
-  if (evolve_tracer)
-  {
-    schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound
-    {
-      LANG: Fortran
-      OPTIONS: LEVEL
-      SYNC: dens
-      SYNC: tau
-      SYNC: scon
-      SYNC: w_lorentz
-      SYNC: HydroBase::rho
-      SYNC: HydroBase::press
-      SYNC: HydroBase::eps
-      SYNC: HydroBase::vel
-      SYNC: HydroBase::Bvec
-      SYNC: GRHydro_cons_tracers
-      SYNC: GRHydro_tracers
-      SYNC: hydrobase::temperature
-    } "Select GRHydro boundary conditions - MHD version"
-  } else {
-    schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound
-    {
-      LANG: Fortran
-      OPTIONS: LEVEL
-      SYNC: dens
-      SYNC: tau
-      SYNC: scon
-      SYNC: w_lorentz
-      SYNC: HydroBase::rho
-      SYNC: HydroBase::press
-      SYNC: HydroBase::eps
-      SYNC: HydroBase::vel
-      SYNC: HydroBase::Bvec
-      SYNC: hydrobase::temperature
-    } "Select GRHydro boundary conditions - MHD version"
-  }
-}
+  LANG: Fortran
+  OPTIONS: LEVEL
+  SYNC: dens
+  SYNC: tau
+  SYNC: scon
+  SYNC: w_lorentz
+  SYNC: HydroBase::rho
+  SYNC: HydroBase::press
+  SYNC: HydroBase::eps
+  SYNC: HydroBase::vel
+  SYNC: HydroBase::Bvec
+  SYNC: GRHydro_cons_tracers
+  SYNC: GRHydro_tracers
+  SYNC: hydrobase::temperature
+  SYNC: hydrobase::entropy
+  SYNC: hydrobase::Y_e
+  SYNC: Y_e_con
+  SYNC: HydroBase::Bvec
+} "Select GRHydro boundary conditions"
   
 ############################################################
 ### Compute first differences of rho for mesh refinement ###