Added support for setting up generators on ellipsoidal initial data.

Added support for evolving the generators independently (used for testing).

Added support for detecting a peanut shaped excision region and take the
appropriate precautions.


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

1 files changed, 42 insertions, 2 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 76ae893..e6b3fd4 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -503,16 +503,56 @@ if (CCTK_Equals(mode,"normal"))
   {
     LANG: Fortran
     SYNC: eh_mask_all
-  } "Finish modifying the mask"
+  } "Find excision boundaries"
 
-  schedule  EHFinder_ApplySymMask in EHFinder_SetMask after EHFinder_SetMask2
+  schedule  EHFinder_ApplySymMask as ASM1 in EHFinder_SetMask after EHFinder_SetMask2
   {
     LANG: Fortran
   } "Apply symmetry boundaries"
  
+  schedule EHFinder_SetMask3 in EHFinder_SetMask after EHFinder_ASM1
+  {
+    LANG: Fortran
+    SYNC: eh_mask_all
+  } "Check to see if the mask needs to be modified"
+
+  schedule  EHFinder_ApplySymMask as ASM2 in EHFinder_SetMask after EHFinder_SetMask3
+  {
+    LANG: Fortran
+  } "Apply symmetry boundaries"
+ 
+  schedule EHFinder_SetMask2 as SM2 in EHFinder_SetMask after ASM2
+  {
+    LANG: Fortran
+    SYNC: eh_mask_all
+  } "Find excision boundaries"
 
+  schedule  EHFinder_ApplySymMask as ASM3 in EHFinder_SetMask after SM2
+  {
+    LANG: Fortran
+  } "Apply symmetry boundaries"
+ 
 }
 
+  if ( evolve_generators)
+  {
+    if (CCTK_Equals(generator_tracking_method,"interpolate_before"))
+    {
+      schedule EHFinder_Generator_Sources as EGS in MoL_CalcRHS
+      {
+        LANG: Fortran
+      } "Calculate the source terms for the generator evolution"
+    }
+    if (CCTK_Equals(generator_tracking_method,"interpolate_after"))
+    {
+      schedule EHFinder_Generator_Sources2 as EGS2 in MoL_CalcRHS after EHFinder_Sources
+      {
+        LANG: Fortran
+      } "Calculate the source terms for the generator evolution"
+    }
+  }
+
+
 }
 
 #schedule  EHFinder_ApplySym at CCTK_POSTINITIAL after EHFinder_MaskInit