From f420e3f09170129a0851f370d9e843e974819e2c Mon Sep 17 00:00:00 2001
From: Michael Deakin <mdeakin@sandia.gov>
Date: Fri, 16 Jun 2017 14:34:50 -0700
Subject: [PATCH] Tested branch runs on Edison; also cleaned up the batch
 options

---
 run_acme.template.csh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 run_acme.template.csh

diff --git a/run_acme.template.csh b/run_acme.template.csh
old mode 100644
new mode 100755
index 7c18ddf1a76b..c816d034fc99
--- a/run_acme.template.csh
+++ b/run_acme.template.csh
@@ -1017,10 +1017,7 @@ if ( $machine == hopper ) then
     sed -i /"#PBS \( \)*-j oe"/a'#PBS  -o batch_output/${PBS_JOBNAME}.o${PBS_JOBID}' $longterm_archive_script
 
 else if ( $machine == cori || $machine == edison ) then
-    set batch_options = "--job-name=${job_name} --account=${project} --output=batch_output/${case_name}.o"
-    sed -i /"#SBATCH \( \)*--job-name"/c"#SBATCH  --job-name=${job_name}"                 ${case_run_exe}
-    sed -i /"#SBATCH \( \)*--job-name"/a"#SBATCH  --account=${project}"                   ${case_run_exe}
-    sed -i /"#SBATCH \( \)*--output"/c"#SBATCH  --output=batch_output/"${case_name}'.o%j' ${case_run_exe}
+    set batch_options = "--job-name=${job_name} --output=batch_output/${case_name}.o%j"
 
     sed -i /"#SBATCH \( \)*--job-name"/c"#SBATCH  --job-name=ST+${job_name}"                  $shortterm_archive_script
     sed -i /"#SBATCH \( \)*--job-name"/a"#SBATCH  --account=${project}"                       $shortterm_archive_script
@@ -1045,6 +1042,8 @@ else
     acme_print '         Assuming default ACME values.'
 endif
 
+acme_print "Batch options: ${batch_options}"
+
 #============================================
 # QUEUE OPTIONS
 #============================================
@@ -1221,7 +1220,7 @@ acme_newline
 if ( `lowercase $submit_run` == 'true' ) then
   if ( $num_submits == 1 ) then
     acme_print '         SUBMITTING A SINGLE JOB.'
-    ${case_submit_exe} --batch-args " ${batch_options} --dependency=afterany:1769195 "
+    ${case_submit_exe} --batch-args " ${batch_options} "
   else if ( $num_submits <= 0 ) then
     acme_print '$num_submits <= 0 so NOT submitting a job.'
     acme_print '$num_submits = '$num_submits