Changeset 23664

Timestamp:

01/28/19 02:20:21 (6 years ago)

Author:

bdef

Message:

BUG: fix to hydrology colapse and minor change in hydrologydc

Location:

issm/trunk-jpl/src/m/classes

Files:

• hydrologydc.py (modified) (2 diffs)
• model.py (modified) (1 diff)

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

@@ -148 +148 @@
 
         def defaultoutputs(self,md): # {{{
-                list = ['SedimentHeadHydrostep','SedimentHeadResidual','EffectivePressureHydrostep']
+                list = ['SedimentHeadHydrostep','SedimentHeadResidual','EffectivePressureHydrostep','HydrologydcMaskThawedNode','HydrologydcMaskThawedElt']
                 if self.isefficientlayer==1:
                         list.extend(['EplHeadHydrostep','HydrologydcMaskEplactiveNode','HydrologydcMaskEplactiveElt','EplHeadSlopeX','EplHeadSlopeY','HydrologydcEplThicknessHydrostep'])
@@ -204 +204 @@
                         md = checkfield(md,'fieldname','hydrology.epl_max_thickness','numel',[1],'>',0.)
                         md = checkfield(md,'fieldname','hydrology.epl_initial_thickness','numel',[1],'>',0.)
-                        md = checkfield(md,'fieldname','hydrology.epl_colapse_thickness','numel',[1],'>',0.)
+                        md = checkfield(md,'fieldname','hydrology.epl_colapse_thickness','numel',[1],'>',0.,'<',self.epl_initial_thickness)
                         md = checkfield(md,'fieldname','hydrology.epl_thick_comp','numel',[1],'values',[0,1])
                         md = checkfield(md,'fieldname','hydrology.eplflip_lock','>=',0.,'numel',[1])

issm/trunk-jpl/src/m/classes/model.py

@@ -783 +783 @@
 
                 # Hydrologydc variables
-                if type(md.hydrology) is 'hydrologydc':
-                        md.hydrology.spcsediment_head=project2d(md,md.hydrology.spcsediment_head,1)
-                        md.hydrology.sediment_transmitivity=project2d(md,md.hydrology.sediment_transmitivity,1)
-                        md.hydrology.basal_moulin_input=project2d(md,md.hydrology.basal_moulin_input,1)
-                        md.hydrology.mask_thawed_node=project2d(md,md.hydrology.mask_thawed_node,1)
-                        if md.hydrology.isefficientlayer == 1:
-                                md.hydrology.mask_eplactive_node=project2d(md,md.hydrology.mask_eplactive_node,1)
-                                md.hydrology.spcepl_head=project2d(md,md.hydrology.spcepl_head,1)
+                hydrofields=md.hydrology.__dict__.keys()
+                for field in hydrofields:
+                        try:
+                                isvector=np.logical_or(np.shape(md.hydrology.__dict__[field])[0]==md.mesh.numberofelements,
+                                                                                                                         np.shape(md.hydrology.__dict__[field])[0]==md.mesh.numberofvertices)
+                        except IndexError:
+                                isvector=False
+                        #we colpase only fields that are vertices or element based
+                        if isvector:
+                                md.hydrology.__dict__[field]=project2d(md,md.hydrology.__dict__[field],1)
 
                 #boundary conditions