Changeset 23369

Timestamp:

10/02/18 09:59:36 (6 years ago)

Author:

bdef

Message:

BUG:partial fix, issues remain in Hydro

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.py (modified) (6 diffs)
• test101.m (modified) (1 diff)

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

@@ -11 +11 @@
         """
         RUNME - test deck for ISSM nightly runs
- 
+
             In a test deck directory (tests/Vertification/NightlyRun for example)
             The following command will launch all the existing tests:
@@ -18 +18 @@
             >> runme(id=[101,102])
             etc...
- 
+
             Available options:
                'id'            followed by the list of ids or (parts of) test names requested
@@ -37 +37 @@
                'procedure'     'check' : run the test (default)
                                'update': update the archive
- 
+
             Usage:
                runme(varargin)
- 
+
             Examples:
                runme()
@@ -49 +49 @@
                runme(id=[[101,102],['Dakota','Slr']])
         """
-
         from parallelrange import parallelrange
         from IdToName import IdToName
@@ -85 +84 @@
         i1,i2=parallelrange(rank,numprocs,len(list_ids))    #Get tests for this cpu only
         list_ids=list_ids[i1:i2+1]
-        
-        if np.size(id) > 0:
+
+        if np.size(id) > 0 and not id==None:
                 test_ids = set(GetIds(id)).intersection(set(list_ids))
         else:
                 # if no tests are specifically provided, do them all
                 test_ids = set(list_ids)
-                
+
         # }}}
         #GET exclude {{{
@@ -183 +182 @@
                                                         if np.shape(field) != np.shape(archive):
                                                                 raise RuntimeError("Field '"+archive_name+"' from test is malformed; shape is "+str(np.shape(field.T))+", should be "+str(np.shape(archive))+" (or "+str(np.shape(archive.T))+").")
-                                                
+
                                                 error_diff=np.amax(np.abs(archive-field),axis=0)/(np.amax(np.abs(archive),axis=0)+float_info.epsilon)
 

issm/trunk-jpl/test/NightlyRun/test101.m

@@ -4 +4 @@
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'SSA','all');
-md.cluster=generic('name',oshostname(),'np',2);
+md.cluster=stallo('numnodes',1,'cpuspernode',16,'time',60,'queue','devel')
+%md.cluster=generic('name',oshostname(),'np',2);
 
 %output