Changeset 18581

Timestamp:

10/06/14 12:21:38 (10 years ago)

Author:

bdef

Message:

NEW: adding a colapsing thickness to the EPL

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (2 diffs)
• classes/Materials/Matpar.cpp (modified) (3 diffs)
• classes/Materials/Matpar.h (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/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -614 +614 @@
         IssmDouble* residual      =xNew<IssmDouble>(numnodes);
 
-        IssmDouble init_thick = basalelement->GetMaterialParameter(HydrologydcEplInitialThicknessEnum);
+        IssmDouble init_thick    =basalelement->GetMaterialParameter(HydrologydcEplInitialThicknessEnum);
+        IssmDouble colapse_thick =basalelement->GetMaterialParameter(HydrologydcEplColapseThicknessEnum);
 
         Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
@@ -639 +640 @@
                         vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL);
                         /*If epl thickness gets under 10-3 initial thickness, close the layer*/
-                        if(epl_thickness[i]<0.001*init_thick){
+                        if(epl_thickness[i]<colapse_thick){
                                 vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL);
                                 epl_thickness[i]=init_thick;

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -79 +79 @@
                                         iomodel->Constant(&this->epl_porosity,HydrologydcEplPorosityEnum);
                                         iomodel->Constant(&this->epl_init_thickness,HydrologydcEplInitialThicknessEnum);
+                                        iomodel->Constant(&this->epl_colapse_thickness,HydrologydcEplColapseThicknessEnum);
                                         iomodel->Constant(&this->epl_max_thickness,HydrologydcEplMaxThicknessEnum);
                                         iomodel->Constant(&this->epl_conductivity,HydrologydcEplConductivityEnum);
@@ -192 +193 @@
         matpar->epl_porosity=this->epl_porosity;
         matpar->epl_init_thickness=this->epl_init_thickness;
+        matpar->epl_colapse_thickness=this->epl_colapse_thickness;
         matpar->epl_max_thickness=this->epl_max_thickness;
         matpar->epl_conductivity=this->epl_conductivity;
@@ -313 +315 @@
                 case HydrologydcEplConductivityEnum:         return this->epl_conductivity;
                 case HydrologydcEplInitialThicknessEnum:     return this->epl_init_thickness;
+                case HydrologydcEplColapseThicknessEnum:     return this->epl_colapse_thickness;
                 case HydrologydcEplMaxThicknessEnum:         return this->epl_max_thickness;
                 case HydrologydcWaterCompressibilityEnum:    return this->water_compressibility;

issm/trunk-jpl/src/c/classes/Materials/Matpar.h

@@ -43 +43 @@
                 IssmDouble  epl_porosity;
                 IssmDouble  epl_init_thickness;
+                IssmDouble  epl_colapse_thickness;
                 IssmDouble  epl_max_thickness;
                 IssmDouble  epl_conductivity;    

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

@@ -123 +123 @@
         HydrologydcEplPorosityEnum,
         HydrologydcEplInitialThicknessEnum,
+        HydrologydcEplColapseThicknessEnum,
         HydrologydcEplMaxThicknessEnum,
         HydrologydcEplThicknessEnum,

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

@@ -131 +131 @@
                 case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";
                 case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness";
+                case HydrologydcEplColapseThicknessEnum : return "HydrologydcEplColapseThickness";
                 case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness";
                 case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";

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

@@ -131 +131 @@
               else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
               else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum;
+              else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum;
               else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum;
               else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
@@ -136 +137 @@
               else if (strcmp(name,"HydrologydcEplConductivity")==0) return HydrologydcEplConductivityEnum;
               else if (strcmp(name,"HydrologydcIsefficientlayer")==0) return HydrologydcIsefficientlayerEnum;
-              else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
+              if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum;
+              else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
               else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
               else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
@@ -259 +260 @@
               else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
               else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum;
-              else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
+              if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
+              else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
               else if (strcmp(name,"QmuMassFluxSegmentsPresent")==0) return QmuMassFluxSegmentsPresentEnum;
               else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum;
@@ -382 +383 @@
               else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum;
               else if (strcmp(name,"HydrologyShreveAnalysis")==0) return HydrologyShreveAnalysisEnum;
-              else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
+              if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum;
+              else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
               else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
               else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
@@ -505 +506 @@
               else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum;
               else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum;
-              else if (strcmp(name,"Boundary")==0) return BoundaryEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Converged")==0) return ConvergedEnum;
+              if (strcmp(name,"Boundary")==0) return BoundaryEnum;
+              else if (strcmp(name,"Converged")==0) return ConvergedEnum;
               else if (strcmp(name,"Fill")==0) return FillEnum;
               else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
@@ -628 +629 @@
               else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
               else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
-              else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
+              if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
+              else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
               else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
               else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
@@ -751 +752 @@
               else if (strcmp(name,"SurfaceforcingsAirLinDragCoef")==0) return SurfaceforcingsAirLinDragCoefEnum;
               else if (strcmp(name,"SurfaceforcingsAirQuadDragCoef")==0) return SurfaceforcingsAirQuadDragCoefEnum;
-              else if (strcmp(name,"SurfaceforcingsWindVx")==0) return SurfaceforcingsWindVxEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SurfaceforcingsWindVy")==0) return SurfaceforcingsWindVyEnum;
+              if (strcmp(name,"SurfaceforcingsWindVx")==0) return SurfaceforcingsWindVxEnum;
+              else if (strcmp(name,"SurfaceforcingsWindVy")==0) return SurfaceforcingsWindVyEnum;
               else if (strcmp(name,"Matseaice")==0) return MatseaiceEnum;
               else if (strcmp(name,"MaterialsPoisson")==0) return MaterialsPoissonEnum;