diff options
author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-10-03 16:20:34 +0000 |
---|---|---|
committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-10-03 16:20:34 +0000 |
commit | d51b12875913e37cdd43f7ef1c67039bdd4b85f6 (patch) | |
tree | ef32c161bc7134385b90b015ca45fa6f03f64bc4 /src/main | |
parent | afaab9892c742f8064f003842d1c3233f9a89a3c (diff) |
Untabifying.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4163 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/main')
-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 |
6 files changed, 89 insertions, 89 deletions
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; |