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

Jump to bottom

fix machines option to srt and unitialzed var #2023

Merged
merged 1 commit into from
Nov 2, 2017
Merged

fix machines option to srt and unitialzed var #2023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions scripts/tests/scripts_regression_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
TEST_COMPILER = None
GLOBAL_TIMEOUT = None
TEST_MPILIB = None
MACHINE = Machines()
MACHINE = None
FAST_ONLY = False
NO_BATCH = False
NO_CMAKE = False
Expand Down Expand Up @@ -2466,9 +2466,10 @@ def _main_func():
midx = sys.argv.index("--machine")
mach_name = sys.argv[midx + 1]
MACHINE = Machines(machine=mach_name)
os.environ["CIME_MACHINE"] = mach_name
del sys.argv[midx + 1]
del sys.argv[midx]
else:
MACHINE = Machines()

if "--compiler" in sys.argv:
global TEST_COMPILER
Expand Down
1 change: 1 addition & 0 deletions src/drivers/mct/main/prep_ocn_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ subroutine prep_ocn_init(infodata, atm_c2_ocn, atm_c2_ice, ice_c2_ocn, rof_c2_oc
wav_gnam=wav_gnam , &
atm_nx=atm_nx , &
atm_ny=atm_ny , &
glc_gnam=glc_gnam , &
esmf_map_flag=esmf_map_flag )

allocate(mapper_Sa2o)
Expand Down