Allow vector groups of scalars.

Allow vector groups with more than one declared variable.

Much of this patch consists of removing special case code for scalars.
Scalars are now almost everywhere treated as rank 0 arrays.


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

2 files changed, 7 insertions, 8 deletions

diff --git a/src/include/pGV.h b/src/include/pGV.h
index fd6edd8..250a653 100644
--- a/src/include/pGV.h
+++ b/src/include/pGV.h
@@ -18,7 +18,7 @@ extern "C"
 
 #define DATINDEX(GH,i,j,k) ((i) + GH->lnsize[0]*((j)+GH->lnsize[1]*(k)))
 
-typedef enum {pgv_none, pgv_scalar, pgv_array, pgv_gf} pgv_type;
+typedef enum {pgv_none, pgv_array, pgv_gf} pgv_type;
 
 typedef struct PConnectivity
 {
@@ -28,12 +28,6 @@ typedef struct PConnectivity
   int *perme;         /* Is the system periodic? */
 } pConnectivity;
 
-typedef struct PGS
-{
-  int vtype;
-  void *data;
-} pGS;
-
 typedef struct PGExtras
 {
   int   dim;                    /* dimension of GA */
@@ -129,7 +123,6 @@ typedef struct PGV
 {
   pgv_type type;
 
-  pGS *scalar;
   pGA *array;
 } pGV;
 
diff --git a/src/include/pugh.h b/src/include/pugh.h
index d9ddd4b..a90a693 100644
--- a/src/include/pugh.h
+++ b/src/include/pugh.h
@@ -126,6 +126,7 @@ int PUGH_SetupGroup (pGH *newGH,
                      int  vtype,
                      int  dim,
                      int  n_variables,
+                     int  vectorlength,
                      int  staggercode,
                      int  n_timelevels,
                      int  vectorgroup);
@@ -151,6 +152,11 @@ int PUGH_GetBounds(int dim,
                    int *nprocs,
                    int *nsize);
 
+void PUGH_InitializeMemory (const char *do_initialize_memory,
+                            int vtype,
+			    int bytes,
+			    void *data);
+
 int PUGH_Terminate (cGH *GH);
 
 int PUGH_ParallelInit(cGH *GH);