Changeset 22899

Timestamp:

07/04/18 07:49:10 (7 years ago)

Author:

bdef

Message:

NEW:deactivation of hydrologydc for frozen elements

Location:

issm/trunk-jpl/src/m/classes

Files:

• hydrologydc.m (modified) (7 diffs)
• hydrologydc.py (modified) (5 diffs)

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

@@ -22 +22 @@
 
                 spcsediment_head         = NaN;
+    mask_thawed_node         = NaN;
                 sediment_transmitivity   = NaN;
                 sediment_compressibility = 0;
@@ -45 +46 @@
                         self.sediment_transmitivity=project3d(md,'vector',self.sediment_transmitivity,'type','node','layer',1);
                         self.basal_moulin_input=project3d(md,'vector',self.basal_moulin_input,'type','node','layer',1);
+      self.mask_thawed_node=project3d(md,'vector',self.mask_thawed_node,'type','node','layer',1);
                         if(self.isefficientlayer==1);
                                 self.spcepl_head=project3d(md,'vector',self.spcepl_head,'type','node','layer',1);
@@ -150 +152 @@
                         md = checkfield(md,'fieldname','hydrology.sediment_thickness','>',0,'numel',1);
                         md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices 1]);
+      md = checkfield(md,'fieldname','hydrology.mask_thawed_node','size',[md.mesh.numberofvertices 1],'values',[0 1]);
 
                         if self.isefficientlayer==1,
@@ -189 +192 @@
                                 fielddisplay(self,'sedimentlimit','user defined upper limit for the inefficient layer [m]');
                         end
-                        fielddisplay(self,'transfer_flag',['what kind of transfer method is applied between the layers']);
+                        fielddisplay(self,'transfer_flag','what kind of transfer method is applied between the layers');
                         disp(sprintf('%55s  0: no transfer',' '));
                         disp(sprintf('%55s  1: constant leakage factor: %s',' ','leakage_factor'));
@@ -195 +198 @@
                                 fielddisplay(self,'leakage_factor','user defined leakage factor [m]');
                         end
-                        fielddisplay(self,'unconfined_flag',['Do you want unconfined scheme to be used (transitory)']);
+                        fielddisplay(self,'unconfined_flag','Do you want unconfined scheme to be used (transitory)');
                         disp(sprintf('%55s  0: confined only',' '));
                         disp(sprintf('%55s  1: confined unconfined'));
@@ -206 +209 @@
                         fielddisplay(self,'sediment_thickness','sediment thickness [m]');
                         fielddisplay(self,'sediment_transmitivity','sediment transmitivity [m^2/s]');
+      fielddisplay(self,'mask_thawed_node','deactivate (0) hydrology on frozen nodes');
 
                         if self.isefficientlayer==1,
@@ -251 +255 @@
                         WriteData(fid,prefix,'object',self,'fieldname','sediment_thickness','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1');
+      WriteData(fid,prefix,'object',self,'fieldname','mask_thawed_node','format','DoubleMat','mattype',1);
 
                         if self.isefficientlayer==1,

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

@@ -26 +26 @@
                 self.unconfined_flag          = 0
                 self.leakage_factor           = 0
-                self.basal_moulin_input       = float('NaN')
+                self.basal_moulin_input       = np.nan
                 self.requested_outputs        = []
 
-                self.spcsediment_head         = float('NaN')
-                self.sediment_transmitivity   = float('NaN')
+                self.spcsediment_head         = np.nan
+                self.mask_thawed_node         = np.nan
+                self.sediment_transmitivity   = np.nan
                 self.sediment_compressibility = 0
                 self.sediment_porosity        = 0
                 self.sediment_thickness       = 0
 
-                self.spcepl_head              = float('NaN')
-                self.mask_eplactive_node      = float('NaN')
+                self.spcepl_head              = np.nan
+                self.mask_eplactive_node      = np.nan
                 self.epl_compressibility      = 0
                 self.epl_porosity             = 0
@@ -87 +88 @@
                 string="%s\n%s"%(string,fielddisplay(self,'sediment_thickness','sediment thickness [m]'))
                 string="%s\n%s"%(string,fielddisplay(self,'sediment_transmitivity','sediment transmitivity [m^2/s]'))
+                string="%s\n%s"%(string,fielddisplay(self,'mask_thawed_node','IDS is deactivaed (0) on frozen nodes'))
 
                 if self.isefficientlayer==1:
@@ -106 +108 @@
                 self.sediment_transmitivity=project3d(md,'vector',self.sediment_transmitivity,'type','node','layer',1)
                 self.basal_moulin_input=project3d(md,'vector',self.basal_moulin_input,'type','node','layer',1)
+                self.mask_thawed_node=project3d(md,'vector',self.mask_thawed_node,'type','node','layer',1)
                 if self.isefficientlayer==1 :
                         self.spcepl_head=project3d(md,'vector',self.spcepl_head,'type','node','layer',1)
@@ -193 +196 @@
                 md = checkfield(md,'fieldname','hydrology.sediment_thickness','>',0.,'numel',[1])
                 md = checkfield(md,'fieldname','hydrology.sediment_transmitivity','>=',0,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','hydrology.mask_thawed_node','size',[md.mesh.numberofvertices],'values',[0,1])
                 if self.isefficientlayer==1:
                         md = checkfield(md,'fieldname','hydrology.spcepl_head','Inf',1,'timeseries',1)
@@ -231 +235 @@
                 WriteData(fid,prefix,'object',self,'fieldname','sediment_thickness','format','Double')
                 WriteData(fid,prefix,'object',self,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1)
+                WriteData(fid,prefix,'object',self,'fieldname','mask_thawed_node','format','DoubleMat','mattype',1)
 
                 if self.isefficientlayer==1: