Changeset 23039

Timestamp:

08/01/18 14:40:07 (7 years ago)

Author:

caronlam

Message:

mask fix and missing new variable declaration

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test2002.py (modified) (2 diffs)
• test2003.py (modified) (2 diffs)
• test2010.py (modified) (2 diffs)

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

@@ -55 +55 @@
 md.mask.groundedice_levelset=-np.ones((md.mesh.numberofvertices))
 
+#make sure that the elements that have loads are fully grounded:
+pos=np.nonzero(md.slr.deltathickness)[0]
+md.mask.groundedice_levelset[md.mesh.elements[pos,:]-1]=1;
+
 #make sure wherever there is an ice load, that the mask is set to ice:
-pos=np.nonzero(md.slr.deltathickness)[0]
 icemask[md.mesh.elements[pos,:]-1]=-1
+md.mask.ice_levelset=icemask
 
+md.slr.ocean_area_scaling=0
 
 #geometry
@@ -71 +76 @@
 md.materials.rheology_B=paterson(md.initialization.temperature)
 md.materials.rheology_n=3*np.ones((md.mesh.numberofelements))
+
+#New stuff
+md.slr.spcthickness = np.nan((md.mesh.numberofvertices,));
+md.slr.Ngia = np.zeros((md.mesh.numberofvertices,))
+md.slr.Ugia = np.zeros((md.mesh.numberofvertices,))
 
 #Miscellaneous

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

@@ -58 +58 @@
 
 #make sure that the elements that have loads are fully grounded:
-pos=np.where(md.slr.deltathickness);
-md.mask.groundedice_levelset[md.mesh.elements[pos,:]]=1;
+pos=np.nonzero(md.slr.deltathickness)[0]
+md.mask.groundedice_levelset[md.mesh.elements[pos,:]-1]=1;
 
-#make sure wherever there is an ice load, that the mask is set to ice: 
-pos = np.where(md.slr.deltathickness)
-md.mask.ice_levelset[md.mesh.elements[pos,:]] = -1
+#make sure wherever there is an ice load, that the mask is set to ice:
+icemask[md.mesh.elements[pos,:]-1]=-1
+md.mask.ice_levelset=icemask
 # }}}
 
@@ -80 +80 @@
 md.materials.rheology_B = paterson(md.initialization.temperature)
 md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements,))
+
+#New stuff
+md.slr.spcthickness = np.nan((md.mesh.numberofvertices,));
+md.slr.Ngia = np.zeros((md.mesh.numberofvertices,))
+md.slr.Ugia = np.zeros((md.mesh.numberofvertices,))
 
 #Miscellaneous

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

@@ -58 +58 @@
 
 #make sure that the elements that have loads are fully grounded:
-pos=np.where(md.slr.deltathickness);
-md.mask.groundedice_levelset[md.mesh.elements[pos,:]]=1;
+pos=np.nonzero(md.slr.deltathickness)[0]
+md.mask.groundedice_levelset[md.mesh.elements[pos,:]-1]=1;
 
-#make sure wherever there is an ice load, that the mask is set to ice: 
-#md.mask.ice_levelset = np.ones((md.mesh.numberofvertices,))
-pos = np.where(md.slr.deltathickness)
-md.mask.ice_levelset[md.mesh.elements[pos,:]] = -1
+#make sure wherever there is an ice load, that the mask is set to ice:
+icemask[md.mesh.elements[pos,:]-1]=-1
+md.mask.ice_levelset=icemask
 # }}}
 #geometry {{{
@@ -86 +85 @@
 md.slr.geodetic = 1
 # }}}
+
+#New stuff
+md.slr.spcthickness = np.nan((md.mesh.numberofvertices,));
+md.slr.Ngia = np.zeros((md.mesh.numberofvertices,))
+md.slr.Ugia = np.zeros((md.mesh.numberofvertices,))
 
 #eustatic + rigid + elastic run: