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.

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

Use the new --script-root option in CIME #1550

Merged
merged 1 commit into from
May 22, 2017
Merged
Changes from all commits
Commits
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
13 changes: 5 additions & 8 deletions run_acme.template.csh
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.6
set script_ver = 3.0.7

#===========================================
# DEFINE ALIASES
Expand Down Expand Up @@ -548,7 +548,7 @@ endif
# DETERMINE THE OPTIONS FOR CREATE_NEWCASE
#=============================================================

set configure_options = "--case ${case_scripts_dir} --compset ${compset} --res ${resolution} --pecount ${std_proc_configuration} --handle-preexisting-dirs u"
set configure_options = "--case ${case_name} --compset ${compset} --script-root ${case_scripts_dir} --res ${resolution} --pecount ${std_proc_configuration} --handle-preexisting-dirs u"

if ( `lowercase $machine` != default ) then
set configure_options = "${configure_options} --mach ${machine}"
Expand Down Expand Up @@ -594,12 +594,6 @@ acme_newline
acme_print '-------- Finished create_newcase --------'
acme_newline

#================================================
# CORRECT THE CASE NAME FOR THE OUTPUT FILES
#================================================

${xmlchange_exe} --id CASE --val ${case_name}

#================================================
# UPDATE VARIABLES WHICH REQUIRE A CASE TO BE SET
#================================================
Expand Down Expand Up @@ -1359,6 +1353,9 @@ acme_newline
# use the new CIME option --handle-preexisting-dirs to avoid this potential error
# Fix the usage of xmlchange for the customknl configuration
# Set walltime to default to get more time on Edison (MD)
# 3.0.7 2017-05-22 Fix for the new CIME 5.3; use the --script-root option instead of PJC's "hack"
# 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)
# NOTE: PJC = Philip Cameron-Smith, PMC = Peter Caldwell, CG = Chris Golaz, MD = Michael Deakin

### ---------- Desired features still to be implemented ------------
Expand Down