1 files changed, 10 insertions, 47 deletions

diff --git a/src/SetupGroup.c b/src/SetupGroup.c
index e619935..3cf4d57 100644
--- a/src/SetupGroup.c
+++ b/src/SetupGroup.c
@@ -79,61 +79,24 @@ static int PUGH_SetupScalarGroup (pGH *newGH,
                                   int n_timelevels)
 {
   DECLARE_CCTK_PARAMETERS
-  int retval;
-  int variable, level;
-  int var_size;
-  void ***temp;
-  const char *vtypename;
+  int variable, retval;
+  void *temp;
 
 
-  retval = PUGH_SUCCESS;
-  var_size = CCTK_VarTypeSize (vtype);
+  retval = 0;  /* PUGH_SUCCESS */
 
-  temp = (void ***) realloc (newGH->variables,
-                             (newGH->nvariables + n_variables)*sizeof(void **));
-  if(temp)
+  temp = realloc (newGH->variables,
+                  (newGH->nvariables + n_variables) * sizeof (void **));
+  if (temp)
   {
-    newGH->variables = temp;
+    newGH->variables = (void ***) temp;
 
     for (variable = 0; variable < n_variables; variable++)
     {
-      newGH->variables[newGH->nvariables] = (void **) malloc (n_timelevels *
-                                                              sizeof (void *));
-      if(newGH->variables[newGH->nvariables])
+      temp = (void **) calloc (n_timelevels, sizeof (void *));
+      if (temp)
       {
-        for (level = 0; level < n_timelevels; level++)
-        {
-          newGH->variables[newGH->nvariables][level] = malloc (var_size);
-
-          /* Initialize the memory if desired. */
-          if (newGH->variables[newGH->nvariables][level] &&
-              ! CCTK_Equals (initialize_memory, "none"))
-          {
-            /* zero out variable */
-            if (CCTK_Equals (initialize_memory, "zero"))
-            {
-              memset (newGH->variables[newGH->nvariables][level], 0, var_size);
-            }
-            /* set elements to Not-a-Number values
-               (floating point variables only) */
-            else if (CCTK_Equals (initialize_memory, "NaN"))
-            {
-              vtypename = CCTK_VarTypeName (vtype);
-              if (strncmp (vtypename, "CCTK_VARIABLE_REAL",    18) == 0 ||
-                  strncmp (vtypename, "CCTK_VARIABLE_COMPLEX", 22) == 0)
-              {
-                memset (newGH->variables[newGH->nvariables][level],-1,var_size);
-              }
-            }
-            else
-            {
-              CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
-                          "PUGH_SetupScalarGroup: Unknown keyword '%s' for "
-                          "parameter 'initialize_memory'", initialize_memory);
-            }
-          }
-        }
-        newGH->nvariables++;
+        newGH->variables[newGH->nvariables++] = (void **) temp;
       }
       else
       {