Changeset 25636

Timestamp:

10/06/20 12:18:22 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics

Location:

issm/trunk-jpl/src/m

Files:

• consistency/checkfield.m (modified) (3 diffs)
• exp/contourlevelzero.m (modified) (2 diffs)

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

@@ -139 +139 @@
 end
 
-
 %check cell
 if getfieldvalue(options,'cell',0);
@@ -187 +186 @@
         lowerbound=getfieldvalue(options,'>=');
         field2=reshape(field,prod(size(field)),1);
-        if getfieldvalue(options,'timeseries',0), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'timeseries',0),       field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
         if getfieldvalue(options,'singletimeseries',0), field2=reshape(field(1,:),prod(size(field(1,:))),1); end
         if any(field2<lowerbound),
@@ -197 +196 @@
         lowerbound=getfieldvalue(options,'>');
         field2=reshape(field,prod(size(field)),1);
-        if getfieldvalue(options,'timeseries',0), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'timeseries',0),       field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
         if getfieldvalue(options,'singletimeseries',0), field2=reshape(field(1,:),prod(size(field(1,:))),1); end
         if any(field2<=lowerbound),

issm/trunk-jpl/src/m/exp/contourlevelzero.m

@@ -9 +9 @@
 %   See also: PLOT_CONTOUR
 
+if isempty(mask)
+        error('mask provided is empty');
+end
+
 %process data 
 if dimension(md.mesh)==3,
-%       error('contourlevelzero error message: routine not supported for 3d meshes, project on a layer');
         x = md.mesh.x2d;
         y = md.mesh.y2d;
@@ -27 +30 @@
 end
 
-if isempty(mask), error('mask provided is empty'); end
 if dimension(md.mesh)==3,
-        if length(mask)~=md.mesh.numberofvertices2d, error('mask provided should be specified at the vertices of the mesh'); end
+        if length(mask)~=md.mesh.numberofvertices2d, error('Since this is a 3d model, you need to project the mask on a layer (e.g. project2d(md,mask,0))'); end
 else
         if length(mask)~=md.mesh.numberofvertices, error('mask provided should be specified at the vertices of the mesh'); end