Changeset 6099
- Timestamp:
- 09/30/10 09:56:32 (14 years ago)
- Location:
- issm/trunk/src/c/EnumDefinitions
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r6079 r6099 174 174 ConvergedEnum, 175 175 DhDtEnum, 176 DhDtObsEnum,177 176 DragCoefficientEnum, 178 177 DragPEnum, … … 194 193 ExtToIuEnum, 195 194 MassFluxEnum, 196 DhDtAbsMisfitEnum,197 195 ThicknessAbsMisfitEnum, 198 196 SurfaceAbsVelMisfitEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp
r5521 r6099 18 18 case RheologyBbarEnum : return "rheology_B"; 19 19 case DhDtEnum : return "dhdt"; 20 case VxEnum : return "vx"; 20 21 case VxObsEnum : return "vx_obs"; 22 case VyEnum : return "vy"; 21 23 case VyObsEnum : return "vy_obs"; 22 24 default : ISSMERROR("No model field is associated to enum %s",EnumToString(en)); -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r6079 r6099 148 148 case ConvergedEnum : return "Converged"; 149 149 case DhDtEnum : return "DhDt"; 150 case DhDtObsEnum : return "DhDtObs";151 150 case DragCoefficientEnum : return "DragCoefficient"; 152 151 case DragPEnum : return "DragP"; … … 168 167 case ExtToIuEnum : return "ExtToIu"; 169 168 case MassFluxEnum : return "MassFlux"; 170 case DhDtAbsMisfitEnum : return "DhDtAbsMisfit";171 169 case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit"; 172 170 case SurfaceAbsVelMisfitEnum : return "SurfaceAbsVelMisfit"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r6079 r6099 146 146 else if (strcmp(name,"Converged")==0) return ConvergedEnum; 147 147 else if (strcmp(name,"DhDt")==0) return DhDtEnum; 148 else if (strcmp(name,"DhDtObs")==0) return DhDtObsEnum;149 148 else if (strcmp(name,"DragCoefficient")==0) return DragCoefficientEnum; 150 149 else if (strcmp(name,"DragP")==0) return DragPEnum; … … 166 165 else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum; 167 166 else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; 168 else if (strcmp(name,"DhDtAbsMisfit")==0) return DhDtAbsMisfitEnum;169 167 else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; 170 168 else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
Note:
See TracChangeset
for help on using the changeset viewer.