Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix branch runs with run_acme #1594

Merged
merged 3 commits into from
Jun 26, 2017
Merged

Fix branch runs with run_acme #1594

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ced19d8
Initial work on fixing branch runs. Also start work on removal of sed…
mfdeakin-sandia Jun 15, 2017
f420e3f
Tested branch runs on Edison; also cleaned up the batch options
mfdeakin-sandia Jun 16, 2017
56215dd
Minor cleanups
mfdeakin-sandia Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions run_acme.template.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ set cpl_hist_num = 1
#===========================================
# VERSION OF THIS SCRIPT
#===========================================
set script_ver = 3.0.8
set script_ver = 3.0.9

#===========================================
# DEFINE ALIASES
Expand Down Expand Up @@ -1001,20 +1001,12 @@ endif

mkdir -p batch_output ### Make directory that stdout and stderr will go into.

set machine = `lowercase $machine` # Change to lowercase, just to make the following easier to read.
set batch_options = ''

if ( $machine == hopper ) then
sed -i /"#PBS \( \)*-N"/c"#PBS -N ${job_name}" ${case_run_exe}
sed -i /"#PBS \( \)*-j oe"/a'#PBS -o batch_output/${PBS_JOBNAME}.o${PBS_JOBID}' ${case_run_exe}
sed -i /"#PBS \( \)*-N"/c"#PBS -N ST+${job_name}" $shortterm_archive_script
sed -i /"#PBS \( \)*-j oe"/a'#PBS -o batch_output/${PBS_JOBNAME}.o${PBS_JOBID}' $shortterm_archive_script
sed -i /"#PBS \( \)*-N"/c"#PBS -N LT+${job_name}" $longterm_archive_script
sed -i /"#PBS \( \)*-j oe"/a'#PBS -o batch_output/${PBS_JOBNAME}.o${PBS_JOBID}' $longterm_archive_script
set machine = `lowercase $machine` # Change to lowercase, just to make the following easier to read.

else if ( $machine == cori || $machine == edison ) then
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}
if ( $machine == cori || $machine == edison ) then
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
Expand All @@ -1024,6 +1016,7 @@ else if ( $machine == cori || $machine == edison ) then
sed -i /"#SBATCH \( \)*--output"/c'#SBATCH --output=batch_output/LT+'${case_name}'.o%j' $longterm_archive_script

else if ( $machine == titan || $machine == eos ) then
set batch_options = ""
sed -i /"#PBS \( \)*-N"/c"#PBS -N ${job_name}" ${case_run_exe}
sed -i /"#PBS \( \)*-A"/c"#PBS -A ${project}" ${case_run_exe}
sed -i /"#PBS \( \)*-j oe"/a'#PBS -o batch_output/${PBS_JOBNAME}.o${PBS_JOBID}' ${case_run_exe}
Expand Down Expand Up @@ -1153,6 +1146,7 @@ else if ( $model_start_type == 'branch' ) then
acme_print '$restart_filedate = '$restart_filedate

### the next line gets the YYYY-MM of the month before the restart time. Needed for staging history files.
### NOTE: This is broken for cases that have run for less than a month
set restart_prevdate = `date -d "${restart_filedate} - 1 month" +%Y-%m`

acme_print '$restart_prevdate = '$restart_prevdate
Expand All @@ -1165,9 +1159,9 @@ else if ( $model_start_type == 'branch' ) then
cp ${restart_files_dir}/${restart_case_name}.cpl.r.${restart_filedate}-00000.nc $case_run_dir
cp ${restart_files_dir}/${restart_case_name}.mosart.r.${restart_filedate}-00000.nc $case_run_dir
cp ${restart_files_dir}/${restart_case_name}.mosart.rh0.${restart_filedate}-00000.nc $case_run_dir
cp ${restart_files_dir}/rst.mpas-cice.${restart_filedate}_00.00.00.nc $case_run_dir
cp ${restart_files_dir}/rst.mpas-o.${restart_filedate}_00.00.00.nc $case_run_dir
cp ${restart_files_dir}/${restart_case_name}.cam.h0.${restart_prevdate}.nc $case_run_dir
cp ${restart_files_dir}/mpascice.rst.${restart_filedate}_00000.nc $case_run_dir
cp ${restart_files_dir}/mpaso.rst.${restart_filedate}_00000.nc $case_run_dir
cp ${restart_files_dir}/${restart_case_name}.cam.h0.${restart_prevdate}-*-00000.nc $case_run_dir
cp ${restart_files_dir}/${restart_case_name}.mosart.h0.${restart_prevdate}.nc $case_run_dir
cp ${restart_files_dir}/${restart_case_name}.clm2.h0.${restart_prevdate}.nc $case_run_dir
cp ${restart_files_dir}/rpointer* $case_run_dir
Expand All @@ -1176,7 +1170,9 @@ else if ( $model_start_type == 'branch' ) then
$xmlchange_exe --id RUN_REFCASE --val $restart_case_name
$xmlchange_exe --id RUN_REFDATE --val $restart_filedate # Model date of restart file
$xmlchange_exe --id CONTINUE_RUN --val "FALSE"
$xmlchange_exe --id BRNCH_RETAIN_CASENAME --val "FALSE" ## Only TRUE if you want to continue the run with the same name (risky)!!
# Currently broken in CIME
# Only uncomment this if you want to continue the run with the same name (risky)!!
# $xmlchange_exe --id BRNCH_RETAIN_CASENAME --val "TRUE"

else

Expand Down Expand Up @@ -1211,7 +1207,7 @@ acme_newline
if ( `lowercase $submit_run` == 'true' ) then
if ( $num_submits == 1 ) then
acme_print ' SUBMITTING A SINGLE JOB.'
${case_submit_exe}
${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
Expand Down Expand Up @@ -1357,6 +1353,7 @@ acme_newline
# Note that this breaks compatibility with older versions of CIME
# Also add a fix to reenable using the special acme qos queue on Edison (MD)
# 3.0.8 2017-05-24 Fixed minor bug when $machine contained a capital letter. Bug was introduced recently. (PJC)
# 3.0.9 2017-06-19 Fixed branch runs. Also removed sed commands for case.run and use --batch-args in case.submit (MD)
#
# NOTE: PJC = Philip Cameron-Smith, PMC = Peter Caldwell, CG = Chris Golaz, MD = Michael Deakin

Expand Down