Changeset 21408 for issm/trunk-jpl/test/NightlyRun/test217.py

Timestamp:

11/22/16 02:31:19 (8 years ago)

Author:

bdef

Message:

CHG: uniformization fix

File:

• issm/trunk-jpl/test/NightlyRun/test217.py (modified) (5 diffs)

issm/trunk-jpl/test/NightlyRun/test217.py

@@ -1 +1 @@
 #Test Name: SquareShelfConstrained
-from MatlabFuncs import *
+
 from model import *
-from numpy import *
+from socket import gethostname
+import numpy as np
 from triangle import *
 from setmask import *
@@ -15 +16 @@
 md=parameterize(md,'../Par/SquareShelf.py')
 md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',oshostname(),'np',3)
+md.cluster=generic('name',gethostname(),'np',3)
 
 # redo the parameter file for this special shelf. 
@@ -33 +34 @@
 
 h=1000.
-md.geometry.thickness=h*ones((md.mesh.numberofvertices,1))
+md.geometry.thickness=h*ones((md.mesh.numberofvertices))
 md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
 md.geometry.surface=md.geometry.base+md.geometry.thickness
 
 # Initial velocity and pressure
-md.initialization.vx=zeros((md.mesh.numberofvertices,1))
-md.initialization.vy=zeros((md.mesh.numberofvertices,1))
-md.initialization.vz=zeros((md.mesh.numberofvertices,1))
-md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
+md.initialization.vx=zeros((md.mesh.numberofvertices))
+md.initialization.vy=zeros((md.mesh.numberofvertices))
+md.initialization.vz=zeros((md.mesh.numberofvertices))
+md.initialization.pressure=zeros((md.mesh.numberofvertices))
 
 # Materials
-md.initialization.temperature=(273.-20.)*ones((md.mesh.numberofvertices,1))
+md.initialization.temperature=(273.-20.)*ones((md.mesh.numberofvertices))
 md.materials.rheology_B=paterson(md.initialization.temperature)
-md.materials.rheology_n=3.*ones((md.mesh.numberofelements,1))
+md.materials.rheology_n=3.*ones((md.mesh.numberofelements))
 
 # Boundary conditions:
-md.stressbalance.spcvx=float(nan)*ones((md.mesh.numberofvertices,1))
-md.stressbalance.spcvy=float(nan)*ones((md.mesh.numberofvertices,1))
-md.stressbalance.spcvz=float(nan)*ones((md.mesh.numberofvertices,1))
+md.stressbalance.spcvx=float(nan)*ones((md.mesh.numberofvertices))
+md.stressbalance.spcvy=float(nan)*ones((md.mesh.numberofvertices))
+md.stressbalance.spcvz=float(nan)*ones((md.mesh.numberofvertices))
 
 # constrain flanks to 0 normal velocity
-pos=numpy.nonzero(numpy.logical_or(md.mesh.x==xmin,md.mesh.x==xmax))
+pos=np.nonzero(np.logical_or.reduce(md.mesh.x==xmin,md.mesh.x==xmax))
 md.stressbalance.spcvx[pos]=0
 md.stressbalance.spcvz[pos]=float(nan)
 
 # constrain grounding line to 0 velocity
-pos=numpy.nonzero(md.mesh.y==ymin)
+pos=np.nonzero(md.mesh.y==ymin)
 md.stressbalance.spcvx[pos]=0
 md.stressbalance.spcvy[pos]=0
@@ -65 +66 @@
 # icefront
 nodeonicefront=zeros(md.mesh.numberofvertices)
-pos=numpy.nonzero(md.mesh.y==ymax)
+pos=np.nonzero(md.mesh.y==ymax)
 nodeonicefront[pos]=1
 md.mask.ice_levelset=-1+nodeonicefront
@@ -72 +73 @@
 
 # create analytical solution: strain rate is constant = ((rho_ice*g*h)/4B)^3 (Paterson, 4th Edition, page 292.
-# ey_c=(md.materials.rho_ice*md.constants.g*(1-di)*md.geometry.thickness./(4*md.materials.rheology_B)).^3;
-# vy_c=ey_c.*md.mesh.y*md.constants.yts;
+# ey_c=(md.materials.rho_ice*md.constants.g*(1-di)*md.geometry.thickness./(4*md.materials.rheology_B)).^3
+# vy_c=ey_c.*md.mesh.y*md.constants.yts
 
 # Fields and tolerances to track changes