Changeset 17738

Timestamp:

04/15/14 10:50:35 (11 years ago)

Author:

bdef

Message:

NEW: adding a stand alone max limit for epl thickness

Location:

issm/trunk-jpl

Files:

• src/c/analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• src/c/classes/Materials/Matpar.cpp (modified) (3 diffs)
• src/c/classes/Materials/Matpar.h (modified) (2 diffs)
• src/m/classes/hydrologydc.m (modified) (5 diffs)
• test/NightlyRun/test3300.m (modified) (1 diff)
• test/NightlyRun/test333.m (modified) (1 diff)
• test/NightlyRun/test335.m (modified) (1 diff)

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

@@ -54 +54 @@
         iomodel->FetchDataToInput(elements,SedimentHeadEnum);
         iomodel->FetchDataToInput(elements,HydrologydcEplInitialThicknessEnum);
+        iomodel->FetchDataToInput(elements,HydrologydcEplMaxThicknessEnum);
         iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum);
         iomodel->FetchDataToInput(elements,HydrologydcEplThicknessEnum);

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_max_thickness,HydrologydcEplMaxThicknessEnum);
                                 iomodel->Constant(&this->epl_conductivity,HydrologydcEplConductivityEnum);
                 }
@@ -263 +264 @@
                 case HydrologydcEplConductivityEnum:         return this->epl_conductivity;
                 case HydrologydcEplInitialThicknessEnum:     return this->epl_init_thickness;
+                case HydrologydcEplMaxThicknessEnum:         return this->epl_max_thickness;
                 case HydrologydcWaterCompressibilityEnum:    return this->water_compressibility;
                 case HydrologyshreveCREnum:                  return this->hydro_CR;
@@ -401 +403 @@
 IssmDouble Matpar::GetEplInitialThickness(){
         return epl_init_thickness;               
+}                
+/*}}}*/ 
+/*FUNCTION Matpar::GetEplMaxThickness {{{*/
+IssmDouble Matpar::GetEplMaxThickness(){
+        return epl_max_thickness;                
 }                
 /*}}}*/ 

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

@@ -49 +49 @@
                 IssmDouble  epl_porosity;
                 IssmDouble  epl_init_thickness;
+                IssmDouble  epl_max_thickness;
                 IssmDouble  epl_conductivity;    
 
@@ -121 +122 @@
                 IssmDouble GetEplConductivity();
                 IssmDouble GetEplInitialThickness();
+                IssmDouble GetEplMaxThickness();
                 IssmDouble TMeltingPoint(IssmDouble pressure);
                 IssmDouble PureIceEnthalpy(IssmDouble pressure);

issm/trunk-jpl/src/m/classes/hydrologydc.m

@@ -30 +30 @@
                 epl_porosity             = 0;
                 epl_initial_thickness    = 0;
+                epl_max_thickness    = 0;
                 epl_conductivity         = 0;
   end
@@ -72 +73 @@
                         obj.epl_porosity             = 0.4;
                         obj.epl_initial_thickness    = 1.0;
+                        obj.epl_max_thickness    = 5.0;
                         obj.epl_conductivity         = 8.0e-02;
 
@@ -110 +112 @@
                                 md = checkfield(md,'fieldname','hydrology.epl_porosity','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','hydrology.epl_initial_thickness','>',0,'numel',1);
+                                md = checkfield(md,'fieldname','hydrology.epl_max_thickness','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','hydrology.epl_conductivity','>',0,'numel',1);
             end
@@ -153 +156 @@
                                 fielddisplay(obj,'epl_porosity','epl [dimensionless]');
                                 fielddisplay(obj,'epl_initial_thickness','epl initial thickness [m]');
+                                fielddisplay(obj,'epl_max_thickness','epl maximal thickness [m]');
                                 fielddisplay(obj,'epl_conductivity','epl conductivity [m^2/s]');
             end
@@ -189 +193 @@
                                 WriteData(fid,'object',obj,'fieldname','epl_porosity','format','Double');                       
                                 WriteData(fid,'object',obj,'fieldname','epl_initial_thickness','format','Double');
+                                WriteData(fid,'object',obj,'fieldname','epl_max_thickness','format','Double');
                                 WriteData(fid,'object',obj,'fieldname','epl_conductivity','format','Double');
                         end

issm/trunk-jpl/test/NightlyRun/test3300.m

@@ -24 +24 @@
 md.hydrology.epl_conductivity=1.5e-2;
 md.hydrology.epl_initial_thickness=1.0;
+md.hydrology.epl_max_thickness=5.0;
 
 md.hydrology.transfer_flag=1;

issm/trunk-jpl/test/NightlyRun/test333.m

@@ -23 +23 @@
 md.hydrology.epl_conductivity=30;
 md.hydrology.epl_initial_thickness=1;
+md.hydrology.epl_max_thickness=1;
 md.timestepping.time_step=0.2;
 md.timestepping.final_time=2.0;

issm/trunk-jpl/test/NightlyRun/test335.m

@@ -23 +23 @@
 md.hydrology.epl_conductivity=30;
 md.hydrology.epl_initial_thickness=1;
+md.hydrology.epl_max_thickness=1;
 md.timestepping.time_step=0.2;
 md.timestepping.final_time=2.0;