Changeset 6099

Timestamp:

09/30/10 09:56:32 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed some enums

Location:

issm/trunk/src/c/EnumDefinitions

Files:

• EnumDefinitions.h (modified) (2 diffs)
• EnumToModelField.cpp (modified) (1 diff)
• EnumToString.cpp (modified) (2 diffs)
• StringToEnum.cpp (modified) (2 diffs)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -174 +174 @@
         ConvergedEnum,
         DhDtEnum,
-        DhDtObsEnum,
         DragCoefficientEnum,
         DragPEnum,
@@ -194 +193 @@
         ExtToIuEnum,
         MassFluxEnum,
-        DhDtAbsMisfitEnum,
         ThicknessAbsMisfitEnum,
         SurfaceAbsVelMisfitEnum,

issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp

@@ -18 +18 @@
                 case RheologyBbarEnum : return "rheology_B";
                 case DhDtEnum : return "dhdt";
+                case VxEnum : return "vx";
                 case VxObsEnum : return "vx_obs";
+                case VyEnum : return "vy";
                 case VyObsEnum : return "vy_obs";
                 default : ISSMERROR("No model field is associated to enum %s",EnumToString(en));

issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

@@ -148 +148 @@
                 case ConvergedEnum : return "Converged";
                 case DhDtEnum : return "DhDt";
-                case DhDtObsEnum : return "DhDtObs";
                 case DragCoefficientEnum : return "DragCoefficient";
                 case DragPEnum : return "DragP";
@@ -168 +167 @@
                 case ExtToIuEnum : return "ExtToIu";
                 case MassFluxEnum : return "MassFlux";
-                case DhDtAbsMisfitEnum : return "DhDtAbsMisfit";
                 case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit";
                 case SurfaceAbsVelMisfitEnum : return "SurfaceAbsVelMisfit";

issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

@@ -146 +146 @@
         else if (strcmp(name,"Converged")==0) return ConvergedEnum;
         else if (strcmp(name,"DhDt")==0) return DhDtEnum;
-        else if (strcmp(name,"DhDtObs")==0) return DhDtObsEnum;
         else if (strcmp(name,"DragCoefficient")==0) return DragCoefficientEnum;
         else if (strcmp(name,"DragP")==0) return DragPEnum;
@@ -166 +165 @@
         else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
         else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
-        else if (strcmp(name,"DhDtAbsMisfit")==0) return DhDtAbsMisfitEnum;
         else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
         else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;