[cig-commits] [commit] master: Fixed errors in run script. (c4e1032)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith_benchmarks

On branch  : master
Link       : https://github.com/geodynamics/pylith_benchmarks/compare/b18768a541005fcf437aa50bdb2cd57e8e8adc11...c4e103232bf76f6fbf78b6524c8603d2d9b9a577

>---------------------------------------------------------------

commit c4e103232bf76f6fbf78b6524c8603d2d9b9a577
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Mar 11 10:17:21 2014 -0700

    Fixed errors in run script.


>---------------------------------------------------------------

c4e103232bf76f6fbf78b6524c8603d2d9b9a577
 dynamic/scecdynrup/tpv28/run_sim.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dynamic/scecdynrup/tpv28/run_sim.py b/dynamic/scecdynrup/tpv28/run_sim.py
index e3284fb..4256c31 100755
--- a/dynamic/scecdynrup/tpv28/run_sim.py
+++ b/dynamic/scecdynrup/tpv28/run_sim.py
@@ -41,14 +41,14 @@ for d in ["output", "logs"]:
   if not os.path.isdir(d):
       os.mkdir(d)
 
-job = "%s_%s_%s" % (tpv, cell, res)
+job = "%s_%s" % (cell, res)
 
 if queue.lower() != "none":
     batchfile = os.environ['HOME'] + "/.pyre/pylithapp/pylithapp_%s.cfg" % queue
 else:
     batchfile = ""
 
-cfgfiles = " %s.cfg %s.cfg %s.cfg" % (tpv, cell, job)
+cfgfiles = " %s.cfg %s.cfg" % (cell, job)
 
 args = batchfile + " --job.name=%s --job.stdout=logs/%s.log --job.stderr=logs/%s.err " % (job, job, job)
 
@@ -68,6 +68,8 @@ elif queue == "lonestar":
         " --nodes=%d --scheduler.pe-name=%dway --scheduler.pe-number=%s " % (nprocs, ppn, max(12, ppn)*nnodes) + \
         args
 
+else:
+    raise ValueError("Unknown queue '%s'." % queue)
 
 print cmd
 #subprocess.call(cmd, shell=True)