diff options
author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-05-10 11:47:43 +0000 |
---|---|---|
committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-05-10 11:47:43 +0000 |
commit | 156ca7c447ef63ace625ff58187260a371ad5517 (patch) | |
tree | f7eb3df8e449fda25929824836c6b6130efa9e9b /src/comm | |
parent | 96c60b1271238d6e7361c149596046d8839355ae (diff) |
New macros for fortran calls
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1637 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/comm')
-rw-r--r-- | src/comm/CactusSync.c | 9 | ||||
-rw-r--r-- | src/comm/Interp.c | 69 | ||||
-rw-r--r-- | src/comm/OverloadComm.c | 14 | ||||
-rw-r--r-- | src/comm/Reduction.c | 152 |
4 files changed, 139 insertions, 105 deletions
diff --git a/src/comm/CactusSync.c b/src/comm/CactusSync.c index eb91a165..fb1b2494 100644 --- a/src/comm/CactusSync.c +++ b/src/comm/CactusSync.c @@ -49,7 +49,8 @@ void CCTK_SyncGroupI(cGH *GH, free(groupname); } -void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupI)(cGH *GH, int *groupi) +void CCTK_FCALL CCTK_FNAME(CCTK_SyncGroupI) + (cGH *GH, int *groupi) { CCTK_SyncGroupI(GH, *groupi); } @@ -80,7 +81,8 @@ void CCTK_SyncGroupWithVar(cGH *GH, CCTK_SyncGroupI(GH,groupi); } -void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupWithVar)(cGH *GH, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_SyncGroupWithVar) + (cGH *GH, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(varn); CCTK_SyncGroupWithVar(GH,varn); @@ -113,7 +115,8 @@ void CCTK_SyncGroupWithVarI(cGH *GH, CCTK_SyncGroupI(GH,groupi); } -void FMODIFIER FORTRAN_NAME(CCTK_SyncGroupWithVarI)(cGH *GH, int *vari) +void CCTK_FCALL CCTK_FNAME(CCTK_SyncGroupWithVarI) + (cGH *GH, int *vari) { CCTK_SyncGroupWithVarI(GH,*vari); } diff --git a/src/comm/Interp.c b/src/comm/Interp.c index a70fc041..f88f192f 100644 --- a/src/comm/Interp.c +++ b/src/comm/Interp.c @@ -129,13 +129,15 @@ int CCTK_GetInterpHandle(const char *interp) #endif if (handle < 0) - CCTK_Warn(1,__LINE__,__FILE__,"Cactus","No handle found for this interpolation operator"); + CCTK_Warn(1,__LINE__,__FILE__,"Cactus", + "No handle found for this interpolation operator"); return handle; } -void FMODIFIER FORTRAN_NAME(CCTK_GetInterpHandle)(int *handle, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GetInterpHandle) + (int *handle, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(interp) *handle = CCTK_GetInterpHandle(interp); @@ -320,21 +322,23 @@ int CCTK_InterpGF (cGH *GH, } else - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Interpolation operation is not registered and cannot be called"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Interpolation operation not registered and cannot be called"); } return retcode; } -void FMODIFIER FORTRAN_NAME(CCTK_InterpGF)(int *fortranreturn, - cGH *GH, - int *operation_handle, - int *nPoints, - int *nDims, - int *nInFields, - int *nOutFields, - ...) +void CCTK_FCALL CCTK_FNAME(CCTK_InterpGF) + (int *fortranreturn, + cGH *GH, + int *operation_handle, + int *nPoints, + int *nDims, + int *nInFields, + int *nOutFields, + ...) { va_list indices; int i, retcode; @@ -352,7 +356,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_InterpGF)(int *fortranreturn, if (*operation_handle < 0) - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Invalid handle passed to CCTK_Interp"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Invalid handle passed to CCTK_Interp"); else { @@ -381,7 +386,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_InterpGF)(int *fortranreturn, timelevel = CCTK_NumTimeLevelsFromVarI (index); retcode = 0; if (timelevel < 0) { - CCTK_Warn (1,__LINE__,__FILE__,"Cactus", "Invalid variable index in CCTK_InterpGF()"); + CCTK_Warn (1,__LINE__,__FILE__,"Cactus", + "Invalid variable index in CCTK_InterpGF()"); retcode = -1; } else { if (--timelevel > 0) @@ -417,7 +423,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_InterpGF)(int *fortranreturn, } else - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Interpolation operation is not registered and cannot be called"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Interpolation operation not registered and cannot be called"); } *fortranreturn = retcode; @@ -598,7 +605,8 @@ int CCTK_Interp (cGH *GH, break; default: - CCTK_Warn(1,__LINE__,__FILE__,"Cactus", "Invalid variable type for coordinates"); + CCTK_Warn(1,__LINE__,__FILE__,"Cactus", + "Invalid variable type for coordinates"); retcode = -1; break; } @@ -632,7 +640,8 @@ int CCTK_Interp (cGH *GH, break; default: - CCTK_Warn (1,__LINE__,__FILE__,"Cactus", "Invalid variable type for coordinates"); + CCTK_Warn (1,__LINE__,__FILE__,"Cactus", + "Invalid variable type for coordinates"); retcode = -1; break; } @@ -677,7 +686,7 @@ int CCTK_Interp (cGH *GH, else { CCTK_Warn(3,__LINE__,__FILE__,"Cactus", - "Interpolation operation is not registered and cannot be called"); + "Interpolation operation not registered and cannot be called"); } } @@ -685,14 +694,15 @@ int CCTK_Interp (cGH *GH, } -void FMODIFIER FORTRAN_NAME(CCTK_Interp)(int *fortranreturn, - cGH *GH, - int *operation_handle, - int *nPoints, - int *nDims, - int *nInFields, - int *nOutFields, - ...) +void CCTK_FCALL CCTK_FNAME(CCTK_Interp) + (int *fortranreturn, + cGH *GH, + int *operation_handle, + int *nPoints, + int *nDims, + int *nInFields, + int *nOutFields, + ...) { va_list indices; int i, retcode; @@ -710,7 +720,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_Interp)(int *fortranreturn, if (*operation_handle < 0) - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Invalid handle passed to CCTK_Interp"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Invalid handle passed to CCTK_Interp"); else { @@ -798,7 +809,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_Interp)(int *fortranreturn, break; default: - CCTK_Warn (1,__LINE__,__FILE__,"Cactus", "Invalid variable type for coordinates"); + CCTK_Warn (1,__LINE__,__FILE__,"Cactus", + "Invalid variable type for coordinates"); retcode = -1; break; } @@ -829,7 +841,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_Interp)(int *fortranreturn, free (dims); } else - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Interpolation operation is not registered and cannot be called"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Interpolation operation not registered and cannot be called"); } *fortranreturn = retcode; diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c index 9a62a3e6..1bb861f6 100644 --- a/src/comm/OverloadComm.c +++ b/src/comm/OverloadComm.c @@ -107,23 +107,23 @@ int CCTKi_SetupCommFunctions(void) -int FMODIFIER FORTRAN_NAME(CCTK_Exit)(int *retval, cGH *GH) +int CCTK_FCALL CCTK_FNAME(CCTK_Exit)(int *retval, cGH *GH) { return CCTK_Exit(*retval, GH); } -int FMODIFIER FORTRAN_NAME(CCTK_ParallelInit)(cGH *GH) +int CCTK_FCALL CCTK_FNAME(CCTK_ParallelInit)(cGH *GH) { return CCTK_ParallelInit(GH); } -int FMODIFIER FORTRAN_NAME(CCTK_Abort)(cGH *GH) +int CCTK_FCALL CCTK_FNAME(CCTK_Abort)(cGH *GH) { CCTK_Abort(GH); return 0; } -int FMODIFIER FORTRAN_NAME(CCTK_SyncGroup)(cGH *GH, ONE_FORTSTRING_ARG) +int CCTK_FCALL CCTK_FNAME(CCTK_SyncGroup)(cGH *GH, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(group_name) CCTK_SyncGroup(GH,group_name); @@ -131,17 +131,17 @@ int FMODIFIER FORTRAN_NAME(CCTK_SyncGroup)(cGH *GH, ONE_FORTSTRING_ARG) return 0; } -int FMODIFIER FORTRAN_NAME(CCTK_nProcs)(cGH *GH) +int CCTK_FCALL CCTK_FNAME(CCTK_nProcs)(cGH *GH) { return CCTK_nProcs(GH); } -int FMODIFIER FORTRAN_NAME(CCTK_MyProc)(cGH *GH) +int CCTK_FCALL CCTK_FNAME(CCTK_MyProc)(cGH *GH) { return CCTK_MyProc(GH); } -int FMODIFIER FORTRAN_NAME(CCTK_Barrier)(cGH *GH) +int CCTK_FCALL CCTK_FNAME(CCTK_Barrier)(cGH *GH) { return CCTK_Barrier(GH); } diff --git a/src/comm/Reduction.c b/src/comm/Reduction.c index 8e4202c6..d28049d7 100644 --- a/src/comm/Reduction.c +++ b/src/comm/Reduction.c @@ -75,7 +75,8 @@ int CCTK_RegisterReductionOperator( else { /* Reduction operator with this name already exists. */ - CCTK_Warn(1,__LINE__,__FILE__,"Cactus","Reduction operator with this name already exists"); + CCTK_Warn(1,__LINE__,__FILE__,"Cactus", + "Reduction operator with this name already exists"); handle = -1; } @@ -124,13 +125,14 @@ int CCTK_ReductionHandle(const char *reduction) #endif if (handle < 0) - CCTK_Warn(1,__LINE__,__FILE__,"Cactus","No handle found for this reduction operator"); + CCTK_Warn(1,__LINE__,__FILE__,"Cactus", + "No handle found for this reduction operator"); return handle; } -void FMODIFIER FORTRAN_NAME(CCTK_ReductionHandle)(int *handle, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_ReductionHandle)(int *handle, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(reduction) *handle = CCTK_ReductionHandle(reduction); @@ -207,7 +209,8 @@ int CCTK_Reduce(cGH *GH, /* Get the pointer to the reduction operator */ if (operation_handle < 0) { - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Invalid handle passed to CCTK_Reduce"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Invalid handle passed to CCTK_Reduce"); return (-1); } @@ -216,7 +219,8 @@ int CCTK_Reduce(cGH *GH, if (! function) { - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Reduction operation is not registered and cannot be called"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Reduction operation is not registered and cannot be called"); return (-1); } @@ -235,15 +239,16 @@ int CCTK_Reduce(cGH *GH, return (0); } -void FMODIFIER FORTRAN_NAME(CCTK_Reduce)(int *fortranreturn, - cGH *GH, - int *proc, - int *operation_handle, - int *num_out_vals, - int *type_out_vals, - void *out_vals, - int *num_in_fields, - ... ) +void CCTK_FCALL CCTK_FNAME(CCTK_Reduce) + (int *fortranreturn, + cGH *GH, + int *proc, + int *operation_handle, + int *num_out_vals, + int *type_out_vals, + void *out_vals, + int *num_in_fields, + ... ) { va_list indices; int i; @@ -256,7 +261,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_Reduce)(int *fortranreturn, if (*operation_handle < 0) { - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Invalid handle passed to CCTK_Reduce"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Invalid handle passed to CCTK_Reduce"); return; } @@ -266,7 +272,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_Reduce)(int *fortranreturn, if (! function) { - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Reduction operation is not registered and cannot be called"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Reduction operation is not registered and cannot be called"); return; } @@ -327,7 +334,8 @@ int CCTK_RegisterReductionArrayOperator else { /* Reduction operator with this name already exists. */ - CCTK_Warn(1,__LINE__,__FILE__,"Cactus","Array reduction operator with this name already exists"); + CCTK_Warn(1,__LINE__,__FILE__,"Cactus", + "Array reduction operator with this name already exists"); handle = -1; } @@ -376,14 +384,15 @@ int CCTK_ReductionArrayHandle(const char *reduction) #endif if (handle < 0) - CCTK_Warn(1,__LINE__,__FILE__,"Cactus","No handle found for this array reduction operator"); + CCTK_Warn(1,__LINE__,__FILE__,"Cactus", + "No handle found for this array reduction operator"); return handle; } -void FMODIFIER FORTRAN_NAME(CCTK_ReductionArrayHandle) - (int *operation_handle, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_ReductionArrayHandle) + (int *operation_handle, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(reduction) *operation_handle = CCTK_ReductionArrayHandle(reduction); @@ -479,7 +488,8 @@ int CCTK_ReduceArray(cGH *GH, /* Get the pointer to the reduction operator */ if (operation_handle < 0) { - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Invalid handle passed to CCTK_ReduceArray"); + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Invalid handle passed to CCTK_ReduceArray"); return (-1); } @@ -488,7 +498,8 @@ int CCTK_ReduceArray(cGH *GH, if (! function) { - CCTK_Warn(3,__LINE__,__FILE__,"Cactus","Array reduction operation is not registered " + CCTK_Warn(3,__LINE__,__FILE__,"Cactus", + "Array reduction operation is not registered " "and cannot be called"); return (-1); } @@ -519,17 +530,18 @@ int CCTK_ReduceArray(cGH *GH, return (0); } -void FMODIFIER FORTRAN_NAME(CCTK_ReduceArray)(int *fortran_return, - cGH *GH, - int *proc, - int *operation_handle, - int *num_out_vals, - int *type_out_vals, - void *out_vals, - int *num_dims, - int *num_in_arrays, - int *type_in_arrays, - ... ) +void CCTK_FCALL CCTK_FNAME(CCTK_ReduceArray) + (int *fortran_return, + cGH *GH, + int *proc, + int *operation_handle, + int *num_out_vals, + int *type_out_vals, + void *out_vals, + int *num_dims, + int *num_in_arrays, + int *type_in_arrays, + ... ) { va_list varargs; @@ -545,7 +557,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_ReduceArray)(int *fortran_return, /* Get the pointer to the reduction operator */ if (*operation_handle < 0) { - CCTK_Warn (3,__LINE__,__FILE__,"Cactus","Invalid handle passed to CCTK_ReduceArray"); + CCTK_Warn (3,__LINE__,__FILE__,"Cactus", + "Invalid handle passed to CCTK_ReduceArray"); return; } @@ -554,7 +567,8 @@ void FMODIFIER FORTRAN_NAME(CCTK_ReduceArray)(int *fortran_return, if (! function) { - CCTK_Warn (3,__LINE__,__FILE__,"Cactus", "Array reduction operation is not registered " + CCTK_Warn (3,__LINE__,__FILE__,"Cactus", + "Array reduction operation is not registered " "and cannot be called"); return; } @@ -636,13 +650,14 @@ int CCTK_ReduceLocalScalar (cGH *GH, int proc, int operation_handle, } /*** FIXME: OLD INTERFACE gerd ***/ -void FMODIFIER FORTRAN_NAME(CCTK_ReduceLocalScalar)(int *fortran_return, - cGH *GH, - int *proc, - int *operation_handle, - void *in_scalar, - void *out_scalar, - int *data_type) +void CCTK_FCALL CCTK_FNAME(CCTK_ReduceLocalScalar) + (int *fortran_return, + cGH *GH, + int *proc, + int *operation_handle, + void *in_scalar, + void *out_scalar, + int *data_type) { *fortran_return = CCTK_ReduceArray (GH, *proc, *operation_handle, 1, *data_type, out_scalar, @@ -658,13 +673,14 @@ int CCTK_ReduceLocScalar (cGH *GH, int proc, int operation_handle, 1, 1, data_type, 1, in_scalar)); } -void FMODIFIER FORTRAN_NAME(CCTK_ReduceLocScalar)(int *fortran_return, - cGH *GH, - int *proc, - int *operation_handle, - void *in_scalar, - void *out_scalar, - int *data_type) +void CCTK_FCALL CCTK_FNAME(CCTK_ReduceLocScalar) + (int *fortran_return, + cGH *GH, + int *proc, + int *operation_handle, + void *in_scalar, + void *out_scalar, + int *data_type) { *fortran_return = CCTK_ReduceArray (GH, *proc, *operation_handle, 1, *data_type, out_scalar, @@ -711,14 +727,15 @@ int CCTK_ReduceLocArrayToArray1D(cGH *GH, int proc, int operation_handle, } /*** FIXME: OLD INTERFACE gerd ***/ -void FMODIFIER FORTRAN_NAME(CCTK_ReduceLocalArray1D)(int *fortran_return, - cGH *GH, - int *proc, - int *operation_handle, - void *in_array1d, - void *out_array1d, - int *num_in_array1d, - int *data_type) +void CCTK_FCALL CCTK_FNAME(CCTK_ReduceLocalArray1D) + (int *fortran_return, + cGH *GH, + int *proc, + int *operation_handle, + void *in_array1d, + void *out_array1d, + int *num_in_array1d, + int *data_type) { *fortran_return = CCTK_ReduceArray (GH, *proc, *operation_handle, *num_in_array1d, *data_type, out_array1d, @@ -744,14 +761,15 @@ void FMODIFIER FORTRAN_NAME(CCTK_ReduceLocalArray1D)(int *fortran_return, @@*/ -void FMODIFIER FORTRAN_NAME(CCTK_ReduceLocArrayToArray1D)(int *fortran_return, - cGH *GH, - int *proc, - int *operation_handle, - void *in_array1d, - void *out_array1d, - int *num_in_array1d, - int *data_type) +void CCTK_FCALL CCTK_FNAME(CCTK_ReduceLocArrayToArray1D) + (int *fortran_return, + cGH *GH, + int *proc, + int *operation_handle, + void *in_array1d, + void *out_array1d, + int *num_in_array1d, + int *data_type) { *fortran_return = CCTK_ReduceArray (GH, *proc, *operation_handle, *num_in_array1d, *data_type, out_array1d, @@ -790,7 +808,7 @@ int CCTK_ReduceLocArrayToArray2D(cGH *GH, int proc, int operation_handle, xsize,ysize, in_array2d)); } -void FMODIFIER FORTRAN_NAME(CCTK_ReduceLocArrayToArray2D) +void CCTK_FCALL CCTK_FNAME(CCTK_ReduceLocArrayToArray2D) (int *fortran_return, cGH *GH, int *proc, int *operation_handle, @@ -839,7 +857,7 @@ int CCTK_ReduceLocArrayToArray3D(cGH *GH, int proc, int operation_handle, in_array3d)); } -void FMODIFIER FORTRAN_NAME(CCTK_ReduceLocArrayToArray3D) +void CCTK_FCALL CCTK_FNAME(CCTK_ReduceLocArrayToArray3D) (int *fortran_return, cGH *GH, int *proc, int *operation_handle, |