Changes to get timelevels working.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@302 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 19 insertions, 4 deletions

diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index b532c996..67ffb693 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 
 #include "flesh.h"
+#include "Groups.h"
 #include "CactusMainDefaults.h"
 #include "GHExtensions.h"
 
@@ -41,6 +42,8 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
   int n_groups;
   int n_variables;
   int variable;
+  int ntimelevels;
+  int level;
 
   retval = NULL;
 
@@ -75,13 +78,26 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
     /* Allocate memory for the variable data pointers.
      * Note we want at least one to prevent memory allocattion from failing !
      */
-    thisGH->data = (void **)malloc((n_variables ? n_variables:1)*sizeof(void *));
+    thisGH->data = (void ***)malloc((n_variables ? n_variables:1)*sizeof(void **));
 
     if(thisGH->data)
     {
       for(variable = 0; variable < n_variables; variable++)
       {
-	thisGH->data[variable] = NULL;
+	ntimelevels = CCTK_GetNumTimeLevels(variable);
+
+	thisGH->data[variable] = (void **)malloc(ntimelevels*sizeof(void *));
+	if(thisGH->data[variable])
+	{
+	  for(level = 0; level < ntimelevels; level++)
+	  {
+	    thisGH->data[variable][level] = NULL;
+	  }
+	}
+	else
+	{
+	  break;
+	}
       }
     }
 
@@ -102,6 +118,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
      thisGH->upper_bound &&
      thisGH->bbox &&
      thisGH->data &&
+     variable == n_variables &&
      thisGH->GroupData)
   {
     /* Traverse list of GH setup routines. */
@@ -112,5 +129,3 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
 
   return retval;
 }
-
-