Changeset 4853
- Timestamp:
- 07/28/10 17:59:27 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk/src/c/Makefile.am ¶
r4841 r4853 194 194 ./objects/Params/DoubleMatParam.cpp\ 195 195 ./objects/Params/DoubleMatParam.h\ 196 ./objects/Params/DoubleMatArrayParam.cpp\ 197 ./objects/Params/DoubleMatArrayParam.h\ 196 198 ./objects/Params/DoubleVecParam.cpp\ 197 199 ./objects/Params/DoubleVecParam.h\ … … 754 756 ./objects/Params/DoubleMatParam.cpp\ 755 757 ./objects/Params/DoubleMatParam.h\ 758 ./objects/Params/DoubleMatArrayParam.cpp\ 759 ./objects/Params/DoubleMatArrayParam.h\ 756 760 ./objects/Params/DoubleVecParam.cpp\ 757 761 ./objects/Params/DoubleVecParam.h\ -
TabularUnified issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp ¶
r4852 r4853 166 166 char* descriptor=responsedescriptors[i]; 167 167 168 if(strncmp( response_descriptor,"MassFlux",8)==0){168 if(strncmp(descriptor,"MassFlux",8)==0){ 169 169 qmu_mass_flux_present=true; 170 170 } -
TabularUnified issm/trunk/src/c/objects/Params/DoubleMatArrayParam.cpp ¶
r4852 r4853 121 121 char* marshalled_dataset=NULL; 122 122 int enum_value=0; 123 int i; 123 124 124 125 /*recover marshalled_dataset: */ … … 312 313 void DoubleMatArrayParam::SetValue(double** in_array, int in_M, int* in_mdim_array, int* in_ndim_array){ 313 314 314 int i ;315 int i,m,n; 315 316 double* in_matrix=NULL; 316 317 double* matrix=NULL; … … 340 341 341 342 matrix=(double*)xmalloc(m*n*sizeof(double)); 342 memcpy( this->matrix,in_matrix,m*n*sizeof(double));343 memcpy(matrix,in_matrix,m*n*sizeof(double)); 343 344 344 345 this->array[i]=matrix; -
TabularUnified issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h ¶
r4852 r4853 73 73 void SetValue(char** stringarray,int M){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a string array",enum_type,EnumAsString(enum_type));} 74 74 void SetValue(double* doublearray,int M){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a double vec array",enum_type,EnumAsString(enum_type));} 75 void SetValue(double* doublearray,int M,int N) ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a double mat array",enum_type,EnumAsString(enum_type));}75 void SetValue(double* doublearray,int M,int N){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a double mat array",enum_type,EnumAsString(enum_type));} 76 76 void SetValue(Vec vec){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a Vec",enum_type,EnumAsString(enum_type));} 77 77 void SetValue(Mat mat){ISSMERROR("DoubleMatArray param of enum %i (%s) cannot hold a Mat",enum_type,EnumAsString(enum_type));} -
TabularUnified issm/trunk/src/c/objects/objects.h ¶
r4773 r4853 79 79 #include "./Params/BoolParam.h" 80 80 #include "./Params/DoubleMatParam.h" 81 #include "./Params/DoubleMatArrayParam.h" 81 82 #include "./Params/DoubleParam.h" 82 83 #include "./Params/DoubleVecParam.h"
Note:
See TracChangeset
for help on using the changeset viewer.