Changeset 22235

Timestamp:

11/04/17 16:36:43 (8 years ago)

Author:

Eric.Larour

Message:

CHG: eustatic mask

Location:

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (3 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/EnumDefinitions.h

@@ -795 +795 @@
         SealevelRSLEustaticEnum,
         SealevelRSLEustaticRateEnum,
+        SealevelEustaticMaskEnum,
         SealevelRSLEnum,
         SealevelRSLRateEnum,

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/EnumToStringx.cpp

@@ -775 +775 @@
                 case SealevelRSLEustaticEnum : return "SealevelRSLEustatic";
                 case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate";
+                case SealevelEustaticMaskEnum : return "SealevelEustaticMask";
                 case SealevelRSLEnum : return "SealevelRSL";
                 case SealevelRSLRateEnum : return "SealevelRSLRate";

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/StringToEnumx.cpp

@@ -793 +793 @@
               else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
               else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum;
+              else if (strcmp(name,"SealevelEustaticMask")==0) return SealevelEustaticMaskEnum;
               else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
               else if (strcmp(name,"SealevelRSLRate")==0) return SealevelRSLRateEnum;
@@ -874 +875 @@
               else if (strcmp(name,"Matpar")==0) return MatparEnum;
               else if (strcmp(name,"Node")==0) return NodeEnum;
-              else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
+              if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
+              else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
               else if (strcmp(name,"Moulin")==0) return MoulinEnum;
@@ -997 +998 @@
               else if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
               else if (strcmp(name,"IceMass")==0) return IceMassEnum;
-              else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
+              if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
+              else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
               else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
               else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;