Changeset 23944

Timestamp:

05/29/19 10:44:01 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added hydraulic potential

File:

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

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

@@ -6 +6 @@
 classdef initialization
         properties (SetAccess=public) 
-                vx            = NaN;
-                vy            = NaN;
-                vz            = NaN;
-                vel           = NaN;
-                pressure      = NaN;
-                temperature   = NaN;
-                enthalpy      = NaN;
-                waterfraction = NaN;
-                sediment_head = NaN;
-                epl_head      = NaN;
-                epl_thickness = NaN;
-                watercolumn   = NaN;
+                vx                  = NaN;
+                vy                  = NaN;
+                vz                  = NaN;
+                vel                 = NaN;
+                pressure            = NaN;
+                temperature         = NaN;
+                enthalpy            = NaN;
+                waterfraction       = NaN;
+                sediment_head       = NaN;
+                epl_head            = NaN;
+                epl_thickness       = NaN;
+                watercolumn         = NaN;
+                hydraulic_potential = NaN;
         end
         methods
@@ -89 +90 @@
                                 end
                         end
+                        if ismember('HydrologyGlaDSAnalysis',analyses),
+                                if isa(md.hydrology,'hydrologyglads'),
+                                        md = checkfield(md,'fieldname','initialization.watercolumn','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                                        md = checkfield(md,'fieldname','initialization.hydraulic_potential','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                                end
+                        end
                         if ismember('HydrologyDCInefficientAnalysis',analyses),
                                 if isa(md.hydrology,'hydrologydc'),
@@ -117 +124 @@
                         fielddisplay(self,'epl_head','epl water head of subglacial system [m]');
                         fielddisplay(self,'epl_thickness','epl layer thickness [m]');
-                        fielddisplay(self,'watercolumn','thickness of subglacial water [m]');
+                        fielddisplay(self,'watercolumn','subglacial water sheet thickness (for Shreve and GlaDS) [m]');
+                        fielddisplay(self,'hydraulic_potential','Hydraulic potential (for GlaDS) [Pa]');
 
                 end % }}}
@@ -134 +142 @@
                         WriteData(fid,prefix,'object',self,'fieldname','epl_thickness','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','watercolumn','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','hydraulic_potential','format','DoubleMat','mattype',1);
 
                         if md.thermal.isenthalpy,
@@ -162 +171 @@
                         writejs1Darray(fid,[modelname '.initialization.epl_thickness'],self.epl_thickness);
                         writejs1Darray(fid,[modelname '.initialization.watercolumn'],self.watercolumn);
+                        writejs1Darray(fid,[modelname '.initialization.hydraulic_potential'],self.hydraulic_potential);
 
                 end % }}}