Changing to new function CCTK_GroupData

Adding USE_CCTK_PARAMETERS

Removing compiler warnings


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@142 b61c5cb5-eaca-4651-9a7a-d64986f99364

1 files changed, 43 insertions, 62 deletions

diff --git a/src/SetupGroup.c b/src/SetupGroup.c
index bbfe5da..9cf6679 100644
--- a/src/SetupGroup.c
+++ b/src/SetupGroup.c
@@ -194,6 +194,48 @@ int pugh_SetupScalarGroup(pGH *newGH, int vtype, int n_variables, int n_timeleve
 
 int pugh_SetupArrayGroup(pGH *newGH, int vtype, int dim, int n_variables, int n_timelevels)
 {
+  int variable;
+  char *msg;
+  int var_size;
+
+  void ***temp;
+
+  int returncode;
+
+  int level;
+
+  var_size = CCTK_VarTypeSize(vtype);
+
+  /* Call Extras and (connectivity) */
+
+  temp = (void ***)realloc(newGH->variables, 
+			   (newGH->nvariables+n_variables)*sizeof(void **));
+
+  if(temp)
+  {
+    newGH->variables = temp;
+
+    for(variable = 0; variable < n_variables; variable++)
+    {
+      newGH->variables[newGH->nvariables] = 
+	(void **)malloc(n_timelevels*sizeof(void *));
+
+      if(newGH->variables[newGH->nvariables])
+      {
+	for(level = 0; level < n_timelevels; level++)
+	{
+	  /*	  newGH->variables[newGH->nvariables][level] = 
+	    SetupPGV(newGH, 
+		     CCTK_VarName(newGH->nvariables), 
+		     dim, 
+		     var_size, 
+		     vtype,
+		     PUGH_VERTEXCTR);*/
+	}
+	newGH->nvariables++;
+      }
+    }
+  }
 
   fprintf(stderr, "PUGH doesn't yet support array groups, sorry !\n");
   exit(1);
@@ -232,68 +274,7 @@ int pugh_SetupGFGroup(pGH *newGH,
 
   int level;
 
-  switch(vtype)
-  {
-    case CCTK_VARIABLE_CHAR: 
-      var_size = sizeof(CCTK_CHAR); 
-      break;
-
-    case CCTK_VARIABLE_INT: 
-      var_size = sizeof(CCTK_INT) ; 
-      break;
-
-#ifdef CCTK_INT2
-    case CCTK_VARIABLE_INT2: 
-      var_size = sizeof(CCTK_INT2); 
-      break;
-#endif
-
-#ifdef CCTK_INT4
-    case CCTK_VARIABLE_INT4: 
-      var_size = sizeof(CCTK_INT4); 
-      break;
-#endif
-
-#ifdef CCTK_INT8
-    case CCTK_VARIABLE_INT8: 
-      var_size = sizeof(CCTK_INT8); 
-      break;
-#endif
-
-    case CCTK_VARIABLE_REAL: 
-      var_size = sizeof(CCTK_REAL); 
-      break;
-
-#ifdef CCTK_REAL4
-    case CCTK_VARIABLE_REAL4: 
-      var_size = sizeof(CCTK_REAL4); 
-      break;
-#endif
-
-#ifdef CCTK_REAL8
-    case CCTK_VARIABLE_REAL8: 
-      var_size = sizeof(CCTK_REAL8); 
-      break;
-#endif
-
-#ifdef CCTK_REAL16
-    case CCTK_VARIABLE_REAL16: 
-      var_size = sizeof(CCTK_REAL16); 
-      break;
-#endif
-
-    case CCTK_VARIABLE_COMPLEX: 
-      var_size = sizeof(CCTK_COMPLEX); 
-      break;
-
-    default:
-      msg = malloc( 200*sizeof(char) );
-      sprintf(msg,"Unknown variable type (%d) in pugh_SetupGFGroup",vtype);
-      CCTK_WARN(0,msg);
-      free(msg);
-      var_size = 1;
-
-  }
+  var_size = CCTK_VarTypeSize(vtype);
 
   temp = (void ***)realloc(newGH->variables, 
 			   (newGH->nvariables+n_variables)*sizeof(void **));