Changeset 24545

Timestamp:

02/04/20 19:38:33 (5 years ago)

Author:

jdquinn

Message:

CHG: Don’t retrieve perturbation_melting_rate in init (maybe add it to base class: basalforcings); added note about consistency between MATLAB and Python versions.

Location:

issm/trunk-jpl/src/m/classes

Files:

• linearbasalforcings.m (modified) (3 diffs)
• linearbasalforcings.py (modified) (2 diffs)

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

@@ -5 +5 @@
 
 classdef linearbasalforcings
-        properties (SetAccess=public) 
+        properties (SetAccess=public)
                 deepwater_melting_rate    = 0.;
                 upperwater_melting_rate   = 0.;
@@ -26 +26 @@
                 end % }}}
                 function self = extrude(self,md) % {{{
-                        self.perturbation_melting_rate=project3d(md,'vector',self.perturbation_melting_rate,'type','node','layer',1); 
-                        self.groundedice_melting_rate=project3d(md,'vector',self.groundedice_melting_rate,'type','node','layer',1); 
+                        self.perturbation_melting_rate=project3d(md,'vector',self.perturbation_melting_rate,'type','node','layer',1);
+                        self.groundedice_melting_rate=project3d(md,'vector',self.groundedice_melting_rate,'type','node','layer',1);
                         self.geothermalflux=project3d(md,'vector',self.geothermalflux,'type','node','layer',1); %bedrock only gets geothermal flux
                 end % }}}
@@ -36 +36 @@
                                 disp('      no basalforcings.groundedice_melting_rate specified: values set as zero');
                         end
+                        % TODO: Should we be setting self.geothermalflux here (we do so in linearbasalforcings.py)?
 
                 end % }}}

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

@@ -17 +17 @@
         if not len(args):
             print('empty init')
-            self.groundedice_melting_rate = float('NaN')
-            self.perturbation_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')
 
@@ -31 +31 @@
             inv = args[0]
             self.groundedice_melting_rate = inv.groundedice_melting_rate
-            self.perturbation_melting_rate = inv.perturbation_melting_rate
+            #self.perturbation_melting_rate = inv.perturbation_melting_rate
             self.geothermalflux = inv.geothermalflux
             self.deepwater_melting_rate = 0.