diff options
| author | tradke <tradke@b61c5cb5-eaca-4651-9a7a-d64986f99364> | 2003-12-05 18:34:52 +0000 |
|---|---|---|
| committer | tradke <tradke@b61c5cb5-eaca-4651-9a7a-d64986f99364> | 2003-12-05 18:34:52 +0000 |
| commit | 78ce6a1e75410873e280290442438a35eb9c3c50 (patch) | |
| tree | c02a593f277e5de43776b2f8c33c7e20b933decd | |
| parent | 57e99b9915d3f38d2de146074d636f1bd22c0d83 (diff) | |
Fix for my latest commit which broke MPI configurations.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@426 b61c5cb5-eaca-4651-9a7a-d64986f99364
| -rw-r--r-- | src/SetupGroup.c | 4 | ||||
| -rw-r--r-- | src/SetupPGV.c | 14 | ||||
| -rw-r--r-- | src/include/pughi.h | 4 |
3 files changed, 16 insertions, 6 deletions
diff --git a/src/SetupGroup.c b/src/SetupGroup.c index 076fe7c..6b2763c 100644 --- a/src/SetupGroup.c +++ b/src/SetupGroup.c @@ -171,9 +171,11 @@ static int PUGH_SetupGAGroup (pGH *newGH, groupcomm = NULL; if(newGH->commmodel == PUGH_ALLOCATEDBUFFERS) { - groupcomm = PUGH_SetupGArrayGroupComm (dim, + groupcomm = PUGH_SetupGArrayGroupComm (newGH, + dim, newGH->nvariables, n_variables, + vtype, 0, extras); } diff --git a/src/SetupPGV.c b/src/SetupPGV.c index ddbc401..3eca95e 100644 --- a/src/SetupPGV.c +++ b/src/SetupPGV.c @@ -1210,9 +1210,11 @@ static int PUGH_SetupRemoteSizes(int dim, int total_procs, pGExtras *this) Sets up a communication buffer for a group of GAs. @enddesc @@*/ -pComm *PUGH_SetupGArrayGroupComm(int dim, +pComm *PUGH_SetupGArrayGroupComm(pGH *pughGH, + int dim, int first_var, int n_vars, + int vartype, int sync_timelevel, pGExtras *extras) { @@ -1220,6 +1222,11 @@ pComm *PUGH_SetupGArrayGroupComm(int dim, pComm *this; +#ifndef CCTK_MPI + (void) (pughGH + 0); + (void) (vartype + 0); +#endif + this = malloc (sizeof (pComm)); if (this) @@ -1343,9 +1350,8 @@ pComm *PUGH_SetupGArrayComm(pGH *pughGH, pComm *result; - (void) (pughGH + 0); - (void) (vartype + 0); - result = PUGH_SetupGArrayGroupComm(dim, var, 1, sync_timelevel, extras); + result = PUGH_SetupGArrayGroupComm(pughGH, dim, var, 1, vartype, + sync_timelevel, extras); return (result); } diff --git a/src/include/pughi.h b/src/include/pughi.h index 75cf766..766a6ab 100644 --- a/src/include/pughi.h +++ b/src/include/pughi.h @@ -31,9 +31,11 @@ pGExtras *PUGH_SetupPGExtras(int is_gf, int *nprocs, int this_proc); -pComm *PUGH_SetupGArrayGroupComm(int dim, +pComm *PUGH_SetupGArrayGroupComm(pGH *pughGH, + int dim, int first_var, int n_vars, + int vartype, int sync_timelevel, pGExtras *extras); |