Changeset 17687

Timestamp:

04/08/14 21:13:16 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: replacing some meshtype by meshdimension

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/SetMarineIceSheetBC.m (modified) (1 diff)
• boundaryconditions/SetMarineIceSheetBC.py (modified) (1 diff)
• classes/model.m (modified) (1 diff)
• contrib/ecco/PropagateFlagsUntilDistance.m (modified) (1 diff)
• extrusion/DepthAverage.m (modified) (1 diff)
• parameterization/contourenvelope.m (modified) (1 diff)
• parameterization/contourenvelope.py (modified) (1 diff)
• plot/applyoptions.m (modified) (2 diffs)
• plot/plot_edges.m (modified) (1 diff)
• plot/plot_icefront.m (modified) (1 diff)
• plot/plot_penalties.m (modified) (1 diff)
• plot/plot_qmu_mass_flux_segments.m (modified) (1 diff)
• plot/plot_referential.m (modified) (1 diff)
• plot/plot_segments.m (modified) (1 diff)
• plot/plot_tensor_components.m (modified) (2 diffs)
• plot/plot_transient_results.m (modified) (2 diffs)
• plot/processdata.m (modified) (3 diffs)
• plot/processmesh.py (modified) (2 diffs)

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m

@@ -52 +52 @@
 
 %First find segments that are not completely on the front
-if ~strcmp(md.mesh.domaintype(),'3D'),
+if strcmp(elementtype(md.mesh),'Penta'),
+        numbernodesfront=4;
+elseif strcmp(elementtype(md.mesh),'Tria'),
         numbernodesfront=2;
-else 
-        numbernodesfront=4;
+else
+        error('mesh type not supported yet');
 end
 segmentsfront=md.mask.ice_levelset(md.mesh.segments(:,1:numbernodesfront))==0;

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py

@@ -53 +53 @@
 
         #First find segments that are not completely on the front
-        if not m.strcmp(md.mesh.domaintype(),'3D'):
+        if m.strcmp(md.mesh.elementtype(),'Penta'):
+                numbernodesfront=4
+        elif m.strcmp(md.mesh.elementtype(),'Tria'):
                 numbernodesfront=2
         else:
-                numbernodesfront=4
+                        raise StandardError("Mesh type not supported")
         if any(md.mask.ice_levelset<=0):
                 values=md.mask.ice_levelset[md.mesh.segments[:,0:-1]-1]

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

@@ -156 +156 @@
 
                         %Check that the model is really a 3d model
-                        if ~strcmp(md.mesh.domaintype(),'3D'),
+                        if ~strcmp(md.mesh.elementtype(),'Penta'),
                                 error('collapse error message: only 3d mesh can be collapsed')
                         end

issm/trunk-jpl/src/m/contrib/ecco/PropagateFlagsUntilDistance.m

@@ -10 +10 @@
 
 %make 3d work in 2d: 
-if strcmp(domaintype(md.mesh),'3D'),
+if dimension(md.mesh)==3,
         md.mesh.x=md.mesh.x2d;
         md.mesh.y=md.mesh.y2d;

issm/trunk-jpl/src/m/extrusion/DepthAverage.m

@@ -9 +9 @@
 
 %check that the model given in input is 3d
-if ~strcmp(md.mesh.domaintype,'3D');
+if ~strcmp(md.mesh.elementtype(),'3D');
         error('DepthAverage error message: the model given in input must be 3d')
 end

issm/trunk-jpl/src/m/parameterization/contourenvelope.m

@@ -42 +42 @@
 %get nodes inside profile
 mesh.elementconnectivity=md.mesh.elementconnectivity;
-if strcmp(md.mesh.domaintype(),'2Dhorizontal'),
+if dimension(md.mesh)==2,
         mesh.elements=md.mesh.elements;
         mesh.x=md.mesh.x;

issm/trunk-jpl/src/m/parameterization/contourenvelope.py

@@ -47 +47 @@
         #get nodes inside profile
         elementconnectivity=copy.deepcopy(md.mesh.elementconnectivity)
-        if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'):
+        if md.mesh.dimension()==2:
                 elements=copy.deepcopy(md.mesh.elements)
                 x=copy.deepcopy(md.mesh.x)

issm/trunk-jpl/src/m/plot/applyoptions.m

@@ -49 +49 @@
 
 %view 
-if strcmp(domaintype(md.mesh),'3D') & ~exist(options,'layer'),
+if dimension(md.mesh)==3 & ~exist(options,'layer'),
         view(getfieldvalue(options,'view',3));
 else
@@ -60 +60 @@
         eval(['axis ' getfieldvalue(options,'axis')]);
 else
-        if strcmpi(domaintype(md.mesh),'2Dhorizontal') | exist(options,'layer'),
+        if dimension(md.mesh)==2 | exist(options,'layer'),
                 axis tight equal;
         else

issm/trunk-jpl/src/m/plot/plot_edges.m

@@ -17 +17 @@
 end
 
-if (strcmp(domaintype(md.mesh),'2Dhorizontal')),
+if dimension(md.mesh)==2,
         %plot mesh
         A=elements(:,1); B=elements(:,2); C=elements(:,3); 

issm/trunk-jpl/src/m/plot/plot_icefront.m

@@ -19 +19 @@
 elementzeroice=sum(zeroice(md.mesh.elements),2);
 
-if (strcmp(domaintype(md.mesh),'2Dhorizontal')),
+if dimension(md.mesh)==2,
         icefront=(elementice & elementnoice) & ~(elementice==2 & elementzeroice);
 

issm/trunk-jpl/src/m/plot/plot_penalties.m

@@ -21 +21 @@
 end
 
-if ~strcmp(domaintype(md.mesh),'3D'),
+if dimension(md.mesh)~=3,
         error('no penalties to plot for ''2d'' model');
 elseif isempty(md.penalties),

issm/trunk-jpl/src/m/plot/plot_qmu_mass_flux_segments.m

@@ -13 +13 @@
 allsegments=md.qmu.mass_flux_segments;
 
-if (strcmp(domaintype(md.mesh),'2Dhorizontal')),
+if dimension(md.mesh)==2,
 
         %recover segments

issm/trunk-jpl/src/m/plot/plot_referential.m

@@ -28 +28 @@
 Yhat=cross(Zhat,Xhat);
 
-if (strcmp(domaintype(md.mesh),'2Dhorizontal')),
+if dimension(md.mesh)==2,
 
         %plot mesh

issm/trunk-jpl/src/m/plot/plot_segments.m

@@ -14 +14 @@
 segments=md.mesh.segments;
 
-if (strcmp(domaintype(md.mesh),'2Dhorizontal')),
+if dimension(md.mesh)==2,
         %plot mesh
         A=elements(:,1); B=elements(:,2); C=elements(:,3); 

issm/trunk-jpl/src/m/plot/plot_tensor_components.m

@@ -10 +10 @@
 upperplots=fix((i-1)/width);
 if upperplots==0, leftplots=i-1; else leftplots=i-width*upperplots-1; end
-if (strcmp(domaintype(md.mesh),'2Dhorizontal'))%3 components -> 3 indexes
+if dimension(md.mesh)==2 %3 components -> 3 indexes
         index1=4*width*upperplots+2*leftplots+1;
         index2=index1+1;
@@ -34 +34 @@
 end
 
-if ((strcmp(domaintype(md.mesh),'2Dhorizontal'))),
+if dimension(md.mesh)==2,
         subplot(2*width,2*width,index1),
         plot_unit(x,y,z,elements,tensor.xx,is2d,isplanet,datatype,options)

issm/trunk-jpl/src/m/plot/plot_transient_results.m

@@ -41 +41 @@
 clear string;
 
-if strcmp(domaintype(md.mesh),'3D'),
+if dimension(md.mesh)==3,
         string='plotmodel(md';
         for i=1:length(md.results.transient),
@@ -67 +67 @@
 clear string;
 
-if strcmp(domaintype(md.mesh),'3D'),
+if dimension(md.mesh)==3,
         string='plotmodel(md';
         for i=2:length(md.results.transient),

issm/trunk-jpl/src/m/plot/processdata.m

@@ -65 +65 @@
 
         %check number of columns, add zeros if necessary,
-        if (strcmp(md.mesh.domaintype(),'3D'))
+        if (dimension(md.mesh)==3)
                 if datasize(2)==2,
                         data=[data, zeros(datasize(1),1)];
@@ -85 +85 @@
 
 %treat the case datasize(1)=nodes2d
-if (strcmp(md.mesh.domaintype(),'3D') & datasize(1)==numberofvertices2d),
+if (dimension(md.mesh)==3 & datasize(1)==numberofvertices2d),
         data=project3d(md,'vector',data,'type','node');
         datasize(1)=md.mesh.numberofvertices;
@@ -92 +92 @@
 
 %treat the case datasize(1)=nodes2d
-if (strcmp(md.mesh.domaintype(),'3D') & datasize(1)==numberofelements2d),
+if (dimension(md.mesh)==3 & datasize(1)==numberofelements2d),
         data=project3d(md,'vector',data,'type','element');
         datasize(1)=md.mesh.numberofelements;

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

@@ -42 +42 @@
 
                 #is it a 2D plot?
-                if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'):
+                if md.mesh.dimension()==2:
                         is2d=1
-                elif m.strcmp(md.mesh.domaintype(),'3D'):
+                else:
                         if options.getfieldvalue('layer',0)>=1:
                                 is2d=1
                         else:
                                 is2d=0
-                else:
-                        raise ValueError('processmesh error: dim = %d not supported' % md.mesh.dimension)
 
                 #layer projection?
@@ -64 +62 @@
         else:
                 #Process mesh for plotting 
-                if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'):
+                if md.mesh.dimension()==2:
                         is2d=1
                 else: