Changeset 21303 for issm/trunk-jpl/src/m/classes/mesh2d.py

Timestamp:

10/21/16 08:49:08 (8 years ago)

Author:

bdef

Message:

CHG: major cosmetic clean up we now ask shape (N,) rather than (N,1) also uniformised numpy imports

File:

• issm/trunk-jpl/src/m/classes/mesh2d.py (modified) (3 diffs)

issm/trunk-jpl/src/m/classes/mesh2d.py

@@ -1 @@
-import numpy
+import numpy as np
 from fielddisplay import fielddisplay
 from checkfield import checkfield
@@ -85 +85 @@
                 md = checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
                 md = checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
-                md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',numpy.arange(1,md.mesh.numberofvertices+1))
+                md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',np.arange(1,md.mesh.numberofvertices+1))
                 md = checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements,3])
-                if numpy.any(numpy.logical_not(m.ismember(numpy.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):
+                if np.any(np.logical_not(m.ismember(np.arange(1,md.mesh.numberofvertices+1),md.mesh.elements))):
                         md.checkmessage("orphan nodes have been found. Check the mesh outline")
                 md = checkfield(md,'fieldname','mesh.numberofelements','>',0)
@@ -112 +112 @@
                 WriteData(fid,prefix,'object',self,'class','mesh','fieldname','x','format','DoubleMat','mattype',1)
                 WriteData(fid,prefix,'object',self,'class','mesh','fieldname','y','format','DoubleMat','mattype',1)
-                WriteData(fid,prefix,'name','md.mesh.z','data',numpy.zeros(self.numberofvertices),'format','DoubleMat','mattype',1);
+                WriteData(fid,prefix,'name','md.mesh.z','data',np.zeros(self.numberofvertices),'format','DoubleMat','mattype',1);
                 WriteData(fid,prefix,'object',self,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2)
                 WriteData(fid,prefix,'object',self,'class','mesh','fieldname','numberofelements','format','Integer')