Changeset 20224

Timestamp:

02/19/16 16:28:48 (9 years ago)

Author:

dlcheng

Message:

CHG: Intermediate fixes for syntax and includes, work in progress

File:

• issm/trunk-jpl/test/NightlyRun/test2002.py (modified) (4 diffs)

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

@@ -2 +2 @@
 #Earth Sea Level Rise test. Uses the mesh3dsurface geometry.
 from MatlabFuncs import *
+from PythonFuncs import *
 from model import *
 from EnumDefinitions import *
@@ -7 +8 @@
 from parameterize import *
 from solve import *
+from gmshplanet import *
 
 #mesh earth: 
 md=model() 
-md.mesh=gmshplanet('radius',6.371012*10^3,'resolution',700) #500 km resolution mesh
+md.mesh=gmshplanet('radius',6.371012*10**3,'resolution',700) #500 km resolution mesh
 
 #parameterize slr solution:
 #slr loading:  {{{
-md.slr.deltathickness=zeros(md.mesh.numberofvertices,1)
-md.slr.sealevel=zeros(md.mesh.numberofvertices,1);
+md.slr.deltathickness=zeros((md.mesh.numberofvertices,1))
+md.slr.sealevel=zeros((md.mesh.numberofvertices,1))
 #antarctica
 pos=numpy.nonzero(md.mesh.lat <-80)
 md.slr.deltathickness[pos]=-100
 #greenlnd 
-pos=numpy.nonzero(md.mesh.lat > 70 &  md.mesh.lat < 80 & md.mesh.long>-60 & md.mesh.long<-30)
+pos=numpy.nonzero(logical_and_n(md.mesh.lat > 70,md.mesh.lat < 80,md.mesh.long>-60,md.mesh.long<-30))
 md.slr.deltathickness[pos]=-100
 
@@ -34 +36 @@
 mask=gmtmask(md.mesh.lat,md.mesh.long) 
 
-icemask=ones(md.mesh.numberofvertices,1)
+icemask=ones((md.mesh.numberofvertices,1))
 pos=find(mask==0)
 icemask[pos]=-1
@@ -41 +43 @@
 
 md.mask.ice_levelset=icemask
-md.mask.ocean_levelset=zeros(md.mesh.numberofvertices,1)
+md.mask.ocean_levelset=zeros((md.mesh.numberofvertices,1))
 pos=numpy.nonzero(md.mask.ice_levelset==1)
 md.mask.ocean_levelset[pos]=1
 
 #make sure that the ice level set is all inclusive:
-md.mask.land_levelset=zeros(md.mesh.numberofvertices,1)
-md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1) 
+md.mask.land_levelset=zeros((md.mesh.numberofvertices,1))
+md.mask.groundedice_levelset=-ones((md.mesh.numberofvertices,1))
 # }}}
 #geometry:  {{{
 di=md.materials.rho_ice/md.materials.rho_water
-md.geometry.thickness=ones(md.mesh.numberofvertices,1)
-md.geometry.surface=(1-di)*zeros(md.mesh.numberofvertices,1)
+md.geometry.thickness=ones((md.mesh.numberofvertices,1))
+md.geometry.surface=(1-di)*zeros((md.mesh.numberofvertices,1))
 md.geometry.base=md.geometry.surface-md.geometry.thickness
 md.geometry.bed=md.geometry.base
 # }}}
 #materials:  {{{
-md.initialization.temperature=273.25*ones(md.mesh.numberofvertices,1)
+md.initialization.temperature=273.25*ones((md.mesh.numberofvertices,1))
 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,1))
 # }}}
 #Miscellaneous: {{{