Major restructuring. Only working routines are scheduled. Others will

be added when they are ready. Right now many parameter choices will
not do anything, because routines are not scheduled.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@16 2a26948c-0e4f-0410-aee8-f1d3e353619c

1 files changed, 226 insertions, 140 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 4465325..067004d 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -8,107 +8,54 @@ STORAGE: eh_mask_all
 STORAGE: rep_mask
 STORAGE: ftmp
 
+# Check for metric_state
+
 schedule EHFinder_ParamCheck at CCTK_PARAMCHECK
 {
   LANG: Fortran
 } "Check parameters"
 
+
+# Set up the initial level set function
+
 schedule EHFinder_Init at CCTK_POSTINITIAL
 {
   LANG: Fortran
   SYNC: level_set
 } "Setup the initial surface"
 
-schedule EHFinder_SetSym at CCTK_BASEGRID
-{
-  LANG: Fortran
-} "Register the symmetries for the level set function"
-
-schedule EHFinder_MaskInit at CCTK_POSTINITIAL after EHFinder_Init
-{
-  LANG: Fortran
-} "Setup the initial mask"
 
-schedule EHFinder_SetMask at CCTK_POSTINITIAL after EHFinder_MaskInit
-{
-  LANG: Fortran
-} "Set the mask"
+# Register the level_set function and its right hand side source with MoL
 
-schedule  EHFinder_ApplySym at CCTK_POSTINITIAL after EHFinder_MaskInit
+schedule EHFinder_MoLRegister in MoL_Register
 {
   LANG: Fortran
-  SYNC: level_set
-} "apply symmetry boundaries"
+} "Register evolution variables"
 
-#schedule GROUP EHFinder_ReParamInit at CCTK_POSTINITIAL after EHFinder_MaskInit
-#{
-#  LANG: Fortran
-#} "Initial re-parametrization and setting of the mask"
-#
-#if (CCTK_Equals(re_param_method,"approx"))
-#{
-#  schedule GROUP Init_ReParametrize in EHFinder_ReParamInit
-#  {
-#    LANG: Fortran
-#    STORAGE: rep_mask
-#  } "Approximation re-parametrization"
-#
-#  schedule EHFinder_ReParametrize5 in Init_ReParametrize
-#  {
-#    LANG: Fortran
-#    SYNC: level_set
-#    SYNC: rep_mask
-#  } "First step in approximation re-parametrization"
-#
-# schedule EHFinder_ReParametrize6 in Init_ReParametrize AFTER EHFinder_ReParametrize5 WHILE ehfinder::re_param_control
-#  {
-#    LANG: Fortran
-#    SYNC: level_set
-#    SYNC: rep_mask
-#  } "Second step in approximation re-parametrization"
-#}
 
-#schedule EHFinder_SetMask in EHFinder_ReParamInit after EHFinder_ReParametrize6
-#{
-#  LANG: Fortran
-#} "Set the mask"
+# Register the symmetries for the level set function
 
-schedule EHFinder_MoLRegister in MoL_Register
+schedule EHFinder_SetSym at CCTK_BASEGRID
 {
   LANG: Fortran
-} "Register evolution variables"
-
-if (CCTK_Equals(mode,"normal"))
-{
-  schedule EHFinder_Sources in MoL_CalcRHS
-  {
-    LANG: Fortran
-  } "Calculate the source terms"
-}
+} "Register the symmetries for the level set function"
 
-if (CCTK_Equals(mode,"test_reparam"))
-{
-  schedule EHFinder_Sources3 in MoL_CalcRHS
-  {
-    LANG: Fortran
-  } "Calculate the source terms for reparam test"
-}
 
-schedule GROUP EHFinder_PostStep in MoL_PostStep
-{
-} "Schedule group for symmetry boundaries and syncing"
+# set the initial eh_mask to at the physical outer boundaries.
 
-schedule EHFinder_ApplySym in EHFinder_PostStep
+schedule EHFinder_MaskInit at CCTK_POSTINITIAL after EHFinder_Init
 {
   LANG: Fortran
-  SYNC: level_set
-} "Apply symmetry boundaries"
+} "Setup the initial mask"
+
+
+# Schedule the euler re-parametrization
 
 if (!CCTK_Equals(mode,"test_reparam"))
 {
   schedule GROUP EHFinder_ReParametrize at CCTK_POSTSTEP
   {
-    LANG: Fortran
+#    LANG: Fortran
   } "Re-parametrize the level set function"
 
   if (CCTK_Equals(re_param_method,"pde"))
@@ -136,84 +83,223 @@ if (!CCTK_Equals(mode,"test_reparam"))
         SYNC: level_set
       } "apply symmetry boundaries"
     }
+  }
 
-    if (CCTK_Equals(re_param_int_method,"rk2"))
-    {
-      schedule GROUP RK2_ReParametrize in EHFinder_ReParametrize AFTER EHFinder_ReParametrize1 WHILE ehfinder::re_param_control
-      {
-        LANG: Fortran
-      } "rk2 evolution for re-parametrization"
-
-      schedule EHFinder_ReParametrize2 in RK2_ReParametrize
-      {
-        LANG: Fortran
-        SYNC: ftmp
-      } "First step of the RK2 scheme"
 
-      schedule EHFinder_ReParametrize3 in RK2_ReParametrize
-      {
-        LANG: Fortran
-        SYNC: level_set
-      } "Second step of the RK2 scheme"
-    }
-  }
+  # Schedule modifications of the mask in group EHFinder_SetMask
 
-  if (CCTK_Equals(re_param_method,"approx"))
+  schedule GROUP EHFinder_SetMask at CCTK_POSTSTEP after EHFinder_ReParametrize
   {
-    schedule GROUP Approx_ReParametrize in EHFinder_ReParametrize
-    {
-      LANG: Fortran
-    } "Approximation re-parametrization"
+#    LANG: Fortran
+  } "Set the mask"
 
-    schedule EHFinder_ReParametrize5 in Approx_ReParametrize
-    {
-      LANG: Fortran
-      SYNC: level_set
-      SYNC: dlevel_set
-      SYNC: rep_mask
-    } "First step in approximation re-parametrization"
+  schedule EHFinder_SetMask1 in EHFinder_SetMask
+  {
+    LANG: Fortran
+    SYNC: level_set
+    SYNC: eh_mask_all
+  } "Start modifying the mask"
 
-    schedule EHFinder_ApplySym in Approx_ReParametrize AFTER EHFinder_ReParametrize5
-    {
-      LANG: Fortran
-      SYNC: level_set
-      SYNC: rep_mask
-    } "Apply symmetry boundaries"
+  schedule  EHFinder_ApplySym in EHFinder_SetMask after EHFinder_SetMask1
+  {
+    LANG: Fortran
+  } "apply symmetry boundaries"
+ 
+  schedule EHFinder_SetMask2 in EHFinder_SetMask after EHFinder_ApplySym
+  {
+    LANG: Fortran
+    SYNC: eh_mask_all
+  } "Finish modifying the mask"
 
-    schedule GROUP EHFinder_Loop in Approx_ReParametrize AFTER EHFinder_ApplySym WHILE ehfinder::re_param_control
-    {
-      LANG: Fortran
-      SYNC: eh_mask_all
-    } "Loop for second step in approximation re-parametrization"
+}
 
-    schedule EHFinder_ReParametrize6 in EHFinder_Loop
-    { 
-      LANG: Fortran
-    } "Second step in approximation re-parametrization"
 
-    schedule EHFinder_ReParametrize7 in EHFinder_Loop AFTER  EHFinder_ReParametrize6
-    { 
-      LANG: Fortran
-    } "Update the re-parametrization mask"
+# Schedule the calculation of the source terms
 
-    schedule EHFinder_ApplySym in EHFinder_Loop AFTER EHFinder_ReParametrize7
-    {
-      LANG: Fortran
-      SYNC: level_set
-      SYNC: rep_mask
-    } "Apply symmetry boundaries"
+if (CCTK_Equals(mode,"normal"))
+{
+  schedule EHFinder_Sources in MoL_CalcRHS
+  {
+    LANG: Fortran
+  } "Calculate the source terms"
+}
 
-    schedule EHFinder_SetMask in EHFinder_ReParametrize after Approx_ReParametrize
-    {
-      LANG: Fortran
-      SYNC: level_set
-    } "Set the mask"
 
-    schedule  EHFinder_ApplySym in EHFinder_ReParametrize after EHFinder_SetMask
-    {
-      LANG: Fortran
-      SYNC: level_set
-    } "apply symmetry boundaries"
-   
-  }
-}
+#schedule  EHFinder_ApplySym at CCTK_POSTINITIAL after EHFinder_MaskInit
+#{
+#  LANG: Fortran
+#  SYNC: level_set
+#} "apply symmetry boundaries"
+#
+#schedule GROUP EHFinder_ReParamInit at CCTK_POSTINITIAL after EHFinder_MaskInit
+#{
+#  LANG: Fortran
+#} "Initial re-parametrization and setting of the mask"
+#
+#if (CCTK_Equals(re_param_method,"approx"))
+#{
+#  schedule GROUP Init_ReParametrize in EHFinder_ReParamInit
+#  {
+#    LANG: Fortran
+#    STORAGE: rep_mask
+#  } "Approximation re-parametrization"
+#
+#  schedule EHFinder_ReParametrize5 in Init_ReParametrize
+#  {
+#    LANG: Fortran
+#    SYNC: level_set
+#    SYNC: rep_mask
+#  } "First step in approximation re-parametrization"
+#
+# schedule EHFinder_ReParametrize6 in Init_ReParametrize AFTER EHFinder_ReParametrize5 WHILE ehfinder::re_param_control
+#  {
+#    LANG: Fortran
+#    SYNC: level_set
+#    SYNC: rep_mask
+#  } "Second step in approximation re-parametrization"
+#}
+#
+#schedule EHFinder_SetMask in EHFinder_ReParamInit after EHFinder_ReParametrize6
+#{
+#  LANG: Fortran
+#} "Set the mask"
+#
+#if (CCTK_Equals(mode,"normal"))
+#{
+#  schedule EHFinder_Sources in MoL_CalcRHS
+#  {
+#    LANG: Fortran
+#  } "Calculate the source terms"
+#}
+#
+#if (CCTK_Equals(mode,"test_reparam"))
+#{
+#  schedule EHFinder_Sources3 in MoL_CalcRHS
+#  {
+#    LANG: Fortran
+#  } "Calculate the source terms for reparam test"
+#}
+#
+#schedule GROUP EHFinder_PostStep in MoL_PostStep
+#{
+#} "Schedule group for symmetry boundaries and syncing"
+#
+#schedule EHFinder_ApplySym in EHFinder_PostStep
+#{
+#  LANG: Fortran
+#  SYNC: level_set
+#} "Apply symmetry boundaries"
+#
+#if (!CCTK_Equals(mode,"test_reparam"))
+#{
+#  schedule GROUP EHFinder_ReParametrize at CCTK_POSTSTEP
+#  {
+#    LANG: Fortran
+#  } "Re-parametrize the level set function"
+#
+#  if (CCTK_Equals(re_param_method,"pde"))
+#  {
+#    schedule EHFinder_ReParametrize1 in EHFinder_ReParametrize
+#    {
+#      LANG: Fortran
+#    } "Initializes the re-parametrization control"
+#
+#    if (CCTK_Equals(re_param_int_method,"euler"))
+#    {
+#      schedule GROUP Euler_ReParametrize in EHFinder_ReParametrize AFTER EHFinder_ReParametrize1 WHILE ehfinder::re_param_control
+#      {
+#      } "Schedule group for Euler re-parametrization"
+#
+#      schedule EHFinder_ReParametrize4 in Euler_ReParametrize 
+#      {
+#        LANG: Fortran
+#        SYNC: level_set
+#      } "Euler scheme"
+#
+#      schedule  EHFinder_ApplySym in Euler_ReParametrize after EHFinder_ReParametrize4
+#      {
+#        LANG: Fortran
+#        SYNC: level_set
+#      } "apply symmetry boundaries"
+#    }
+#
+#    if (CCTK_Equals(re_param_int_method,"rk2"))
+#    {
+#      schedule GROUP RK2_ReParametrize in EHFinder_ReParametrize AFTER EHFinder_ReParametrize1 WHILE ehfinder::re_param_control
+#      {
+#        LANG: Fortran
+#      } "rk2 evolution for re-parametrization"
+#
+#      schedule EHFinder_ReParametrize2 in RK2_ReParametrize
+#      {
+#        LANG: Fortran
+#        SYNC: ftmp
+#      } "First step of the RK2 scheme"
+#
+#      schedule EHFinder_ReParametrize3 in RK2_ReParametrize
+#      {
+#        LANG: Fortran
+#        SYNC: level_set
+#      } "Second step of the RK2 scheme"
+#    }
+#  }
+#
+#  if (CCTK_Equals(re_param_method,"approx"))
+#  {
+#    schedule GROUP Approx_ReParametrize in EHFinder_ReParametrize
+#    {
+#      LANG: Fortran
+#    } "Approximation re-parametrization"
+#
+#    schedule EHFinder_ReParametrize5 in Approx_ReParametrize
+#    {
+#      LANG: Fortran
+#      SYNC: level_set
+#      SYNC: dlevel_set
+#      SYNC: rep_mask
+#    } "First step in approximation re-parametrization"
+#
+#    schedule EHFinder_ApplySym in Approx_ReParametrize AFTER EHFinder_ReParametrize5
+#    {
+#      LANG: Fortran
+#      SYNC: level_set
+#      SYNC: rep_mask
+#    } "Apply symmetry boundaries"
+#
+#    schedule GROUP EHFinder_Loop in Approx_ReParametrize AFTER EHFinder_ApplySym WHILE ehfinder::re_param_control
+#    {
+#      LANG: Fortran
+#      SYNC: eh_mask_all
+#    } "Loop for second step in approximation re-parametrization"
+#
+#    schedule EHFinder_ReParametrize6 in EHFinder_Loop
+#    { 
+#      LANG: Fortran
+#    } "Second step in approximation re-parametrization"
+#
+#    schedule EHFinder_ReParametrize7 in EHFinder_Loop AFTER  EHFinder_ReParametrize6
+#    { 
+#      LANG: Fortran
+#    } "Update the re-parametrization mask"
+#
+#    schedule EHFinder_ApplySym in EHFinder_Loop AFTER EHFinder_ReParametrize7
+#    {
+#      LANG: Fortran
+#      SYNC: level_set
+#      SYNC: rep_mask
+#    } "Apply symmetry boundaries"
+#
+#    schedule EHFinder_SetMask in EHFinder_ReParametrize after Approx_ReParametrize
+#    {
+#      LANG: Fortran
+#      SYNC: level_set
+#    } "Set the mask"
+#
+#    schedule  EHFinder_ApplySym in EHFinder_ReParametrize after EHFinder_SetMask
+#    {
+#      LANG: Fortran
+#      SYNC: level_set
+#    } "apply symmetry boundaries"
+#   
+#  }
+#}