diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-11-05 17:33:23 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-11-05 17:33:23 +0000 |
| commit | 08dfcb0ca55b252b80364a38623f8787616b1c58 (patch) | |
| tree | ce004624790eef00f496a2a522d8ec84d3dca46a /src/comm | |
| parent | 7429addb5b7f80c1035b59afa239996ff1a58c65 (diff) | |
Undo something from my last commit where I accidentally changed the API
for the fortran wrappers for CCTK_SyncGroup() and CCTK_Barrier().
This will be recommitted at a later time.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2453 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/comm')
| -rw-r--r-- | src/comm/OverloadComm.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c index 9d0b80da..81edab77 100644 --- a/src/comm/OverloadComm.c +++ b/src/comm/OverloadComm.c @@ -110,10 +110,18 @@ int CCTKi_SetupCommFunctions(void) /* Fortran bindings prototypes for the comm functions */ int CCTK_FCALL CCTK_FNAME (CCTK_nProcs) (const cGH *GH); int CCTK_FCALL CCTK_FNAME (CCTK_MyProc) (const cGH *GH); +#if 0 void CCTK_FCALL CCTK_FNAME (CCTK_Barrier) (int *ierr, const cGH *GH); +#else +int CCTK_FCALL CCTK_FNAME(CCTK_Barrier)(const cGH *GH); +#endif void CCTK_FCALL CCTK_FNAME (CCTK_Exit) (int *ierr, cGH *GH, const int *retval); void CCTK_FCALL CCTK_FNAME (CCTK_Abort) (int *ierr, cGH *GH, const int *retval); +#if 0 void CCTK_FCALL CCTK_FNAME (CCTK_SyncGroup) (int *ierr, cGH *GH, ONE_FORTSTRING_ARG); +#else +int CCTK_FCALL CCTK_FNAME(CCTK_SyncGroup)(cGH *GH, ONE_FORTSTRING_ARG); +#endif void CCTK_FCALL CCTK_FNAME (CCTK_EnableGroupComm) (int *ierr, cGH *GH, ONE_FORTSTRING_ARG); void CCTK_FCALL CCTK_FNAME (CCTK_DisableGroupComm) (int *ierr, cGH *GH, ONE_FORTSTRING_ARG); void CCTK_FCALL CCTK_FNAME (CCTK_EnableGroupStorage) (int *ierr, cGH *GH, ONE_FORTSTRING_ARG); @@ -131,10 +139,17 @@ int CCTK_FCALL CCTK_FNAME (CCTK_MyProc) (const cGH *GH) return (CCTK_MyProc (GH)); } +#if 0 void CCTK_FCALL CCTK_FNAME (CCTK_Barrier) (int *ierr, const cGH *GH) { *ierr = CCTK_Barrier (GH); } +#else +int CCTK_FCALL CCTK_FNAME(CCTK_Barrier)(const cGH *GH) +{ + return CCTK_Barrier(GH); +} +#endif void CCTK_FCALL CCTK_FNAME (CCTK_Exit) (int *ierr, cGH *GH, const int *retval) { @@ -146,12 +161,22 @@ void CCTK_FCALL CCTK_FNAME (CCTK_Abort) (int *ierr, cGH *GH, const int *retval) *ierr = CCTK_Abort (GH, *retval); } +#if 0 void CCTK_FCALL CCTK_FNAME (CCTK_SyncGroup) (int *ierr, cGH *GH, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE (group_name) *ierr = CCTK_SyncGroup (GH, group_name); free (group_name); } +#else +int CCTK_FCALL CCTK_FNAME(CCTK_SyncGroup)(cGH *GH, ONE_FORTSTRING_ARG) +{ + ONE_FORTSTRING_CREATE(group_name) + CCTK_SyncGroup(GH,group_name); + free(group_name); + return 0; +} +#endif void CCTK_FCALL CCTK_FNAME (CCTK_EnableGroupComm) (int *ierr, cGH *GH, ONE_FORTSTRING_ARG) { |