Changeset 9730

Timestamp:

09/09/11 14:07:21 (14 years ago)

Author:

Mathieu Morlighem

Message:

Better consistency checks

Location:

issm/trunk

Files:

• src/m/classes/constants.m (modified) (1 diff)
• src/m/classes/mesh.m (modified) (1 diff)
• src/m/model/ismodelselfconsistent.m (modified) (1 diff)
• src/m/utils/consistency (added)
• src/m/utils/consistency/checkforcing.m (added)
• src/m/utils/consistency/checkgreater.m (added)
• src/m/utils/consistency/checkgreaterstrict.m (added)
• src/m/utils/consistency/checklength.m (added)
• src/m/utils/consistency/checkless.m (added)
• src/m/utils/consistency/checklessstrict.m (added)
• src/m/utils/consistency/checkmessage.m (added)
• src/m/utils/consistency/checknan.m (added)
• src/m/utils/consistency/checkreal.m (added)
• src/m/utils/consistency/checksize.m (added)
• src/m/utils/consistency/checkvalues.m (added)
• src/m/utils/consistency/modelconsistency.m (added)
• src/m/utils/recursivepath.m (moved) (moved from issm/trunk/src/m/utils/genpath_ice.m ) (2 diffs)
• startup.m (modified) (2 diffs)

issm/trunk/src/m/classes/constants.m

@@ -45 +45 @@
 
                 end % }}}
+                function flag = checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/mesh.m

@@ -65 +65 @@
                         obj.average_vertex_connectivity=25;
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                        fields={'dimension'};
+                        checkgreaterstrict(md,'mesh',fields,0);
+
+                end % }}}
                 function disp(obj) % {{{
                         disp(sprintf('   Mesh:')); 

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

@@ -5 +5 @@
 %      ismodelselfconsistent(md),
 
-%nothing for now
+%initialize consistency as true
+modelconsistency(true);
+
+%Always check mesh
+md.mesh.checkconsistency(md);
+
+%error message if mode is not consistent
+if modelconsistency==false,
+        error(' ');
+end

issm/trunk/src/m/utils/recursivepath.m

@@ -1 @@
-function p = genpath_ice(d)
-%GENPATH_ICE - generate paths in a directory
+function p = recursivepath(d)
+%RECURSIVEPATH - generate paths in a directory
 %
 %   this routine is equivalent to Matlab's genpath except that it skips CVS and .svn directories
 %
 %   Usage:
-%      p = genpath_ice(d)
+%      p = recursivepath(d)
 
 %initialize path to be returned
@@ -34 +34 @@
                 ~strcmp(dirname,'private')    %private directories not allowed in MATLAB path
 
-                p = [p genpath_ice(fullfile(d,dirname))];
+                p = [p recursivepath(fullfile(d,dirname))];
         end
 end

issm/trunk/startup.m

@@ -24 +24 @@
 
 %ISSM path
-addpath([ISSM_TIER '/src/m/utils/']); %loads genpath_ice
+addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath
 addpath([ISSM_TIER '/doc']);
 addpath([ISSM_TIER '/bin']);
-addpath(genpath_ice([ISSM_TIER '/src/m']));
-addpath(genpath_ice([ISSM_TIER '/externalpackages/scotch']));
-addpath(genpath_ice([ISSM_TIER '/externalpackages/canos']));
-addpath(genpath_ice([ISSM_TIER '/externalpackages/kml']));
-addpath(genpath_ice([ISSM_TIER '/externalpackages/googleearthtoolbox/']));
-addpath(genpath_ice([ISSM_TIER '/externalpackages/export_fig']));
+addpath(recursivepath([ISSM_TIER '/src/m']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/scotch']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/canos']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/kml']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig']));
 
 %Check on any warning messages that might indicate that the paths were not correct. 
@@ -57 +57 @@
 
 %Now, load personal startup preferences, using the local user name: 
-rmpath(genpath_ice([ISSM_TIER '/src/m/usr']));
+rmpath(recursivepath([ISSM_TIER '/src/m/usr']));
 if exist([ISSM_TIER '/src/m/usr/' USERNAME],'dir'),
-        addpath(genpath_ice([ISSM_TIER '/src/m/usr/' USERNAME]));
+        addpath(recursivepath([ISSM_TIER '/src/m/usr/' USERNAME]));
 end