Changeset 11234

Timestamp:

01/27/12 06:25:30 (13 years ago)

Author:

Eric.Larour

Message:

Merge of trunk and trunk-jpl

Location:

issm/trunk-jpl/src/m/model

Files:

• extrude.m (modified) (1 diff)
• parameterization/parameterize.m (modified) (1 diff)
• plot/processmesh.m (modified) (1 diff)
• setmask.m (modified) (1 diff)

issm/trunk-jpl/src/m/model/extrude.m

@@ -59 +59 @@
 
 if numlayers<2,
-        disp('number of layers should be at least 2. returning initial model...');
-        return
+        error('number of layers should be at least 2');
+end
+if md.mesh.dimension==3,
+        error('Cannot extrude a 3d mesh (extrude cannot be called more than once)');
 end
 

issm/trunk-jpl/src/m/model/parameterization/parameterize.m

@@ -36 +36 @@
 
         %rename parameter file
+        me2.message=regexprep(me2.message,[temporaryname '.m'],parametername);
         for i=1:length(me2.stack)-1,
-                if (strncmp(fliplr(me2.stack(i).file),fliplr([temporaryname '.m']),length(temporaryname)+2))
-                        me2.stack(i).file=parametername;
-                end
-                if strcmp(me2.stack(i).name,temporaryname),
-                        me2.stack(i).name=parametername;
-                end
-                if strcmp(me2.stack(i).name,temporaryname),
-                        %remove parameterize.m error "TemporaryParameterFile" misleading
+                me2.stack(i).file=regexprep(me2.stack(i).file,[temporaryname '.m'],parametername);
+                me2.stack(i).name=regexprep(me2.stack(i).name,[temporaryname '.m'],parametername);
+                if strcmp(me2.stack(i).name,'parameterize'),
+                        %remove error (eval(temporaryname);) misleading
                         me2.stack(i)=[];
                 end

issm/trunk-jpl/src/m/model/plot/processmesh.m

@@ -8 +8 @@
 
 %some checks
+if md.mesh.numberofvertices==0,
+        error('plot error message: mesh is empty')
+end
 if md.mesh.numberofvertices==md.mesh.numberofelements
-        error('plot error message: the number of elements is the same as the number of nodes! cannot plot anything with model/plot, use matlab/plot instead')
+        error(['plot error message: the number of elements is the same as the number of nodes...']);
 end
 

issm/trunk-jpl/src/m/model/setmask.m

@@ -1 +1 @@
 function md=setmask(md,floatingicename,groundedicename)
-%GEOGRAPHY - establish boundaries between grounded and floating ice.
+%SETMASK - establish boundaries between grounded and floating ice.
 %
 %   By default, ice is considered grounded. The contour floatingicename defines nodes