Changeset 24686 for issm/trunk/src/m/classes/linearbasalforcings.py

Timestamp:

04/01/20 21:54:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24684

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/linearbasalforcings.py (modified) (7 diffs)

issm/trunk/src/m/classes/linearbasalforcings.py

@@ -17 +17 @@
         if not len(args):
             print('empty init')
-            self.groundedice_melting_rate = float('NaN')
             self.deepwater_melting_rate = 0.
             self.deepwater_elevation = 0.
             self.upperwater_melting_rate = 0.
             self.upperwater_elevation = 0.
+            self.groundedice_melting_rate = float('NaN')
+            self.perturbation_melting_rate = float('NaN')
             self.geothermalflux = float('NaN')
 
@@ -30 +31 @@
             inv = args[0]
             self.groundedice_melting_rate = inv.groundedice_melting_rate
+            self.perturbation_melting_rate = float('NaN')
             self.geothermalflux = inv.geothermalflux
             self.deepwater_melting_rate = 0.
@@ -41 +43 @@
             raise Exception('constructor not supported')
     #}}}
-
     def __repr__(self):  # {{{
         string = "   linear basal forcings parameters:"
@@ -49 +50 @@
         string = "%s\n%s" % (string, fielddisplay(self, "upperwater_elevation", "elevation of ocean upper water [m]"))
         string = "%s\n%s" % (string, fielddisplay(self, "groundedice_melting_rate", "basal melting rate (positive if melting) [m/yr]"))
+        string = "%s\n%s" % (string, fielddisplay(self, "perturbation_melting_rate", "perturbation applied to computed melting rate (positive if melting) [m/yr]"))
         string = "%s\n%s" % (string, fielddisplay(self, "geothermalflux", "geothermal heat flux [W/m^2]"))
         return string
     #}}}
-
     def initialize(self, md):  # {{{
         if np.all(np.isnan(self.groundedice_melting_rate)):
@@ -59 +60 @@
         return self
     #}}}
-
     def setdefaultparameters(self):  # {{{
         self.deepwater_melting_rate = 50.0
@@ -68 +68 @@
         return self
     #}}}
+    def checkconsistency(self, md, solution, analyses):  # {{{
 
-    def checkconsistency(self, md, solution, analyses):  # {{{
+        if not np.all(np.isnan(self.perturbation_melting_rate)):
+            md = checkfield(md, 'fieldname', 'basalforcings.perturbation_melting_rate', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
+
         if 'MasstransportAnalysis' in analyses and not (solution == 'TransientSolution' and not md.transient.ismasstransport):
             md = checkfield(md, 'fieldname', 'basalforcings.groundedice_melting_rate', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
@@ -94 +97 @@
         return md
     # }}}
-
     def marshall(self, prefix, md, fid):  # {{{
         yts = md.constants.yts
 
         WriteData(fid, prefix, 'name', 'md.basalforcings.model', 'data', 2, 'format', 'Integer')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'perturbation_melting_rate', 'name', 'md.basalforcings.perturbation_melting_rate', 'format', 'DoubleMat', 'mattype', 1, 'scale', 1. / yts, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'groundedice_melting_rate', 'name', 'md.basalforcings.groundedice_melting_rate', 'format', 'DoubleMat', 'mattype', 1, 'scale', 1. / yts, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'geothermalflux', 'name', 'md.basalforcings.geothermalflux', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)