Changeset 23969 for issm/trunk-jpl/src/m/classes/hydrologyglads.m

Timestamp:

05/31/19 11:17:36 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added neumann flux for hydro model

File:

• issm/trunk-jpl/src/m/classes/hydrologyglads.m (modified) (4 diffs)

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

@@ -19 +19 @@
                 %Other
                 spcphi               = NaN;
+                moulin_input         = NaN;
+                neumannflux          = NaN;
                 englacial_void_ratio = 0.;
-                moulin_input         = NaN;
                 requested_outputs    = {};
         end
@@ -75 +76 @@
                         md = checkfield(md,'fieldname','hydrology.englacial_void_ratio','numel',[1],'>=',0);
                         md = checkfield(md,'fieldname','hydrology.moulin_input','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1);
                 end % }}}
@@ -89 +91 @@
                         disp(sprintf('      OTHER'));
                         fielddisplay(self,'spcphi','Hydraulic potential Dirichlet constraints [Pa]');
+                        fielddisplay(self,'neumannflux','water flux applied along the model boundary (m^2/s)');
+                        fielddisplay(self,'moulin_input','moulin input (Q_s) [m^3/s]');
                         fielddisplay(self,'englacial_void_ratio','englacial void ratio (e_v)');
-                        fielddisplay(self,'moulin_input','moulin input (Q_s) [m^3/s]');
                         fielddisplay(self,'requested_outputs','additional outputs requested');
                 end % }}}
@@ -113 +116 @@
                         %Others
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','spcphi','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        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','moulin_input','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','englacial_void_ratio','format','Double');
-                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','moulin_input','format','DoubleMat','mattype',1);
                         outputs = self.requested_outputs;
                         pos  = find(ismember(outputs,'default'));