Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18580) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18581) @@ -614,5 +614,6 @@ IssmDouble* residual =xNew(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,5 +640,5 @@ 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]SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL); epl_thickness[i]=init_thick; Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 18580) +++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 18581) @@ -79,4 +79,5 @@ 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,4 +193,5 @@ 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,4 +315,5 @@ 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; Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matpar.h (revision 18580) +++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.h (revision 18581) @@ -43,4 +43,5 @@ IssmDouble epl_porosity; IssmDouble epl_init_thickness; + IssmDouble epl_colapse_thickness; IssmDouble epl_max_thickness; IssmDouble epl_conductivity; Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18580) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18581) @@ -123,4 +123,5 @@ HydrologydcEplPorosityEnum, HydrologydcEplInitialThicknessEnum, + HydrologydcEplColapseThicknessEnum, HydrologydcEplMaxThicknessEnum, HydrologydcEplThicknessEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18580) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18581) @@ -131,4 +131,5 @@ case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity"; case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness"; + case HydrologydcEplColapseThicknessEnum : return "HydrologydcEplColapseThickness"; case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness"; case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18580) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18581) @@ -131,4 +131,5 @@ 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,9 +137,9 @@ 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,9 +260,9 @@ 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,9 +383,9 @@ 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,9 +506,9 @@ 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,9 +629,9 @@ 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,9 +752,9 @@ 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;