From 6cf26e922d46f30e51430a046a2330659d086602 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Mon, 16 May 2022 15:31:01 -0600 Subject: [PATCH] Move the setting of PIO_TYPENAME and PIO_REARRANGER_LND into the NEON default user-mod so it's at a lower level than run_neon --- cime_config/usermods_dirs/NEON/defaults/shell_commands | 6 ++++++ tools/site_and_regional/run_neon.py | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/cime_config/usermods_dirs/NEON/defaults/shell_commands b/cime_config/usermods_dirs/NEON/defaults/shell_commands index f82278e4b5..80df7bd71d 100644 --- a/cime_config/usermods_dirs/NEON/defaults/shell_commands +++ b/cime_config/usermods_dirs/NEON/defaults/shell_commands @@ -4,3 +4,9 @@ ./xmlchange CCSM_CO2_PPMV=408.83 ./xmlchange DATM_PRESAERO=SSP3-7.0 ./xmlchange DATM_YR_ALIGN=2018,DATM_YR_END=2020,DATM_YR_START=2018 +# Explicitly set PIO Type to NETCDF since this is a single processor case (should already be set this way) +./xmlchange PIO_TYPENAME=netcdf +# BD:05/06/2022 - The PIO_REARRANGER_LND value - for global runs, PIO_REARRANGER_LND = 1 is ideal +# and a value of 2 results in slow I/O. For point runs like these, a value of 1 results in a crash (PIO bug, probably), +# so we explicitly set a value of 2. +./xmlchange PIO_REARRANGER_LND=2 diff --git a/tools/site_and_regional/run_neon.py b/tools/site_and_regional/run_neon.py index 5f213756f1..476c0c99db 100755 --- a/tools/site_and_regional/run_neon.py +++ b/tools/site_and_regional/run_neon.py @@ -416,11 +416,6 @@ def build_base_case( # --change any config for base_case: # case.set_value("RUN_TYPE","startup") - case.set_value("PIO_TYPENAME", "netcdf") # BD:05/06/2022 - These single point runs should use NetCDF; this just makes it explicit. - case.set_value("PIO_REARRANGER_LND", 2) # BD:05/06/2022 - And this explicitly sets the PIO_REARRANGER_LND value - for global runs, - # PIO_REARRANGER_LND = 1 is ideal, and a value of 2 results in slow I/O. For point runs like - # these, a value of 1 results in a crash (PIO bug, probably), so we explicitly set a value of 2. - print("---- base case setup ------") case.case_setup() else: @@ -523,11 +518,6 @@ def run_case( case.set_value("REST_OPTION", "end") case.set_value("CONTINUE_RUN", False) case.set_value("NEONVERSION", version) - case.set_value("PIO_TYPENAME", "netcdf") # BD:05/06/2022 - These single point runs should use NetCDF; this just makes it explicit. - case.set_value("PIO_REARRANGER_LND", 2) # BD:05/06/2022 - And this explicitly sets the PIO_REARRANGER_LND value - for global runs, - # PIO_REARRANGER_LND = 1 is ideal, and a value of 2 results in slow I/O. For point runs like - # these, a value of 1 results in a crash (PIO bug, probably), so we explicitly set a value of 2. - if run_type == "ad": case.set_value("CLM_FORCE_COLDSTART", "on") case.set_value("CLM_ACCELERATED_SPINUP", "on")