Changeset 20286

Timestamp:

03/01/16 20:19:53 (9 years ago)

Author:

Eric.Larour

Message:

CHG: test2002 now working!

File:

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

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

@@ -12 +12 @@
 from gmtmask import *
 from paterson import *
+from love_numbers import *
 
 #mesh earth: 
@@ -29 +30 @@
 
 #elastic loading from love numbers: 
+nlov=101
+md.slr.love_h = love_numbers('h')[:nlov];
+md.slr.love_k = love_numbers('k')[:nlov];
 
-love = loadtxt('../Data/love_numbers_10k.txt')
-nlov=101
-print love
-md.slr.love_h = love[1][1:nlov]  # radial displacement (height) 
-md.slr.love_k = love[2][1:nlov]  # gravitational potential (phi) 
 #}}}
 #mask:  {{{
@@ -41 +40 @@
 
 icemask=ones((md.mesh.numberofvertices,1))
-pos=nonzero(mask==0)
-icemask[pos]=-1
-pos=nonzero(sum(mask[md.mesh.elements.astype(int)-1],2)<3)
+pos=nonzero(mask==0);  icemask[pos]=-1
+pos=nonzero(sum(mask[md.mesh.elements.astype(int)-1],axis=1)<3)
 icemask[md.mesh.elements[pos].astype(int)-1]=-1
+md.mask.ice_levelset=icemask
 
-md.mask.ice_levelset=icemask
 md.mask.ocean_levelset=zeros((md.mesh.numberofvertices,1))
 pos=numpy.nonzero(md.mask.ice_levelset==1)
@@ -80 +78 @@
 md.slr.elastic=0
 md=solve(md,SealevelriseSolutionEnum())
-Seustatic=md.results.SealevelriseSolution.SealevelriseS
+Seustatic=md.results.SealevelriseSolution.Sealevel;
 
 #eustatic + rigid run: 
@@ -87 +85 @@
 md.slr.elastic=0
 md=solve(md,SealevelriseSolutionEnum())
-Srigid=md.results.SealevelriseSolution.SealevelriseS
+Srigid=md.results.SealevelriseSolution.Sealevel;
 
 #eustatic + rigid + elastic run: 
@@ -94 +92 @@
 md.slr.elastic=1
 md=solve(md,SealevelriseSolutionEnum())
-Selastic=md.results.SealevelriseSolution.SealevelriseS
+Selastic=md.results.SealevelriseSolution.Sealevel;
 
 #Fields and tolerances to track changes