From 4df87b70ea2ea09c089ce4aa3cd63bcfa526b2d2 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 2 Nov 2017 10:48:10 -0600 Subject: [PATCH] fix machines option to srt and unitialzed var --- scripts/tests/scripts_regression_tests.py | 5 +++-- src/drivers/mct/main/prep_ocn_mod.F90 | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/tests/scripts_regression_tests.py b/scripts/tests/scripts_regression_tests.py index ba9a5d91bcb..b6b9b66c3d7 100755 --- a/scripts/tests/scripts_regression_tests.py +++ b/scripts/tests/scripts_regression_tests.py @@ -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 @@ -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 diff --git a/src/drivers/mct/main/prep_ocn_mod.F90 b/src/drivers/mct/main/prep_ocn_mod.F90 index 6f14a5aca9f..ac90d9a1518 100644 --- a/src/drivers/mct/main/prep_ocn_mod.F90 +++ b/src/drivers/mct/main/prep_ocn_mod.F90 @@ -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)