Changeset 16767 for issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

Timestamp:

11/14/13 16:14:16 (11 years ago)

Author:

Eric.Larour

Message:

NEW: new enums for misfit class.

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -551 +551 @@
               else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
               else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
+              else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
+              else if (strcmp(name,"MisfitModel")==0) return MisfitModelEnum;
+              else if (strcmp(name,"MisfitObservations")==0) return MisfitObservationsEnum;
+              else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
+              else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
               else if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
@@ -624 +629 @@
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
               else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
-              else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
               else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
-         else stage=6;
+         else stage=7;
    }
         /*If we reach this point, the string provided has not been found*/