Changeset 23943

Timestamp:

05/29/19 10:38:24 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/src/c

Files:

• cores/hydrology_core.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (7 diffs)

issm/trunk-jpl/src/c/cores/hydrology_core.cpp

@@ -191 +191 @@
         }
 
+        /*Using the GlaDS model*/
+        else if (hydrology_model==HydrologyGlaDSAnalysisEnum){
+                femmodel->SetCurrentConfiguration(HydrologyGlaDSAnalysisEnum);
+                InputDuplicatex(femmodel,HydraulicPotentialEnum,HydraulicPotentialOldEnum);
+                solutionsequence_shakti_nonlinear(femmodel);
+                if(VerboseSolution()) _printf0_("   updating sheet thickness\n");
+                HydrologyGlaDSAnalysis* analysis = new HydrologyGlaDSAnalysis();
+                analysis->UpdateSheetThickness(femmodel);
+                delete analysis;
+        }
+
         /*Using the PISM hydrology model*/
         else if (hydrology_model==HydrologypismEnum){

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

@@ -537 +537 @@
         GroundinglineHeightEnum,
         HydraulicPotentialEnum,
+        HydraulicPotentialOldEnum,
         HydrologyBasalFluxEnum,
         HydrologySheetThicknessEnum,

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

@@ -543 +543 @@
                 case GroundinglineHeightEnum : return "GroundinglineHeight";
                 case HydraulicPotentialEnum : return "HydraulicPotential";
+                case HydraulicPotentialOldEnum : return "HydraulicPotentialOld";
                 case HydrologyBasalFluxEnum : return "HydrologyBasalFlux";
                 case HydrologySheetThicknessEnum : return "HydrologySheetThickness";

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

@@ -555 +555 @@
               else if (strcmp(name,"GroundinglineHeight")==0) return GroundinglineHeightEnum;
               else if (strcmp(name,"HydraulicPotential")==0) return HydraulicPotentialEnum;
+              else if (strcmp(name,"HydraulicPotentialOld")==0) return HydraulicPotentialOldEnum;
               else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
               else if (strcmp(name,"HydrologySheetThickness")==0) return HydrologySheetThicknessEnum;
@@ -628 +629 @@
               else if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum;
               else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
-              else if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
+              if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
+              else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
               else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
               else if (strcmp(name,"SealevelEustaticMask")==0) return SealevelEustaticMaskEnum;
@@ -751 +752 @@
               else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
               else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
-              else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
+              if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
+              else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
               else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
               else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
@@ -874 +875 @@
               else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
               else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum;
-              else if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"Outputdefinition69")==0) return Outputdefinition69Enum;
+              if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;
+              else if (strcmp(name,"Outputdefinition69")==0) return Outputdefinition69Enum;
               else if (strcmp(name,"Outputdefinition6")==0) return Outputdefinition6Enum;
               else if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum;
@@ -997 +998 @@
               else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
-              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"FileParam")==0) return FileParamEnum;
+              if (strcmp(name,"FemModel")==0) return FemModelEnum;
+              else if (strcmp(name,"FileParam")==0) return FileParamEnum;
               else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum;
               else if (strcmp(name,"FloatingArea")==0) return FloatingAreaEnum;
@@ -1120 +1121 @@
               else if (strcmp(name,"MeshY")==0) return MeshYEnum;
               else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
-              else if (strcmp(name,"MINI")==0) return MINIEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"MinVel")==0) return MinVelEnum;
+              if (strcmp(name,"MINI")==0) return MINIEnum;
+              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
               else if (strcmp(name,"MinVx")==0) return MinVxEnum;
               else if (strcmp(name,"MinVy")==0) return MinVyEnum;
@@ -1243 +1244 @@
               else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
               else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
-              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
+              if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
+              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
               else if (strcmp(name,"Tria")==0) return TriaEnum;