diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/cctk_Coord.h | 6 | ||||
-rw-r--r-- | src/include/cctk_Faces.h | 2 | ||||
-rw-r--r-- | src/include/cctk_Parameter.h | 2 | ||||
-rw-r--r-- | src/include/cctk_Reduction.h | 22 | ||||
-rw-r--r-- | src/include/util_ErrorCodes.h | 41 | ||||
-rw-r--r-- | src/include/util_Table.h | 10 | ||||
-rw-r--r-- | src/main/Complex.c | 6 | ||||
-rw-r--r-- | src/main/Coord.c | 30 | ||||
-rw-r--r-- | src/main/Parameters.c | 12 | ||||
-rw-r--r-- | src/main/ProcessParameterDatabase.c | 24 | ||||
-rw-r--r-- | src/main/SetParams.c | 84 | ||||
-rw-r--r-- | src/main/Stagger.c | 22 | ||||
-rw-r--r-- | src/util/CactusTimers.c | 38 | ||||
-rw-r--r-- | src/util/Misc.c | 2 | ||||
-rw-r--r-- | src/util/Table.c | 2 |
15 files changed, 150 insertions, 153 deletions
diff --git a/src/include/cctk_Coord.h b/src/include/cctk_Coord.h index 12e4ca0a..252dfd29 100644 --- a/src/include/cctk_Coord.h +++ b/src/include/cctk_Coord.h @@ -9,7 +9,7 @@ @@*/ #ifndef _CCTK_COORD_H_ -#define _CCTK_COORD_H_ +#define _CCTK_COORD_H_ 1 #ifdef __cplusplus extern "C" @@ -47,8 +47,8 @@ int CCTK_CoordRegisterData(int dir, #define CCTK_CoordRegisterSystem(a,b) \ CCTKi_CoordRegisterSystem (a,CCTK_THORNSTRING,b) int CCTKi_CoordRegisterSystem(int dim, - const char *implementation, - const char *systemname); + const char *implementation, + const char *systemname); int CCTK_CoordSystemDim(const char *systemname); diff --git a/src/include/cctk_Faces.h b/src/include/cctk_Faces.h index 5e41557e..878609eb 100644 --- a/src/include/cctk_Faces.h +++ b/src/include/cctk_Faces.h @@ -4,7 +4,7 @@ @author David Rideout @desc Macros for generic specification of sets of 'faces' of an - 'n-cube' + 'n-cube' @enddesc @version $Header$ @@*/ diff --git a/src/include/cctk_Parameter.h b/src/include/cctk_Parameter.h index acc7bfc8..7c11db74 100644 --- a/src/include/cctk_Parameter.h +++ b/src/include/cctk_Parameter.h @@ -154,7 +154,7 @@ const cParamData *CCTK_ParameterData (const char *name, /* Return number of times a parameter has been set */ int CCTK_ParameterQueryTimesSet(const char *name, - const char *thorn); + const char *thorn); #ifdef __cplusplus diff --git a/src/include/cctk_Reduction.h b/src/include/cctk_Reduction.h index 861aec76..6d7c0d73 100644 --- a/src/include/cctk_Reduction.h +++ b/src/include/cctk_Reduction.h @@ -9,7 +9,7 @@ @@*/ #ifndef _CCTK_REDUCTION_H_ -#define _CCTK_REDUCTION_H_ +#define _CCTK_REDUCTION_H_ 1 #define REDUCTION_OPERATOR_REGISTER_ARGLIST \ const cGH *arg_GH, \ @@ -63,12 +63,12 @@ extern "C" /* prototype for reduction operator routine */ typedef int (*cReduceOperator) (const cGH *GH, - int arg_proc, - int arg_num_outvals, - int arg_outtype, - void *arg_outvals, - int arg_num_invars, - const int arg_varlist[]); + int arg_proc, + int arg_num_outvals, + int arg_outtype, + void *arg_outvals, + int arg_num_invars, + const int arg_varlist[]); /* prototype for local array reduction operator routine */ typedef int (*cLocalArrayReduceOperator) (int N_dims, int operator_handle, @@ -105,8 +105,8 @@ int CCTK_ReductionHandle(const char *reduction); CCTKi_RegisterReductionOperator(CCTK_THORNSTRING,a,b) int CCTKi_RegisterReductionOperator(const char *thorn, - cReduceOperator operatorGV, - const char *name); + cReduceOperator operatorGV, + const char *name); int CCTK_ReductionArrayHandle(const char *reduction); @@ -138,8 +138,8 @@ int CCTK_LocalArrayReductionHandle(const char *reduction); CCTKi_RegisterLocalArrayReductionOperator(CCTK_THORNSTRING,a,b) int CCTKi_RegisterLocalArrayReductionOperator(const char *thorn, - cLocalArrayReduceOperator operatorGV, - const char *name); + cLocalArrayReduceOperator operatorGV, + const char *name); int CCTK_RegisterReductionLocalArrayOperator( int (*function)(REDUCTION_LOCAL_ARRAY_OPERATOR_REGISTER_ARGLIST), diff --git a/src/include/util_ErrorCodes.h b/src/include/util_ErrorCodes.h index c479235f..9551d385 100644 --- a/src/include/util_ErrorCodes.h +++ b/src/include/util_ErrorCodes.h @@ -1,19 +1,16 @@ -/* util_ErrorCodes.h -- header for Util_* error codes */ -/* $Id$ */ - /*@@ - @file util_ErrorCodes.h - @header util_ErrorCodes.h - @version $Header$ - @date Wed Nov 7 16:16:08 CET 2001 - @author Jonathan Thornburg <jthorn@aei.mpg.de> - @desc - This header defines the error codes returned by Util_* functions. + @file util_ErrorCodes.h + @date Wed Nov 7 16:16:08 CET 2001 + @author Jonathan Thornburg <jthorn@aei.mpg.de> + @header util_ErrorCodes.h + @version $Header$ + @desc + This header defines the error codes returned by Util_* functions. + @enddesc @@*/ #ifndef _UTIL_ERRORCODES_H_ -#define _UTIL_ERRORCODES_H_ 1 /* define to 1 is Cactus standard */ - /* n.b. usual standard is empty defn! */ +#define _UTIL_ERRORCODES_H_ 1 /******************************************************************************/ @@ -24,23 +21,23 @@ */ /*@@ - @defines UTIL_ERROR_NO_MEMORY - @desc error return code: unable to allocate memory + @defines UTIL_ERROR_NO_MEMORY + @desc error return code: unable to allocate memory @@*/ -#define UTIL_ERROR_NO_MEMORY (-1) +#define UTIL_ERROR_NO_MEMORY (-1) /*@@ - @defines UTIL_ERROR_BAD_HANDLE - @desc error return code: handle is invalid + @defines UTIL_ERROR_BAD_HANDLE + @desc error return code: handle is invalid @@*/ -#define UTIL_ERROR_BAD_HANDLE (-2) +#define UTIL_ERROR_BAD_HANDLE (-2) /*@@ - @defines UTIL_ERROR_BAD_INPUT - @desc error return code: input is invalid + @defines UTIL_ERROR_BAD_INPUT + @desc error return code: input is invalid @@*/ -#define UTIL_ERROR_BAD_INPUT (-3) +#define UTIL_ERROR_BAD_INPUT (-3) /******************************************************************************/ -#endif /* _UTIL_ERRORCODES_H_ */ +#endif /* _UTIL_ERRORCODES_H_ */ diff --git a/src/include/util_Table.h b/src/include/util_Table.h index b21a44cb..45e3cadc 100644 --- a/src/include/util_Table.h +++ b/src/include/util_Table.h @@ -5,9 +5,9 @@ @desc This header defines the programmer API for Cactus key-value tables. This is documented in the Cactus Reference Manual, - and there's a tutorial introduction to the API - in chapter C of the Cactus Users' Guide. - A slightly-out-of-date draft of this API can also be found in + and there's a tutorial introduction to the API + in chapter C of the Cactus Users' Guide. + A slightly-out-of-date draft of this API can also be found in http://www.cactuscode.org/Development/Specs/KeyValueLookup.txt @enddesc @seefile seefile Table.c @@ -50,7 +50,7 @@ extern "C" @defines UTIL_TABLE_FLAGS_CASE_INSENSITIVE @desc flags-word macro: key comparisons are case-insensitive @@*/ -#define UTIL_TABLE_FLAGS_CASE_INSENSITIVE 1 /* 0x1 */ +#define UTIL_TABLE_FLAGS_CASE_INSENSITIVE 1 /* 0x1 */ /*@@ @defines UTIL_TABLE_FLAGS_USER_DEFINED_BASE @@ -59,7 +59,7 @@ extern "C" all bit positions below this one are reserved for current or future Cactus use) @@*/ -#define UTIL_TABLE_FLAGS_USER_DEFINED_BASE 65536 /* 0x10000 */ +#define UTIL_TABLE_FLAGS_USER_DEFINED_BASE 65536 /* 0x10000 */ /******************************************************************************/ /***** Error Codes ************************************************************/ diff --git a/src/main/Complex.c b/src/main/Complex.c index e0f6b4d0..207fa265 100644 --- a/src/main/Complex.c +++ b/src/main/Complex.c @@ -491,7 +491,7 @@ cctk_complex CCTK_Cmplx##Sqrt (cctk_complex complex_number) \ x = fabs (complex_number.Re); \ y = fabs (complex_number.Im); \ if (x >= y) \ - { \ + { \ t = y / x; \ w = sqrt (x) * sqrt (0.5 * (1.0 + sqrt (1.0 * t * t))); \ } \ @@ -500,9 +500,9 @@ cctk_complex CCTK_Cmplx##Sqrt (cctk_complex complex_number) \ t = x / y; \ w = sqrt (y) * sqrt (0.5 * (t + sqrt (1.0 * t * t))); \ } \ - \ + \ if (complex_number.Re >= 0.0) \ - { \ + { \ result.Re = w; \ result.Im = complex_number.Im / (2.0 * w); \ } \ diff --git a/src/main/Coord.c b/src/main/Coord.c index ed507f6e..883ecdab 100644 --- a/src/main/Coord.c +++ b/src/main/Coord.c @@ -156,7 +156,7 @@ void CCTK_FCALL CCTK_FNAME (CCTK_CoordLocalRange) @@*/ int CCTKi_CoordRegisterSystem (int dim, const char *thorn, - const char *systemname) + const char *systemname) { int retval=-1; struct Coordsystem *new_system; @@ -175,14 +175,14 @@ int CCTKi_CoordRegisterSystem (int dim, if (dim > 0) { new_system->dimension = dim; - new_system->implementation = CCTK_ThornImplementation (thorn); + new_system->implementation = CCTK_ThornImplementation (thorn); new_system->systemname = strdup (systemname); new_system->coords = (struct Coordprops *) calloc (dim, sizeof(struct Coordprops)); retval = Util_NewHandle (&CoordSystems, systemname, new_system); - /* Remember how many systems there are */ - num_systems++; + /* Remember how many systems there are */ + num_systems++; } else @@ -313,8 +313,8 @@ int CCTK_CoordRegisterData(int dir, { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", "CCTK_CoordRegisterData: Invalid grid variable " - "specified"); - retval = -5; + "specified"); + retval = -5; } } } @@ -1103,7 +1103,7 @@ int CCTK_CoordRange (const cGH *GH, } if (coord) { - gotrange = 0; + gotrange = 0; for (curr = coord->listcomp; curr; curr = curr->next) { @@ -1116,7 +1116,7 @@ int CCTK_CoordRange (const cGH *GH, if (curr->GH == GH) { - gotrange = 1; + gotrange = 1; *lower = curr->lower; *upper = curr->upper; @@ -1125,10 +1125,10 @@ int CCTK_CoordRange (const cGH *GH, #endif } } - if (!gotrange) - { - retval = -6; - } + if (!gotrange) + { + retval = -6; + } } } } @@ -1437,7 +1437,7 @@ int CCTK_NumCoordSystems (void) @author Gabrielle Allen @desc Provide the implementation which registered a coordinate - system + system @enddesc @var handle @vdesc handle of coordinate system @@ -1484,7 +1484,7 @@ const char *CCTK_CoordSystemImplementation (int handle) @returntype const char * @returndesc the coordinate name or NULL if handle is coordinate name - cannot be found + cannot be found @endreturndesc @@*/ const char *CCTK_CoordName (int dir, const char *systemname) @@ -1496,7 +1496,7 @@ const char *CCTK_CoordName (int dir, const char *systemname) if (! coord_system) { CCTK_VWarn (4, __LINE__, __FILE__, "Cactus", - "CCTK_CoordName: System '%s' not registered", systemname); + "CCTK_CoordName: System '%s' not registered", systemname); retval = NULL; } else diff --git a/src/main/Parameters.c b/src/main/Parameters.c index 4b78264f..696a4520 100644 --- a/src/main/Parameters.c +++ b/src/main/Parameters.c @@ -1979,8 +1979,8 @@ static int ParameterSetKeyword (t_param *param, const char *value) if (*(char **) param->data == NULL) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Since this was the default value, " - "setting anyway - please fix!"); + "Since this was the default value, " + "setting anyway - please fix!"); CCTK_SetString (param->data, value); } } @@ -2023,8 +2023,8 @@ static int ParameterSetString (t_param *param, const char *value) if (*(char **) param->data == NULL) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Since this was the default value, " - "setting anyway - please fix!"); + "Since this was the default value, " + "setting anyway - please fix!"); CCTK_SetString (param->data, value); } } @@ -2067,8 +2067,8 @@ static int ParameterSetSentence (t_param *param, const char *value) if (*(char **) param->data == NULL) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Since this was the default value, " - "setting anyway - please fix!"); + "Since this was the default value, " + "setting anyway - please fix!"); CCTK_SetString (param->data, value); } } diff --git a/src/main/ProcessParameterDatabase.c b/src/main/ProcessParameterDatabase.c index b4e82ea5..018a21c3 100644 --- a/src/main/ProcessParameterDatabase.c +++ b/src/main/ProcessParameterDatabase.c @@ -170,15 +170,15 @@ int CCTKi_ProcessParameterDatabase (tFleshConfig *ConfigData) { if (minor > 1) { - CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "CCTKi_SetParameterSetMask: %d minor errors in " - "parameter file", CCTKi_NumParameterFileErrors (1)); + CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", + "CCTKi_SetParameterSetMask: %d minor errors in " + "parameter file", CCTKi_NumParameterFileErrors (1)); } else { - CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "CCTKi_SetParameterSetMask: %d minor error in " - "parameter file", CCTKi_NumParameterFileErrors (1)); + CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", + "CCTKi_SetParameterSetMask: %d minor error in " + "parameter file", CCTKi_NumParameterFileErrors (1)); } } @@ -188,15 +188,15 @@ int CCTKi_ProcessParameterDatabase (tFleshConfig *ConfigData) { if (major > 1) { - CCTK_VWarn (0, __LINE__, __FILE__, "Cactus", - "CCTKi_SetParameterSetMask: %d major errors in " - "parameter file", CCTKi_NumParameterFileErrors (0)); + CCTK_VWarn (0, __LINE__, __FILE__, "Cactus", + "CCTKi_SetParameterSetMask: %d major errors in " + "parameter file", CCTKi_NumParameterFileErrors (0)); } else { - CCTK_VWarn (0, __LINE__, __FILE__, "Cactus", - "CCTKi_SetParameterSetMask: %d major error in " - "parameter file", CCTKi_NumParameterFileErrors (0)); + CCTK_VWarn (0, __LINE__, __FILE__, "Cactus", + "CCTKi_SetParameterSetMask: %d major error in " + "parameter file", CCTKi_NumParameterFileErrors (0)); } } diff --git a/src/main/SetParams.c b/src/main/SetParams.c index 0df71576..8c089d6b 100644 --- a/src/main/SetParams.c +++ b/src/main/SetParams.c @@ -92,7 +92,7 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) { CCTK_VWarn (0, __LINE__, __FILE__, "Cactus", "CCTKi_SetParameter: Error at line %d in parameter file %s " - "while activating thorns",lineno,parfile); + "while activating thorns",lineno,parfile); } retval = 0; } @@ -105,7 +105,7 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", "Major error in parameter file '%s' line %d: " - "Range error setting parameter " + "Range error setting parameter " "'%s' to '%s'", parfile, lineno, parameter, value); num_0errors++; } @@ -115,17 +115,17 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) if (parameter_check == CCTK_PARAMETER_RELAXED) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Minor error in parameter file '%s' line %d: " - "Parameter '%s' not found", - parfile, lineno, parameter); + "Minor error in parameter file '%s' line %d: " + "Parameter '%s' not found", + parfile, lineno, parameter); num_1errors++; } else { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Major error in parameter file '%s' line %d: " - "Parameter '%s' not found", - parfile, lineno, parameter); + "Major error in parameter file '%s' line %d: " + "Parameter '%s' not found", + parfile, lineno, parameter); num_0errors++; } } @@ -135,17 +135,17 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) if (parameter_check == CCTK_PARAMETER_RELAXED) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Minor error in parameter file '%s' line %d: " - "Parameter '%s' set in two " - "different thorns", parfile, lineno, parameter); + "Minor error in parameter file '%s' line %d: " + "Parameter '%s' set in two " + "different thorns", parfile, lineno, parameter); num_1errors++; } else { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Major error in parameter file '%s' line %d: " - "Parameter '%s' set in two " - "different thorns", parfile, lineno, parameter); + "Major error in parameter file '%s' line %d: " + "Parameter '%s' set in two " + "different thorns", parfile, lineno, parameter); num_0errors++; } } @@ -155,19 +155,19 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) if (parameter_check == CCTK_PARAMETER_STRICT) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Major error in parameter file '%s' line %d: " - "Parameter '%s' is not " - "associated with an active thorn", - parfile, lineno, parameter); + "Major error in parameter file '%s' line %d: " + "Parameter '%s' is not " + "associated with an active thorn", + parfile, lineno, parameter); num_0errors++; } else if (parameter_check == CCTK_PARAMETER_NORMAL) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Minor error in parameter file '%s' line %d: " - "Parameter '%s' is not " - "associated with an active thorn", - parfile, lineno, parameter); + "Minor error in parameter file '%s' line %d: " + "Parameter '%s' is not " + "associated with an active thorn", + parfile, lineno, parameter); num_1errors++; } } @@ -176,9 +176,9 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) /* Parameter value is not a valid number */ CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", "Major error in parameter file '%s' line %d: " - "Error setting parameter '%s' " + "Error setting parameter '%s' " "'%s' is not a valid number", - parfile, lineno, parameter, value); + parfile, lineno, parameter, value); num_0errors++; } else if (retval == -7) @@ -187,19 +187,19 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) if (parameter_check == CCTK_PARAMETER_STRICT) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Major error in parameter file '%s' line %d: " - "Parameter '%s' is an " - "accumulator parameter; it cannot be set directly", - parfile, lineno, parameter); + "Major error in parameter file '%s' line %d: " + "Parameter '%s' is an " + "accumulator parameter; it cannot be set directly", + parfile, lineno, parameter); num_0errors++; } else if (parameter_check == CCTK_PARAMETER_NORMAL) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Minor error in parameter file '%s' line %d: " - "Parameter '%s' is an " - "accumulator parameter; it cannot be set directly", - parfile, lineno, parameter); + "Minor error in parameter file '%s' line %d: " + "Parameter '%s' is an " + "accumulator parameter; it cannot be set directly", + parfile, lineno, parameter); num_1errors++; } } @@ -209,19 +209,19 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) if (parameter_check == CCTK_PARAMETER_STRICT) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Major error in parameter file '%s' line %d: " - "Parameter '%s' is an " - "array base parameter; please use %s[<number>]", - parfile, lineno, parameter, parameter); + "Major error in parameter file '%s' line %d: " + "Parameter '%s' is an " + "array base parameter; please use %s[<number>]", + parfile, lineno, parameter, parameter); num_0errors++; } else if (parameter_check == CCTK_PARAMETER_NORMAL) { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "Minor error in parameter file '%s' line %d: " - "Parameter '%s' is an " - "array base parameter; please use %s[<number>]", - parfile, lineno, parameter, parameter); + "Minor error in parameter file '%s' line %d: " + "Parameter '%s' is an " + "array base parameter; please use %s[<number>]", + parfile, lineno, parameter, parameter); num_1errors++; } } @@ -230,9 +230,9 @@ int CCTKi_SetParameter (const char *parameter, const char *value, int lineno) /* Parameter adds to an accumulator and that value would be out of range. */ CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", "Major error in parameter file '%s' line %d: " - "Range error setting parameter " + "Range error setting parameter " "'%s' to '%s' - out of range in accumulator", - parfile, lineno, parameter, value); + parfile, lineno, parameter, value); num_0errors++; } diff --git a/src/main/Stagger.c b/src/main/Stagger.c index 9eb23e6d..67aa8c0f 100644 --- a/src/main/Stagger.c +++ b/src/main/Stagger.c @@ -145,7 +145,7 @@ int CCTK_StaggerIndex(const char *stype) case 'P':m=2; break; default: CCTK_VWarn(1,__LINE__,__FILE__,"Cactus", - "CCTK_StaggerIndex: Unknown stagger type %s",stype); + "CCTK_StaggerIndex: Unknown stagger type %s",stype); return(-1); } scode+= m*base; @@ -251,7 +251,7 @@ int CCTK_StaggerDirArray(int *dindex , int dim, int sindex) if (dim>4) { CCTK_VWarn(1,__LINE__,__FILE__,"Cactus", - "CCTK_StaggerDirArray: Dimension %d exceeds maximum of 4",dim); + "CCTK_StaggerDirArray: Dimension %d exceeds maximum of 4",dim); return(-1); } @@ -331,8 +331,8 @@ int CCTK_StaggerDirName(int dir, const char *stype) if (dir> (int) strlen(hs)) { CCTK_VWarn(1,__LINE__,__FILE__,"Cactus", - "CCTK_StaggerDirName: Stagger name too short for direction %d", - dir); + "CCTK_StaggerDirName: Stagger name too short for direction %d", + dir); } switch (toupper(hs[dir])) @@ -342,7 +342,7 @@ int CCTK_StaggerDirName(int dir, const char *stype) case 'P': scode = 2; break; default: CCTK_VWarn(1,__LINE__,__FILE__,"Cactus", - "CCTK_StaggerDirName: Unknown stagger type %s",hs); + "CCTK_StaggerDirName: Unknown stagger type %s",hs); return(-1); } return(scode); @@ -394,8 +394,8 @@ int CCTKi_ParseStaggerString(int dim, if (dim>10) { CCTK_VWarn(0,__LINE__,__FILE__,"Cactus", - "CCTKi_ParseStaggerString: Dimension %d exceeds maximum of 10", - dim); + "CCTKi_ParseStaggerString: Dimension %d exceeds maximum of 10", + dim); } /* change possible SHORTCUTS into the official notation*/ @@ -412,8 +412,8 @@ int CCTKi_ParseStaggerString(int dim, if ((int) strlen(stype)!=dim) { CCTK_VWarn(1,__LINE__,__FILE__,"Cactus", - "CCTKi_ParseStaggerString: Staggering %s for %s unequal to group dimension %d", - stype,gname,dim); + "CCTKi_ParseStaggerString: Staggering %s for %s unequal to group dimension %d", + stype,gname,dim); } sprintf(hs,"%s",stype); @@ -428,8 +428,8 @@ int CCTKi_ParseStaggerString(int dim, case 'P':m=2; break; default: CCTK_VWarn(1,__LINE__,__FILE__,"Cactus", - "CCTKi_ParseStaggerString: Unknown stagger type %s for %s::%s", - stype,imp,gname); + "CCTKi_ParseStaggerString: Unknown stagger type %s for %s::%s", + stype,imp,gname); return(-1); } scode+= m*base; diff --git a/src/util/CactusTimers.c b/src/util/CactusTimers.c index 7c630dac..912f4041 100644 --- a/src/util/CactusTimers.c +++ b/src/util/CactusTimers.c @@ -1399,7 +1399,7 @@ void CCTK_FCALL CCTK_FNAME (CCTK_TimerPrintData) unsigned int CCTK_NumTimerClocks( const cTimerData *info ) { - return info->n_vals; + return info->n_vals; } /*@@ @@ -1434,10 +1434,10 @@ CCTK_NumTimerClocks( const cTimerData *info ) const cTimerVal * CCTK_GetClockValueI( int valno, const cTimerData *info ) { - if( valno < info->n_vals ) - return (cTimerVal *)&info->vals[valno]; - else - return NULL; + if( valno < info->n_vals ) + return (cTimerVal *)&info->vals[valno]; + else + return NULL; } /*@@ @@ -1474,13 +1474,13 @@ CCTK_GetClockValueI( int valno, const cTimerData *info ) const cTimerVal * CCTK_GetClockValue( const char * clockName, const cTimerData *info ) { - int i; + int i; - for (i = 0; i < info->n_vals; i++) - if( strcmp( clockName, info->vals[i].heading ) == 0 ) - return (cTimerVal *)&info->vals[i]; + for (i = 0; i < info->n_vals; i++) + if( strcmp( clockName, info->vals[i].heading ) == 0 ) + return (cTimerVal *)&info->vals[i]; - return NULL; + return NULL; } /*@@ @@ -1507,9 +1507,9 @@ CCTK_GetClockValue( const char * clockName, const cTimerData *info ) double CCTK_TimerClockSeconds( const cTimerVal *clockVal ) { - if( clockVal != NULL ) - return clockVal->seconds; - return 0.0; + if( clockVal != NULL ) + return clockVal->seconds; + return 0.0; } /*@@ @@ -1539,9 +1539,9 @@ CCTK_TimerClockSeconds( const cTimerVal *clockVal ) double CCTK_TimerClockResolution( const cTimerVal *clockVal ) { - if( clockVal != NULL ) - return clockVal->resolution; - return 0.0; + if( clockVal != NULL ) + return clockVal->resolution; + return 0.0; } /*@@ @@ -1568,8 +1568,8 @@ CCTK_TimerClockResolution( const cTimerVal *clockVal ) const char * CCTK_TimerClockName( const cTimerVal *clockVal ) { - if( clockVal != NULL ) - return clockVal->heading; - return NULL; + if( clockVal != NULL ) + return clockVal->heading; + return NULL; } diff --git a/src/util/Misc.c b/src/util/Misc.c index f4418799..f8642e41 100644 --- a/src/util/Misc.c +++ b/src/util/Misc.c @@ -1155,7 +1155,7 @@ int CCTK_RegexMatch(const char *string, Handle this case specially. */ if (strcmp(pattern, "") == 0) { - retval = 1; /* report success */ + retval = 1; /* report success */ } else { diff --git a/src/util/Table.c b/src/util/Table.c index 31db8444..4e38fee9 100644 --- a/src/util/Table.c +++ b/src/util/Table.c @@ -9,7 +9,7 @@ @desc This program implements the key-value table API defined in util_Table.h, the Cactus Reference Manual, and in - chapter C of the the Cactus User's Guide. A slightly + chapter C of the the Cactus User's Guide. A slightly earlier version of this API is documented in http://www.cactuscode.org/Development/Specs/KeyValueLookup.txt @enddesc |