From 33a7647df613e58a99f5f0c18c75ee2bc33642a0 Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Wed, 8 Oct 2025 17:01:50 -0600 Subject: [PATCH 1/5] Test .ini files - Drop storm_days_restart This value is now automatically set based on the current run date in AWSM. It's a leftover cleanup from reworking the AWSM CLI interface. --- awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini | 6 +++--- awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini | 6 +++--- awsm/tests/basins/RME/config.ini | 2 +- awsm/tests/basins/RME/gold/gold_config.ini | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini b/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini index 9f3ad2a..c39d97b 100644 --- a/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini +++ b/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini @@ -100,7 +100,7 @@ max: None min: 0.0 grid_method: cubic storm_mass_threshold: 1.0 -storm_days_restart: None + precip_temp_method: dew_point detrend_slope: 1 grid_mask: False @@ -136,8 +136,8 @@ max_grain: 700.0 dirt: 2.0 decay_method: None grid_mask: True -date_method_start_decay: None -date_method_end_decay: None +start_decay: None +end_decay: None date_method_decay_power: 0.714 date_method_veg_default: 0.25 date_method_veg_41: 0.36 diff --git a/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini b/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini index 45dab40..3c82afe 100644 --- a/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini +++ b/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini @@ -100,7 +100,7 @@ max: None min: 0.0 grid_method: cubic storm_mass_threshold: 1.0 -storm_days_restart: None + precip_temp_method: dew_point detrend_slope: 1 grid_mask: False @@ -136,8 +136,8 @@ max_grain: 700.0 dirt: 2.0 decay_method: None grid_mask: True -date_method_start_decay: None -date_method_end_decay: None +start_decay: None +end_decay: None date_method_decay_power: 0.714 date_method_veg_default: 0.25 date_method_veg_41: 0.36 diff --git a/awsm/tests/basins/RME/config.ini b/awsm/tests/basins/RME/config.ini index 5f4242d..2bbe44b 100644 --- a/awsm/tests/basins/RME/config.ini +++ b/awsm/tests/basins/RME/config.ini @@ -118,7 +118,7 @@ stations: None max: None min: 0.0 storm_mass_threshold: 1.0 -storm_days_restart: None + detrend_slope: 1.0 marks2017_timesteps_to_end_storms: 6.0 susong1999_timesteps_to_end_storms: 6 diff --git a/awsm/tests/basins/RME/gold/gold_config.ini b/awsm/tests/basins/RME/gold/gold_config.ini index 377a2dc..673f349 100644 --- a/awsm/tests/basins/RME/gold/gold_config.ini +++ b/awsm/tests/basins/RME/gold/gold_config.ini @@ -117,7 +117,7 @@ stations: None max: None min: 0.0 storm_mass_threshold: 1.0 -storm_days_restart: None + precip_temp_method: dew_point detrend_slope: 1 marks2017_timesteps_to_end_storms: 6 From 331b639c99cb52d8b9a83658bd3b1f8ec2b05aee Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Fri, 10 Oct 2025 08:43:58 -0600 Subject: [PATCH 2/5] CoreConfig - Albedo - Change the name for dates one more time Change the names to configure dates to `decay_start` and `decay_end` to be consistent with the main parameter name `decay_method`. --- awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini | 4 ++-- awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini b/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini index c39d97b..bfccdf4 100644 --- a/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini +++ b/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini @@ -136,8 +136,8 @@ max_grain: 700.0 dirt: 2.0 decay_method: None grid_mask: True -start_decay: None -end_decay: None +decay_start: None +decay_end: None date_method_decay_power: 0.714 date_method_veg_default: 0.25 date_method_veg_41: 0.36 diff --git a/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini b/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini index 3c82afe..4bb94c1 100644 --- a/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini +++ b/awsm/tests/basins/Lakes/gold_hrrr_update/gold_config.ini @@ -136,8 +136,8 @@ max_grain: 700.0 dirt: 2.0 decay_method: None grid_mask: True -start_decay: None -end_decay: None +decay_start: None +decay_end: None date_method_decay_power: 0.714 date_method_veg_default: 0.25 date_method_veg_41: 0.36 From e466f5d8aa2ea91f751dd7614d4f370599722a86 Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Wed, 20 May 2026 10:08:56 -0600 Subject: [PATCH 3/5] Release - Bump version of SMRF to 20260520 Adding a new albedo decay method for post fire scenarios --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e276d4a..aee1fdc 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ "Programming Language :: Python :: 3.9" ] dependencies = [ - 'smrf @ git+https://github.com/UofU-Cryosphere/smrf.git@20260309', + 'smrf @ git+https://github.com/UofU-Cryosphere/smrf.git@20260520', 'pysnobal @ git+https://github.com/iSnobal/pysnobal.git@20260126', ] From 978de5bedaac884e55ff9f797c5bbbb8d6081516 Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Wed, 20 May 2026 10:24:39 -0600 Subject: [PATCH 4/5] GH actions - Bump micromamba setup to v3 --- .github/workflows/unittest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 1162dca..e326094 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -62,7 +62,7 @@ jobs: if: runner.os == 'Linux' env: CC: gcc-${{ env.GCC_VERSION }} - uses: mamba-org/setup-micromamba@v2 + uses: mamba-org/setup-micromamba@v3 with: environment-file: ${{ env.LINUX_YAML }} init-shell: bash @@ -73,7 +73,7 @@ jobs: if: runner.os == 'macOS' env: CONDA_SUBDIR: osx-64 - uses: mamba-org/setup-micromamba@v2 + uses: mamba-org/setup-micromamba@v3 with: environment-file: ${{ env.MACOS_YAML }} init-shell: bash From 795f43ce6e86e6796b6346c8554006673209f0b4 Mon Sep 17 00:00:00 2001 From: Joachim Meyer Date: Wed, 20 May 2026 16:28:04 +0000 Subject: [PATCH 5/5] Cleanup - Delete .pyproject.toml.un~ Should not have been in here to begin with. --- .pyproject.toml.un~ | Bin 1195 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 .pyproject.toml.un~ diff --git a/.pyproject.toml.un~ b/.pyproject.toml.un~ deleted file mode 100755 index 880600008830ddb2032dfbc026e7d9872a5ab18e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1195 zcmWH`%$*;a=aT=Ffr-=9u=J?A^ij!H?*5W)Hl>;W<{b`cI$+|VDl>m}PfHd91A{pb zBLhYthY2bGqG6aJvwVvS3rLocA^rlA0w@zG%)lTG}F zPEj&Ig|OfUMU9^w1SljK8k;7iBr9kHR0b5~XQd{W=#}K><|ybYgchVEmZU0_EaTFVBa7&g~YrRg@8&(YEURj%}GrxPA%3nZG6580LNK%761SM