Changeset 13808

Timestamp:

10/23/12 11:44:54 (12 years ago)

Author:

jschierm

Message:

NEW: Python and Matlab versions of roundmesh with rounding for exp files.

Location:

issm/trunk-jpl/src/m/mesh

Files:

• roundmesh.m (modified) (2 diffs)
• roundmesh.py (modified) (2 diffs)

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

@@ -17 +17 @@
 x_list=ones(pointsonedge,1); y_list=ones(pointsonedge,1);
 theta=(0.:2.*pi/pointsonedge:2.*pi*(1.-1./pointsonedge))';
-x_list=radius*x_list.*cos(theta);
-y_list=radius*y_list.*sin(theta);
+x_list=roundsigfig(radius*x_list.*cos(theta),12);
+y_list=roundsigfig(radius*y_list.*sin(theta),12);
 A=struct('x',x_list,'y',y_list,'density',1.);
 expwrite(A,'RoundDomainOutline.exp');
@@ -33 +33 @@
 %delete domain
 delete('RoundDomainOutline.exp')
+end
+
+function x=roundsigfig(x,n)
+
+digits=ceil(log10(abs(x)));
+x=x./10.^digits;
+x=round(x.*10.^n)./10.^n;
+x=x.*10.^digits;
+
+pos=find(isnan(x));
+x(pos)=0.;
+
+end
+

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

@@ -27 +27 @@
         y_list=numpy.ones(pointsonedge)
         theta=numpy.linspace(0.,2.*numpy.pi,num=pointsonedge,endpoint=False)
-        x_list=radius*x_list*numpy.cos(theta)
-        y_list=radius*y_list*numpy.sin(theta)
+        x_list=roundsigfig(radius*x_list*numpy.cos(theta),12)
+        y_list=roundsigfig(radius*y_list*numpy.sin(theta),12)
         A=OrderedDict()
         A['x']=x_list
@@ -49 +49 @@
         return md
 
+def roundsigfig(x,n):
+
+        digits=numpy.ceil(numpy.log10(numpy.abs(x)))
+        x=x/10.**digits
+        x=numpy.round(x,decimals=n)
+        x=x*10.**digits
+
+        pos=numpy.nonzero(numpy.isnan(x))
+        x[pos]=0.
+
+        return x
+