Skip to content

Commit

Permalink
Merge pull request #173 from eschnett/eschnett/schedule
Browse files Browse the repository at this point in the history
{ADM,Hydro,Tmunu}BaseX: Format schedule.ccl
  • Loading branch information
eschnett authored Jul 12, 2023
2 parents 318434b + 08f6216 commit 6f5903b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
8 changes: 2 additions & 6 deletions ADMBaseX/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,15 @@ SCHEDULE GROUP ADMBaseX_PostInitial AT initial AFTER (ADMBaseX_InitialData ADMBa
{
} "Schedule group for modifying the ADM initial data, such as e.g. adding noise"

if( CCTK_IsThornActive("ODESolvers") )
{
if (CCTK_IsThornActive("ODESolvers")) {
SCHEDULE GROUP ADMBaseX_SetADMVars IN ODESolvers_PostStep
{
} "Set ADM variables in this group"

SCHEDULE GROUP ADMBaseX_SetADMRHS IN ODESolvers_PostStep
{
} "Set ADM RHS variables in this group"
}
else
{
# ODESolvers_PostStep is also scheduled AT postinitial and postrestrict
} else {
SCHEDULE GROUP ADMBaseX_SetADMVars AT postregrid
{
} "Set ADM variables in this group"
Expand Down
9 changes: 3 additions & 6 deletions HydroBaseX/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@ SCHEDULE GROUP HydroBaseX_PostInitial AT initial AFTER HydroBaseX_InitialData
{
} "Schedule group for modifying the hydro initial data, such as e.g. adding noise"

if( CCTK_IsThornActive("ODESolvers") )
{
if (CCTK_IsThornActive("ODESolvers")) {
SCHEDULE GROUP HydroBaseX_SetHydroVars IN ODESolvers_PostStep
{
} "Set hydro variables in this group, or before this group"
}
else
{
# ODESolvers_PostStep is also scheduled AT postinitial and postrestrict
} else {
SCHEDULE GROUP HydroBaseX_SetHydroVars AT postregrid
{
} "Set hydro variables in this group, or before this group"
Expand All @@ -27,6 +23,7 @@ else
}



if (CCTK_EQUALS(initial_hydro, "vacuum")) {
SCHEDULE HydroBaseX_initial_data IN HydroBaseX_InitialData
{
Expand Down
9 changes: 2 additions & 7 deletions TmunuBaseX/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT initial AFTER ADMBaseX_SetADMVars
{
} "Schedule group for setting T_munu"

if( CCTK_IsThornActive("ODESolvers") )
{
if (CCTK_IsThornActive("ODESolvers")) {
SCHEDULE GROUP TmunuBaseX_SetTmunuVars IN ODESolvers_PostStep AFTER ADMBaseX_SetADMVars
{
} "Schedule group for setting T_munu"
}
else
{
# ODESolvers_PostStep is also scheduled AT postinitial and postrestrict
} else {
SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT postregrid AFTER ADMBaseX_SetADMVars
{
} "Schedule group for setting T_munu"
Expand All @@ -24,7 +20,6 @@ else




SCHEDULE TmunuBaseX_ZeroTmunu IN TmunuBaseX_SetTmunuVars
{
LANG: C
Expand Down

0 comments on commit 6f5903b

Please sign in to comment.