diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/pGH.h | 18 | ||||
| -rw-r--r-- | src/include/pGV.h | 16 | ||||
| -rw-r--r-- | src/include/pugh.h | 2 | ||||
| -rw-r--r-- | src/include/pugh_constants.h | 14 | ||||
| -rw-r--r-- | src/include/pughi.h | 2 |
5 files changed, 15 insertions, 37 deletions
diff --git a/src/include/pGH.h b/src/include/pGH.h index f21db09..d8ae113 100644 --- a/src/include/pGH.h +++ b/src/include/pGH.h @@ -61,19 +61,19 @@ typedef struct PGH #ifdef PUGH_WITH_DERIVED_DATATYPES /* Derived data types for communication */ - MPI_Datatype send_char_dt [PUGH_NSTAGGER][6]; - MPI_Datatype recv_char_dt [PUGH_NSTAGGER][6]; - MPI_Datatype send_int_dt [PUGH_NSTAGGER][6]; - MPI_Datatype recv_int_dt [PUGH_NSTAGGER][6]; - MPI_Datatype send_real_dt [PUGH_NSTAGGER][6]; - MPI_Datatype recv_real_dt [PUGH_NSTAGGER][6]; - MPI_Datatype send_complex_dt [PUGH_NSTAGGER][6]; - MPI_Datatype recv_complex_dt [PUGH_NSTAGGER][6]; + MPI_Datatype send_char_dt [6]; + MPI_Datatype recv_char_dt [6]; + MPI_Datatype send_int_dt [6]; + MPI_Datatype recv_int_dt [6]; + MPI_Datatype send_real_dt [6]; + MPI_Datatype recv_real_dt [6]; + MPI_Datatype send_complex_dt [6]; + MPI_Datatype recv_complex_dt [6]; #endif #endif /* Used for all grid functions */ - pGExtras **GFExtras; /* [dim] stagger ? */ + pGExtras **GFExtras; /* [dim] */ pConnectivity **Connectivity; /* [dim] */ char *identity_string; /* identifier for this pGH */ diff --git a/src/include/pGV.h b/src/include/pGV.h index 8219847..fad2fa3 100644 --- a/src/include/pGV.h +++ b/src/include/pGV.h @@ -51,17 +51,14 @@ typedef struct PGExtras /* Ghosts and overlaps. */ int *nghostzones; /* Width of ghost zone */ - int *ownership[PUGH_NSTAGGER][2]; - /* The box owned in each direction. */ - /* [stagger][min/max][dir] */ + int *ownership[2]; /* The box owned in each direction. */ + /* [min/max][dir] */ - int **ghosts[PUGH_NSTAGGER][2]; - /* The ghost zones on each face. */ - /* [stagger][min/max][face][dir] */ + int **ghosts[2]; /* The ghost zones on each face. */ + /* [min/max][face][dir] */ - int **overlap[PUGH_NSTAGGER][2]; - /* The overlap region owned on each face. */ - /* [stagger][min/max][face][ijk] */ + int **overlap[2]; /* The overlap region owned on each face. */ + /* [min/max][face][ijk] */ } pGExtras; @@ -96,7 +93,6 @@ typedef struct PGA void *data; /* See the note above. */ int storage; /* Do we have storage or not? */ int npoints; /* Number of points (for memory statistics) */ - int *stagger; /* [dim] directional stagger indicies */ void *parent; /* The GH to which I belong */ /* Note this is struct PGH which is diff --git a/src/include/pugh.h b/src/include/pugh.h index 4ca23f0..8c528af 100644 --- a/src/include/pugh.h +++ b/src/include/pugh.h @@ -131,7 +131,6 @@ int PUGH_SetupGroup (pGH *newGH, int dim, int n_variables, int vectorlength, - int staggercode, int n_timelevels, int vectorgroup); @@ -139,7 +138,6 @@ pGH *PUGH_SetupPGH(void *callerid, int dim, int *nsize, int *nghostzones, - int staggertype, int *perme); void PUGH_GFSize(int dim, int *nsize); diff --git a/src/include/pugh_constants.h b/src/include/pugh_constants.h index d9a919f..1b1fbba 100644 --- a/src/include/pugh_constants.h +++ b/src/include/pugh_constants.h @@ -20,20 +20,6 @@ #define PUGH_NOSTORAGE 0 #define PUGH_STORAGE 1 -/* Constants for the GF Type. Only one now ... */ -/* Number of staggerings available in the code */ -#define PUGH_NSTAGGER 4 - -/* The index for each staggering type */ -/* This classifies each PGF member */ -#define PUGH_VERTEXCTR 0 -#define PUGH_FACECTR(i) i+1 - -/* The index for each staggering type */ -/* This determines the PGH should be set up */ -#define PUGH_NO_STAGGER 0 -#define PUGH_STAGGER 1 - /* Comm types available */ #define PUGH_NOCOMMBUFFERS 0 #define PUGH_ALLOCATEDBUFFERS 1 diff --git a/src/include/pughi.h b/src/include/pughi.h index a37b85a..b934690 100644 --- a/src/include/pughi.h +++ b/src/include/pughi.h @@ -34,7 +34,6 @@ pConnectivity *PUGH_SetupConnectivity(int dim, pGExtras *PUGH_SetupPGExtras(int is_gf, int dim, int *perme, - int stagger, int *sh, int *nghosts, int total_procs, @@ -73,7 +72,6 @@ pGA *PUGH_SetupGArray(void *parent, int arrayid, int varsize, int vtype, - int stagger, int vector_size, int vector_entry, pGA *vector_base); |