Skip to content

Commit

Permalink
Merge branch 'b4b-dev' into simplify-tower-types
Browse files Browse the repository at this point in the history
  • Loading branch information
samsrabin committed Feb 18, 2025
2 parents c7f70ae + 0d44388 commit 1567d29
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion python/ctsm/site_and_regional/tower_arg_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def get_parser(args, description, valid_neon_sites, valid_plumber_sites):
"--base-case",
help="""
Root Directory of base case build
[default: CESMROOT/NEONSITE]
[default: %(default)s]
""",
action="store",
dest="base_case_root",
Expand Down
1 change: 0 additions & 1 deletion python/ctsm/site_and_regional/tower_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ def build_base_case(
abort("Input output_root directory does NOT exist: " + str(output_root))

case_path = os.path.join(output_root, self.name)
print(case_path)

logger.info("base_case_name : %s", self.name)
logger.info("user_mods_dir : %s", self.user_mods_dirs[0])
Expand Down
5 changes: 0 additions & 5 deletions python/ctsm/test/test_sys_run_tower.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def test_one_site(self):
"--output-root",
self._tempdir,
]
print(sys.argv)
main("")

# assert that BART directories were created during setup
Expand Down Expand Up @@ -138,7 +137,6 @@ def test_xmlchange(self):
"--output-root",
self._tempdir,
]
print(sys.argv)
main("")

# Check that the --xmlchange argument is obeyed
Expand Down Expand Up @@ -169,7 +167,6 @@ def test_setup_only(self):
"--output-root",
self._tempdir,
]
print(sys.argv)
main("")

# make sure that build didn't happen: this dir should be empty
Expand All @@ -195,7 +192,6 @@ def test_overwrite(self):
"--output-root",
self._tempdir,
]
print(sys.argv)
main("")

# create a file that should be erased during the upcoming overwrite
Expand All @@ -206,7 +202,6 @@ def test_overwrite(self):

# run the tool again, overwriting existing
sys.argv += ["--overwrite"]
print(sys.argv)
main("")

# ensure that file we created is gone
Expand Down

0 comments on commit 1567d29

Please sign in to comment.