diff options
author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-09-21 11:19:30 +0000 |
---|---|---|
committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-09-21 11:19:30 +0000 |
commit | 2a822c2bf4488a33fff9c5d5e017556de0815530 (patch) | |
tree | 1e160d537c8c864004edb6c3130bff9f98446851 | |
parent | a76728d5a6c6dd92ca9c75a1d2553bd5f069e108 (diff) |
Renamed LOGICAL in ccl files to BOOLEAN
LOGICAL will still work for now
Hopefully this will remove the confusion in Fortran with "logicals"
having integer values
git-svn-id: http://svn.cactuscode.org/flesh/trunk@977 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r-- | src/include/ParameterBindings.h | 2 | ||||
-rw-r--r-- | src/include/cctk_Misc.h | 2 | ||||
-rw-r--r-- | src/main/Parameters.c | 16 | ||||
-rw-r--r-- | src/param.ccl | 10 | ||||
-rw-r--r-- | src/util/Misc.c | 8 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/include/ParameterBindings.h b/src/include/ParameterBindings.h index 1f5da613..7e28d40a 100644 --- a/src/include/ParameterBindings.h +++ b/src/include/ParameterBindings.h @@ -36,6 +36,6 @@ int ParameterCreate(const char *name, /* The parameter name */ #define PARAMETER_INT 4 #define PARAMETER_INTEGER 4 #define PARAMETER_REAL 5 -#define PARAMETER_LOGICAL 6 +#define PARAMETER_BOOLEAN 6 #endif diff --git a/src/include/cctk_Misc.h b/src/include/cctk_Misc.h index fe7ebba5..d6506dd6 100644 --- a/src/include/cctk_Misc.h +++ b/src/include/cctk_Misc.h @@ -35,7 +35,7 @@ int CCTK_SetIntInRangeList(CCTK_INT *data, const char *value, int CCTK_SetKeywordInRangeList(char **data, const char *value, int n_elements, ...); int CCTK_SetString(char **data, const char *value); -int CCTK_SetLogical(CCTK_INT *data, const char *value); +int CCTK_SetBoolean(CCTK_INT *data, const char *value); #ifdef __cplusplus } diff --git a/src/main/Parameters.c b/src/main/Parameters.c index 2d4eaa49..ded6229c 100644 --- a/src/main/Parameters.c +++ b/src/main/Parameters.c @@ -134,7 +134,7 @@ static int ParameterSetString(t_parameter *param, const char *value); static int ParameterSetSentence(t_parameter *param, const char *value); static int ParameterSetInteger(t_parameter *param, const char *value); static int ParameterSetReal(t_parameter *param, const char *value); -static int ParameterSetLogical(t_parameter *param, const char *value); +static int ParameterSetBoolean(t_parameter *param, const char *value); @@ -843,12 +843,12 @@ static int ParameterGetType(const char *type) PTYPE(SENTENCE); PTYPE(INT); PTYPE(REAL); - PTYPE(LOGICAL); + PTYPE(BOOLEAN); #undef PTYPE if(retval == -1) { - fprintf(stderr, "What on earth kind of a paramter is %s ? \n",type); + fprintf(stderr, "What on earth kind of a parameter is %s ? \n",type); } return retval; @@ -1036,8 +1036,8 @@ static int ParameterSetSimple(t_parameter *param, const char *value) retval = ParameterSetInteger(param, value); break; case PARAMETER_REAL : retval = ParameterSetReal(param, value); break; - case PARAMETER_LOGICAL : - retval = ParameterSetLogical(param, value); break; + case PARAMETER_BOOLEAN : + retval = ParameterSetBoolean(param, value); break; default : fprintf(stderr, "Unknown parameter type %d\n", param->type); } @@ -1274,17 +1274,17 @@ static int ParameterSetReal(t_parameter *param, const char *value) return retval; } -static int ParameterSetLogical(t_parameter *param, const char *value) +static int ParameterSetBoolean(t_parameter *param, const char *value) { int retval; retval = -1; - retval = CCTK_SetLogical(param->data, value); + retval = CCTK_SetBoolean(param->data, value); if(retval == -1) { fprintf(stderr, - "Unable to set logical %s::%s - %s not recognised\n", + "Unable to set boolean %s::%s - %s not recognised\n", param->thorn, param->name, value); diff --git a/src/param.ccl b/src/param.ccl index 33b6c7a7..512972c3 100644 --- a/src/param.ccl +++ b/src/param.ccl @@ -4,26 +4,26 @@ private: -LOGICAL cctk_full_warnings "Give detailed information for each warning statement" +BOOLEAN cctk_full_warnings "Give detailed information for each warning statement" { } "yes" -LOGICAL cctk_strong_param_check "Die on parameter errors in CCTK_PARAMCHECK" +BOOLEAN cctk_strong_param_check "Die on parameter errors in CCTK_PARAMCHECK" { : :: } "yes" -LOGICAL cctk_show_rfr_tree "Show the order of the calling tree for the RFR" +BOOLEAN cctk_show_rfr_tree "Show the order of the calling tree for the RFR" { : :: } "yes" -LOGICAL cctk_show_banners "Show any registered banners for the different thorns" +BOOLEAN cctk_show_banners "Show any registered banners for the different thorns" { : :: } "yes" -LOGICAL cctk_brief_output "Give only brief output" +BOOLEAN cctk_brief_output "Give only brief output" { : :: } "no" diff --git a/src/util/Misc.c b/src/util/Misc.c index 22716b3e..bde592a5 100644 --- a/src/util/Misc.c +++ b/src/util/Misc.c @@ -879,11 +879,11 @@ void FMODIFIER FORTRAN_NAME(CCTK_PrintString)(char **arg1) } /*@@ - @routine CCTK_SetLogical + @routine CCTK_SetBoolean @date Thu Jan 21 10:35:11 1999 @author Tom Goodale @desc - Sets the value of a logical to true or false according to + Sets the value of a boolean to true or false according to the value of the value string. @enddesc @calls @@ -893,7 +893,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_PrintString)(char **arg1) @endhistory @@*/ -int CCTK_SetLogical(CCTK_INT *data, const char *value) +int CCTK_SetBoolean(CCTK_INT *data, const char *value) { int retval = 1; @@ -909,7 +909,7 @@ int CCTK_SetLogical(CCTK_INT *data, const char *value) } else { - CCTK_Warn(1,__LINE__,__FILE__,"Cactus","Logical not set in CCTK_SetLogical"); + CCTK_Warn(1,__LINE__,__FILE__,"Cactus","Boolean not set in CCTK_SetBoolean"); retval = -1; } |