Changeset 6165
- Timestamp:
- 10/06/10 11:59:54 (14 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 2 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r6141 r6165 135 135 DoubleVecParamEnum, 136 136 IntParamEnum, 137 IntVecParamEnum, 137 138 FileParamEnum, 138 139 PetscMatParamEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r6141 r6165 117 117 case DoubleVecParamEnum : return "DoubleVecParam"; 118 118 case IntParamEnum : return "IntParam"; 119 case IntVecParamEnum : return "IntVecParam"; 119 120 case FileParamEnum : return "FileParam"; 120 121 case PetscMatParamEnum : return "PetscMatParam"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r6141 r6165 115 115 else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; 116 116 else if (strcmp(name,"IntParam")==0) return IntParamEnum; 117 else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; 117 118 else if (strcmp(name,"FileParam")==0) return FileParamEnum; 118 119 else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum; -
issm/trunk/src/c/Makefile.am
r6130 r6165 181 181 ./objects/Params/IntParam.cpp\ 182 182 ./objects/Params/IntParam.h\ 183 ./objects/Params/IntVecParam.cpp\ 184 ./objects/Params/IntVecParam.h\ 183 185 ./objects/Params/DoubleParam.cpp\ 184 186 ./objects/Params/DoubleParam.h\ … … 745 747 ./objects/Params/IntParam.cpp\ 746 748 ./objects/Params/IntParam.h\ 749 ./objects/Params/IntVecParam.cpp\ 750 ./objects/Params/IntVecParam.h\ 747 751 ./objects/Params/DoubleParam.cpp\ 748 752 ./objects/Params/DoubleParam.h\ -
issm/trunk/src/c/objects/Params/BoolParam.h
r6163 r6165 51 51 void GetParameterValue(bool* pbool){*pbool=value;} 52 52 void GetParameterValue(int* pinteger){ISSMERROR("Bool param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 53 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("Bool param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 53 54 void GetParameterValue(double* pdouble){ISSMERROR("Bool param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(char** pstring){ISSMERROR("Bool param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 63 64 void SetValue(bool boolean){this->value=boolean;} 64 65 void SetValue(int integer){this->value=(bool)integer;} 66 void SetValue(int* intarray,int M){ISSMERROR("Bool param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 65 67 void SetValue(double scalar){this->value=(bool)scalar;} 66 68 void SetValue(char* string){ISSMERROR("Bool param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h
r6163 r6165 54 54 void GetParameterValue(bool* pbool){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 55 55 void GetParameterValue(int* pinteger){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 56 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 56 57 void GetParameterValue(double* pdouble){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 57 58 void GetParameterValue(char** pstring){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 66 67 void SetValue(bool boolean){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a boolean",enum_type,EnumToString(enum_type));} 67 68 void SetValue(int integer){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold an integer",enum_type,EnumToString(enum_type));} 69 void SetValue(int* intarray,int M){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 68 70 void SetValue(double scalar){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a scalar",enum_type,EnumToString(enum_type));} 69 71 void SetValue(char* string){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/DoubleMatParam.h
r6163 r6165 53 53 void GetParameterValue(bool* pbool){ISSMERROR("DoubleMat param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 54 54 void GetParameterValue(int* pinteger){ISSMERROR("DoubleMat param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 55 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("DoubleMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 55 56 void GetParameterValue(double* pdouble){ISSMERROR("DoubleMat param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 56 57 void GetParameterValue(char** pstring){ISSMERROR("DoubleMat param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 65 66 void SetValue(bool boolean){ISSMERROR("DoubleMat param of enum %i (%s) cannot hold a boolean",enum_type,EnumToString(enum_type));} 66 67 void SetValue(int integer){ISSMERROR("DoubleMat param of enum %i (%s) cannot hold an integer",enum_type,EnumToString(enum_type));} 68 void SetValue(int* intarray,int M){ISSMERROR("DoubleMat param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 67 69 void SetValue(double scalar){ISSMERROR("DoubleMat param of enum %i (%s) cannot hold a scalar",enum_type,EnumToString(enum_type));} 68 70 void SetValue(char* string){ISSMERROR("DoubleMat param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/DoubleParam.h
r6163 r6165 52 52 void GetParameterValue(bool* pbool); 53 53 void GetParameterValue(int* pinteger); 54 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(double* pdouble){*pdouble=value;} 55 56 void GetParameterValue(char** pstring){ISSMERROR("Double param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 64 65 void SetValue(bool boolean){this->value=(double)boolean;} 65 66 void SetValue(int integer){this->value=(double)integer;} 67 void SetValue(int* intarray,int M){ISSMERROR("Double param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 66 68 void SetValue(double scalar){this->value=(double)scalar;} 67 69 void SetValue(char* string){ISSMERROR("Double param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/DoubleVecParam.h
r6163 r6165 52 52 void GetParameterValue(bool* pbool){ISSMERROR("DoubleVec param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 53 53 void GetParameterValue(int* pinteger){ISSMERROR("DoubleVec param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 54 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("DoubleVec param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(double* pdouble){ISSMERROR("DoubleVec param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 55 56 void GetParameterValue(char** pstring){ISSMERROR("DoubleVec param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 64 65 void SetValue(bool boolean){ISSMERROR("DoubleVec param of enum %i (%s) cannot hold a boolean",enum_type,EnumToString(enum_type));} 65 66 void SetValue(int integer){ISSMERROR("DoubleVec param of enum %i (%s) cannot hold an integer",enum_type,EnumToString(enum_type));} 67 void SetValue(int* intarray,int M){ISSMERROR("DoubleVec param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 66 68 void SetValue(double scalar){ISSMERROR("DoubleVec param of enum %i (%s) cannot hold a scalar",enum_type,EnumToString(enum_type));} 67 69 void SetValue(char* string){ISSMERROR("DoubleVec param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/FileParam.h
r6163 r6165 51 51 void GetParameterValue(bool* pbool){ ISSMERROR("FileParam of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 52 52 void GetParameterValue(int* pinteger){ISSMERROR("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 53 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 53 54 void GetParameterValue(double* pdouble){ISSMERROR("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(char** pstring){ISSMERROR("FileParam of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 63 64 void SetValue(bool boolean){ISSMERROR("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} 64 65 void SetValue(int integer){ISSMERROR("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} 66 void SetValue(int* intarray,int M){ISSMERROR("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} 65 67 void SetValue(double scalar){ISSMERROR("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} 66 68 void SetValue(char* string){ISSMERROR("FileParam of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/IntParam.h
r6163 r6165 52 52 void GetParameterValue(bool* pbool){ISSMERROR("Int param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 53 53 void GetParameterValue(int* pinteger){*pinteger=value;} 54 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("Int param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(double* pdouble){ISSMERROR("Int param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 55 56 void GetParameterValue(char** pstring){ISSMERROR("Int param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 64 65 void SetValue(bool boolean){this->value=(int)boolean;} 65 66 void SetValue(int integer){this->value=integer;} 67 void SetValue(int* intarray,int M){ISSMERROR("Int param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 66 68 void SetValue(double scalar){this->value=(int)scalar;} 67 69 void SetValue(char* string){ISSMERROR("Int param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/Param.h
r4873 r6165 34 34 virtual void GetParameterValue(bool* pbool)=0; 35 35 virtual void GetParameterValue(int* pinteger)=0; 36 virtual void GetParameterValue(int** pintarray,int* pM)=0; 36 37 virtual void GetParameterValue(double* pdouble)=0; 37 38 virtual void GetParameterValue(char** pstring)=0; … … 46 47 virtual void SetValue(bool boolean)=0; 47 48 virtual void SetValue(int integer)=0; 49 virtual void SetValue(int* intarray,int M)=0; 48 50 virtual void SetValue(double scalar)=0; 49 51 virtual void SetValue(char* string)=0; -
issm/trunk/src/c/objects/Params/PetscMatParam.h
r6163 r6165 52 52 void GetParameterValue(bool* pbool){ISSMERROR("PetscMat param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 53 53 void GetParameterValue(int* pinteger){ISSMERROR("PetscMat param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 54 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("PetscMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(double* pdouble){ISSMERROR("PetscMat param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 55 56 void GetParameterValue(char** pstring){ISSMERROR("PetscMat param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 64 65 void SetValue(bool boolean){ISSMERROR("PetscMat param of enum %i (%s) cannot hold a boolean",enum_type,EnumToString(enum_type));} 65 66 void SetValue(int integer){ISSMERROR("PetscMat param of enum %i (%s) cannot hold an integer",enum_type,EnumToString(enum_type));} 67 void SetValue(int* intarray,int M){ISSMERROR("PetscMat param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 66 68 void SetValue(double scalar){ISSMERROR("PetscMat param of enum %i (%s) cannot hold a scalar",enum_type,EnumToString(enum_type));} 67 69 void SetValue(char* string){ISSMERROR("PetscMat param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/PetscVecParam.h
r6163 r6165 52 52 void GetParameterValue(bool* pbool){ISSMERROR("PetscVec param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 53 53 void GetParameterValue(int* pinteger){ISSMERROR("PetscVec param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 54 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("PetscVec param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(double* pdouble){ISSMERROR("PetscVec param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 55 56 void GetParameterValue(char** pstring){ISSMERROR("PetscVec param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 64 65 void SetValue(bool boolean){ISSMERROR("PetscVec of enum %i (%s) cannot hold a boolean",enum_type,EnumToString(enum_type));} 65 66 void SetValue(int integer){ISSMERROR("PetscVec of enum %i (%s) cannot hold an integer",enum_type,EnumToString(enum_type));} 67 void SetValue(int* intarray,int M){ISSMERROR("PetscVec of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 66 68 void SetValue(double scalar){ISSMERROR("PetscVec of enum %i (%s) cannot hold a scalar",enum_type,EnumToString(enum_type));} 67 69 void SetValue(char* string){ISSMERROR("PetscVec of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/StringArrayParam.h
r6163 r6165 54 54 void GetParameterValue(bool* pbool){ISSMERROR("StringArray param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 55 55 void GetParameterValue(int* pinteger){ISSMERROR("StringArray param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 56 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("StringArray param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 56 57 void GetParameterValue(double* pdouble){ISSMERROR("StringArray param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 57 58 void GetParameterValue(char** pstring){ISSMERROR("StringArray param of enum %i (%s) cannot return a string",enum_type,EnumToString(enum_type));} … … 66 67 void SetValue(bool boolean){ISSMERROR("StringArray param of enum %i (%s) cannot hold a boolean",enum_type,EnumToString(enum_type));} 67 68 void SetValue(int integer){ISSMERROR("StringArray param of enum %i (%s) cannot hold an integer",enum_type,EnumToString(enum_type));} 69 void SetValue(int* intarray,int M){ISSMERROR("StringArray param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 68 70 void SetValue(double scalar){ISSMERROR("StringArray param of enum %i (%s) cannot hold a scalar",enum_type,EnumToString(enum_type));} 69 71 void SetValue(char* string){ISSMERROR("StringArray param of enum %i (%s) cannot hold a string",enum_type,EnumToString(enum_type));} -
issm/trunk/src/c/objects/Params/StringParam.h
r6163 r6165 52 52 void GetParameterValue(bool* pbool){ISSMERROR("String param of enum %i (%s) cannot return a bool",enum_type,EnumToString(enum_type));} 53 53 void GetParameterValue(int* pinteger){ISSMERROR("String param of enum %i (%s) cannot return an integer",enum_type,EnumToString(enum_type));} 54 void GetParameterValue(int** pintarray,int* pM){ISSMERROR("String param of enum %i (%s) cannot return an array of integers",enum_type,EnumToString(enum_type));} 54 55 void GetParameterValue(double* pdouble){ISSMERROR("String param of enum %i (%s) cannot return a double",enum_type,EnumToString(enum_type));} 55 56 void GetParameterValue(char** pstring); … … 64 65 void SetValue(bool boolean){ISSMERROR("String param of enum %i (%s) cannot hold a boolean",enum_type,EnumToString(enum_type));} 65 66 void SetValue(int integer){ISSMERROR("String param of enum %i (%s) cannot hold an integer",enum_type,EnumToString(enum_type));} 67 void SetValue(int* intarray,int M){ISSMERROR("String param of enum %i (%s) cannot hold an int array",enum_type,EnumToString(enum_type));} 66 68 void SetValue(double scalar){ISSMERROR("String param of enum %i (%s) cannot hold a scalar",enum_type,EnumToString(enum_type));} 67 69 void SetValue(char* string); -
issm/trunk/src/c/objects/objects.h
r5908 r6165 84 84 #include "./Params/DoubleVecParam.h" 85 85 #include "./Params/IntParam.h" 86 #include "./Params/IntVecParam.h" 86 87 #include "./Params/FileParam.h" 87 88 #include "./Params/Param.h"
Note:
See TracChangeset
for help on using the changeset viewer.