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 diff --git a/.pyproject.toml.un~ b/.pyproject.toml.un~ deleted file mode 100755 index 8806000..0000000 Binary files a/.pyproject.toml.un~ and /dev/null differ diff --git a/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini b/awsm/tests/basins/Lakes/gold_hrrr/gold_config.ini index 9f3ad2a..bfccdf4 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 +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 45dab40..4bb94c1 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 +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/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 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', ]