Changeset 26952

Timestamp:

04/11/22 08:22:49 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: make sure that we do not have ANY NaN in initialization.vx and vy

Location:

issm/trunk-jpl/src/m/classes

Files:

• basalforcings.m (modified) (1 diff)
• initialization.m (modified) (1 diff)

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

@@ -15 +15 @@
                                 case 0
                                         self=setdefaultparameters(self);
+                                case 1
+                                        self =structtoobj(basalforcings(),varargin{1});
                                 otherwise
                                         error('constructor not supported');

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

@@ -39 +39 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
                         if ismember('StressbalanceAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.isstressbalance == 0),
-                                if ~(isnan(md.initialization.vx) | isnan(md.initialization.vy)),
+                                if numel(md.initialization.vx)>1 | numel(md.initialization.vy)>1
                                         md = checkfield(md,'fieldname','initialization.vx','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                         md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);