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

Last change on this file since 21726 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 2.3 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.py
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.py (revision 13069)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.py (revision 13070)
5@@ -1,10 +1,11 @@
6 from numpy import *
7 from verbose import *
8 import scipy.io as matio
9-import InterpFromMeshToMesh2d as im
10-from paterson import *
11+from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
12+from paterson import *
13 from SetIceShelfBC import *
14 import inspect
15+import os.path
16
17 #Start defining model parameters here
18 #Geometry
19@@ -28,8 +29,8 @@
20 index=mat['index'].astype(float)
21 index=reshape(index.T,(len(index),3),order='F')
22
23-md.initialization.vx = im.InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)
24-md.initialization.vy = im.InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
25+[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)
26+[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
27 md.initialization.vz = zeros(md.mesh.numberofvertices)
28 md.initialization.pressure = zeros(md.mesh.numberofvertices)
29 #Materials
30@@ -61,5 +62,5 @@
31 md = SetIceShelfBC(md)
32 #Change name so that no tests have the same name
33 if len(inspect.stack()) > 2:
34- md.miscellaneous.name = inspect.stack()[2][1].split('.')[0]
35+ md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0]
36
37Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test101.py
38===================================================================
39--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test101.py (revision 13069)
40+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test101.py (revision 13070)
41@@ -13,8 +13,8 @@
42 md=parameterize(md,'../Par/SquareShelfConstrained.py')
43 md=setflowequation(md,'macayeal','all')
44 md.cluster=generic('name',oshostname(),'np',3)
45-md.diagnostic.requested_outputs=StressTensorEnum
46-md=solve(md,DiagnosticSolutionEnum)
47+md.diagnostic.requested_outputs=StressTensorEnum()
48+md=solve(md,DiagnosticSolutionEnum())
49
50 #Fields and tolerances to track changes
51 field_names =['Vx','Vy','Vel','Pressure',\
Note: See TracBrowser for help on using the repository browser.