Changeset 12853

Timestamp:

08/01/12 15:27:39 (13 years ago)

Author:

jschierm

Message:

Minor changes for test101.py.

Location:

issm/trunk-jpl/test

Files:

• NightlyRun/runme.py (modified) (2 diffs)
• Par/SquareShelfConstrained.par (modified) (1 diff)
• Par/SquareShelfConstrained.py (modified) (3 diffs)

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

@@ -7 +7 @@
 import netCDF4
 import sys
-
-from parallelrange import parallelrange
-from IdToName import IdToName
 
 def runme(id=None,exclude=None,benchmark='nightly',procedure='check',output='none',rank=1,numprocs=1):
@@ -42 +39 @@
                md=runme(id=102,procedure='update')
         """
+
+        from parallelrange import parallelrange
+        from IdToName import IdToName
 
         #Get ISSM_DIR variable

issm/trunk-jpl/test/Par/SquareShelfConstrained.par

@@ -50 +50 @@
 md=SetIceShelfBC(md);
 
-%Change name so that no test have the same name
+%Change name so that no tests have the same name
 A=dbstack;
 if (length(A)>2), md.miscellaneous.name=A(3).file(1:end-2); end

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

@@ -4 +4 @@
 import InterpFromMeshToMesh2d as im
 from   paterson import  *
+from SetIceShelfBC import *
+import inspect
 
 #Start defining model parameters here
@@ -19 +21 @@
 mat=matio.loadmat('../Data/SquareShelfConstrained.data')
 #Reshape as Rank-1 arrays
-x=reshape(mat['x'],(size(mat['x']),))
-y=reshape(mat['y'],(size(mat['y']),))
+x=reshape(mat['x'],(-1))
+y=reshape(mat['y'],(-1))
 vx=mat['vx']
 vy=mat['vy']
@@ -58 +60 @@
 #Deal with boundary conditions:
 md = SetIceShelfBC(md)
-#Change name so that no test have the same name
-A = dbstack
-if length(A) > 2.:
-    md.miscellaneous.name = A[2].file[0:0-2.]
+#Change name so that no tests have the same name
+if len(inspect.stack()) > 2:
+    md.miscellaneous.name = inspect.stack()[2][1].split('.')[0]