Changeset 26617

Timestamp:

11/12/21 10:13:55 (3 years ago)

Author:

vverjans

Message:

CHG: set md.stochasticforcing.default_id as dummy if defaults not used

Location:

issm/trunk-jpl/src/m/classes

Files:

• stochasticforcing.m (modified) (2 diffs)
• stochasticforcing.py (modified) (1 diff)

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

@@ -89 +89 @@
             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,1]);
-         end
+                        end
                 end % }}}
                 function disp(self) % {{{
@@ -142 +142 @@
                                         end
                                 end
+                                %Set dummy default_id vector if defaults not used
+                                if isnan(self.default_id)
+                                        self.default_id = zeros(md.mesh.numberofelements,1);
+                                end
                                 WriteData(fid,prefix,'data',num_fields,'name','md.stochasticforcing.num_fields','format','Integer');
                                 WriteData(fid,prefix,'object',self,'fieldname','fields','format','StringArray');

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

@@ -132 +132 @@
                     for col in inds: # scale columns corresponding to scaled field
                         tempcovariance[:, col] = 1 / yts * tempcovariance[:, col]
+            #Set dummy default_id vector if defaults not used
+            if 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')
             WriteData(fid, prefix, 'object', self, 'fieldname', 'fields', 'format', 'StringArray')