diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main/ActiveThorns.c | 8 | ||||
-rw-r--r-- | src/main/Banner.c | 3 | ||||
-rw-r--r-- | src/main/CactusDefaultEvolve.c | 3 | ||||
-rw-r--r-- | src/main/Coord.c | 91 | ||||
-rw-r--r-- | src/main/GHExtensions.c | 3 | ||||
-rw-r--r-- | src/main/Groups.c | 61 | ||||
-rw-r--r-- | src/main/ScheduleInterface.c | 3 | ||||
-rw-r--r-- | src/main/Stagger.c | 16 | ||||
-rw-r--r-- | src/main/WarnLevel.c | 22 |
9 files changed, 105 insertions, 105 deletions
diff --git a/src/main/ActiveThorns.c b/src/main/ActiveThorns.c index 3bfc37b1..0b1efe57 100644 --- a/src/main/ActiveThorns.c +++ b/src/main/ActiveThorns.c @@ -316,7 +316,8 @@ int CCTK_IsThornActive(const char *name) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_IsThornActive)(int *retval, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_IsThornActive) + (int *retval, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *retval = CCTK_IsThornActive(name); @@ -429,7 +430,8 @@ int CCTK_IsThornCompiled(const char *name) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_IsThornCompiled)(int *retval, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_IsThornCompiled) + (int *retval, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *retval = CCTK_IsThornCompiled(name); @@ -477,7 +479,7 @@ int CCTK_IsImplementationActive(const char *name) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_IsImplementationActive) +void CCTK_FCALL CCTK_FNAME(CCTK_IsImplementationActive) (int *retval, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) diff --git a/src/main/Banner.c b/src/main/Banner.c index 4a5ced9d..b8574e02 100644 --- a/src/main/Banner.c +++ b/src/main/Banner.c @@ -131,7 +131,8 @@ int CCTK_RegisterBanner(const char *string) } -void FMODIFIER FORTRAN_NAME(CCTK_RegisterBanner)(int *ierr,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_RegisterBanner) + (int *ierr,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(message) *ierr=CCTK_RegisterBanner(message); diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c index 169b2a5d..c1642da9 100644 --- a/src/main/CactusDefaultEvolve.c +++ b/src/main/CactusDefaultEvolve.c @@ -194,10 +194,9 @@ int CactusDefaultEvolve(tFleshConfig *config) #if 0 ConvergenceReport(config->GH, iteration); - TerminationStepper(config->GH[0]); - #endif + /* Termination has been raised and broadcasted, exit loop*/ if (cactus_terminate==TERMINATION_RAISED_BRDCAST) break; diff --git a/src/main/Coord.c b/src/main/Coord.c index 70082a52..2af37d25 100644 --- a/src/main/Coord.c +++ b/src/main/Coord.c @@ -144,11 +144,8 @@ int CCTK_CoordRegisterI(int dir, int index, const char*name) else { /* Method already exists. */ - char *msg; - msg = (char *)malloc(200*sizeof(char)+strlen(name)); - sprintf(msg,"Coordinate with name -%s- already registered",name); - CCTK_Warn(1,__LINE__,__FILE__,"Cactus",msg); - if (msg) free(msg); + CCTK_VWarn(1,__LINE__,__FILE__,"Cactus", + "Coordinate with name -%s- already registered",name); handle = -1; } @@ -156,7 +153,8 @@ int CCTK_CoordRegisterI(int dir, int index, const char*name) } -void FMODIFIER FORTRAN_NAME(CCTK_CoordRegisterI)(int *handle, int *dir, int *index, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_CoordRegisterI) + (int *handle, int *dir, int *index, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *handle = CCTK_CoordRegisterI(*dir,*index, name); @@ -232,9 +230,8 @@ int CCTK_CoordRegister(int dir, } -void FMODIFIER FORTRAN_NAME(CCTK_CoordRegister)(int *handle, - int *dir, - TWO_FORTSTRINGS_ARGS) +void CCTK_FCALL CCTK_FNAME(CCTK_CoordRegister) + (int *handle,int *dir,TWO_FORTSTRINGS_ARGS) { TWO_FORTSTRINGS_CREATE(gf,name) *handle = CCTK_CoordRegister(*dir, gf, name); @@ -274,20 +271,16 @@ int CCTK_CoordRegisterRange(cGH *GH, } else { - char *msg = (char *) malloc (200*sizeof(char)); - sprintf (msg, "Cannot allocate data for coordinate range\n"); - CCTK_Warn (0,__LINE__,__FILE__,"Cactus", msg); - free (msg); + CCTK_Warn (0,__LINE__,__FILE__,"Cactus", + "Cannot allocate data for coordinate range"); } return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_CoordRegisterRange)(cGH *GH, - CCTK_REAL *lower, - CCTK_REAL *upper, - ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_CoordRegisterRange) + (cGH *GH,CCTK_REAL *lower,CCTK_REAL *upper,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) CCTK_CoordRegisterRange (GH,*lower,*upper,name); @@ -313,18 +306,16 @@ int CCTK_CoordIndex(const char *name) } else { - char *msg; - msg = (char *)malloc( 100*sizeof(char)+strlen(name) ); - sprintf(msg,"Could not find registered coordinate %s",name); - CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg); - if (msg) free(msg); + CCTK_VWarn(2,__LINE__,__FILE__,"Cactus", + "Could not find registered coordinate %s",name); return ERROR_COORDNOTFOUND; } } } -void FMODIFIER FORTRAN_NAME(CCTK_CoordIndex)(int *index, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_CoordIndex) + (int *index, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *index = CCTK_CoordIndex (name); @@ -350,18 +341,16 @@ int CCTK_CoordDir(const char *name) } else { - char *msg; - msg = (char *)malloc( 100*sizeof(char)+strlen(name) ); - sprintf(msg,"Could not find registered coordinate %s",name); - CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg); - if (msg) free(msg); + CCTK_VWarn(2,__LINE__,__FILE__,"Cactus", + "Could not find registered coordinate %s",name); return ERROR_COORDNOTFOUND; } } } -void FMODIFIER FORTRAN_NAME(CCTK_CoordDir)(int *dir, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_CoordDir) + (int *dir, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *dir = CCTK_CoordDir(name); @@ -426,11 +415,8 @@ int CCTK_CoordRange(cGH *GH, } -void FMODIFIER FORTRAN_NAME(CCTK_CoordRange)(int *ierr, - cGH *GH, - CCTK_REAL *lower, - CCTK_REAL *upper, - ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_CoordRange) + (int *ierr,cGH *GH,CCTK_REAL *lower,CCTK_REAL *upper,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *ierr = CCTK_CoordRange (GH,lower,upper,name); @@ -489,11 +475,8 @@ int CCTK_CoordLocalRange(cGH *GH, } -void FMODIFIER FORTRAN_NAME(CCTK_CoordLocalRange)(int *ierr, - cGH *GH, - CCTK_REAL *lower, - CCTK_REAL *upper, - ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_CoordLocalRange) + (int *ierr,cGH *GH,CCTK_REAL *lower,CCTK_REAL *upper,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *ierr = CCTK_CoordLocalRange (GH,lower,upper,name); @@ -523,11 +506,8 @@ int CCTKi_CoordHandle(const char *name) } else { - char *msg; - msg = (char *)malloc( 100*sizeof(char)+strlen(name) ); - sprintf(msg,"Could not find registered coordinate %s",name); - CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg); - if (msg) free(msg); + CCTK_VWarn(2,__LINE__,__FILE__,"Cactus", + "Could not find registered coordinate %s",name); return ERROR_COORDNOTFOUND; } @@ -549,11 +529,8 @@ struct Coordprops *CCTKi_CoordData(const char *name) } else { - char *msg; - msg = (char *)malloc( 100*sizeof(char)+strlen(name) ); - sprintf(msg,"Could not find registered coordinate %s",name); - CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg); - if (msg) free(msg); + CCTK_VWarn(2,__LINE__,__FILE__,"Cactus", + "Could not find registered coordinate %s",name); return NULL; } @@ -571,7 +548,8 @@ int CCTK_RegisterCoordI(int dir, int index, const char*name) return CCTK_CoordRegisterI(dir,index,name); } -void FMODIFIER FORTRAN_NAME(CCTK_RegisterCoord)(int *handle, int *dir, TWO_FORTSTRINGS_ARGS) +void CCTK_FCALL CCTK_FNAME(CCTK_RegisterCoord) + (int *handle, int *dir, TWO_FORTSTRINGS_ARGS) { TWO_FORTSTRINGS_CREATE(gf,name) *handle = CCTK_RegisterCoord(*dir, gf, name); @@ -587,10 +565,8 @@ int CCTK_RegisterCoordRange(cGH *GH, return CCTK_CoordRegisterRange(GH,min,max,coordname); } -void FMODIFIER FORTRAN_NAME(CCTK_RegisterCoordRange)(cGH *GH, - CCTK_REAL *lower, - CCTK_REAL *upper, - ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_RegisterCoordRange) + (cGH *GH,CCTK_REAL *lower,CCTK_REAL *upper,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) CCTK_RegisterCoordRange (GH,*lower,*upper,name); @@ -621,11 +597,8 @@ CCTK_REAL CCTK_CoordOrigin(const char *name) } else { - char *msg; - msg = (char *)malloc( 100*sizeof(char)+strlen(name) ); - sprintf(msg,"Could not find registered coordinate %s",name); - CCTK_Warn(2,__LINE__,__FILE__,"Cactus",msg); - if (msg) free(msg); + CCTK_VWarn(2,__LINE__,__FILE__,"Cactus", + "Could not find registered coordinate %s",name); return ERROR_COORDNOTFOUND; } diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c index 1206f318..f7962096 100644 --- a/src/main/GHExtensions.c +++ b/src/main/GHExtensions.c @@ -466,7 +466,8 @@ int CCTK_GHExtensionHandle(const char *name) return Util_GetHandle(GHExtensions, name, NULL); } -void FMODIFIER FORTRAN_NAME(CCTK_GHExtensionHandle)(int *handle,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GHExtensionHandle) + (int *handle,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *handle = CCTK_GHExtensionHandle(name); diff --git a/src/main/Groups.c b/src/main/Groups.c index ab16d974..86431704 100644 --- a/src/main/Groups.c +++ b/src/main/Groups.c @@ -199,7 +199,8 @@ int CCTK_GroupIndex(const char *fullgroupname) } -void FMODIFIER FORTRAN_NAME(CCTK_GroupIndex)(int *index,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupIndex) + (int *index,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *index = CCTK_GroupIndex(name); @@ -564,7 +565,8 @@ int CCTK_VarIndex(const char *variable_name) } -void FMODIFIER FORTRAN_NAME(CCTK_VarIndex)(int *index,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_VarIndex) + (int *index,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(name) *index = CCTK_VarIndex(name); @@ -591,7 +593,8 @@ int CCTK_MaxDim(void) return maxdim; } -void FMODIFIER FORTRAN_NAME(CCTK_MaxDim)(int *dim) +void CCTK_FCALL CCTK_FNAME(CCTK_MaxDim) + (int *dim) { *dim = CCTK_MaxDim(); } @@ -616,7 +619,8 @@ int CCTK_NumVars(void) return total_variables; } -void FMODIFIER FORTRAN_NAME(CCTK_NumVars)(int *total_variables) +void CCTK_FCALL CCTK_FNAME(CCTK_NumVars) + (int *total_variables) { *total_variables = CCTK_NumVars(); } @@ -641,7 +645,8 @@ int CCTK_NumGroups(void) return n_groups; } -void FMODIFIER FORTRAN_NAME(CCTK_NumGroups)(int *n_groups) +void CCTK_FCALL CCTK_FNAME(CCTK_NumGroups) + (int *n_groups) { *n_groups = CCTK_NumGroups(); } @@ -717,7 +722,8 @@ int CCTK_GroupIndexFromVarI(int var) } -void FMODIFIER FORTRAN_NAME(CCTK_GroupIndexFromVarI)(int *gindex,int *var) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupIndexFromVarI) + (int *gindex,int *var) { *gindex = CCTK_GroupIndexFromVarI(*var); } @@ -744,7 +750,8 @@ int CCTK_GroupIndexFromVar(const char *var) return CCTK_GroupIndexFromVarI(CCTK_VarIndex(var)); } -void FMODIFIER FORTRAN_NAME(CCTK_GroupIndexFromVar)(int *index,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupIndexFromVar) + (int *index,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(var) *index = CCTK_GroupIndexFromVar(var); @@ -866,7 +873,8 @@ int CCTK_GroupTypeNumber(const char *type) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_GroupTypeNumber)(int *number,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupTypeNumber) + (int *number,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(type) *number = CCTK_GroupTypeNumber(type); @@ -948,7 +956,8 @@ int CCTK_VarTypeNumber(const char *type) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_VarTypeNumber)(int *number,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_VarTypeNumber) + (int *number,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(type) *number = CCTK_VarTypeNumber(type); @@ -1063,8 +1072,8 @@ int CCTK_GroupScopeNumber(const char *type) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_GroupScopeNumber)(int *number, - ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupScopeNumber) + (int *number,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(type) *number = CCTK_GroupScopeNumber(type); @@ -1105,8 +1114,8 @@ int CCTK_GroupDistribNumber(const char *dtype) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_GroupDistribNumber)(int *number, - ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupDistribNumber) + (int *number,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(type) *number = CCTK_GroupDistribNumber(type); @@ -1282,7 +1291,8 @@ int CCTK_FirstVarIndexI(int group) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_FirstVarIndexI)(int *first, int *group) +void CCTK_FCALL CCTK_FNAME(CCTK_FirstVarIndexI) + (int *first, int *group) { *first = CCTK_FirstVarIndexI(*group); } @@ -1331,7 +1341,8 @@ int CCTK_NumVarsInGroup(const char *groupname) return CCTK_NumVarsInGroupI(CCTK_GroupIndex(groupname)); } -void FMODIFIER FORTRAN_NAME(CCTK_NumVarsInGroup)(int *num,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_NumVarsInGroup) + (int *num,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(groupname) *num = CCTK_NumVarsInGroup(groupname); @@ -1438,7 +1449,8 @@ int CCTK_VarTypeI(int var) return vtype; } -void FMODIFIER FORTRAN_NAME(CCTK_VarTypeI)(int *type,int *var) +void CCTK_FCALL CCTK_FNAME(CCTK_VarTypeI) + (int *type,int *var) { *type = CCTK_VarTypeI(*var); } @@ -1477,7 +1489,8 @@ int CCTK_NumTimeLevelsFromVarI(int var) return ntimelevels; } -void FMODIFIER FORTRAN_NAME(CCTK_NumTimeLevelsFromVarI)(int *num,int *var) +void CCTK_FCALL CCTK_FNAME(CCTK_NumTimeLevelsFromVarI) + (int *num,int *var) { *num = CCTK_NumTimeLevelsFromVarI(*var); } @@ -1503,7 +1516,8 @@ int CCTK_NumTimeLevelsFromVar(const char *var) return CCTK_NumTimeLevelsFromVarI(CCTK_VarIndex(var)); } -void FMODIFIER FORTRAN_NAME(CCTK_NumTimeLevelsFromVar)(int *num,ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_NumTimeLevelsFromVar) + (int *num,ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(var) *num = CCTK_NumTimeLevelsFromVar(var); @@ -1532,7 +1546,8 @@ void CCTK_PrintGroup(int group) fprintf(stdout,"Group %d is %s\n",group,CCTK_GroupName(group)); } -void FMODIFIER FORTRAN_NAME(CCTK_PrintGroup)(int *group) +void CCTK_FCALL CCTK_FNAME(CCTK_PrintGroup) + (int *group) { CCTK_PrintGroup(*group); } @@ -1559,7 +1574,8 @@ void CCTK_PrintVar(int var) fprintf(stdout,"Variable %d is %s\n",var,CCTK_VarName(var)); } -void FMODIFIER FORTRAN_NAME(CCTK_PrintVar)(int *var) +void CCTK_FCALL CCTK_FNAME(CCTK_PrintVar) + (int *var) { CCTK_PrintGroup(*var); } @@ -1839,7 +1855,8 @@ int CCTK_GroupDimI(int group) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_GroupDimI)(int *dim, int *group) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupDimI) + (int *dim, int *group) { *dim = CCTK_GroupDimI(*group); } @@ -1862,7 +1879,7 @@ int CCTK_GroupDimFromVarI(int vi) return retval; } -void FMODIFIER FORTRAN_NAME(CCTK_GroupDimFromVarI)(int *dim, int *vi) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupDimFromVarI)(int *dim, int *vi) { *dim = CCTK_GroupDimFromVarI(*vi); } diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c index 3d90f2d8..e5f54cce 100644 --- a/src/main/ScheduleInterface.c +++ b/src/main/ScheduleInterface.c @@ -851,7 +851,7 @@ static t_attribute *CreateAttribute(const char *description, CreateGroupIndexList(n_comm_groups, this->comm_groups, ap); CreateGroupIndexList(n_trigger_groups, this->trigger_groups, ap); CreateGroupIndexList(n_sync_groups, this->FunctionData.SyncGroups, ap); - + /* Check the miscellaneous options */ InitialiseOptionList(this); @@ -1443,7 +1443,6 @@ static int CCTKi_ScheduleCallExit(t_attribute *attribute, } /* Synchronise variable groups associated with this schedule group. */ - CCTK_SyncGroupsI(data->GH, attribute->FunctionData.n_SyncGroups, attribute->FunctionData.SyncGroups); diff --git a/src/main/Stagger.c b/src/main/Stagger.c index eb5c5ddc..c11e43f4 100644 --- a/src/main/Stagger.c +++ b/src/main/Stagger.c @@ -60,7 +60,7 @@ int CCTK_GroupStaggerIndexGI(int gindex) return(sc); } -void FMODIFIER FORTRAN_NAME(CCTK_GroupStaggerIndexGI) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupStaggerIndexGI) (int *stagcode, int *gindex) { *stagcode = CCTK_GroupStaggerIndexGI(*gindex); @@ -88,7 +88,8 @@ int CCTK_GroupStaggerIndexGN(const char *gname) return(CCTK_GroupStaggerIndexGI(gindex)); } -void FMODIFIER FORTRAN_NAME(CCTK_GroupStaggerIndexGN)(int *scode, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupStaggerIndexGN) + (int *scode, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(gname) int gindex; @@ -143,7 +144,8 @@ int CCTK_StaggerIndex(const char *stype) return(scode); } -void FMODIFIER FORTRAN_NAME(CCTK_StaggerIndex)(int *scode, ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTK_StaggerIndex) + (int *scode, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(sname); *scode = CCTK_StaggerIndex(sname); @@ -196,7 +198,7 @@ int CCTK_StaggerDirIndex(int dir, int si) -void FMODIFIER FORTRAN_NAME(CCTK_StaggerDirIndex) +void CCTK_FCALL CCTK_FNAME(CCTK_StaggerDirIndex) ( int *dsi, int *dir, int *gsi) { /* accept fortran indexing [1..]: decrease the directional index @@ -251,7 +253,7 @@ int CCTK_StaggerDirArray(int *dindex , int dim, int sindex) } -void FMODIFIER FORTRAN_NAME(CCTK_GroupStaggerDirArray) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupStaggerDirArray) (int *ierr, int *dindex, int *dim, int *gsc) { /* accept fortran indexing [1..]: decrease the directional index @@ -284,7 +286,7 @@ int CCTK_GroupStaggerDirArrayGI(int *dindex, int dim, int gi) return ierr; } -void FMODIFIER FORTRAN_NAME(CCTK_GroupStaggerDirArrayGI) +void CCTK_FCALL CCTK_FNAME(CCTK_GroupStaggerDirArrayGI) (int *ierr, int *dindex, int *dim, int *gi) { *ierr = CCTK_GroupStaggerDirArrayGI(dindex, *dim, *gi); @@ -334,7 +336,7 @@ int CCTK_StaggerDirName(int dir, const char *stype) return(scode); } -void FMODIFIER FORTRAN_NAME(CCTK_StaggerDirName) +void CCTK_FCALL CCTK_FNAME(CCTK_StaggerDirName) (int *dsc, int *dir, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(sname); diff --git a/src/main/WarnLevel.c b/src/main/WarnLevel.c index 7a8efe81..0a1e1d13 100644 --- a/src/main/WarnLevel.c +++ b/src/main/WarnLevel.c @@ -151,7 +151,8 @@ int CCTK_Warn(int level, int line, const char *file, const char *thorn, const ch } -void FMODIFIER FORTRAN_NAME(CCTK_Warn)(int *level, int *line, THREE_FORTSTRINGS_ARGS) +void CCTK_FCALL CCTK_FNAME(CCTK_Warn) + (int *level, int *line, THREE_FORTSTRINGS_ARGS) { THREE_FORTSTRINGS_CREATE(file,thorn,message) @@ -187,7 +188,7 @@ void CCTKi_ExpectError(int in, int err, int warnonerr, int line, } -void FMODIFIER FORTRAN_NAME(CCTKi_ExpectError) +void CCTK_FCALL CCTK_FNAME(CCTKi_ExpectError) (int *in, int *err, int *warnonerr, int *line, THREE_FORTSTRINGS_ARGS) { THREE_FORTSTRINGS_CREATE(file,thorn,message) @@ -224,7 +225,7 @@ void CCTKi_ExpectOK(int in, int ok, int warnonerr, int line, if (in!=ok) CCTK_Warn(warnonerr, line, file, thorn, message); } -void FMODIFIER FORTRAN_NAME(CCTKi_ExpectOK) +void CCTK_FCALL CCTK_FNAME(CCTKi_ExpectOK) (int *in, int *ok, int *warnonerr, int *line, THREE_FORTSTRINGS_ARGS) { THREE_FORTSTRINGS_CREATE(file,thorn,message) @@ -328,7 +329,8 @@ int CCTK_ParamWarn(const char *thorn, const char *message) return 0; } -void FMODIFIER FORTRAN_NAME(CCTK_ParamWarn)(TWO_FORTSTRINGS_ARGS) +void CCTK_FCALL CCTK_FNAME(CCTK_ParamWarn) + (TWO_FORTSTRINGS_ARGS) { TWO_FORTSTRINGS_CREATE(thorn,message) @@ -361,7 +363,8 @@ int CCTK_Info(const char *thorn, const char *message) return 0; } -void FMODIFIER FORTRAN_NAME(CCTK_Info)(TWO_FORTSTRINGS_ARGS) +void CCTK_FCALL CCTK_FNAME(CCTK_Info) + (TWO_FORTSTRINGS_ARGS) { TWO_FORTSTRINGS_CREATE(thorn,message) @@ -518,7 +521,8 @@ void CCTKi_FinaliseParamWarn(void) @endhistory @@*/ -int FMODIFIER FORTRAN_NAME(CCTK_MessageFormat)(ONE_FORTSTRING_ARG) +int CCTK_FCALL CCTK_FNAME(CCTK_MessageFormat) + (ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(format) @@ -527,7 +531,8 @@ int FMODIFIER FORTRAN_NAME(CCTK_MessageFormat)(ONE_FORTSTRING_ARG) return n_formats-1; } -void FMODIFIER FORTRAN_NAME(CCTK_VInfo)(int format_number, ...) +void CCTK_FCALL CCTK_FNAME(CCTK_VInfo) + (int format_number, ...) { char *format_string; char *message; @@ -592,7 +597,8 @@ void CCTKi_NotYetImplemented(const char *message) } -void FMODIFIER FORTRAN_NAME(CCTKi_NotYetImplemented)(ONE_FORTSTRING_ARG) +void CCTK_FCALL CCTK_FNAME(CCTKi_NotYetImplemented) + (ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(message) |