Changeset 21966

Timestamp:

08/17/17 06:32:58 (8 years ago)

Author:

bdef

Message:

NEW:adding a bypass for unconfined scheme (transitory for nondev use)

Location:

issm/trunk-jpl/src/m/classes

Files:

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

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

@@ -15 +15 @@
                 sedimentlimit            = 0;
                 transfer_flag            = 0;
+                unconfined_flag          = 0;
                 leakage_factor           = 0;
                 basal_moulin_input       = NaN;
@@ -79 +80 @@
                         self.sedimentlimit            = 0;
                         self.transfer_flag            = 0;
+                        self.unconfined_flag          = 0;
                         self.leakage_factor           = 10.0;
 
@@ -113 +115 @@
                         md = checkfield(md,'fieldname','hydrology.sedimentlimit_flag','numel',[1],'values',[0 1 2 3]);
                         md = checkfield(md,'fieldname','hydrology.transfer_flag','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','hydrology.unconfined_flag','numel',[1],'values',[0 1]);
                         if self.sedimentlimit_flag==1,
                                 md = checkfield(md,'fieldname','hydrology.sedimentlimit','>',0,'numel',1);
@@ -170 +173 @@
                                 fielddisplay(self,'leakage_factor','user defined leakage factor [m]');
                         end
+                        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'));
                         fielddisplay(self,'basal_moulin_input','water flux at a given point [m3 s-1]');
                         disp(sprintf('   - for the sediment layer'));
@@ -207 +213 @@
                         WriteData(fid,prefix,'object',self,'fieldname','sedimentlimit_flag','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','transfer_flag','format','Integer');
+                        WriteData(fid,prefix,'object',self,'fieldname','unconfined_flag','format','Integer');
                         if self.sedimentlimit_flag==1,
                                 WriteData(fid,prefix,'object',self,'fieldname','sedimentlimit','format','Double');

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

@@ -23 +23 @@
                 self.sedimentlimit            = 0
                 self.transfer_flag            = 0
+                self.unconfined_flag          = 0
                 self.leakage_factor           = 0
                 self.basal_moulin_input       = float('NaN')
@@ -73 +74 @@
                         string="%s\n%s"%(string,fielddisplay(self,'leakage_factor','user defined leakage factor [m]'))
 
+                string="%s\n%s"%(string,fielddisplay(self,'unconfined_flag','using an unconfined scheme or not (transitory)'))
+                string="%s\n\t\t%s"%(string,'0: Confined only')
+                string="%s\n\t\t%s"%(string,'1: Confined-Unconfined')
+                         
                 string="%s\n%s"%(string,'   - for the sediment layer')
                 string="%s\n%s"%(string,fielddisplay(self,'spcsediment_head','sediment water head constraints (NaN means no constraint) [m above MSL]'))
@@ -115 +120 @@
                 self.sedimentlimit            = 0
                 self.transfer_flag            = 0
+                self.unconfined_flag          = 0
                 self.leakage_factor           = 10.0
 
@@ -154 +160 @@
                 md = checkfield(md,'fieldname','hydrology.sedimentlimit_flag','numel',[1],'values',[0,1,2,3])
                 md = checkfield(md,'fieldname','hydrology.transfer_flag','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','hydrology.unconfined_flag','numel',[1],'values',[0,1])
 
                 if self.sedimentlimit_flag==1:
@@ -191 +198 @@
                 WriteData(fid,prefix,'object',self,'fieldname','sedimentlimit_flag','format','Integer')
                 WriteData(fid,prefix,'object',self,'fieldname','transfer_flag','format','Integer')
+                WriteData(fid,prefix,'object',self,'fieldname','unconfined_flag','format','Integer')
                 if self.sedimentlimit_flag==1:
                         WriteData(fid,prefix,'object',self,'fieldname','sedimentlimit','format','Double')