Enabled PUGH to synchronize groups of arrays in one communication call

rather than doing it sequentially on individual arrays.
Nothing changes for the CCTK routines overloaded by PUGH.

For BAM and other thorns which don't care about groups there is now
a separate interface to synchronize individual arrays.

Also eliminated the restriction to synchronize 1D and 3D arrays only
- now it should do arbitrary dims (not yet tested).


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

1 files changed, 58 insertions, 32 deletions

diff --git a/src/include/pughi.h b/src/include/pughi.h
index 8defba7..f6fdf1c 100644
--- a/src/include/pughi.h
+++ b/src/include/pughi.h
@@ -30,22 +30,22 @@ pGExtras *PUGH_SetupPGExtras(int dim,
                              int *nprocs,
                              int this_proc);
 
-pGA *SetupPGA(void          *parent,
-	      pGExtras      *extras,
-	      pConnectivity *connectivity,
-	      const char    *name,
-	      int            id,
-	      int            varsize, 
-	      int            vtype, 
-	      int            stagger);      
-
-
-void pGH_DumpInfo(pGH *GH);
+pComm *PUGH_SetupGArrayGroupComm(pGH *pughGH,
+                                 int dim,
+                                 int first_var,
+                                 int n_vars,
+                                 int sync_timelevel,
+                                 int vartype,
+                                 pGExtras *extras);
+
+void pGH_DumpInfo(pGH *pughGH);
 int  PUGH_SetupDefaultTopology(int dim, int *nprocs);
-int  pGH_SetupnProcs(pGH *GH,int dim);
-void PUGH_DestroyPGA(pGA **GA);
+int  pGH_SetupnProcs(pGH *pughGH,int dim);
+void PUGH_DestroyGArray(pGA **GA);
+void PUGH_DestroyComm(pComm **comm);
 void PUGH_DestroyConnectivity(pConnectivity **conn);
 void PUGH_DestroyPGExtras(pGExtras **PGExtras);
+void PUGH_DestroyPGH(pGH **pughGH);
 
 int PUGH_GenerateTopology(int dim, int total_procs, int *nprocs);
 
@@ -104,25 +104,6 @@ int PUGH_SetupRemoteSizes(int dim,
                           int *nprocs,
                           pGExtras *this);
 
-pGA *PUGH_SetupPGA(void *parent,
-                   pGExtras *extras,
-                   pConnectivity *connectivity,
-                   const char *name,
-                   int id,
-                   int varsize, 
-                   int vtype, 
-                   int stagger);
-
-int PUGH_EnablePGAStorage(pGA *GA, 
-                          int this_proc,
-                          int zero_memory, 
-                          int padding_active,
-                          int padding_cacheline_bits,
-                          int padding_size,
-                          int padding_address_spacing);
-
-int PUGH_DisableGADataStorage(pGA *GA);
-
 int PUGH_SetupPGExtrasStaggering(int dim,
                                  int *perme,
                                  int stagger,
@@ -133,6 +114,51 @@ int PUGH_SetupPGExtrasStaggering(int dim,
                                  int this_proc,
                                  pGExtras *this);
 
+pGA *PUGH_SetupGArray(void *parent,
+                      pGExtras *extras,
+                      pConnectivity *connectivity,
+                      pComm *comm,
+                      const char *name,
+                      int id,
+                      int varsize, 
+                      int vtype, 
+                      int stagger);
+
+pComm *PUGH_SetupGArrayComm(pGH *pughGH,
+                            int dim,
+                            int var,
+                            int sync_timelevel,
+                            int vartype,
+                            pGExtras *extras);
+
+int PUGH_EnableGArrayGroupStorage(pGH *pughGH,
+                                  int first_var,
+                                  int n_variables,
+                                  int n_timelevels);
+
+int PUGH_EnableGArrayDataStorage(pGA *GA,
+                                 int this_proc,
+                                 int zero_memory,
+                                 int padding_active,
+                                 int padding_cacheline_bits,
+                                 int padding_size,
+                                 int padding_address_spacing);
+
+int PUGH_DisableGArrayDataStorage(pGA *GA);
+
+int PUGH_EnableGArrayComm(pGA *GA,
+                          int commflag);
+
+int PUGH_DisableGArrayComm(pGA *GA);
+
+int PUGH_SyncGArray(pGA *GA);
+
+#ifdef CCTK_MPI
+void PostSendGA     (pGH *pughGH, int dir, pComm *comm);
+void PostReceiveGA  (pGH *pughGH, int dir, pComm *comm);
+void FinishReceiveGA(pGH *pughGH, int dir, pComm *comm);
+#endif
+
 #ifdef _cplusplus
 }
 #endif