Changeset 26671

Timestamp:

11/26/21 09:43:04 (3 years ago)

Author:

vverjans

Message:

CHG: Correcting basin_id initialization in stochasticforcing.py

File:

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

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

@@ -108 +108 @@
         if (checkdefaults):
             md = checkfield(md, 'fieldname', 'stochasticforcing.defaultdimension', 'numel', 1, 'NaN', 1, 'Inf', 1, '>', 0)
-            md = checkfield(md, 'fieldname', 'stochasticforcing.default_id', 'Inf', 1, '>=', 0, '<=', self.defaultdimension, 'size', [md.mesh.numberofelements])
+            md = checkfield(md, 'fieldname', 'stochasticforcing.default_id','Inf',1,'NaN',1,'>=',0,'<=',self.defaultdimension,'size', [md.mesh.numberofelements])
         return md
     # }}}
@@ -145 +145 @@
                         tempcovariance[:, col] = 1 / yts * tempcovariance[:, col]
             # Set dummy default_id vector if defaults not used
-            if np.isnan(self.default_id):
+            if np.any(np.isnan(self.default_id)):
                 self.default_id = np.zeros(md.mesh.numberofelements)
             WriteData(fid, prefix, 'data', num_fields, 'name', 'md.stochasticforcing.num_fields', 'format', 'Integer')