Changeset 9749

Timestamp:

09/09/11 16:46:53 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added some checks

Location:

issm/trunk/src/m/classes

Files:

• basalforcings.m (modified) (1 diff)
• constants.m (modified) (1 diff)
• diagnostic.m (modified) (2 diffs)
• friction.m (modified) (1 diff)
• geometry.m (modified) (1 diff)
• inversion.m (modified) (1 diff)
• mask.m (modified) (1 diff)
• materials.m (modified) (1 diff)
• mesh.m (modified) (1 diff)
• settings.m (modified) (1 diff)

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

@@ -37 +37 @@
                 function checkconsistency(obj,md) % {{{
 
+                        fields={'melting_rate','geothermalflux'};
+                        checksize(md,'basalforcings',fields,[md.mesh.numberofvertices 1]);
                 end % }}}
         end

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

@@ -47 +47 @@
                 function flag = checkconsistency(obj,md) % {{{
 
+                        fields={'g'};
+                        checknan(md,'constants',fields);
+                        checkgreaterstrict(md,'constants',fields,0);
+
                 end % }}}
         end

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

@@ -78 +78 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
+
+                        fields={'restol','maxiter'};
+                        checknan(md,'diagnostic',fields);
+
+                        fields={'abstol','restol','reltol'};
+                        checkgreaterstrict(md,'diagnostic',fields,0);
+
                         fields={'icefront'};
                         if (md.mesh.dimension==2),
@@ -86 +93 @@
                         fields={'icefront(:,end)'};
                         checkvalues(md,'diagnostic',fields,[0 1 2]);
+
+                        fields={'referential'};
+                        checksize(md,'diagnostic',fields,[md.mesh.numberofvertices 6]);
+
+                        if ~isempty(md.diagnostic.requested_outputs),
+                                if(size(md.diagnostic.requested_outputs,2)~=1),
+                                        checkmessage(['model ' md.miscellaneous.name ' requested outputs should be a column vector']);
+                                end
+                        end
+
                 end % }}}
                 function disp(obj) % {{{

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

@@ -38 +38 @@
                 function checkconsistency(obj,md) % {{{
 
+                        fields={'coefficient','p','q'};
+                        checknan(md,'friction',fields);
+                        checkgreater(md,'friction',fields,0);
+
+                        fields={'p','q'};
+                        checksize(md,'friction',fields,[md.mesh.numberofelements 1]);
+
+                        fields={'coefficient'};
+                        checksize(md,'friction',fields,[md.mesh.numberofvertices 1]);
                 end % }}}
                 function disp(obj) % {{{

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

@@ -39 +39 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
+                        fields={'surface','thickness','bed'};
+                        checknan(md,'geometry',fields);
+                        checksize(md,'geometry',fields,[md.mesh.numberofvertices 1]);
 
+                        fields={'thickness'};
+                        checkgreater(md,'geometry',fields,0);
+
+                        if any((obj.thickness-obj.surface+obj.bed)>10^-9),
+                                checkmessage(['equality thickness=surface-bed violated']);
+                        end 
                 end % }}}
         end

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

@@ -88 +88 @@
                 function checkconsistency(obj,md) % {{{
 
+                        %Early return
+                        if ~obj.iscontrol, return; end
+
+                        %Check NaN
+                        fields={'nsteps','maxiter_per_step'};
+                        checknan(md,'materials',fields);
+
                 end % }}}
                 function disp(obj) % {{{

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

@@ -41 +41 @@
                 function checkconsistency(obj,md) % {{{
 
+                        fields=properties('mask');
+                        checknan(md,'mask',fields);
+                        checkvalues(md,'mask',fields,[0 1]);
+
+                        fields={'elementonfloatingice','elementongroundedice','elementonwater'};
+                        checksize(md,'mask',fields,[md.mesh.numberofelements 1]);
+
+                        fields={'vertexonfloatingice','vertexongroundedice','vertexonwater'};
+                        checksize(md,'mask',fields,[md.mesh.numberofvertices 1]);
                 end % }}}
                 function disp(obj) % {{{

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

@@ -76 +76 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
+                        fields={'rho_ice','rho_water','rheology_B','rheology_n'};
+                        checknan(md,'materials',fields);
+                        checkgreater(md,'materials',fields,0);
 
+                        fields={'rheology_n'};
+                        checksize(md,'materials',fields,[md.mesh.numberofelements 1]);
+
+                        fields={'rheology_B'};
+                        checksize(md,'materials',fields,[md.mesh.numberofvertices 1]);
                 end % }}}
                 function disp(obj) % {{{

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

@@ -80 +80 @@
                 function checkconsistency(obj,md) % {{{
 
-                        fields={'dimension'};
+                        fields={'x','y','z','elements','elementonbed','elementonsurface','vertexonbed','vertexonsurface','elementconnectivity'};
+                        checknan(md,'mesh',fields);
+
+                        fields={'elements','elementonbed','elementonsurface','vertexonbed','vertexonsurface','elementconnectivity'};
+                        checkgreater(md,'mesh',fields,0);
+
+                        fields={'dimension','elements','numberofelements','numberofvertices'};
                         checkgreaterstrict(md,'mesh',fields,0);
+                        
+                        fields={'vertexonbed','vertexonsurface','x','y','z'};
+                        checksize(md,'mesh',fields,[md.mesh.numberofvertices 1]);
+
+                        fields={'elementonbed','elementonsurface'};
+                        checksize(md,'mesh',fields,[md.mesh.numberofelements 1]);
 
                         fields={'elements'};

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

@@ -54 +54 @@
                 function checkconsistency(obj,md) % {{{
 
+                        fields={'lowmem'};
+                        checknan(md,'settings',fields);
+                        checkvalues(md,'settings',fields,[0 1]);
+
                 end % }}}
         end