Changeset 25023

Timestamp:

06/12/20 08:13:21 (5 years ago)

Author:

bdef

Message:

NEW: adding hydro models in py and related tests, fix in intialisation for m/py compatibility

Location:

issm/trunk-jpl

Files:

• src/m/classes/frictionpism.py (added)
• src/m/classes/hydrologyglads.py (added)
• src/m/classes/hydrologypism.py (added)
• src/m/classes/initialization.py (modified) (5 diffs)
• src/m/classes/model.py (modified) (1 diff)
• src/m/classes/stressbalance.py (modified) (1 diff)
• test/NightlyRun/test350.py (modified) (2 diffs)
• test/NightlyRun/test355.py (added)
• test/NightlyRun/test610.py (added)
• test/NightlyRun/test612.py (added)

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

@@ -28 +28 @@
         self.epl_head = float('NaN')
         self.epl_thickness = float('NaN')
+        self.hydraulic_potential = float('NaN')
+        self.channelarea = float('NaN')
 
     #set defaults
@@ -48 +50 @@
         string = "%s\n%s" % (string, fielddisplay(self, 'epl_head', 'epl water head of subglacial system [m]'))
         string = "%s\n%s" % (string, fielddisplay(self, 'epl_thickness', 'thickness of the epl [m]'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'hydraulic_potential', 'Hydraulic potential (for GlaDS) [Pa]'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'channelarea', 'subglaciale water channel area (for GlaDS) [m2]'))
 
         return string
@@ -97 +101 @@
                                      np.sum(np.abs(md.initialization.vy[md.mesh.elements - 1]), axis=1) == 0)):
                 md.checkmessage("at least one triangle has all its vertices with a zero velocity")
-        if 'ThermalAnalysis' in analyses:
+        if 'ThermalAnalysis' in analyses and solution != 'TransientSolution' and md.transient.isthermal == 0:
             md = checkfield(md, 'fieldname', 'initialization.vx', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
             md = checkfield(md, 'fieldname', 'initialization.vy', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
@@ -121 +125 @@
                     md = checkfield(md, 'fieldname', 'initialization.epl_head', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
                     md = checkfield(md, 'fieldname', 'initialization.epl_thickness', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
-
+        if 'HydrologyGlaDSAnalysis' in analyses:
+            if hasattr(md.hydrology, 'hydrologyglads'):
+                md = checkfield(md, 'fieldname', 'initialization.watercolumn', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
+                md = checkfield(md, 'fieldname', 'initialization.hydraulic_potential', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices])
+                md = checkfield(md, 'fieldname', 'initialization.channelarea', 'NaN', 1, 'Inf', 1, '>=', 0, 'size', [md.mesh.numberofelements])
         return md
     # }}}
@@ -139 +147 @@
         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', 'channelarea', 'format', 'DoubleMat', 'mattype', 1)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'hydraulic_potential', 'format', 'DoubleMat', 'mattype', 1)
         if md.thermal.isenthalpy:
             if (np.size(self.enthalpy) <= 1):

issm/trunk-jpl/src/m/classes/model.py

@@ -46 +46 @@
 from hydrologyshreve import hydrologyshreve
 from hydrologydc import hydrologydc
+from hydrologyglads import hydrologyglads
+from hydrologypism import hydrologypism
+from hydrologyshakti import hydrologyshakti
 from masstransport import masstransport
 from thermal import thermal

issm/trunk-jpl/src/m/classes/stressbalance.py

@@ -88 +88 @@
         self.maxiter = 100
         #Convergence criterion: absolute, relative and residual
-        self.restol = 10**-4
+        self.restol = 1.0e-4
         self.reltol = 0.01
         self.abstol = 10

issm/trunk-jpl/test/NightlyRun/test350.py

@@ -4 +4 @@
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
-from frictionshakti import *
-from hydrologyshakti import *
-from transient import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
+from frictionshakti import frictionshakti
+from transient import transient
 
 md = triangle(model(), '../Exp/Square.exp', 50000.)
@@ -18 +17 @@
 md = setmask(md, '', '')
 md = parameterize(md, '../Par/SquareSheetConstrained.py')
-md.transient = transient().deactivateall()
+md.transient = transient.deactivateall(md.transient)
 md.transient.ishydrology = 1
 md = setflowequation(md, 'SSA', 'all')