Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test423.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test423.py (modified) (3 diffs)

issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test423.py

@@ -1 +1 @@
 #Test Name: RoundSheetShelfGLMigrationSSA2d
-import numpy
+import numpy as np
 from model import *
+from socket import gethostname
 from roundmesh import *
 from setmask import *
@@ -7 +8 @@
 from setflowequation import *
 from solve import *
-from MatlabFuncs import *
+
 
 radius=1.e6
@@ -14 +15 @@
 md=roundmesh(model(),radius,50000.)
 #fix center node to 0,0
-rad=numpy.sqrt(md.mesh.x**2+md.mesh.y**2)
-pos=numpy.argmin(rad)
+rad=np.sqrt(md.mesh.x**2+md.mesh.y**2)
+pos=np.argmin(rad)
 md.mesh.x[pos]=0.
 md.mesh.y[pos]=0.    #the closest node to the center is changed to be exactly at the center
-xelem=numpy.mean(md.mesh.x[md.mesh.elements.astype(int)-1],axis=1)
-yelem=numpy.mean(md.mesh.y[md.mesh.elements.astype(int)-1],axis=1)
-rad=numpy.sqrt(xelem**2+yelem**2)
-flags=numpy.zeros(md.mesh.numberofelements)
-pos=numpy.nonzero(rad>=(radius-shelfextent))
+xelem=np.mean(md.mesh.x[md.mesh.elements.astype(int)-1],axis=1)
+yelem=np.mean(md.mesh.y[md.mesh.elements.astype(int)-1],axis=1)
+rad=np.sqrt(xelem**2+yelem**2)
+flags=np.zeros(md.mesh.numberofelements)
+pos=np.nonzero(rad>=(radius-shelfextent))
 flags[pos]=1
 md=setmask(md,flags,'') 
 md=parameterize(md,'../Par/RoundSheetShelf.py')
 md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',oshostname(),'np',3)
+md.cluster=generic('name',gethostname(),'np',3)
 
 md.transient.isthermal=False