Changeset 9263

Timestamp:

08/10/11 15:57:52 (14 years ago)

Author:

jschierm

Message:

ismodelselfconsistent.m: Move Flaim check up front and return (per Eric).

File:

• issm/trunk/src/m/model/ismodelselfconsistent.m (modified) (2 diffs)

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -16 +16 @@
 %initialize consistency as true
 modelconsistency(true);
+
+% Flaim doesn't need the entire model, so take an early return
+%FLAIM {{{1
+if (md.solution_type == FlaimSolutionEnum),
+        if ~exist(md.fm_tracks,'file')
+                message(['model not consistent: fm_tracks file ''' md.fm_tracks ''' must exist.']);
+        end
+        %   probably going to need some checks on fm_flightreqs here
+        if (numel(md.fm_criterion) ~= md.numberofnodes) && (numel(md.fm_criterion) ~= md.numberofelements)
+                message(['model not consistent: fm_criterion vector must have number of nodes (' int2str(md.numberofnodes) ') or elements (' int2str(md.numberofelements) ') values, not ' int2str(numel(md.fm_criterion)) ' values.']);
+        end
+        return;
+end
+%}}}
 
 % Common checks
@@ -333 +347 @@
         if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
                 message(['model not consistent: model ' md.name ' cfl_coefficient field should between  0 and 1']);
-        end
-end
-%}}}
-%FLAIM {{{1
-if (md.solution_type == FlaimSolutionEnum),
-        if ~exist(md.fm_tracks,'file')
-                message(['model not consistent: fm_tracks file ''' md.fm_tracks ''' must exist.']);
-        end
-        %   probably going to need some checks on fm_flightreqs here
-        if (numel(md.fm_criterion) ~= md.numberofnodes) && (numel(md.fm_criterion) ~= md.numberofelements)
-                message(['model not consistent: fm_criterion vector must have number of nodes (' int2str(md.numberofnodes) ') or elements (' int2str(md.numberofelements) ') values, not ' int2str(numel(md.fm_criterion)) ' values.']);
         end
 end