Skip to content
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.145
fxtag = cime6.1.152
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/cime

Expand Down
5 changes: 3 additions & 2 deletions cime_config/cam.case_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@

logger = logging.getLogger(__name__)

if len(sys.argv) != 3:
if len(sys.argv) != 4:
raise SystemExit(f"Incorrect call to {sys.argv[0]}, need CAM root and case root")
# end if
cam_root = sys.argv[1]
case_root = sys.argv[2]
non_local = sys.argv[3] == 'True'

with Case(case_root) as case:
with Case(case_root, non_local=non_local) as case:
cam_config = case.get_value('CAM_CONFIG_OPTS')
# Gather case information (from _build_usernl_files in case_setup.py)
comp_interface = case.get_value("COMP_INTERFACE")
Expand Down
4 changes: 2 additions & 2 deletions cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</machines>
<options>
<option name="comment">CAM7-LT, enable gpu for PUMAS, CLUBB, and RRTMGP</option>
<option name="wallclock">02:00:00</option>
<option name="wallclock">00:20:00</option>
</options>
</test>

Expand Down Expand Up @@ -1276,7 +1276,7 @@
<machine name="derecho" compiler="nvhpc" category="prealpha"/>
</machines>
<options>
<option name="wallclock">02:00:00</option>
<option name="wallclock">00:20:00</option>
</options>
</test>
<test compset="F2000dev" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s" supported="false">
Expand Down