Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 22858) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 22859) @@ -5,5 +5,5 @@ classdef hydrologydc - properties (SetAccess=public) + properties (SetAccess=public) water_compressibility = 0; isefficientlayer = 0; @@ -40,6 +40,6 @@ end methods - % {{{ function self = extrude(self,md) - function self = extrude(self,md) + % {{{ function self = extrude(self,md) + function self = extrude(self,md) self.spcsediment_head=project3d(md,'vector',self.spcsediment_head,'type','node','layer',1); self.sediment_transmitivity=project3d(md,'vector',self.sediment_transmitivity,'type','node','layer',1); @@ -49,8 +49,8 @@ self.mask_eplactive_node=project3d(md,'vector',self.mask_eplactive_node,'type','node','layer',1); end - end + end % }}} - % {{{ function self = hydrologydc(varargin) - function self = hydrologydc(varargin) + % {{{ function self = hydrologydc(varargin) + function self = hydrologydc(varargin) switch nargin case 0 @@ -59,18 +59,18 @@ error('constructor not supported'); end - end + end % }}} function list = defaultoutputs(self,md) % {{{ - list = {'SedimentHead','SedimentHeadResidual','EffectivePressure'}; + list = {'SedimentHeadHydrostep','SedimentHeadResidual','EffectivePressureHydrostep'}; if self.isefficientlayer, - list=[list,{'EplHead','HydrologydcMaskEplactiveNode','HydrologydcMaskEplactiveElt','EplHeadSlopeX','EplHeadSlopeY','HydrologydcEplThickness'}]; + list=[list,{'EplHeadHydrostep','HydrologydcMaskEplactiveNode','HydrologydcMaskEplactiveElt','EplHeadSlopeX','EplHeadSlopeY','HydrologydcEplThicknessHydrostep'}]; end if self.steps_per_step>1, - list = [list,'EffectivePressureTimeAverage','SedimentHeadTimeAverage']; + list = [list,'EffectivePressure','SedimentHead']; if self.isefficientlayer, - list = [list,'EplHeadTimeAverage','HydrologydcEplThicknessTimeAverage']; + list = [list,'EplHead','HydrologydcEplThickness']; end end - end % }}} + end % }}} function self = initialize(self,md) % {{{ @@ -81,7 +81,7 @@ end % }}} - % {{{ function self = setdefaultparameters(self) - - function self = setdefaultparameters(self) + % {{{ function self = setdefaultparameters(self) + + function self = setdefaultparameters(self) %Parameters from de Fleurian 2014 @@ -114,10 +114,10 @@ self.epl_conductivity = 8.0e-02; self.eplflip_lock = 0; - end - - % }}} - % {{{ function md = checkconsistency(self,md,solution,analyses) - - function md = checkconsistency(self,md,solution,analyses) + end + + % }}} + % {{{ function md = checkconsistency(self,md,solution,analyses) + + function md = checkconsistency(self,md,solution,analyses) %Early return if ~ismember('HydrologyDCInefficientAnalysis',analyses) & ~ismember('HydrologyDCEfficientAnalysis',analyses), @@ -163,12 +163,12 @@ if (self.epl_colapse_thickness>self.epl_initial_thickness), md = checkmessage(md,'Colapsing thickness for EPL larger than initial thickness'); - end - end - end + end + end + end % }}} % {{{ function disp(self) - function disp(self) + function disp(self) disp(sprintf(' hydrology Dual Porous Continuum Equivalent parameters:')); disp(sprintf(' - general parameters')); @@ -220,10 +220,10 @@ end - end - - % }}} - % {{{ function marshall(self,prefix,md,fid) - - function marshall(self,prefix,md,fid) + end + + % }}} + % {{{ function marshall(self,prefix,md,fid) + + function marshall(self,prefix,md,fid) WriteData(fid,prefix,'name','md.hydrology.model','data',1,'format','Integer'); WriteData(fid,prefix,'object',self,'fieldname','water_compressibility','format','Double'); @@ -246,14 +246,14 @@ WriteData(fid,prefix,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'fieldname','sediment_compressibility','format','Double'); - WriteData(fid,prefix,'object',self,'fieldname','sediment_porosity','format','Double'); + WriteData(fid,prefix,'object',self,'fieldname','sediment_compressibility','format','Double'); + WriteData(fid,prefix,'object',self,'fieldname','sediment_porosity','format','Double'); WriteData(fid,prefix,'object',self,'fieldname','sediment_thickness','format','Double'); - WriteData(fid,prefix,'object',self,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1'); - - if self.isefficientlayer==1, - WriteData(fid,prefix,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1'); + + if self.isefficientlayer==1, + WriteData(fid,prefix,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); WriteData(fid,prefix,'object',self,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1); - WriteData(fid,prefix,'object',self,'fieldname','epl_compressibility','format','Double'); - WriteData(fid,prefix,'object',self,'fieldname','epl_porosity','format','Double'); + WriteData(fid,prefix,'object',self,'fieldname','epl_compressibility','format','Double'); + WriteData(fid,prefix,'object',self,'fieldname','epl_porosity','format','Double'); WriteData(fid,prefix,'object',self,'fieldname','epl_initial_thickness','format','Double'); WriteData(fid,prefix,'object',self,'fieldname','epl_colapse_thickness','format','Double'); @@ -270,5 +270,5 @@ end WriteData(fid,prefix,'data',outputs,'name','md.hydrology.requested_outputs','format','StringArray'); - end + end % }}} Index: /issm/trunk-jpl/src/m/classes/hydrologydc.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.py (revision 22858) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.py (revision 22859) @@ -45,5 +45,5 @@ self.epl_conductivity = 0 self.eplflip_lock = 0 - + #set defaults self.setdefaultparameters() @@ -58,5 +58,5 @@ string="%s\n%s"%(string,fielddisplay(self,'rel_tol','tolerance of the nonlinear iteration for the transfer between layers [dimensionless]')) string="%s\n%s"%(string,fielddisplay(self,'max_iter','maximum number of nonlinear iteration')) - string="%s\n%s"%(string,fielddisplay(self,'steps_per_step','number of hydrology steps per time step')) + string="%s\n%s"%(string,fielddisplay(self,'steps_per_step','number of hydrology steps per time step')) 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,'requested_outputs','additional outputs requested')) @@ -66,5 +66,5 @@ string="%s\n\t\t%s"%(string,'2: hydrostatic pressure') string="%s\n\t\t%s"%(string,'3: normal stress') - + if self.sedimentlimit_flag==1: string="%s\n%s"%(string,fielddisplay(self,'sedimentlimit','user defined upper limit for the inefficient layer [m]')) @@ -73,5 +73,5 @@ string="%s\n\t\t%s"%(string,'0: no transfer') string="%s\n\t\t%s"%(string,'1: constant leakage factor: leakage_factor') - + if self.transfer_flag is 1: string="%s\n%s"%(string,fielddisplay(self,'leakage_factor','user defined leakage factor [m]')) @@ -80,5 +80,5 @@ 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]')) @@ -95,5 +95,5 @@ string="%s\n%s"%(string,fielddisplay(self,'epl_porosity','epl [dimensionless]')) string="%s\n%s"%(string,fielddisplay(self,'epl_max_thickness','epl maximal thickness [m]')) - string="%s\n%s"%(string,fielddisplay(self,'epl_initial_thickness','epl initial thickness [m]')) + string="%s\n%s"%(string,fielddisplay(self,'epl_initial_thickness','epl initial thickness [m]')) string="%s\n%s"%(string,fielddisplay(self,'epl_colapse_thickness','epl colapsing thickness [m]')) string="%s\n%s"%(string,fielddisplay(self,'epl_thick_comp','epl thickness computation flag')) @@ -111,5 +111,5 @@ return self #}}} - def setdefaultparameters(self): #{{{ + def setdefaultparameters(self): #{{{ #Parameters from de Fleurian 2014 self.water_compressibility = 5.04e-10 @@ -140,16 +140,16 @@ self.epl_conductivity = 8.0e-02 self.eplflip_lock = 0 - + return self # }}} def defaultoutputs(self,md): # {{{ - list = ['SedimentHead','SedimentHeadResidual','EffectivePressure'] - if self.isefficientlayer==1: - list.extend(['EplHead','HydrologydcMaskEplactiveNode','HydrologydcMaskEplactiveElt','EplHeadSlopeX','EplHeadSlopeY','HydrologydcEplThickness']) + list = ['SedimentHeadHydrostep','SedimentHeadResidual','EffectivePressureHydrostep'] + if self.isefficientlayer==1: + list.extend(['EplHeadHydrostep','HydrologydcMaskEplactiveNode','HydrologydcMaskEplactiveElt','EplHeadSlopeX','EplHeadSlopeY','HydrologydcEplThicknessHydrostep']) if self.steps_per_step>1: - list.extend(['EffectivePressureTimeAverage','SedimentHeadTimeAverage']) + list.extend(['EffectivePressure','SedimentHead']) if self.isefficientlayer==1: - list.extend(['EplHeadTimeAverage','HydrologydcEplThicknessTimeAverage']) + list.extend(['EplHead','HydrologydcEplThickness']) return list #}}} @@ -162,5 +162,5 @@ return self # }}} - def checkconsistency(self,md,solution,analyses): #{{{ + def checkconsistency(self,md,solution,analyses): #{{{ #Early return @@ -206,5 +206,5 @@ md = checkfield(md,'fieldname','hydrology.epl_conductivity','numel',[1],'>',0.) # }}} - def marshall(self,prefix,md,fid): #{{{ + def marshall(self,prefix,md,fid): #{{{ WriteData(fid,prefix,'name','md.hydrology.model','data',1,'format','Integer') WriteData(fid,prefix,'object',self,'fieldname','water_compressibility','format','Double') @@ -227,17 +227,17 @@ WriteData(fid,prefix,'object',self,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts) WriteData(fid,prefix,'object',self,'fieldname','sediment_compressibility','format','Double') - WriteData(fid,prefix,'object',self,'fieldname','sediment_porosity','format','Double') + WriteData(fid,prefix,'object',self,'fieldname','sediment_porosity','format','Double') WriteData(fid,prefix,'object',self,'fieldname','sediment_thickness','format','Double') - WriteData(fid,prefix,'object',self,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1) - - if self.isefficientlayer==1: - WriteData(fid,prefix,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts) + WriteData(fid,prefix,'object',self,'fieldname','sediment_transmitivity','format','DoubleMat','mattype',1) + + if self.isefficientlayer==1: + WriteData(fid,prefix,'object',self,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts) WriteData(fid,prefix,'object',self,'fieldname','mask_eplactive_node','format','DoubleMat','mattype',1) - WriteData(fid,prefix,'object',self,'fieldname','epl_compressibility','format','Double') - WriteData(fid,prefix,'object',self,'fieldname','epl_porosity','format','Double') + WriteData(fid,prefix,'object',self,'fieldname','epl_compressibility','format','Double') + WriteData(fid,prefix,'object',self,'fieldname','epl_porosity','format','Double') WriteData(fid,prefix,'object',self,'fieldname','epl_max_thickness','format','Double') - WriteData(fid,prefix,'object',self,'fieldname','epl_initial_thickness','format','Double') + WriteData(fid,prefix,'object',self,'fieldname','epl_initial_thickness','format','Double') WriteData(fid,prefix,'object',self,'fieldname','epl_colapse_thickness','format','Double') - WriteData(fid,prefix,'object',self,'fieldname','epl_thick_comp','format','Integer') + WriteData(fid,prefix,'object',self,'fieldname','epl_thick_comp','format','Integer') WriteData(fid,prefix,'object',self,'fieldname','epl_conductivity','format','Double') WriteData(fid,prefix,'object',self,'fieldname','eplflip_lock','format','Integer')