Changeset 23882

Timestamp:

04/22/19 10:50:12 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added 2 Enums for computation of mass flux

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

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

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -1053 +1053 @@
         MassfluxatgateEnum,
         MassFluxEnum,
+        GroundinglineMassFluxEnum,
+        IceFrontMassFluxEnum,
         MasstransportAnalysisEnum,
         MasstransportSolutionEnum,

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

@@ -1057 +1057 @@
                 case MassfluxatgateEnum : return "Massfluxatgate";
                 case MassFluxEnum : return "MassFlux";
+                case GroundinglineMassFluxEnum : return "GroundinglineMassFlux";
+                case IceFrontMassFluxEnum : return "IceFrontMassFlux";
                 case MasstransportAnalysisEnum : return "MasstransportAnalysis";
                 case MasstransportSolutionEnum : return "MasstransportSolution";

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

@@ -1081 +1081 @@
               else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
               else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
+              else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
+              else if (strcmp(name,"IceFrontMassFlux")==0) return IceFrontMassFluxEnum;
               else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
               else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
@@ -1119 +1121 @@
               else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
               else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum;
-              else if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum;
-              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"None")==0) return NoneEnum;
+              if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum;
+              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
+              else if (strcmp(name,"None")==0) return NoneEnum;
               else if (strcmp(name,"Numberedcostfunction")==0) return NumberedcostfunctionEnum;
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
@@ -1242 +1244 @@
               else if (strcmp(name,"Water")==0) return WaterEnum;
               else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
-              else if (strcmp(name,"XY")==0) return XYEnum;
-              else if (strcmp(name,"XYZ")==0) return XYZEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
+              if (strcmp(name,"XY")==0) return XYEnum;
+              else if (strcmp(name,"XYZ")==0) return XYZEnum;
+              else if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
               else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;