Changeset 27781

Timestamp:

06/05/23 12:26:25 (22 months ago)

Author:

jdquinn

Message:

BUG: Allow runme to be called as function or script.

File:

• issm/trunk-jpl/test/NightlyRun/runme.py (modified) (3 diffs)

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

@@ -123 +123 @@
     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 and id is not None:
-    #if len(id[0]) > 0 or len(id[1]) > 0:
-        test_ids = set(GetIds(id)).intersection(set(list_ids))
-        benchmark = None
+    if id is not None:
+        if np.size(id) > 0 or (len(id[0]) > 0 or len(id[1]) > 0):
+            test_ids = set(GetIds(id)).intersection(set(list_ids))
+            benchmark = None
+        else:
+            print(('runme error: \'id\' argument "{}" does not follow the required protocol. When calling runme as a function from Python runtime, use runme(<int>). If calling runme.py from command line, use runme.py <options>'.format(id)))
+            exit()
     else:
         # If no tests are specifically provided, do them all
@@ -135 +138 @@
     exclude_ids = GetIds(exclude)
     test_ids = test_ids.difference(exclude_ids)
+
     # }}}
     if procedure == 'runFromNC':
@@ -175 +179 @@
     test_ids = list(test_ids)
     test_ids.sort()
+
     # }}}