diff options
| -rw-r--r-- | ML_ADMConstraints/schedule.ccl | 8 | ||||
| -rw-r--r-- | ML_ADMConstraints_MP/schedule.ccl | 8 | ||||
| -rw-r--r-- | ML_ADMConstraints_O2/schedule.ccl | 8 | ||||
| -rw-r--r-- | ML_ADMQuantities/schedule.ccl | 8 | ||||
| -rw-r--r-- | ML_ADMQuantities_MP/schedule.ccl | 8 | ||||
| -rw-r--r-- | ML_ADMQuantities_O2/schedule.ccl | 8 | ||||
| -rw-r--r-- | m/Makefile | 2 | ||||
| -rw-r--r-- | m/McLachlan_ADMConstraints.m | 4 | ||||
| -rw-r--r-- | m/McLachlan_ADMQuantities.m | 4 |
9 files changed, 30 insertions, 28 deletions
diff --git a/ML_ADMConstraints/schedule.ccl b/ML_ADMConstraints/schedule.ccl index 933463d..e0d2615 100644 --- a/ML_ADMConstraints/schedule.ccl +++ b/ML_ADMConstraints/schedule.ccl @@ -23,19 +23,19 @@ schedule ML_ADMConstraints_RegisterSymmetries in SymmetryRegister OPTIONS: meta } "register symmetries" -schedule ML_ADMConstraints IN MoL_PseudoEvolution +schedule ML_ADMConstraints IN MoL_PseudoEvolution BEFORE ML_ADMConstraints_SelectBoundConds { LANG: C SYNC: ML_Ham SYNC: ML_mom } "ML_ADMConstraints" -schedule ML_ADMConstraints_boundary IN MoL_PseudoEvolution AFTER ML_ADMConstraints +schedule ML_ADMConstraints_boundary IN MoL_PseudoEvolution BEFORE ML_ADMConstraints_SelectBoundConds { LANG: C } "ML_ADMConstraints_boundary" -schedule ML_ADMConstraints_SelectBoundConds in MoL_PostStep +schedule ML_ADMConstraints_SelectBoundConds in MoL_PseudoEvolution { LANG: C OPTIONS: level @@ -47,7 +47,7 @@ schedule ML_ADMConstraints_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" -schedule group ApplyBCs as ML_ADMConstraints_ApplyBCs in MoL_PostStep after ML_ADMConstraints_SelectBoundConds +schedule group ApplyBCs as ML_ADMConstraints_ApplyBCs in MoL_PseudoEvolution after ML_ADMConstraints_SelectBoundConds { # no language specified } "Apply boundary conditions controlled by thorn Boundary" diff --git a/ML_ADMConstraints_MP/schedule.ccl b/ML_ADMConstraints_MP/schedule.ccl index 364b14d..0d2c89e 100644 --- a/ML_ADMConstraints_MP/schedule.ccl +++ b/ML_ADMConstraints_MP/schedule.ccl @@ -23,19 +23,19 @@ schedule ML_ADMConstraints_MP_RegisterSymmetries in SymmetryRegister OPTIONS: meta } "register symmetries" -schedule ML_ADMConstraints_MP IN MoL_PseudoEvolution +schedule ML_ADMConstraints_MP IN MoL_PseudoEvolution BEFORE ML_ADMConstraints_MP_SelectBoundConds { LANG: C SYNC: ML_Ham SYNC: ML_mom } "ML_ADMConstraints_MP" -schedule ML_ADMConstraints_MP_boundary IN MoL_PseudoEvolution AFTER ML_ADMConstraints_MP +schedule ML_ADMConstraints_MP_boundary IN MoL_PseudoEvolution BEFORE ML_ADMConstraints_MP_SelectBoundConds { LANG: C } "ML_ADMConstraints_MP_boundary" -schedule ML_ADMConstraints_MP_SelectBoundConds in MoL_PostStep +schedule ML_ADMConstraints_MP_SelectBoundConds in MoL_PseudoEvolution { LANG: C OPTIONS: level @@ -47,7 +47,7 @@ schedule ML_ADMConstraints_MP_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" -schedule group ApplyBCs as ML_ADMConstraints_MP_ApplyBCs in MoL_PostStep after ML_ADMConstraints_MP_SelectBoundConds +schedule group ApplyBCs as ML_ADMConstraints_MP_ApplyBCs in MoL_PseudoEvolution after ML_ADMConstraints_MP_SelectBoundConds { # no language specified } "Apply boundary conditions controlled by thorn Boundary" diff --git a/ML_ADMConstraints_O2/schedule.ccl b/ML_ADMConstraints_O2/schedule.ccl index 907dc6d..b24813a 100644 --- a/ML_ADMConstraints_O2/schedule.ccl +++ b/ML_ADMConstraints_O2/schedule.ccl @@ -23,19 +23,19 @@ schedule ML_ADMConstraints_O2_RegisterSymmetries in SymmetryRegister OPTIONS: meta } "register symmetries" -schedule ML_ADMConstraints_O2 IN MoL_PseudoEvolution +schedule ML_ADMConstraints_O2 IN MoL_PseudoEvolution BEFORE ML_ADMConstraints_O2_SelectBoundConds { LANG: C SYNC: ML_Ham SYNC: ML_mom } "ML_ADMConstraints_O2" -schedule ML_ADMConstraints_O2_boundary IN MoL_PseudoEvolution AFTER ML_ADMConstraints_O2 +schedule ML_ADMConstraints_O2_boundary IN MoL_PseudoEvolution BEFORE ML_ADMConstraints_O2_SelectBoundConds { LANG: C } "ML_ADMConstraints_O2_boundary" -schedule ML_ADMConstraints_O2_SelectBoundConds in MoL_PostStep +schedule ML_ADMConstraints_O2_SelectBoundConds in MoL_PseudoEvolution { LANG: C OPTIONS: level @@ -47,7 +47,7 @@ schedule ML_ADMConstraints_O2_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" -schedule group ApplyBCs as ML_ADMConstraints_O2_ApplyBCs in MoL_PostStep after ML_ADMConstraints_O2_SelectBoundConds +schedule group ApplyBCs as ML_ADMConstraints_O2_ApplyBCs in MoL_PseudoEvolution after ML_ADMConstraints_O2_SelectBoundConds { # no language specified } "Apply boundary conditions controlled by thorn Boundary" diff --git a/ML_ADMQuantities/schedule.ccl b/ML_ADMQuantities/schedule.ccl index b33d8fe..7bf4931 100644 --- a/ML_ADMQuantities/schedule.ccl +++ b/ML_ADMQuantities/schedule.ccl @@ -23,19 +23,19 @@ schedule ML_ADMQuantities_RegisterSymmetries in SymmetryRegister OPTIONS: meta } "register symmetries" -schedule ML_ADMQuantities IN MoL_PseudoEvolution +schedule ML_ADMQuantities IN MoL_PseudoEvolution BEFORE ML_ADMQuantities_SelectBoundConds { LANG: C SYNC: ML_Jadm SYNC: ML_Madm } "ML_ADMQuantities" -schedule ML_ADMQuantities_boundary IN MoL_PseudoEvolution AFTER ML_ADMQuantities +schedule ML_ADMQuantities_boundary IN MoL_PseudoEvolution BEFORE ML_ADMQuantities_SelectBoundConds { LANG: C } "ML_ADMQuantities_boundary" -schedule ML_ADMQuantities_SelectBoundConds in MoL_PostStep +schedule ML_ADMQuantities_SelectBoundConds in MoL_PseudoEvolution { LANG: C OPTIONS: level @@ -47,7 +47,7 @@ schedule ML_ADMQuantities_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" -schedule group ApplyBCs as ML_ADMQuantities_ApplyBCs in MoL_PostStep after ML_ADMQuantities_SelectBoundConds +schedule group ApplyBCs as ML_ADMQuantities_ApplyBCs in MoL_PseudoEvolution after ML_ADMQuantities_SelectBoundConds { # no language specified } "Apply boundary conditions controlled by thorn Boundary" diff --git a/ML_ADMQuantities_MP/schedule.ccl b/ML_ADMQuantities_MP/schedule.ccl index b45d58b..162b989 100644 --- a/ML_ADMQuantities_MP/schedule.ccl +++ b/ML_ADMQuantities_MP/schedule.ccl @@ -23,19 +23,19 @@ schedule ML_ADMQuantities_MP_RegisterSymmetries in SymmetryRegister OPTIONS: meta } "register symmetries" -schedule ML_ADMQuantities_MP IN MoL_PseudoEvolution +schedule ML_ADMQuantities_MP IN MoL_PseudoEvolution BEFORE ML_ADMQuantities_MP_SelectBoundConds { LANG: C SYNC: ML_Jadm SYNC: ML_Madm } "ML_ADMQuantities_MP" -schedule ML_ADMQuantities_MP_boundary IN MoL_PseudoEvolution AFTER ML_ADMQuantities_MP +schedule ML_ADMQuantities_MP_boundary IN MoL_PseudoEvolution BEFORE ML_ADMQuantities_MP_SelectBoundConds { LANG: C } "ML_ADMQuantities_MP_boundary" -schedule ML_ADMQuantities_MP_SelectBoundConds in MoL_PostStep +schedule ML_ADMQuantities_MP_SelectBoundConds in MoL_PseudoEvolution { LANG: C OPTIONS: level @@ -47,7 +47,7 @@ schedule ML_ADMQuantities_MP_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" -schedule group ApplyBCs as ML_ADMQuantities_MP_ApplyBCs in MoL_PostStep after ML_ADMQuantities_MP_SelectBoundConds +schedule group ApplyBCs as ML_ADMQuantities_MP_ApplyBCs in MoL_PseudoEvolution after ML_ADMQuantities_MP_SelectBoundConds { # no language specified } "Apply boundary conditions controlled by thorn Boundary" diff --git a/ML_ADMQuantities_O2/schedule.ccl b/ML_ADMQuantities_O2/schedule.ccl index 72c9cc8..ea46d09 100644 --- a/ML_ADMQuantities_O2/schedule.ccl +++ b/ML_ADMQuantities_O2/schedule.ccl @@ -23,19 +23,19 @@ schedule ML_ADMQuantities_O2_RegisterSymmetries in SymmetryRegister OPTIONS: meta } "register symmetries" -schedule ML_ADMQuantities_O2 IN MoL_PseudoEvolution +schedule ML_ADMQuantities_O2 IN MoL_PseudoEvolution BEFORE ML_ADMQuantities_O2_SelectBoundConds { LANG: C SYNC: ML_Jadm SYNC: ML_Madm } "ML_ADMQuantities_O2" -schedule ML_ADMQuantities_O2_boundary IN MoL_PseudoEvolution AFTER ML_ADMQuantities_O2 +schedule ML_ADMQuantities_O2_boundary IN MoL_PseudoEvolution BEFORE ML_ADMQuantities_O2_SelectBoundConds { LANG: C } "ML_ADMQuantities_O2_boundary" -schedule ML_ADMQuantities_O2_SelectBoundConds in MoL_PostStep +schedule ML_ADMQuantities_O2_SelectBoundConds in MoL_PseudoEvolution { LANG: C OPTIONS: level @@ -47,7 +47,7 @@ schedule ML_ADMQuantities_O2_CheckBoundaries at BASEGRID OPTIONS: meta } "check boundaries treatment" -schedule group ApplyBCs as ML_ADMQuantities_O2_ApplyBCs in MoL_PostStep after ML_ADMQuantities_O2_SelectBoundConds +schedule group ApplyBCs as ML_ADMQuantities_O2_ApplyBCs in MoL_PseudoEvolution after ML_ADMQuantities_O2_SelectBoundConds { # no language specified } "Apply boundary conditions controlled by thorn Boundary" @@ -24,6 +24,7 @@ McLachlan_BSSN.out: McLachlan_BSSN.m McLachlan_ADMConstraints.out: McLachlan_ADMConstraints.m rm -rf ML_ADMConstraints* ./runmath.sh $^ + perl -pi -e 's/MoL_PostStep/MoL_PseudoEvolution/g' ML_ADMConstraints*/schedule.ccl for thorn in ML_ADMConstraints*; do \ ./copy-if-changed.sh $$thorn ../$$thorn; \ done @@ -31,6 +32,7 @@ McLachlan_ADMConstraints.out: McLachlan_ADMConstraints.m McLachlan_ADMQuantities.out: McLachlan_ADMQuantities.m rm -rf ML_ADMQuantities* ./runmath.sh $^ + perl -pi -e 's/MoL_PostStep/MoL_PseudoEvolution/g' ML_ADMQuantities*/schedule.ccl for thorn in ML_ADMQuantities*; do \ ./copy-if-changed.sh $$thorn ../$$thorn; \ done diff --git a/m/McLachlan_ADMConstraints.m b/m/McLachlan_ADMConstraints.m index ccad0e5..57d53cd 100644 --- a/m/McLachlan_ADMConstraints.m +++ b/m/McLachlan_ADMConstraints.m @@ -223,7 +223,7 @@ groups = Join [declaredGroups, extraGroups]; ADMConstraintsCalc = { Name -> ADMConstraints, - Schedule -> {"IN MoL_PseudoEvolution"}, + Schedule -> {"IN MoL_PseudoEvolution BEFORE " <> ADMConstraints <> "_SelectBoundConds"}, Where -> Interior, Shorthands -> {detg, gu[ua,ub], G[ua,lb,lc], R[la,lb], trR, Km[la,lb], trK, @@ -262,7 +262,7 @@ ADMConstraintsCalc = ADMConstraintsBoundaryCalc = { Name -> ADMConstraints <> "_boundary", - Schedule -> {"IN MoL_PseudoEvolution AFTER " <> ADMConstraints}, + Schedule -> {"IN MoL_PseudoEvolution BEFORE " <> ADMConstraints <> "_SelectBoundConds"}, Where -> BoundaryWithGhosts, Equations -> { diff --git a/m/McLachlan_ADMQuantities.m b/m/McLachlan_ADMQuantities.m index 28f1c9d..db3406d 100644 --- a/m/McLachlan_ADMQuantities.m +++ b/m/McLachlan_ADMQuantities.m @@ -227,7 +227,7 @@ groups = Join [declaredGroups, extraGroups]; ADMQuantitiesCalc = { Name -> ADMQuantities, - Schedule -> {"IN MoL_PseudoEvolution"}, + Schedule -> {"IN MoL_PseudoEvolution BEFORE " <> ADMQuantities <> "_SelectBoundConds"}, Where -> Interior, Shorthands -> {detgt, gtu[ua,ub], dgtu[ua,ub,lc], Gtl[la,lb,lc], Gtlu[la,lb,uc], Gt[ua,lb,lc], @@ -295,7 +295,7 @@ ADMQuantitiesCalc = ADMQuantitiesBoundaryCalc = { Name -> ADMQuantities <> "_boundary", - Schedule -> {"IN MoL_PseudoEvolution AFTER " <> ADMQuantities}, + Schedule -> {"IN MoL_PseudoEvolution BEFORE " <> ADMQuantities <> "_SelectBoundConds"}, Where -> BoundaryWithGhosts, Equations -> { |