From 858786734f905a4d2e964b15bdd559a7738b6b03 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Sat, 15 Feb 2025 15:28:24 -0700 Subject: [PATCH] Add simple __init__() method to tower child types. --- python/ctsm/site_and_regional/neon_site.py | 3 +++ python/ctsm/site_and_regional/plumber_site.py | 3 +++ python/ctsm/site_and_regional/run_tower.py | 6 ++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python/ctsm/site_and_regional/neon_site.py b/python/ctsm/site_and_regional/neon_site.py index a692896bf8..da979e0be3 100755 --- a/python/ctsm/site_and_regional/neon_site.py +++ b/python/ctsm/site_and_regional/neon_site.py @@ -34,6 +34,9 @@ class NeonSite(TowerSite): A class for encapsulating neon sites. """ + def __init__(self, *args, **kwargs): + super().__init__("NEON", *args, **kwargs) + def modify_user_nl(self, case_root, run_type, rundir, site_lines=None): # TODO: include neon-specific user namelist lines, using this as just an example currently if site_lines is None: diff --git a/python/ctsm/site_and_regional/plumber_site.py b/python/ctsm/site_and_regional/plumber_site.py index 06174c54ef..2d6e006b07 100755 --- a/python/ctsm/site_and_regional/plumber_site.py +++ b/python/ctsm/site_and_regional/plumber_site.py @@ -33,6 +33,9 @@ class Plumber2Site(TowerSite): A class for encapsulating plumber sites. """ + def __init__(self, *args, **kwargs): + super().__init__("PLUMBER2", *args, **kwargs) + def set_ref_case(self, case): super().set_ref_case(case) return True ### Check if super returns false, if this will still return True? diff --git a/python/ctsm/site_and_regional/run_tower.py b/python/ctsm/site_and_regional/run_tower.py index 4e10fb80fd..fe3859fa3c 100755 --- a/python/ctsm/site_and_regional/run_tower.py +++ b/python/ctsm/site_and_regional/run_tower.py @@ -160,9 +160,7 @@ def parse_neon_listing(listing_file, valid_neon_sites): if site_name in line: finidat = line.split(",")[0].split("/")[-1] - neon_site = NeonSite( - "NEON", site_name, start_year, end_year, start_month, end_month, finidat - ) + neon_site = NeonSite(site_name, start_year, end_year, start_month, end_month, finidat) logger.debug(neon_site) available_list.append(neon_site) @@ -194,7 +192,7 @@ def setup_plumber_data(valid_plumber_sites): finidat = None plumber_site = Plumber2Site( - "PLUMBER2", site_name, start_year, end_year, start_month, end_month, finidat + site_name, start_year, end_year, start_month, end_month, finidat ) available_list.append(plumber_site)