First attempt at using 2d grid arrays to hold the generator information.

Something fishy is going on. Don't use yet.


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

1 files changed, 45 insertions, 26 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 3e9f6ab..f522f5c 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -19,8 +19,16 @@ else
   STORAGE: center_arrays
   if ( evolve_generators )
   {
-    STORAGE: xg[2], yg[2], zg[2]
-    STORAGE: dxg, dyg, dzg
+    if (CCTK_Equals(generator_distribution,"line"))
+    {
+      STORAGE: xg[2], yg[2], zg[2]
+      STORAGE: dxg, dyg, dzg
+    }
+    if (CCTK_Equals(generator_distribution,"2D array"))
+    {
+      STORAGE: xg2[2], yg2[2], zg2[2]
+      STORAGE: dxg2, dyg2, dzg2
+    }
   }
 }
 
@@ -341,11 +349,22 @@ if (CCTK_Equals(mode,"normal"))
   {
     if (CCTK_Equals(generator_tracking_method,"interpolate_before"))
     {
-      schedule EHFinder_Generator_Sources in MoL_CalcRHS
+      if (CCTK_Equals(generator_distribution,"line"))
       {
-        LANG: Fortran
-        STORAGE: generator_arrays
-      } "Calculate the source terms for the generator evolution"
+        schedule EHFinder_Generator_Sources in MoL_CalcRHS
+        {
+          LANG: Fortran
+          STORAGE: generator_arrays
+        } "Calculate the source terms for the generator evolution"
+      }
+      if (CCTK_Equals(generator_distribution,"2D array"))
+      {
+        schedule EHFinder_Generator_Sources_2D in MoL_CalcRHS
+        {
+          LANG: Fortran
+          STORAGE: generator_arrays2
+        } "Calculate the source terms for the 2D generator evolution"
+      }
     }
     if (CCTK_Equals(generator_tracking_method,"interpolate_after"))
     {
@@ -353,7 +372,7 @@ if (CCTK_Equals(mode,"normal"))
       {
         LANG: Fortran
         STORAGE: generator_arrays
-      } "Calculate the source terms for the generator evolution"
+      } "Calculate the source terms2 for the generator evolution"
     }
   }
 
@@ -533,23 +552,23 @@ if (CCTK_Equals(mode,"normal"))
     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
-        STORAGE: generator_arrays
-      } "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
-      {
-        LANG: Fortran
-        STORAGE: generator_arrays
-      } "Calculate the source terms for the generator evolution"
-    }
-  }
+#  if ( evolve_generators)
+#  {
+#    if (CCTK_Equals(generator_tracking_method,"interpolate_before"))
+#    {
+#      schedule EHFinder_Generator_Sources as EGS in MoL_CalcRHS
+#      {
+#        LANG: Fortran
+#        STORAGE: generator_arrays
+#      } "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
+#      {
+#        LANG: Fortran
+#        STORAGE: generator_arrays
+#      } "Calculate the source terms for the generator evolution"
+#    }
+#  }
 }