Changeset 22599

Timestamp:

03/21/18 21:01:13 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving an enum to the parameter set

Location:

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

Files:

• EnumDefinitions.h (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (7 diffs)

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

@@ -194 +194 @@
         MeshAverageVertexConnectivityEnum,
         MeshElementtypeEnum,
+        MeshNumberofelementsEnum,
         MeshNumberoflayersEnum,
         MeshNumberofverticesEnum,
@@ -847 +848 @@
         MeshLatEnum,
         MeshLongEnum,
-        MeshNumberofelementsEnum,
         MeshXEnum,
         MeshYEnum,

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

@@ -202 +202 @@
                 case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity";
                 case MeshElementtypeEnum : return "MeshElementtype";
+                case MeshNumberofelementsEnum : return "MeshNumberofelements";
                 case MeshNumberoflayersEnum : return "MeshNumberoflayers";
                 case MeshNumberofverticesEnum : return "MeshNumberofvertices";
@@ -851 +852 @@
                 case MeshLatEnum : return "MeshLat";
                 case MeshLongEnum : return "MeshLong";
-                case MeshNumberofelementsEnum : return "MeshNumberofelements";
                 case MeshXEnum : return "MeshX";
                 case MeshYEnum : return "MeshY";

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

@@ -205 +205 @@
               else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
               else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
+              else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
               else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
@@ -259 +260 @@
               else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
               else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
-              else if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum;
+              if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum;
+              else if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum;
               else if (strcmp(name,"SmbDt")==0) return SmbDtEnum;
               else if (strcmp(name,"Smb")==0) return SmbEnum;
@@ -382 +383 @@
               else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
-              else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;
+              if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
+              else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;
               else if (strcmp(name,"Converged")==0) return ConvergedEnum;
               else if (strcmp(name,"CrevasseDepth")==0) return CrevasseDepthEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
               else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
-              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
+              if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
+              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
               else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
               else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
@@ -628 +629 @@
               else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
               else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
-              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
+              if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
+              else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
               else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
               else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum;
@@ -751 +752 @@
               else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
               else if (strcmp(name,"Gset")==0) return GsetEnum;
-              else if (strcmp(name,"Gsl")==0) return GslEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
+              if (strcmp(name,"Gsl")==0) return GslEnum;
+              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
               else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
               else if (strcmp(name,"Hook")==0) return HookEnum;
@@ -869 +870 @@
               else if (strcmp(name,"MeshLat")==0) return MeshLatEnum;
               else if (strcmp(name,"MeshLong")==0) return MeshLongEnum;
-              else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
               else if (strcmp(name,"MeshX")==0) return MeshXEnum;
               else if (strcmp(name,"MeshY")==0) return MeshYEnum;