diff --git a/python/ctsm/site_and_regional/neon_site.py b/python/ctsm/site_and_regional/neon_site.py index 4af8e66fdd..70414d9e5c 100755 --- a/python/ctsm/site_and_regional/neon_site.py +++ b/python/ctsm/site_and_regional/neon_site.py @@ -47,8 +47,6 @@ def build_base_case( user_mods_dirs = [ os.path.join(self.cesmroot, "cime_config", "usermods_dirs", "NEON", self.name) ] - print("in neonsite adding usermodsdirs") - print("usermodsdirs: {}".format(user_mods_dirs)) case_path = super().build_base_case(cesmroot, output_root, res, compset, user_mods_dirs) return case_path @@ -99,8 +97,20 @@ def run_case( os.path.join(self.cesmroot, "cime_config", "usermods_dirs", "NEON", self.name) ] tower_type = "NEON" + super().run_case( - base_case_root, run_type, prism, run_length, user_version, tower_type, user_mods_dirs + base_case_root, + run_type, + prism, + run_length, + user_version, + tower_type, + user_mods_dirs, + overwrite, + setup_only, + no_batch, + rerun, + experiment, ) def modify_user_nl(self, case_root, run_type, rundir, site_lines=None): diff --git a/python/ctsm/site_and_regional/run_neon.py b/python/ctsm/site_and_regional/run_neon.py index d831f8dba2..445234fa92 100755 --- a/python/ctsm/site_and_regional/run_neon.py +++ b/python/ctsm/site_and_regional/run_neon.py @@ -228,15 +228,16 @@ def main(description): ) logger.info("-----------------------------------") logger.info("Running CTSM for neon site : %s", neon_site.name) + neon_site.run_case( base_case_root, run_type, prism, run_length, user_version, - overwrite, - setup_only, - no_batch, - rerun, - experiment, + overwrite=overwrite, + setup_only=setup_only, + no_batch=no_batch, + rerun=rerun, + experiment=experiment, ) diff --git a/python/ctsm/site_and_regional/tower_site.py b/python/ctsm/site_and_regional/tower_site.py index 1f0bb93b24..31c959cac7 100644 --- a/python/ctsm/site_and_regional/tower_site.py +++ b/python/ctsm/site_and_regional/tower_site.py @@ -257,11 +257,11 @@ def run_case( user_version, tower_type, user_mods_dirs, - overwrite=False, - setup_only=False, - no_batch=False, - rerun=False, - experiment=False, + overwrite, + setup_only, + no_batch, + rerun, + experiment, ): """ Run case. @@ -301,7 +301,7 @@ def run_case( print("using this version:", version) - if experiment is not False: + if (experiment is not False) and (experiment is not None): self.name = self.name + "." + experiment case_root = os.path.abspath(os.path.join(base_case_root, "..", self.name + "." + run_type))