Changeset 26241

Timestamp:

05/05/21 13:13:38 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing initialization.sealevel to be a time series

Location:

issm/trunk-jpl/src/m/classes

Files:

• basalforcings.py (modified) (5 diffs)
• initialization.m (modified) (1 diff)
• initialization.py (modified) (5 diffs)

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

@@ -21 +21 @@
         self.setdefaultparameters()
     #}}}
-
     def __repr__(self):  # {{{
         s = '   basal forcings parameters:\n'
@@ -29 +28 @@
         return s
     #}}}
-
     def extrude(self, md):  # {{{
         self.groundedice_melting_rate = project3d(md, 'vector', self.groundedice_melting_rate, 'type', 'node', 'layer', 1)
@@ -36 +34 @@
         return self
     #}}}
-
     def initialize(self, md):  # {{{
         if np.all(np.isnan(self.groundedice_melting_rate)):
@@ -46 +43 @@
         return self
     #}}}
-
     def setdefaultparameters(self):  # {{{
         return self
     #}}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         if 'MasstransportAnalysis' in analyses and not solution == 'TransientSolution' and not md.transient.ismasstransport:
@@ -64 +59 @@
         return md
     # }}}
-
     def marshall(self, prefix, md, fid):  # {{{
         yts = md.constants.yts

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

@@ -174 +174 @@
                         WriteData(fid,prefix,'object',self,'fieldname','vz','format','DoubleMat','mattype',1,'scale',1./yts);
                         WriteData(fid,prefix,'object',self,'fieldname','pressure','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',self,'fieldname','sealevel','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','sealevel','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','bottompressure','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','str','format','DoubleMat','mattype',1);

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

@@ -36 +36 @@
         self.setdefaultparameters()
     #}}}
-
     def __repr__(self):  # {{{
         s = '   initial field values:\n'
@@ -56 +55 @@
         return s
     #}}}
-
     def extrude(self, md):  # {{{
         self.vx = project3d(md, 'vector', self.vx, 'type', 'node')
@@ -81 +79 @@
         return self
     #}}}
-
     def setdefaultparameters(self):  # {{{
         return self
     #}}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         if 'StressbalanceAnalysis' in analyses and not solution == 'TransientSolution' and not md.transient.isstressbalance:
@@ -137 +133 @@
         return md
     # }}}
-
     def marshall(self, prefix, md, fid):  # {{{
         yts = md.constants.yts
@@ -144 +139 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'vz', 'format', 'DoubleMat', 'mattype', 1, 'scale', 1. / yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'pressure', 'format', 'DoubleMat', 'mattype', 1)
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'sealevel', 'format', 'DoubleMat', 'mattype', 1)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'sealevel', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'bottompressure', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'temperature', 'format', 'DoubleMat', 'mattype', 1)