Changeset 12960

Timestamp:

08/09/12 16:32:52 (13 years ago)

Author:

schlegel

Message:

CHG: check that mesh.z is within bed and surface

Location:

issm/trunk-jpl/src/m

Files:

• classes/mesh.m (modified) (1 diff)
• utils/consistency/checkfield.m (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/mesh.m ¶

@@ -87 +87 @@
                         md = checkfield(md,'mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]);
                         md = checkfield(md,'mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]);
+                        if (md.mesh.dimension==3),
+                                md = checkfield(md,'mesh.z','>=',md.geometry.bed,'message','''mesh.z'' should be above the bed');
+                                md = checkfield(md,'mesh.z','<=',md.geometry.surface,'message','''mesh.z'' should be below the ice surface');
+                        end
                         if (md.mesh.dimension==2),
                                 md = checkfield(md,'mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d');

issm/trunk-jpl/src/m/utils/consistency/checkfield.m ¶

@@ -136 +136 @@
         if any(field2<lowerbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
-                        ['field ''' fieldname ''' should have values above ' num2str(lowerbound)]));
+                        ['field ''' fieldname ''' should have values above ' num2str(lowerbound(1,1))]));
         end
 end
@@ -144 +144 @@
         if any(field2<=lowerbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
-                        ['field ''' fieldname ''' should have values above ' num2str(lowerbound)]));
+                        ['field ''' fieldname ''' should have values above ' num2str(lowerbound(1,1))]));
         end
 end
@@ -154 +154 @@
         if any(field2>upperbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
-                        ['field ''' fieldname ''' should have values below ' num2str(upperbound)]));
+                        ['field ''' fieldname ''' should have values below ' num2str(upperbound(1,1))]));
         end
 end
@@ -162 +162 @@
         if any(field2>=upperbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
-                        ['field ''' fieldname ''' should have values below ' num2str(upperbound)]));
+                        ['field ''' fieldname ''' should have values below ' num2str(upperbound(1,1))]));
         end
 end