Merge pull request #149 from SamuelCupp/main

Removed duplicated scheduling
EinsteinToolkit · Jul 11, 2023 · 318434b · 318434b
2 parents 6701233 + e51448f
commit 318434b
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 39 deletions.
diff --git a/ADMBaseX/schedule.ccl b/ADMBaseX/schedule.ccl
@@ -12,31 +12,35 @@ SCHEDULE GROUP ADMBaseX_PostInitial AT initial AFTER (ADMBaseX_InitialData ADMBa
 {
 } "Schedule group for modifying the ADM initial data, such as e.g. adding noise"
 
-SCHEDULE GROUP ADMBaseX_SetADMVars AT postregrid
+if( CCTK_IsThornActive("ODESolvers") )
 {
-} "Set ADM variables in this group"
-
-SCHEDULE GROUP ADMBaseX_SetADMVars AT poststep
-{
-} "Set ADM variables in this group"
-
-SCHEDULE GROUP ADMBaseX_SetADMVars IN ODESolvers_PostStep
-{
-} "Set ADM variables in this group"
-
-SCHEDULE GROUP ADMBaseX_SetADMRHS AT postregrid
-{
-} "Set ADM RHS variables in this group"  
-
-SCHEDULE GROUP ADMBaseX_SetADMRHS AT poststep
-{
-} "Set ADM RHS variables in this group"  
+  SCHEDULE GROUP ADMBaseX_SetADMVars IN ODESolvers_PostStep
+  {
+  } "Set ADM variables in this group"
 
-SCHEDULE GROUP ADMBaseX_SetADMRHS IN ODESolvers_PostStep
+  SCHEDULE GROUP ADMBaseX_SetADMRHS IN ODESolvers_PostStep
+  {
+  } "Set ADM RHS variables in this group"  
+}
+else
 {
-} "Set ADM RHS variables in this group"  
-
+  # ODESolvers_PostStep is also scheduled AT postinitial and postrestrict
+  SCHEDULE GROUP ADMBaseX_SetADMVars AT postregrid
+  {
+  } "Set ADM variables in this group"
 
+  SCHEDULE GROUP ADMBaseX_SetADMVars AT poststep
+  {
+  } "Set ADM variables in this group"
+
+  SCHEDULE GROUP ADMBaseX_SetADMRHS AT postregrid
+  {
+  } "Set ADM RHS variables in this group"  
+
+  SCHEDULE GROUP ADMBaseX_SetADMRHS AT poststep
+  {
+  } "Set ADM RHS variables in this group"  
+}
 
 if (CCTK_EQUALS(initial_data, "Cartesian Minkowski")) {
   SCHEDULE ADMBaseX_initial_data IN ADMBaseX_InitialData

diff --git a/HydroBaseX/schedule.ccl b/HydroBaseX/schedule.ccl
@@ -8,19 +8,23 @@ SCHEDULE GROUP HydroBaseX_PostInitial AT initial AFTER HydroBaseX_InitialData
 {
 } "Schedule group for modifying the hydro initial data, such as e.g. adding noise"
 
-
-SCHEDULE GROUP HydroBaseX_SetHydroVars AT postregrid
-{
-} "Set hydro variables in this group, or before this group"
-
-SCHEDULE GROUP HydroBaseX_SetHydroVars AT poststep
+if( CCTK_IsThornActive("ODESolvers") )
 {
-} "Set hydro variables in this group, or before this group"
-
-SCHEDULE GROUP HydroBaseX_SetHydroVars IN ODESolvers_PostStep
+  SCHEDULE GROUP HydroBaseX_SetHydroVars IN ODESolvers_PostStep
+  {
+  } "Set hydro variables in this group, or before this group"
+}
+else
 {
-} "Set hydro variables in this group, or before this group"
+  # ODESolvers_PostStep is also scheduled AT postinitial and postrestrict
+  SCHEDULE GROUP HydroBaseX_SetHydroVars AT postregrid
+  {
+  } "Set hydro variables in this group, or before this group"
 
+  SCHEDULE GROUP HydroBaseX_SetHydroVars AT poststep
+  {
+  } "Set hydro variables in this group, or before this group"
+}
 
 
 if (CCTK_EQUALS(initial_hydro, "vacuum")) {

diff --git a/TmunuBaseX/schedule.ccl b/TmunuBaseX/schedule.ccl
@@ -4,17 +4,24 @@ SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT initial AFTER ADMBaseX_SetADMVars
 {
 } "Schedule group for setting T_munu"
 
-SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT postregrid AFTER ADMBaseX_SetADMVars
+if( CCTK_IsThornActive("ODESolvers") )
 {
-} "Schedule group for setting T_munu"
-
-SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT poststep AFTER ADMBaseX_SetADMVars
+  SCHEDULE GROUP TmunuBaseX_SetTmunuVars IN ODESolvers_PostStep AFTER ADMBaseX_SetADMVars
+  {
+  } "Schedule group for setting T_munu"
+}
+else
 {
-} "Schedule group for setting T_munu"
+  # ODESolvers_PostStep is also scheduled AT postinitial and postrestrict
+  SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT postregrid AFTER ADMBaseX_SetADMVars
+  {
+  } "Schedule group for setting T_munu"
+
+  SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT poststep AFTER ADMBaseX_SetADMVars
+  {
+  } "Schedule group for setting T_munu"
+}
 
-SCHEDULE GROUP TmunuBaseX_SetTmunuVars IN ODESolvers_PostStep AFTER ADMBaseX_SetADMVars
-{
-} "Schedule group for setting T_munu"