Make MoL independent of dimensions for GFs.

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/MoL/trunk@70 578cdeb0-5ea1-4b81-8215-5a3b8777ee0b

6 files changed, 50 insertions, 12 deletions

diff --git a/src/GenericRK.c b/src/GenericRK.c
index 308ca74..ed2372a 100644
--- a/src/GenericRK.c
+++ b/src/GenericRK.c
@@ -95,8 +95,12 @@ void MoL_GenericRKAdd(CCTK_ARGUMENTS)
 
   CCTK_INT arrayscratchlocation;
 
-  totalsize = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
-
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
+  
   beta = RKBetaCoefficients[MoL_Intermediate_Steps - 
                            (*MoL_Intermediate_Step)];
 
diff --git a/src/ICN.c b/src/ICN.c
index f6bbfd6..9966adb 100644
--- a/src/ICN.c
+++ b/src/ICN.c
@@ -102,7 +102,12 @@ void MoL_ICNAdd(CCTK_ARGUMENTS)
          cctk_time);
 #endif  
 
-  totalsize = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
+
 #ifdef MOLDEBUG
   printf("MoL: the ICN routine says dt = %f.\n", CCTK_DELTA_TIME);
 #endif
@@ -232,7 +237,12 @@ void MoL_ICNAverage(CCTK_ARGUMENTS)
          cctk_time);
 #endif  
 
-  totalsize = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
+
 #ifdef MOLDEBUG
   printf("MoL: the ICN routine says dt = %f.\n", CCTK_DELTA_TIME);
 #endif
diff --git a/src/InitialCopy.c b/src/InitialCopy.c
index 733cfa1..1af0154 100644
--- a/src/InitialCopy.c
+++ b/src/InitialCopy.c
@@ -100,7 +100,11 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
 
 #endif
 
-  totalsize = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
 
   for (var = 0; var < MoLNumEvolvedVariables; var++)
   {
@@ -447,7 +451,11 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
 
 #endif
 
-  totalsize = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
 
   for (var = 0; var < MoLNumEvolvedVariables; var++)
   {
@@ -596,12 +604,16 @@ void MoL_FillAllLevels(CCTK_ARGUMENTS)
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_INT var, level;
-  CCTK_INT totalsize;
+  CCTK_INT totalsize, arraydim;
 
   CCTK_REAL *CurrentVar;
   CCTK_REAL *PreviousVar;
 
-  totalsize = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
 
   for (var = 0; var < MoLNumEvolvedVariables; var++)
   {
diff --git a/src/RK2.c b/src/RK2.c
index eef8ce7..8316244 100644
--- a/src/RK2.c
+++ b/src/RK2.c
@@ -100,7 +100,11 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
          cctk_time);
 #endif  
 
-  totalsize = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
 
   switch (*MoL_Intermediate_Step)
   {
diff --git a/src/RK3.c b/src/RK3.c
index 5c52d0c..df6982b 100644
--- a/src/RK3.c
+++ b/src/RK3.c
@@ -105,7 +105,11 @@ void MoL_RK3Add(CCTK_ARGUMENTS)
          cctk_time);
 #endif  
 
-  totalsize = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
 
   switch (*MoL_Intermediate_Step)
   {
diff --git a/src/SandR.c b/src/SandR.c
index 9761d3a..5954a53 100644
--- a/src/SandR.c
+++ b/src/SandR.c
@@ -75,7 +75,7 @@ void MoL_RestoreSandR(CCTK_ARGUMENTS)
   DECLARE_CCTK_PARAMETERS;
   
   CCTK_INT /*  index, */ var;
-  CCTK_INT totalsize;
+  CCTK_INT totalsize, arraydim;
   CCTK_REAL *SandRDataArray;
   CCTK_REAL *ScratchVar;
 
@@ -88,7 +88,11 @@ void MoL_RestoreSandR(CCTK_ARGUMENTS)
 
 #endif
   
-  totalsize = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
+  totalsize = 1;
+  for (arraydim = 0; arraydim < cctk_dim; arraydim++)
+  {
+    totalsize *= cctk_lsh[arraydim];
+  }
 
   for (var = 0; var < MoLNumSandRVariables; var++) 
   {