source: issm/oecreview/Archive/23185-23389/ISSM-23368-23369.diff@ 23390

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

@@ -10 +10 @@
 def runme(id=None,exclude=None,benchmark='nightly',procedure='check',output='none',rank=1,numprocs=1):
         """
         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:
             >> runme()
@@ -17 +17 @@
             To run the tests 101 and 102:
             >> runme(id=[101,102])
             etc...
- 
+
             Available options:
                'id'            followed by the list of ids or (parts of) test names requested
                                 Note: runs all tests by default
@@ -36 +36 @@
 
                'procedure'     'check' : run the test (default)
                                'update': update the archive
- 
+
             Usage:
                runme(varargin)
- 
+
             Examples:
                runme()
                runme(101)
@@ -48 +48 @@
                runme(exclude='Dakota',benchmark='all')
                runme(id=[[101,102],['Dakota','Slr']])
         """
-
         from parallelrange import parallelrange
         from IdToName import IdToName
         from arch import archread
@@ -84 +83 @@
 
         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 {{{
         exclude_ids = GetIds(exclude)
@@ -182 +181 @@
                                                         field = field.T
                                                         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)
 
                                                 if not np.isscalar(error_diff): error_diff=error_diff[0]

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

@@ -3 +3 @@
 md=setmask(md,'all','');
 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
 md.stressbalance.requested_outputs={'default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy','MassFlux1','MassFlux2','MassFlux3','MassFlux4','MassFlux5','MassFlux6'};