Changeset 23936 for issm/trunk-jpl/src/m/classes/hydrologyshakti.m

Timestamp:

05/26/19 15:48:01 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added empty shell for GlaDS

File:

• issm/trunk-jpl/src/m/classes/hydrologyshakti.m (modified) (5 diffs)

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

@@ -17 +17 @@
                 relaxation      = 0;
                 storage         = 0;
-    requested_outputs = {};
+                requested_outputs = {};
         end
         methods
@@ -32 +32 @@
                         end
                 end % }}}
-    function list = defaultoutputs(self,md) % {{{
-        list = {'HydrologyHead','HydrologyGapHeight','EffectivePressure','HydrologyBasalFlux','DegreeOfChannelization'};
-    end % }}}    
+                function list = defaultoutputs(self,md) % {{{
+                        list = {'HydrologyHead','HydrologyGapHeight','EffectivePressure','HydrologyBasalFlux','DegreeOfChannelization'};
+                end % }}}    
 
                 function self = setdefaultparameters(self) % {{{
-              % Set under-relaxation parameter to be 1 (no under-relaxation of nonlinear iteration)     
+                        % Set under-relaxation parameter to be 1 (no under-relaxation of nonlinear iteration)   
                         self.relaxation=1;
                         self.storage=0;
-      self.requested_outputs={'default'};
+                        self.requested_outputs={'default'};
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -58 +58 @@
                         md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','hydrology.spchead','size',[md.mesh.numberofvertices 1]);        
-         md = checkfield(md,'fieldname','hydrology.relaxation','>=',0); 
+                        md = checkfield(md,'fieldname','hydrology.relaxation','>=',0);  
                         md = checkfield(md,'fieldname','hydrology.storage','>=',0);
-      md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1);
+                        md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1);
                 end % }}}
                 function disp(self) % {{{
@@ -75 +75 @@
                         fielddisplay(self,'relaxation','under-relaxation coefficient for nonlinear iteration');
                         fielddisplay(self,'storage','englacial storage coefficient (void ratio)');
-      fielddisplay(self,'requested_outputs','additional outputs requested');
+                        fielddisplay(self,'requested_outputs','additional outputs requested');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -91 +91 @@
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','neumannflux','format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','spchead','format','DoubleMat','mattype',1);
-      WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','relaxation','format','Double');
+                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','relaxation','format','Double');
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','storage','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 % }}}
         end