Changeset 18585

Timestamp:

10/07/14 09:07:21 (10 years ago)

Author:

bdef

Message:

BUG : indentation issue

File:

• issm/trunk-jpl/src/m/classes/hydrologydc.py (modified) (7 diffs)

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

@@ -23 +23 @@
                 self.transfer_flag            = 0
                 self.leakage_factor           = 0
+                self.basal_moulin_input       = float('NaN')
 
                 self.spcsediment_head         = float('NaN')
@@ -36 +37 @@
                 self.epl_porosity             = 0
                 self.epl_initial_thickness    = 0
+                self.epl_max_thickness        = 0
                 self.epl_conductivity         = 0
                 
                 #set defaults
                 self.setdefaultparameters()
+
                 #}}}
                 
@@ -59 +62 @@
             if self.sedimentlimit_flag==1:
                 string="%s\n%s"%(string,fielddisplay(self,'sedimentlimit','user defined upper limit for the inefficient layer [m]'))
-                string="%s\n%s"%(string,fielddisplay(self,'transfer_flag',['what kind of transfer method is applied between the layers']))
+                string="%s\n%s"%(string,fielddisplay(self,'basal_moulin_input','water flux at a given point [m3 s-1]'))
+                string="%s\n%s"%(string,fielddisplay(self,'transfer_flag','what kind of transfer method is applied between the layers'))
                 string='%55s  0: no transfer',' '
                 string='%55s  1: constant leakage factor: %s',' ','leakage_factor'
@@ -103 +107 @@
         self.epl_porosity             = 0.4
         self.epl_initial_thickness    = 1.0
+        self.epl_max_thickness        = 5.0
         self.epl_conductivity         = 8.0e-02
         
@@ -108 +113 @@
     # }}}
     
+    def initialize(self): # {{{
+        if numpy.all(numpy.isnan(self.basal_moulin_input):
+            self.basal_moulin_input=numpy.zeros(md.mesh.numberofvertices,1)
+            print"      no hydrology.basal_moulin_input specified: values set as zero"
+
+        return self
+
+    # }}}
     def checkconsistency(self,md,solution,analyses): #{{{ 
         
@@ -127 +140 @@
         if self.transfer_flag==1:
             md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0,'numel',1)
-            
+
+        md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'forcing',1)
         md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1)
         md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0,'numel',1)
@@ -159 +173 @@
             WriteData(fid,'object',self,'fieldname','leakage_factor','format','Double')
 
+        WriteData(fid,'object',self,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
         WriteData(fid,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
         WriteData(fid,'object',self,'fieldname','sediment_compressibility','format','Double')