Changeset 25969

Timestamp:

02/03/21 12:51:18 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/src/m/classes

Files:

• solidearth.m (modified) (2 diffs)
• solidearth.py (modified) (5 diffs)

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

@@ -17 +17 @@
                 partitionice           = [];
                 partitionhydro         = [];
+        end
+        methods (Static)
+                function self = loadobj(self) % {{{
+                        % This function is directly called by matlab when a model object is
+                        % loaded. If the input is a struct it is an old version of this class and
+                        % old fields must be recovered (make sure they are in the deprecated
+                        % model properties)
+
+                        if isstruct(self)
+                                % 2021, Jan 10
+                                if isfield(self,'sealevel')
+                                        self.initialsealevel = self.sealevel;
+                                end
+                                self = structtoobj(solidearth(),self);
+
+                        end
+                end% }}}
         end
         methods
@@ -76 +93 @@
                         disp(sprintf('   solidearth inputs, forcings and settings:'));
 
-                        fielddisplay(self,'initialsealevel','sea level at the start of computation) [m]');
+                        fielddisplay(self,'initialsealevel','sea level at the start of computation [m]');
                         fielddisplay(self,'planetradius','planet radius [m]');
                         fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps');

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

@@ -41 +41 @@
             raise Exception('solidearth constructor error message: zero or one argument only!')
     #}}}
-
     def __repr__(self):  # {{{
         s = '   solidearthinputs, forcings and settings:\n'
@@ -60 +59 @@
         return s
     #}}}
-
     def setdefaultparameters(self, planet):  # {{{
         # Default output
@@ -78 +76 @@
         self.planetradius = planetradius(planet)
     #}}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and not md.transient.isslc):
@@ -96 +93 @@
         return md
     #}}}
-
     def defaultoutputs(self, md):  #{{{
         return ['Sealevel']
     #}}}
-
     def marshall(self, prefix, md, fid):  #{{{
         WriteData(fid, prefix, 'object', self, 'fieldname', 'initialsealevel', 'mattype', 1, 'format', 'DoubleMat', 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)
@@ -136 +131 @@
         WriteData(fid, prefix, 'data', outputs, 'name', 'md.solidearth.requested_outputs', 'format', 'StringArray')
     #}}}
-
     def extrude(self, md): #{{{
         self.initialsealevel = project3d(md, 'vector', self.initialsealevel, 'type', 'node')