Changeset 4140

Timestamp:

2013-10-25T18:19:03+02:00 (11 years ago)

Author:

andrewryan

Message:

added a command option to allow custom submit commands to be run by the quick start script

Location:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo

Files:

• ooo.py (modified) (2 diffs)
• run.py (modified) (3 diffs)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/ooo.py

@@ -25 +25 @@
     parser.add_argument("--dry-run", action="store_true",
                         help="Flag to test namelist building without submitting.")
+    parser.add_argument("--cmd", dest="command", default="./opa",
+                        help="Submit task to run.")
     parser.add_argument("-v", "--verbose", action="store_true",
                         help="Prints difference between before and after namelists.")
@@ -114 +116 @@
     # Run job
     if not args.dry_run:
-        run.submit()
+        run.submit(command=args.command)
     
 

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/run.py

@@ -6 +6 @@
 """
 import subprocess
+import shlex
 import os
 
@@ -11 +12 @@
     pass
 
-def submit():
+def submit(command="./opa"):
     """Simple function that runs the code.
 
@@ -22 +23 @@
     :returns: retcode
     """
-    exe = "./opa"
-    if os.path.exists(exe):
-        retcode = subprocess.call([exe])
-    else:
-        raise SubmitError("can not find {}".format(exe))
+    retcode = subprocess.call(shlex.split(command))
     return retcode