diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/CommandLine.h | 2 | ||||
| -rw-r--r-- | src/include/cctk_ActiveThorns.h | 9 | ||||
| -rw-r--r-- | src/include/cctk_ParameterFunctions.h | 49 |
3 files changed, 35 insertions, 25 deletions
diff --git a/src/include/CommandLine.h b/src/include/CommandLine.h index 8c873d90..0c679a89 100644 --- a/src/include/CommandLine.h +++ b/src/include/CommandLine.h @@ -15,7 +15,7 @@ extern "C" { #endif void CCTKi_CommandLineTestThornCompiled(const char *optarg); -void CCTKi_CommandLineDescribeAllParameters(void); +void CCTKi_CommandLineDescribeAllParameters(const char *optarg); void CCTKi_CommandLineDescribeParameter(const char *optarg); void CCTKi_CommandLineTestParameters(const char *optarg); void CCTKi_CommandLineWarningLevel(const char *optarg); diff --git a/src/include/cctk_ActiveThorns.h b/src/include/cctk_ActiveThorns.h index 128efbe7..9b16d27a 100644 --- a/src/include/cctk_ActiveThorns.h +++ b/src/include/cctk_ActiveThorns.h @@ -21,6 +21,7 @@ extern "C" { int CCTKi_RegisterThorn(const char *name, const char *imp); int CCTKi_ActivateThorn(const char *name); int CCTK_IsThornActive(const char *name); +int CCTK_IsThornCompiled(const char *name); int CCTK_IsImplementationActive(const char *name); int CCTKi_ListThorns(FILE *file, const char *format, int active); int CCTKi_ListImplementations(FILE *file, const char *format, int active); @@ -30,8 +31,12 @@ const char *CCTK_ActivatingThorn(const char *imp); t_sktree *CCTK_ImpThornList (const char *imp); /* public routines to get information about thorns and imps */ -int CCTK_ImpList (int active, char ***list, int *n_implementations); -int CCTK_ThornList (const char* imp, char ***list, int *n_thorns); +int CCTK_ImplementationList (int active, char ***list, int *n_implementations); +int CCTK_ImplementationThornList (const char *imp, char ***list, int *n_thorns); +int CCTK_ThornList(int active, char ***list, int *n_items); + +const char *CCTK_ThornImplementation(const char *name); +const char *CCTK_ImplementationThorn(const char *name); #ifdef __cplusplus diff --git a/src/include/cctk_ParameterFunctions.h b/src/include/cctk_ParameterFunctions.h index 0babf36d..ce71d4ae 100644 --- a/src/include/cctk_ParameterFunctions.h +++ b/src/include/cctk_ParameterFunctions.h @@ -27,9 +27,9 @@ #define SCOPE_NOT_GLOBAL 4 /* parameter is not visible everywhere */ #define SCOPE_ANY 5 /* parameter scope is undefined/arbitrary */ +static char *cctk_parameter_scopes[] = {"GLOBAL", "RESTRICTED", "PRIVATE"}; - -/* parameter types ***Tom: correct? *** */ +/* parameter types */ #define PARAMETER_KEYWORD 1 /* parameter is keyword */ #define PARAMETER_STRING 2 /* parameter is string */ @@ -39,7 +39,12 @@ #define PARAMETER_REAL 5 /* parameter is float */ #define PARAMETER_BOOLEAN 6 /* parameter is bool */ - +static const char *cctk_parameter_type_names[] = {"KEYWORD", + "STRING", + "SENTENCE", + "INTEGER", + "REAL", + "BOOLEAN"}; /* what is a parameter range: * list of independent ranges, each with @@ -49,12 +54,12 @@ */ typedef struct RANGE { - struct RANGE* last; - struct RANGE* next; - char* range; - char* origin; - int active; - char* description; + struct RANGE *last; + struct RANGE *next; + char *range; + char *origin; + int active; + char *description; } t_range; @@ -72,18 +77,18 @@ typedef struct RANGE */ typedef struct PARAM_PROPS { - char* name; - char* thorn; - int scope; - - char* description; - char* defval; + char *name; + char *thorn; + int scope; + + char *description; + char *defval; - int type; - t_range* range; + int type; + t_range *range; - int n_set; - int steerable; + int n_set; + int steerable; } t_param_prop; @@ -91,11 +96,11 @@ typedef struct PARAM_PROPS extern "C" { #endif /* get list of parameter names for given thorn */ -int CCTK_ParList (const char* thorn, char ***paramlist, int *n_param); +int CCTK_ParameterList (const char* thorn, char ***paramlist, int *n_param); /* get parameter properties for gven parameter/thorn pair */ -t_param_prop* CCTK_ParInfo (const char* name, - const char* thorn); +t_param_prop *CCTK_ParameterInfo (const char *name, + const char *thorn); #ifdef __cplusplus } |