diff --git a/benchcab/fluxsite.py b/benchcab/fluxsite.py index f455a2b0..fc180173 100644 --- a/benchcab/fluxsite.py +++ b/benchcab/fluxsite.py @@ -175,10 +175,6 @@ def setup_task(self, verbose=False): "restart": False, }, "fixedCO2": internal.CABLE_FIXED_CO2_CONC, - "casafile": { - "phen": str(internal.PHEN_FILE.absolute()), - "cnpbiome": str(internal.CNPBIOME_FILE.absolute()), - }, "spinup": False, } }, diff --git a/benchcab/internal.py b/benchcab/internal.py index 365f4481..7e1fc8fe 100644 --- a/benchcab/internal.py +++ b/benchcab/internal.py @@ -39,26 +39,11 @@ # Relative path to core namelist files NAMELIST_DIR = Path("namelists") -# Relative path to CABLE Auxiliary repository -CABLE_AUX_DIR = SRC_DIR / "CABLE-AUX" +# Path to grid files +GRID_DIR = Path("/g/data/rp23/data/no_provenance/gridinfo") -# Relative URL path to CABLE Auxiliary repository on SVN -CABLE_AUX_RELATIVE_SVN_PATH = "branches/Share/CABLE-AUX" - -# TODO(Sean): hard coding paths assets in CABLE_AUX is brittle, these should -# be promoted to config parameters, especially since we no longer throw exceptions -# when the assets cannot be found. - -# Relative path to CABLE grid info file -GRID_FILE = CABLE_AUX_DIR / "offline" / "gridinfo_CSIRO_1x1.nc" - -# Relative path to modis_phenology_csiro.txt -PHEN_FILE = CABLE_AUX_DIR / "core" / "biogeochem" / "modis_phenology_csiro.txt" - -# Relative path to pftlookup_csiro_v16_17tiles.csv -CNPBIOME_FILE = ( - CABLE_AUX_DIR / "core" / "biogeochem" / "pftlookup_csiro_v16_17tiles.csv" -) +# Path CABLE grid info file +GRID_FILE = GRID_DIR / "crujra_accessN96_gridinfo.nc" # Fluxsite directory tree FLUXSITE_DIRS: dict[str, Path] = {} diff --git a/tests/test_fluxsite.py b/tests/test_fluxsite.py index 606b7d09..d8f2a425 100644 --- a/tests/test_fluxsite.py +++ b/tests/test_fluxsite.py @@ -277,10 +277,6 @@ def test_all_settings_are_patched_into_namelist_file(self, task): }, "output": {"restart": False}, "fixedco2": internal.CABLE_FIXED_CO2_CONC, - "casafile": { - "phen": str(internal.PHEN_FILE.absolute()), - "cnpbiome": str(internal.CNPBIOME_FILE.absolute()), - }, "spinup": False, "some_setting": True, "some_branch_specific_setting": True,