Changeset 18747

Timestamp:

11/06/14 10:26:14 (10 years ago)

Author:

bdef

Message:

NEW: Adding eplflip lock specific Enum

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -664 +664 @@
         active_element_input->GetInputValue(&active_element);
 
-        basalelement->parameters->FindParam(&penalty_lock,HydrologydcPenaltyLockEnum); 
+        basalelement->parameters->FindParam(&penalty_lock,HydrologydcEplflipLockEnum); 
 
         basalelement-> GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveNodeEnum); 

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

@@ -137 +137 @@
         HydrologydcPenaltyFactorEnum,
         HydrologydcPenaltyLockEnum,
+        HydrologydcEplflipLockEnum,
         HydrologydcBasalMoulinInputEnum,
         HydrologyLayerEnum,

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

@@ -145 +145 @@
                 case HydrologydcPenaltyFactorEnum : return "HydrologydcPenaltyFactor";
                 case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock";
+                case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock";
                 case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput";
                 case HydrologyLayerEnum : return "HydrologyLayer";

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

@@ -148 +148 @@
               else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
               else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
+              else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
               else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
               else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
@@ -259 +260 @@
               else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
               else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
-              else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum;
+              if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
+              else if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum;
               else if (strcmp(name,"MasstransportLevermannCalvingCoeff")==0) return MasstransportLevermannCalvingCoeffEnum;
               else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum;
@@ -382 +383 @@
               else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
               else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
-              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
          else stage=4;
    }
    if(stage==4){
-              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,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
               else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
@@ -505 +506 @@
               else if (strcmp(name,"Tria")==0) return TriaEnum;
               else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
-              else if (strcmp(name,"Tetra")==0) return TetraEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
+              if (strcmp(name,"Tetra")==0) return TetraEnum;
+              else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
               else if (strcmp(name,"Penta")==0) return PentaEnum;
               else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
@@ -628 +629 @@
               else if (strcmp(name,"P1xP3")==0) return P1xP3Enum;
               else if (strcmp(name,"P2xP4")==0) return P2xP4Enum;
-              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
+              if (strcmp(name,"P1P1")==0) return P1P1Enum;
+              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
               else if (strcmp(name,"MINI")==0) return MINIEnum;
               else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
@@ -751 +752 @@
               else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
-              else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
+              if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
+              else if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
               else if (strcmp(name,"Seaiceocean")==0) return SeaiceoceanEnum;
               else if (strcmp(name,"SeaiceThickness")==0) return SeaiceThicknessEnum;