Changeset 22866

Timestamp:

06/22/18 01:03:36 (7 years ago)

Author:

bdef

Message:

BUG: random fixes in nightlies

Location:

issm/trunk-jpl/test/Par

Files:

• 79North.py (modified) (3 diffs)
• Pig.py (modified) (2 diffs)

issm/trunk-jpl/test/Par/79North.py

@@ -3 +3 @@
 from arch import *
 import numpy
-from verbose import verbose 
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import paterson 
+from paterson import paterson
 from SetMarineIceSheetBC import SetMarineIceSheetBC
 
@@ -16 +16 @@
 vy        = numpy.array(archread('../Data/79North.arch','vy'));
 index     = numpy.array(archread('../Data/79North.arch','index')).astype(int);
-surface   = numpy.array(archread('../Data/79North.arch','surface')); 
-thickness = numpy.array(archread('../Data/79North.arch','thickness')); 
+surface   = numpy.array(archread('../Data/79North.arch','surface'));
+thickness = numpy.array(archread('../Data/79North.arch','thickness'));
 
-[md.initialization.vx]  = InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
-[md.initialization.vy]  = InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
-[md.geometry.surface]   = InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)
-[md.geometry.thickness] = InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)
-md.geometry.base         = md.geometry.surface-md.geometry.thickness
+md.initialization.vx  = InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)[0][:,0]
+md.initialization.vy  = InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)[0][:,0]
+md.geometry.surface   = InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)[0][:,0]
+md.geometry.thickness = InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)[0][:,0]
+md.geometry.base      = md.geometry.surface-md.geometry.thickness
 
 #Materials
@@ -37 +37 @@
 md.friction.q=numpy.ones((md.mesh.numberofelements))
 
-#Ice shelf melting and surface mass balance 
+#Ice shelf melting and surface mass balance
 md.basalforcings.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices))
 md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.

issm/trunk-jpl/test/Par/Pig.py

@@ -5 +5 @@
 from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import paterson 
+from paterson import paterson
 from SetMarineIceSheetBC import SetMarineIceSheetBC
 
@@ -13 +13 @@
 x         = numpy.array(archread('../Data/Pig.arch','x'))
 y         = numpy.array(archread('../Data/Pig.arch','y'))
-vx_obs    = numpy.array(archread('../Data/Pig.arch','vx_obs')) 
-vy_obs    = numpy.array(archread('../Data/Pig.arch','vy_obs')) 
+vx_obs    = numpy.array(archread('../Data/Pig.arch','vx_obs'))
+vy_obs    = numpy.array(archread('../Data/Pig.arch','vy_obs'))
 index     = numpy.array(archread('../Data/Pig.arch','index')).astype(int)
 surface   = numpy.array(archread('../Data/Pig.arch','surface'))
-thickness = numpy.array(archread('../Data/Pig.arch','thickness')) 
+thickness = numpy.array(archread('../Data/Pig.arch','thickness'))
 
-[md.inversion.vx_obs]   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y)
-[md.inversion.vy_obs]   =InterpFromMeshToMesh2d(index,x,y,vy_obs,md.mesh.x,md.mesh.y)
-[md.geometry.surface]  =InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)
-[md.geometry.thickness]=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)
+md.inversion.vx_obs   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y)[0][:,0]
+md.inversion.vy_obs   =InterpFromMeshToMesh2d(index,x,y,vy_obs,md.mesh.x,md.mesh.y)[0][:,0]
+md.geometry.surface  =InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)[0][:,0]
+md.geometry.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)[0][:,0]
 md.geometry.base=md.geometry.surface-md.geometry.thickness
 md.initialization.vx=md.inversion.vx_obs