Changeset 18101

Timestamp:

06/04/14 06:20:34 (11 years ago)

Author:

glperez

Message:

CHG: introduced option to bypass on consistency check.

Location:

issm/trunk-jpl/src/m/solve

Files:

• solve.m (modified) (2 diffs)
• solve.py (modified) (2 diffs)

issm/trunk-jpl/src/m/solve/solve.m

@@ -21 +21 @@
 %      - loadonly    : does not solve. only load results
 %      - runtimename : true or false (default is true), makes name unique
+%      - checkconsistency : 'yes' or 'no' (default is 'yes'), ensures checks on consistency of model
 %
 %   Examples:
@@ -36 +37 @@
 
 %check model consistency
-if md.verbose.solution,
-        disp('checking model consistency');
-end
-if (solutionenum == FlaimSolutionEnum())
-        md.private.isconsistent=true;
-        md=checkconsistency(md.mesh,md,solutionenum);
-        md=checkconsistency(md.flaim,md,solutionenum);
-        if md.private.isconsistent==false,
-                error('Model not consistent, see messages above');
+if strcmpi(getfieldvalue(options,'checkconsistency','yes'),'no'),
+        if md.verbose.solution,
+                disp('checking model consistency');
         end
-else
-        ismodelselfconsistent(md),
+        if (solutionenum == FlaimSolutionEnum())
+                md.private.isconsistent=true;
+                md=checkconsistency(md.mesh,md,solutionenum);
+                md=checkconsistency(md.flaim,md,solutionenum);
+                if md.private.isconsistent==false,
+                        error('Model not consistent, see messages above');
+                end
+        else
+                ismodelselfconsistent(md),
+        end
 end
 

issm/trunk-jpl/src/m/solve/solve.py

@@ -33 +33 @@
            extra options:
               - loadonly : does not solve. only load results
+                  - checkconsistency : 'yes' or 'no' (default is 'yes'), ensures checks on consistency of model
  
            Examples:
@@ -48 +49 @@
 
         #check model consistency
-        print "checking model consistency"
-        if solutionenum == FlaimSolutionEnum():
-                md.private.isconsistent=True
-                md.mesh.checkconsistency(md,solutionenum)
-                md.flaim.checkconsistency(md,solutionenum)
-                if not md.private.isconsistent:
-                        raise RuntimeError("Model not consistent, see messages above.")
-        else:
-                ismodelselfconsistent(md)
+        if m.strcmpi(options.getfieldvalue('checkconsistency','yes'),'no'):
+                print "checking model consistency"
+                if solutionenum == FlaimSolutionEnum():
+                        md.private.isconsistent=True
+                        md.mesh.checkconsistency(md,solutionenum)
+                        md.flaim.checkconsistency(md,solutionenum)
+                        if not md.private.isconsistent:
+                                raise RuntimeError("Model not consistent, see messages above.")
+                else:
+                        ismodelselfconsistent(md)
 
         #First, build a runtime name that is unique