Changeset 26642

Timestamp:

11/18/21 08:51:52 (3 years ago)

Author:

vverjans

Message:

BUG: fixing call to methods in stochasticforcing.py

File:

• issm/trunk-jpl/src/m/classes/stochasticforcing.py (modified) (3 diffs)

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

@@ -60 +60 @@
         # Check that all fields agree with the corresponding md class
         checkdefaults = False
-        structstoch   = stochasticforcing.structstochforcing()
+        structstoch   = self.structstochforcing()
         for field in self.fields:
             if 'SMB' in field:
@@ -97 +97 @@
 
         md = checkfield(md, 'fieldname', 'stochasticforcing.isstochasticforcing', 'values', [0, 1])
-        md = checkfield(md, 'fieldname', 'stochasticforcing.fields', 'numel', num_fields, 'cell', 1, 'values', stochasticforcing.supportedstochforcings())
+        md = checkfield(md, 'fieldname', 'stochasticforcing.fields', 'numel', num_fields, 'cell', 1, 'values', self.supportedstochforcings())
         #md = checkfield(md, 'fieldname', 'stochasticforcing.dimensions', 'NaN', 1, 'Inf', 1, '>', 0, 'size', [num_fields]) # specific dimension for each field; NOTE: As opposed to MATLAB implementation, pass list
         md = checkfield(md, 'fieldname', 'stochasticforcing.covariance', 'NaN', 1, 'Inf', 1, 'size', [size_tot, size_tot])  # global covariance matrix
@@ -151 +151 @@
     # }}}
 
-    def supportedstochforcings(): # {{{
+    def supportedstochforcings(self): # {{{
         """Defines list of fields supported by the class md.stochasticforcing
         """
-        list1 = stochasticforcing.structstochforcing()
+        list1 = self.structstochforcing()
         list1 = list1['fields']
         return(list1) #}}}
 
-    def structstochforcing(): # {{{
+    def structstochforcing(self): # {{{
         """Defines dictionary with list of fields
            supported and corresponding md names