Changeset 25118 for issm/trunk-jpl/src/m/classes/model.m

Timestamp:

06/22/20 22:29:05 (5 years ago)

Author:

Eric.Larour

Message:

CHG: significant changes to the organization of slr -> new solidearth class
that encompasses all of the slr fields.

File:

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

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

@@ -23 +23 @@
                 rifts            = 0;
                 dsl              = 0;
-                slr              = 0;
+                solidearth       = 0;
 
                 debug            = 0;
@@ -126 +126 @@
                         if isa(md.calving,'double'); md.calving=calving(); end
                         %2016 February 3
-                        if isa(md.slr,'double'); md.slr=slr(); end
+                        if isa(md.slr,'double'); md.solidearth=solidearth(); end
                         %2016 October 11
                         if isa(md.esa,'double'); md.esa=esa(); end
@@ -888 +888 @@
                         md.frontalforcings=extrude(md.frontalforcings,md);
                         md.hydrology = extrude(md.hydrology,md);
-                        md.slr = extrude(md.slr,md);
+                        md.solidearth = extrude(md.solidearth,md);
                         md.dsl = extrude(md.dsl,md);
 
@@ -1209 +1209 @@
                         md.friction         = friction();
                         md.rifts            = rifts();
-                        md.slr              = slr();
+                        md.solidearth       = solidearth();
                         md.dsl              = dsl();
                         md.timestepping     = timestepping();
@@ -1390 +1390 @@
                         disp(sprintf('%19s: %-22s -- %s','initialization'  ,['[1x1 ' class(self.initialization) ']'],'initial guess/state'));
                         disp(sprintf('%19s: %-22s -- %s','rifts'           ,['[1x1 ' class(self.rifts) ']'],'rifts properties'));
-                        disp(sprintf('%19s: %-22s -- %s','slr'             ,['[1x1 ' class(self.slr) ']'],'slr forcings'));
+                        disp(sprintf('%19s: %-22s -- %s','solidearth'      ,['[1x1 ' class(self.solidearth) ']'],'solidearth inputs and settings'));
                         disp(sprintf('%19s: %-22s -- %s','dsl'             ,['[1x1 ' class(self.dsl) ']'],'dynamic sea-level '));
                         disp(sprintf('%19s: %-22s -- %s','debug'           ,['[1x1 ' class(self.debug) ']'],'debugging tools (valgrind, gprof)'));