Changeset 26744 for issm/trunk/src/m/classes/hydrologyshreve.m

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/hydrologyshreve.m (modified) (3 diffs)

issm/trunk/src/m/classes/hydrologyshreve.m

@@ -11 +11 @@
         end
         methods
-                function self = extrude(self,md) % {{{
-                end % }}}
                 function self = hydrologyshreve(varargin) % {{{
                         switch nargin
@@ -23 +21 @@
                         end
                 end % }}}
-                function list = defaultoutputs(self,md) % {{{
-                        list = {'Watercolumn','HydrologyWaterVx','HydrologyWaterVy'};
-                end % }}}    
+                function disp(self) % {{{
+                        disp(sprintf('   hydrologyshreve solution parameters:'));
+                        fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]');
+                        fielddisplay(self,'stabilization','artificial diffusivity (default: 1). can be more than 1 to increase diffusivity.');
+                        fielddisplay(self,'requested_outputs','additional outputs requested');
 
+                end % }}}
                 function self = setdefaultparameters(self) % {{{
 
                         %Type of stabilization to use 0:nothing 1:artificial_diffusivity
                         self.stabilization     = 1;
-      self.requested_outputs = {'default'};
+                        self.requested_outputs = {'default'};
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
                         %Early return
-                        if ~ismember('HydrologyShreveAnalysis',analyses)
-                                return;
-                        end
+                        if ~ismember('HydrologyShreveAnalysis',analyses) | (strcmp(solution,'TransientSolution') & md.transient.ishydrology==0), return; end
 
                         md = checkfield(md,'fieldname','hydrology.spcwatercolumn','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','hydrology.stabilization','>=',0);
                 end % }}}
-                function disp(self) % {{{
-                        disp(sprintf('   hydrologyshreve solution parameters:'));
-                        fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]');
-                        fielddisplay(self,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.');
-      fielddisplay(self,'requested_outputs','additional outputs requested');
-
+                function list = defaultoutputs(self,md) % {{{
+                        list = {'Watercolumn','HydrologyWaterVx','HydrologyWaterVy'};
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -54 +49 @@
                         WriteData(fid,prefix,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','stabilization','format','Double');
-      outputs = self.requested_outputs;
-      pos  = find(ismember(outputs,'default'));
-      if ~isempty(pos),
-        outputs(pos) = [];  %remove 'default' from outputs
-        outputs      = [outputs defaultoutputs(self,md)]; %add defaults
-      end
-      WriteData(fid,prefix,'data',outputs,'name','md.hydrology.requested_outputs','format','StringArray');
+                        outputs = self.requested_outputs;
+                        pos = find(ismember(outputs,'default'));
+                        if ~isempty(pos),
+                                outputs(pos) = []; %remove 'default' from outputs
+                                outputs      = [outputs defaultoutputs(self,md)]; %add defaults
+                        end
+                        WriteData(fid,prefix,'data',outputs,'name','md.hydrology.requested_outputs','format','StringArray');
+                end % }}}
+                function self = extrude(self,md) % {{{
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{