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

experiment bug fix #2435

Merged
merged 9 commits into from
Apr 16, 2024
Merged

experiment bug fix #2435

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d9254d4
experiment bug fix
TeaganKing Mar 25, 2024
cd6be8b
formatting
TeaganKing Mar 25, 2024
3a6f0f7
remove reduntant usermods, addresses #2470
wwieder Apr 12, 2024
031c476
explicitly set CALENDAR for transient vs. spinup cases
wwieder Apr 12, 2024
f30b528
address #2474 by creating run_directory
wwieder Apr 15, 2024
ea4bcc6
Merge branch 'b4b-dev' into b4b-neon
slevis-lmwg Apr 15, 2024
e586033
Merge branch 'b4b-neon' into neon_experiment_fix
slevis-lmwg Apr 15, 2024
56bb4c2
fix from sys test
TeaganKing Apr 16, 2024
2cac510
Merge remote-tracking branch 'TeaganKing/neon_experiment_fix' into ne…
slevis-lmwg Apr 16, 2024
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
16 changes: 13 additions & 3 deletions python/ctsm/site_and_regional/neon_site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
wwieder marked this conversation as resolved.
Show resolved Hide resolved
print("usermodsdirs: {}".format(user_mods_dirs))
case_path = super().build_base_case(cesmroot, output_root, res, compset, user_mods_dirs)

return case_path
Expand Down Expand Up @@ -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,
wwieder marked this conversation as resolved.
Show resolved Hide resolved
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):
Expand Down
11 changes: 6 additions & 5 deletions python/ctsm/site_and_regional/run_neon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
10 changes: 5 additions & 5 deletions python/ctsm/site_and_regional/tower_site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
wwieder marked this conversation as resolved.
Show resolved Hide resolved
setup_only,
no_batch,
rerun,
experiment,
):
"""
Run case.
Expand Down
Loading