Changeset 2357

Timestamp:

10/02/09 07:38:13 (16 years ago)

Author:

seroussi

Message:

Added check on observed velocity to avoid NaN

File:

• issm/trunk/src/m/classes/public/ismodelselfconsistent.m (modified) (3 diffs)

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -213 +213 @@
                 end
         end
+
 end
 
@@ -218 +219 @@
 if md.analysis_type==PrognosticAnalysisEnum,
 
-        %VELOCITIES
-        if (size(md.vx,1)~=md.numberofgrids | size(md.vy,1)~=md.numberofgrids),
-                error(['model not consistent: a 3d velocity is required. Run ''diagnostic'' solution first!'])
-        end
+        %INITIAL VELOCITIES
+        fields={'vx','vy'};
+        testsize(md,fields,[md.numberofgrids 1]);
+        testnan(md,fields);
+
 end
 
@@ -257 +259 @@
 
         %VELOCITIES AND PRESSURE
-        if (length(md.vx)~=md.numberofgrids | length(md.vy)~=md.numberofgrids | length(md.vz)~=md.numberofgrids),
-                error(['model not consistent: a 3d velocity is required. Run ''diagnostic'' solution first!'])
-        end
-        if (length(md.pressure)~=md.numberofgrids),
-                error(['model not consistent: pressure is required. Run ''diagnostic'' solution first!'])
-        end
+        fields={'vx','vy','vz','pressure'};
+        testsize(md,fields,[md.numberofgrids 1]);
+        testnan(md,fields);
+
 end