source: issm/oecreview/Archive/12678-13393/ISSM-13069-13070.diff@ 21726

u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.py

@@ -1 +1 @@
 from numpy import *
 from verbose import *
 import scipy.io as matio
-import InterpFromMeshToMesh2d as im
-from   paterson import  *
+from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
+from paterson import  *
 from SetIceShelfBC import *
 import inspect
+import os.path
 
 #Start defining model parameters here
 #Geometry
@@ -28 +29 @@
 index=mat['index'].astype(float)
 index=reshape(index.T,(len(index),3),order='F')
 
-md.initialization.vx = im.InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)
-md.initialization.vy = im.InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
+[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.initialization.vz = zeros(md.mesh.numberofvertices)
 md.initialization.pressure = zeros(md.mesh.numberofvertices)
 #Materials
@@ -61 +62 @@
 md = SetIceShelfBC(md)
 #Change name so that no tests have the same name
 if len(inspect.stack()) > 2:
-    md.miscellaneous.name = inspect.stack()[2][1].split('.')[0]
+        md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0]
 

u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test101.py

@@ -13 +13 @@
 md=parameterize(md,'../Par/SquareShelfConstrained.py')
 md=setflowequation(md,'macayeal','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.diagnostic.requested_outputs=StressTensorEnum
-md=solve(md,DiagnosticSolutionEnum)
+md.diagnostic.requested_outputs=StressTensorEnum()
+md=solve(md,DiagnosticSolutionEnum())
 
 #Fields and tolerances to track changes
 field_names     =['Vx','Vy','Vel','Pressure',\