Changeset 13741

Timestamp:

10/18/12 16:06:12 (12 years ago)

Author:

jschierm

Message:

NEW: Python version of roundmesh (plus cosmetic Matlab changes).

Location:

issm/trunk-jpl/src/m

Files:

• geometry/FlagElements.py (modified) (1 diff)
• mesh/roundmesh.m (modified) (2 diffs)
• mesh/roundmesh.py (added)

issm/trunk-jpl/src/m/geometry/FlagElements.py

@@ -52 +52 @@
                         flag=numpy.logical_not(flag)
 
-        elif isinstance(region,numpy.nparray) or isinstance(region,bool):
+        elif isinstance(region,numpy.ndarray) or isinstance(region,bool):
                 if not numpy.size(region,0)==md.mesh.numberofelements:
                         raise TypeError("Flaglist for region must be of same size as number of elements in model.")

issm/trunk-jpl/src/m/mesh/roundmesh.m

@@ -12 +12 @@
 
 %Get number of points on the circle
-pointsonedge=floor((2*pi*radius) / resolution);
+pointsonedge=floor((2.*pi*radius) / resolution);
 
 %Calculate the cartesians coordinates of the points
 x_list=ones(pointsonedge,1); y_list=ones(pointsonedge,1);
-theta=(0:2*pi/pointsonedge:2*pi*(1-1/pointsonedge))';
+theta=(0.:2.*pi/pointsonedge:2.*pi*(1.-1./pointsonedge))';
 x_list=radius*x_list.*cos(theta);
 y_list=radius*y_list.*sin(theta);
-A=struct('x',x_list,'y',y_list,'density',1);
+A=struct('x',x_list,'y',y_list,'density',1.);
 expwrite(A,'RoundDomainOutline.exp');
 
@@ -28 +28 @@
 %move the closest node to the center
 [mini pos]=min(md.mesh.x.^2+md.mesh.y.^2);
-md.mesh.x(pos)=0;
-md.mesh.y(pos)=0;
+md.mesh.x(pos)=0.;
+md.mesh.y(pos)=0.;
 
 %delete domain