Changeset 18585


Ignore:
Timestamp:
10/07/14 09:07:21 (10 years ago)
Author:
bdef
Message:

BUG : indentation issue

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/classes/hydrologydc.py

    r17497 r18585  
    2323                self.transfer_flag            = 0
    2424                self.leakage_factor           = 0
     25                self.basal_moulin_input       = float('NaN')
    2526
    2627                self.spcsediment_head         = float('NaN')
     
    3637                self.epl_porosity             = 0
    3738                self.epl_initial_thickness    = 0
     39                self.epl_max_thickness        = 0
    3840                self.epl_conductivity         = 0
    3941               
    4042                #set defaults
    4143                self.setdefaultparameters()
     44
    4245                #}}}
    4346               
     
    5962            if self.sedimentlimit_flag==1:
    6063                string="%s\n%s"%(string,fielddisplay(self,'sedimentlimit','user defined upper limit for the inefficient layer [m]'))
    61                 string="%s\n%s"%(string,fielddisplay(self,'transfer_flag',['what kind of transfer method is applied between the layers']))
     64                string="%s\n%s"%(string,fielddisplay(self,'basal_moulin_input','water flux at a given point [m3 s-1]'))
     65                string="%s\n%s"%(string,fielddisplay(self,'transfer_flag','what kind of transfer method is applied between the layers'))
    6266                string='%55s  0: no transfer',' '
    6367                string='%55s  1: constant leakage factor: %s',' ','leakage_factor'
     
    103107        self.epl_porosity             = 0.4
    104108        self.epl_initial_thickness    = 1.0
     109        self.epl_max_thickness        = 5.0
    105110        self.epl_conductivity         = 8.0e-02
    106111       
     
    108113    # }}}
    109114   
     115    def initialize(self): # {{{
     116        if numpy.all(numpy.isnan(self.basal_moulin_input):
     117            self.basal_moulin_input=numpy.zeros(md.mesh.numberofvertices,1)
     118            print"      no hydrology.basal_moulin_input specified: values set as zero"
     119
     120        return self
     121
     122    # }}}
    110123    def checkconsistency(self,md,solution,analyses): #{{{
    111124       
     
    127140        if self.transfer_flag==1:
    128141            md = checkfield(md,'fieldname','hydrology.leakage_factor','>',0,'numel',1)
    129            
     142
     143        md = checkfield(md,'fieldname','hydrology.basal_moulin_input','NaN',1,'forcing',1)
    130144        md = checkfield(md,'fieldname','hydrology.spcsediment_head','forcing',1)
    131145        md = checkfield(md,'fieldname','hydrology.sediment_compressibility','>',0,'numel',1)
     
    159173            WriteData(fid,'object',self,'fieldname','leakage_factor','format','Double')
    160174
     175        WriteData(fid,'object',self,'fieldname','basal_moulin_input','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
    161176        WriteData(fid,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
    162177        WriteData(fid,'object',self,'fieldname','sediment_compressibility','format','Double')
Note: See TracChangeset for help on using the changeset viewer.