Changeset 25522
- Timestamp:
- 09/03/20 10:26:35 (5 years ago)
- Location:
- issm/trunk-jpl/src/c/shared
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/shared/Enum/Enum.vim
r25514 r25522 1083 1083 syn keyword cConstant GenericOptionEnum 1084 1084 syn keyword cConstant GenericParamEnum 1085 syn keyword cConstant GenericExternalResultEnum 1085 1086 syn keyword cConstant GiaAnalysisEnum 1086 1087 syn keyword cConstant GiaSolutionEnum -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r25514 r25522 1082 1082 GenericOptionEnum, 1083 1083 GenericParamEnum, 1084 GenericExternalResultEnum, 1084 1085 GiaAnalysisEnum, 1085 1086 GiaSolutionEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r25514 r25522 1085 1085 case GenericOptionEnum : return "GenericOption"; 1086 1086 case GenericParamEnum : return "GenericParam"; 1087 case GenericExternalResultEnum : return "GenericExternalResult"; 1087 1088 case GiaAnalysisEnum : return "GiaAnalysis"; 1088 1089 case GiaSolutionEnum : return "GiaSolution"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r25514 r25522 1109 1109 else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum; 1110 1110 else if (strcmp(name,"GenericParam")==0) return GenericParamEnum; 1111 else if (strcmp(name,"GenericExternalResult")==0) return GenericExternalResultEnum; 1111 1112 else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum; 1112 1113 else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum; … … 1120 1121 else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum; 1121 1122 else if (strcmp(name,"Gset")==0) return GsetEnum; 1122 else if (strcmp(name,"Gsl")==0) return GslEnum;1123 1123 else stage=10; 1124 1124 } 1125 1125 if(stage==10){ 1126 if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; 1126 if (strcmp(name,"Gsl")==0) return GslEnum; 1127 else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; 1127 1128 else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; 1128 1129 else if (strcmp(name,"Hook")==0) return HookEnum; … … 1243 1244 else if (strcmp(name,"P1P1")==0) return P1P1Enum; 1244 1245 else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; 1245 else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;1246 1246 else stage=11; 1247 1247 } 1248 1248 if(stage==11){ 1249 if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; 1249 if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; 1250 else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; 1250 1251 else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; 1251 1252 else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; … … 1366 1367 else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum; 1367 1368 else if (strcmp(name,"MeshZ")==0) return MeshZEnum; 1368 else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;1369 1369 else stage=12; 1370 1370 } 1371 1371 if(stage==12){ 1372 if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum; 1372 if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; 1373 else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum; 1373 1374 else if (strcmp(name,"SealevelObs")==0) return SealevelObsEnum; 1374 1375 else if (strcmp(name,"SealevelWeights")==0) return SealevelWeightsEnum; -
issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h
r25513 r25522 43 43 public: 44 44 WriteCheckpointFunctor(char** pmarshalled_data_in) : MarshallHandle(MARSHALLING_WRITE),pmarshalled_data(pmarshalled_data_in){} 45 void Echo(void){ 46 printf("WriteCheckpointFunctor Echo:\n"); 47 printf(" pmarshalled_data: %p\n",pmarshalled_data); 48 } 45 49 template<typename T> void call(T & value){ 46 50 memcpy(*pmarshalled_data,&value,sizeof(T)); 47 51 *pmarshalled_data+=sizeof(T); 48 52 } 49 void Echo(void){ 50 printf("WriteCheckpointFunctor Echo:\n"); 51 printf(" pmarshalled_data: %p\n",pmarshalled_data); 52 } 53 void call(char* & value){ 54 int size = 0; 55 if(value) size = strlen(value)+1; 56 this->call(size); 57 this->call(value,size); 58 }; 53 59 template<typename T> void call(T* & value,int size){ 54 60 bool pointer_null = true; 55 61 if(value) pointer_null = false; 56 call(pointer_null);62 this->call<bool>(pointer_null); 57 63 if(value){ 58 64 memcpy(*pmarshalled_data,value,size*sizeof(T)); … … 76 82 *pmarshalled_data+=sizeof(T); 77 83 } 84 void call(char* & value){ 85 int size; 86 this->call(size); 87 this->call(value,size); 88 }; 78 89 template<typename T> void call(T* & value,int size){ 79 90 bool pointer_null; … … 104 115 marshalled_data_size+=sizeof(T); 105 116 } 117 void call(char* & value){ 118 int size = 0; 119 if(value) size = strlen(value)+1; 120 this->call(size); 121 if(size) marshalled_data_size+=size*sizeof(char); 122 }; 106 123 template<typename T> void call(T* & value,int size){ 107 124 bool pointer_null = true;
Note:
See TracChangeset
for help on using the changeset viewer.