Changeset 15396 for issm/trunk/test/NightlyRun/runme.py

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test (modified) (1 prop)
• test/NightlyRun (modified) (1 prop)
• test/NightlyRun/runme.py (modified) (6 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

issm/trunk/test/NightlyRun

@@ +1 @@
+*.toolkits
 __pycache__
 *.tar.gz

@@ +1 @@
+*.toolkits
 __pycache__
 *.tar.gz

issm/trunk/test/NightlyRun/runme.py

@@ -22 +22 @@
                'id'            followed by the list of ids requested
                'exclude'       ids to be excluded from the test
-               'benchmark'     'nightly' (nightly run/ daily run)
+               'benchmark'     'all' (all of the tests)
+                                   'nightly' (nightly run/ daily run)
                                'ismip'  : validation of ismip-hom tests
                                'eismint': validation of eismint tests
                                'thermal': validation of thermal tests
                                'mesh'   : validation of mesh tests
+                                                   'adolc'   : validation of adolc tests
+                           'gia'   : validation of gia tests
+
                                ...
                'procedure'     'check' : run the test (default)
@@ -32 +36 @@
  
             Usage:
-               md=runme(varargin);
+               runme(varargin);
  
             Examples:
                runme()
                runme(exclude=101)
-               md=runme(id=102,procedure='update')
+               runme(id=102,procedure='update')
         """
 
@@ -50 +54 @@
         #Process options
         #GET benchmark {{{
-        if not ismember(benchmark,['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc']):
+        if not ismember(benchmark,['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc','gia']):
                 print "runme warning: benchmark '%s' not supported, defaulting to test 'nightly'." % benchmark
                 benchmark='nightly'
@@ -113 +117 @@
         elif strcmpi(benchmark,'referential'):
                 test_ids=test_ids.intersection(set(range(1601,1603)))
+        elif strcmpi(benchmark,'gia'):
+                test_ids=test_ids.intersection(set(range(2001,2100)))
         elif strcmpi(benchmark,'adolc'):
                 test_ids=test_ids.intersection(set(range(3001,3020)))
@@ -144 +150 @@
                                                 else:
                                                         field=field.reshape(0,0)
+                                        elif len(field.shape) == 0:
+                                                field=field.reshape(1,1)
                                         # Matlab uses base 1, so use base 1 in labels
                                         f.createDimension(archive_name+'_field'+str(k+1)+'_1',numpy.size(field,0))
@@ -234 +242 @@
                                 raise RuntimeError(me)
 
-#       #output md if requested
-#       if nargout==1
-#               varargout{1}=md;
-#       end
-
         return
 

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+*.toolkits
 __pycache__
 *.tar.gz