Changeset 9739

Timestamp:

09/09/11 16:04:14 (14 years ago)

Author:

Mathieu Morlighem

Message:

Better consistency checks

Location:

issm/trunk/src/m

Files:

• classes/autodiff.m (modified) (1 diff)
• classes/balancethickness.m (modified) (1 diff)
• classes/basalforcings.m (modified) (1 diff)
• classes/diagnostic.m (modified) (1 diff)
• classes/flaim.m (modified) (1 diff)
• classes/flowequation.m (modified) (1 diff)
• classes/friction.m (modified) (1 diff)
• classes/geometry.m (modified) (1 diff)
• classes/groundingline.m (modified) (1 diff)
• classes/hydrology.m (modified) (1 diff)
• classes/initialization.m (modified) (1 diff)
• classes/inversion.m (modified) (1 diff)
• classes/mask.m (modified) (1 diff)
• classes/materials.m (modified) (1 diff)
• classes/mesh.m (modified) (1 diff)
• classes/private.m (modified) (1 diff)
• classes/prognostic.m (modified) (1 diff)
• classes/qmu.m (modified) (1 diff)
• classes/rifts.m (modified) (1 diff)
• classes/settings.m (modified) (1 diff)
• classes/solver.m (modified) (1 diff)
• classes/steadystate.m (modified) (1 diff)
• classes/surfaceforcings.m (modified) (1 diff)
• classes/thermal.m (modified) (1 diff)
• classes/timestepping.m (modified) (1 diff)
• classes/transient.m (modified) (1 diff)
• classes/verbose.m (modified) (1 diff)
• model/ismodelselfconsistent.m (modified) (1 diff)
• utils/consistency/checkforcing.m (modified) (1 diff)
• utils/consistency/checkgreater.m (modified) (1 diff)
• utils/consistency/checkgreaterstrict.m (modified) (1 diff)
• utils/consistency/checklength.m (modified) (1 diff)
• utils/consistency/checkless.m (modified) (1 diff)
• utils/consistency/checklessstrict.m (modified) (1 diff)
• utils/consistency/checkmessage.m (modified) (1 diff)
• utils/consistency/checknan.m (modified) (1 diff)
• utils/consistency/checknonempty.m (added)
• utils/consistency/checkreal.m (modified) (1 diff)
• utils/consistency/checksize.m (modified) (1 diff)
• utils/consistency/checkvalues.m (modified) (1 diff)

issm/trunk/src/m/classes/autodiff.m

@@ -35 +35 @@
                         end
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/balancethickness.m

@@ -39 +39 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

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

@@ -35 +35 @@
                         end
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/diagnostic.m

@@ -77 +77 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+                        fields={'icefront'};
+                        if (md.mesh.dimension==2),
+                                checksize(md,'diagnostic',fields,[NaN 4]);
+                        elseif md.mesh.dimension==3,
+                                checksize(md,'diagnostic',fields,[NaN 6]);
+                        end
+                        fields={'icefront(:,end)'};
+                        checkvalues(md,'diagnostic',fields,[0 1 2]);
+                end % }}}
                 function disp(obj) % {{{
 

issm/trunk/src/m/classes/flaim.m

@@ -43 +43 @@
                 function checkconsistency(obj,md) % {{{
 
-                        if ~exist(obj.flaim.tracks,'file')
+                        if md.private.solution~=FlaimSolutionEnum,
+                                return;
+                        end
+
+                        if ~exist(obj.tracks,'file')
                                 checkmessage(['flaim.tracks file ''' md.flaim.tracks ''' does not exist.']);
                         end
                         %   probably going to need some checks on flaim.flightreqs here
-                        if (numel(obj.flaim.criterion)~=md.mesh.numberofvertices) & (numel(md.flaim.criterion)~=md.mesh.numberofelements),
+                        if (numel(obj.criterion)~=md.mesh.numberofvertices) & (numel(obj.criterion)~=md.mesh.numberofelements),
                                 checkmessage(['flaim.criterion vector must have number of nodes (' ...
                                         int2str(md.mesh.numberofvertices) ') or elements (' int2str(md.mesh.numberofelements)...

issm/trunk/src/m/classes/flowequation.m

@@ -41 +41 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/friction.m

@@ -36 +36 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
                 function disp(obj) % {{{
 

issm/trunk/src/m/classes/geometry.m

@@ -38 +38 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/groundingline.m

@@ -42 +42 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/hydrology.m

@@ -49 +49 @@
                         obj.stabilization=1;
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

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

@@ -41 +41 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/inversion.m

@@ -86 +86 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
                 function disp(obj) % {{{
                         fielddisplay(obj,'iscontrol','is inversion activated?');

issm/trunk/src/m/classes/mask.m

@@ -39 +39 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
                 function disp(obj) % {{{
 

issm/trunk/src/m/classes/materials.m

@@ -75 +75 @@
                         obj.rheology_law='Paterson';
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
                 function disp(obj) % {{{
                         disp(sprintf('   Materials:\n'));

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

@@ -83 +83 @@
                         checkgreaterstrict(md,'mesh',fields,0);
 
+                        fields={'elements'};
+                        if(md.mesh.dimension==2),
+                                checksize(md,'mesh',fields,[md.mesh.numberofelements 3]);
+                        else
+                                checksize(md,'mesh',fields,[md.mesh.numberofelements 6]);
+                        end
+                        if any(~ismember(1:md.mesh.numberofvertices,sort(unique(md.mesh.elements(:)))));
+                                checkmessage('orphan nodes have been found. Check the mesh');
+                        end
+
+                        %Solution specific checks
+                        switch(md.private.solution),
+                                case PrognosticSolutionEnum,
+                                        if md.prognostic.stabilization==3,
+                                                if md.mesh.dimension~=2, checkmessage('Discontinuous Galerkin only supported for 2d meshes'); end
+                                                fields={'edges'};
+                                                checksize(md,'mesh',fields,[NaN 4]);
+                                                fields={'edges(:,1:3)'};
+                                                checknan(md,'mesh',fields);
+                                                checkgreaterstrict(md,'mesh',fields,0);
+                                        end
+                                case BalancethicknessSolutionEnum,
+                                        if md.balancethickness.stabilization==3,
+                                                if md.mesh.dimension~=2, checkmessage('Discontinuous Galerkin only supported for 2d meshes'); end
+                                                fields={'edges'};
+                                                checksize(md,'mesh',fields,[NaN 4]);
+                                                fields={'edges(:,1:3)'};
+                                                checknan(md,'mesh',fields);
+                                                checkgreaterstrict(md,'mesh',fields,0);
+                                        end
+                                case TransientSolutionEnum,
+                                        if md.transient.isprognostic & md.prognostic.stabilization==3,
+                                                if md.mesh.dimension~=2, checkmessage('Discontinuous Galerkin only supported for 2d meshes'); end
+                                                fields={'edges'};
+                                                checksize(md,'mesh',fields,[NaN 4]);
+                                                fields={'edges(:,1:3)'};
+                                                checknan(md,'mesh',fields);
+                                                checkgreaterstrict(md,'mesh',fields,0);
+                                        end
+                        end
                 end % }}}
                 function disp(obj) % {{{

issm/trunk/src/m/classes/private.m

@@ -36 +36 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/prognostic.m

@@ -46 +46 @@
                         obj.hydrostatic_adjustment='Absolute';
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
                 function disp(obj) % {{{
                         disp(sprintf('   Prognostic solution parameters:'));

issm/trunk/src/m/classes/qmu.m

@@ -47 +47 @@
                                 obj.(fieldname)=obj.(fieldname).default;
                         end
+                end % }}}
+                function checkconsistency(obj,md) % {{{
+
                 end % }}}
                 function disp(obj) % {{{

issm/trunk/src/m/classes/rifts.m

@@ -35 +35 @@
                         end
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/settings.m

@@ -52 +52 @@
                         md.waitonlock=Inf;
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/solver.m

@@ -40 +40 @@
                  end
                  %}}}
+                 function checkconsistency(obj,md) % {{{
+
+                 end % }}}
                  function PetscFile(solver,filename) % {{{
                          %PETSCFILE - build petsc file

issm/trunk/src/m/classes/steadystate.m

@@ -41 +41 @@
                         obj.reltol=0.01;
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/surfaceforcings.m

@@ -35 +35 @@
                         end
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/thermal.m

@@ -50 +50 @@
                         obj.penalty_factor=3;
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
                 function disp(obj) % {{{
                         disp(sprintf('   Thermal solution parameters:'));

issm/trunk/src/m/classes/timestepping.m

@@ -46 +46 @@
                         obj.cfl_coefficient=.5;
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/transient.m

@@ -52 +52 @@
 
                 end % }}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/verbose.m

@@ -99 +99 @@
                 end
                 %}}}
+                function checkconsistency(obj,md) % {{{
+
+                end % }}}
                 function disp(verbose) % {{{1
                         

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

@@ -8 +8 @@
 modelconsistency(true);
 
-%General consistency checks
-md.mesh.checkconsistency(md);
-
-%Solution dependent checks
-%FLAIM {{{1
-switch(md.private.solution),
-        case FlaimSolutionEnum, md.flaim.checkconsistency(md);
+%Go through al model field check that it is a class and call checkconsistency
+fields=properties(md);
+for i=1:length(fields),
+        field=fields{i};
+        if ismember(field,{'cluster' 'results' 'debug' 'radaroverlay'}),
+                continue;
+        end
+        if ~isobject(md.(field))
+                checkmessage(['field ''' char(field) ''' is not an object']);
+        else
+                md.(field).checkconsistency(md);
+        end
 end
-%}}}
 
 %error message if mode is not consistent

issm/trunk/src/m/utils/consistency/checkforcing.m

@@ -11 +11 @@
         if size(field,1)==md.mesh.numberofvertices,
                 if ~size(field,2)==1,
-                        checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have only one column as there are md.mesh.numberofvertices lines']);
+                        checkmessage(['field ''' obj '.' fields{i} ''' should have only one column as there are md.mesh.numberofvertices lines']);
                 end
         elseif size(field,1)==md.mesh.numberofvertices+1
                 if any(field(end,:)~=sort(field(end,:))),
-                        checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' columns should be chronological']);
+                        checkmessage(['field ''' obj '.' fields{i} ''' columns should be chronological']);
                 end
                 if any(field(end,1:end-1)==field(end,2:end)),
-                        checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' columns must not contain duplicate timesteps']);
+                        checkmessage(['field ''' obj '.' fields{i} ''' columns must not contain duplicate timesteps']);
                 end
         else
-                checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have md.mesh.numberofvertices or md.mesh.numberofvertices+1 lines']);
+                checkmessage(['field ''' obj '.' fields{i} ''' should have md.mesh.numberofvertices or md.mesh.numberofvertices+1 lines']);
         end
 end

issm/trunk/src/m/utils/consistency/checkgreater.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if any(field<lowerbound),
-                checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have values above ' num2str(lowerbound)]);
+                checkmessage(['field ''' obj '.' fields{i} ''' should have values above ' num2str(lowerbound)]);
         end
 end

issm/trunk/src/m/utils/consistency/checkgreaterstrict.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if any(field<=lowerbound),
-                checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have values stricly above ' num2str(lowerbound)]);
+                checkmessage(['field ''' obj '.' fields{i} ''' should have values stricly above ' num2str(lowerbound)]);
         end
 end

issm/trunk/src/m/utils/consistency/checklength.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if length(field)~=fieldlength,
-                checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' length should be ' num2str(fieldlength)]);
+                checkmessage(['field ''' obj '.' fields{i} ''' length should be ' num2str(fieldlength)]);
         end
 end

issm/trunk/src/m/utils/consistency/checkless.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if any(field>upperbound),
-                checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have values below ' num2str(upperbound)]);
+                checkmessage(['field ''' obj '.' fields{i} ''' should have values below ' num2str(upperbound)]);
         end
 end

issm/trunk/src/m/utils/consistency/checklessstrict.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if any(field>=upperbound),
-                checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have values stricly below ' num2str(upperbound)]);
+                checkmessage(['field ''' obj '.' fields{i} ''' should have values stricly below ' num2str(upperbound)]);
         end
 end

issm/trunk/src/m/utils/consistency/checkmessage.m

@@ -7 +7 @@
 %      checkmessage(string);
 
-disp(string);
+disp(['model not consistent: ' string]);
 modelconsistency(false);

issm/trunk/src/m/utils/consistency/checknan.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if any(isnan(field)),
-                checkmessage(['model not consistent: NaN values found in field ''' obj '.' fields{i}'''']);
+                checkmessage(['NaN values found in field ''' obj '.' fields{i}'''']);
         end
 end

issm/trunk/src/m/utils/consistency/checkreal.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if any(~isreal(field))
-                checkmessage(['model not consistent: complex values found in field ''' obj '.' fields{i}'''']);
+                checkmessage(['complex values found in field ''' obj '.' fields{i}'''']);
         end
 end

issm/trunk/src/m/utils/consistency/checksize.m

@@ -11 +11 @@
         if isnan(fieldsize(1)),
                 if (size(field,2)~=fieldsize(2)),
-                        checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have ' num2str(fieldsize(2)) ' columns']);
+                        checkmessage(['field ''' obj '.' fields{i} ''' should have ' num2str(fieldsize(2)) ' columns']);
                 end
         elseif isnan(fieldsize(2)),
                 if (size(field,1)~=fieldsize(1)),
-                        checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have ' num2str(fieldsize(1)) ' rows']);
+                        checkmessage(['field ''' obj '.' fields{i} ''' should have ' num2str(fieldsize(1)) ' rows']);
                 end
         else
                 if ((size(field)~=fieldsize(1)) |  (size(field,2)~=fieldsize(2)))
-                        checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' size should be ' num2str(fieldsize(1)) ' x ' num2str(fieldsize(2))]);
+                        checkmessage(['field ''' obj '.' fields{i} ''' size should be ' num2str(fieldsize(1)) ' x ' num2str(fieldsize(2))]);
                 end
         end

issm/trunk/src/m/utils/consistency/checkvalues.m

@@ -10 +10 @@
         eval(['field=md.' obj '.' fields{i} ';']);
         if any(~ismember(field,values)),
-                checkmessage(['model not consistent: field ''' obj '.' fields{i} ''' should have values in ' num2str(values)]);
+                checkmessage(['field ''' obj '.' fields{i} ''' should have values in ' num2str(values)]);
         end
 end