Changeset 25656

Timestamp:

10/08/20 11:37:32 (4 years ago)

Author:

jdquinn

Message:

CHG: Modified test suites and benchmarks

Location:

issm/trunk-jpl

Files:

• jenkins/pine_island-mac-dakota (modified) (1 diff)
• jenkins/pine_island-mac-python (modified) (1 diff)
• test/NightlyRun/runme.m (modified) (2 diffs)
• test/NightlyRun/runme.py (modified) (4 diffs)

issm/trunk-jpl/jenkins/pine_island-mac-dakota

@@ -83 +83 @@
 # - Test 444 fails intermittently under Python with "IndexError: list index out of range"
 #
-MATLAB_NROPTIONS="'exclude',[234 235 418 420 444 445],'id',[IdFromString('Dakota')]"
-PYTHON_NROPTIONS="--exclude 234 417 418 420 444 445 --include_name 'Dakota'"
+MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234 235 418 420 444 445]"
+PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 417 418 420 444 445"

issm/trunk-jpl/jenkins/pine_island-mac-python

@@ -87 +87 @@
 #
 MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS="--exclude 234 417 418 420 435 444 445 701 702 703 2005 2006]"
+PYTHON_NROPTIONS="--exclude 234 417 418 420 435 444 445 701 702 703"

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

@@ -12 +12 @@
 %      'id'            followed by the list of ids requested
 %      'exclude'       ids to be excluded from the test
-%      'benchmark'     'all' (all of them)
-%                      'nightly' (nightly 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
-%                      'slr'   : validation of slr tests
-%                      'qmu'   : validation of dakota tests
+%      'benchmark'     'all'         : (all of them)
+%                      'nightly'     : (nightly run
+%                      'validation'  : (validation)
+%                      'adolc'       : validation of adolc tests
+%                      'eismint'     : validation of eismint tests
+%                      'ismip'       : validation of ismip-hom tests
+%                      'mesh'        : validation of mesh tests
+%                      'qmu'         : validation of dakota tests
+%                      'referential' : validation of referential tests
+%                      'slr'         : validation of slr tests
+%                      'thermal'     : validation of thermal tests
+%                      'tranforcing' : validation of transient forcing tests
 %                      ...
 %      'procedure'     'check' :   run the test (default)
@@ -104 +107 @@
 %Process Ids according to benchmarks{{{
 if strcmpi(benchmark,'nightly'),
-        test_ids=intersect(test_ids,[1:999]);
+        test_ids=intersect(test_ids,union([1:999],[2001:2500]));
 elseif strcmpi(benchmark,'validation'),
         test_ids=intersect(test_ids,[1001:1999]);

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

@@ -38 +38 @@
                             NOTE: exclude does nothing if 'id' is specified with different values
 
-        -b/--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
-                            'slr'    : validation of slr tests
-
-        -p/--procedure      'check' : run the test (default)
-                            'update': update the archive
+        -b/--benchmark      'all'           : (all of the tests)
+                            'nightly'       : (nightly run/daily run)
+                            'validation'    : (validation)
+                            'adolc'         : validation of adolc tests
+                            'eismint'       : validation of eismint tests
+                            'ismip'         : validation of ismip-hom tests
+                            'mesh'          : validation of mesh tests
+                            'qmu'           : validation of qmu tests
+                            'referential'   : validation of referential tests
+                            'slr'           : validation of slr tests
+                            'thermal'       : validation of thermal tests
+                            'tranforcing'   : validation of transient forcing tests
+
+        -p/--procedure      'check'         : run the test (default)
+                            'update'        : update the archive
 
     Usage:
@@ -72 +76 @@
     #Process options
     #GET benchmark {{{
-    if benchmark not in ['all', 'nightly', 'ismip', 'eismint',
-                         'thermal', 'mesh', 'validation', 'tranforcing',
-                         'adolc', 'slr', 'referential']:
+    if benchmark not in ['all', 'nightly', 'validation', 'adolc', 'eismint', 'ismip', 'mesh', 'slr', 'thermal', 'tranforcing', 'qmu']:
         print(("runme warning: benchmark '{}' not supported, defaulting to test 'nightly'.".format(benchmark)))
         benchmark = 'nightly'
@@ -112 +114 @@
     #Process Ids according to benchmarks {{{
     if benchmark == 'nightly':
-        test_ids = test_ids.intersection(set(range(1, 1000)))
+        test_ids = test_ids.intersection(set(range(1, 1000)).union(set(range(2001, 2500))))
     elif benchmark == 'validation':
         test_ids = test_ids.intersection(set(range(1001, 2000)))
@@ -131 +133 @@
     elif benchmark == 'adolc':
         test_ids = test_ids.intersection(set(range(3001, 3200)))
+    elif benchmark == 'qmu':
+        test_ids = test_ids.intersection(set((218, 234, 235, 417, 418, 420)).union(set(range(412, 414))))
     test_ids = list(test_ids)
     test_ids.sort()
     # }}}
+
+    print(test_ids)
+    exit()
 
     #Loop over tests and launch sequence