Prepare for upcoming SOILWAT2 release v7.0.0 #535
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
dschlaep
commented
Dec 6, 2022
dschlaep
commented
- SOILWAT2 will get a major new release with several improvements and new features
- milestone: https://github.com/DrylandEcology/SOILWAT2/milestone/13
- PR: Release/devel v7.0.0 SOILWAT2#325
- one of the goals is to limit code changes required in STEPWAT2 and to reproduce previous STEPWAT2 behavior and output (new settings will be set such that they reproduce previous behavior)
- SOILWAT2 commit "Isolate "allWeather" functionality from global variables" - updated "weathsetup.in": removed obsolete "first year of historical weather"
- SOILWAT2 branch "feature_read_weather" isolated the handling of daily weather data and moved it from within the simulation loop to the overall setup process - STEPWAT2 needs now to handle daily weather data itself; there are two basic options: i) follow SOILWAT2's new approach and generate daily weather for all years of a simulation run (for each grid cell and iteration); this would require that each grid cell stores and handles a local copy of `SW_Weather` ii) stick with the previous approach which generated daily weather for each year - this commit follows option (ii), i.e., generate daily weather for each year ** new `_sxw_generate_weather()` handles the generation of daily weather for the current year ** `Env_Generate()` now calls `_sxw_generate_weather()` before running SOILWAT2 for the current year ** non-gridded mode needed to set RNGs for each year (so that `markov_rng` gets updated with fresh values for each year) -> this commit satisfies expectations, i.e., (script based on #528 (comment)) - if seed != 0 (output is reproduced among runs) ** weather is exactly identical among runs and cells ** weather is different among years, iterations and seeds - if seed == 0 (output cannot be reproduced among runs) ** weather is different among cells, years, iterations and runs
- updated "veg.in": new input to select SOILWAT2-side method for estimation vegetation parameters from climate -> not relevant for STEPWAT2 and turned off
- SOILWAT2 is preparing for major new release with several improvements and new features * milestone: https://github.com/DrylandEcology/SOILWAT2/milestone/13 * PR: DrylandEcology/SOILWAT2#325 - the purpose of this STEPWAT2 branch is to track progress in SOILWAT2 towards that major release and add any necessary changes to the STEPWAT2/SOILWAT2 interface * one of the goals is to limit code changes required in STEPWAT2 and to reproduce previous STEPWAT2 behavior and output (new settings will be set such that they reproduce previous behavior), at least as much as possible (and document deviations) * new input: user specifies whether input soil density represents matric or bulk density (new input in `siteparam.in` with backwards compatible value of 0 = matric)
9 tasks
- SOILWAT2 has now multiple soil water release curves (SWRC) implemented - updated SOILWAT2 submodule on branch release/devel_v7.0.0 to commit a6c367aef07b746a43b459067ee0ef0139f9f60b "Merge pull request #322 from DrylandEcology/feature_swrc" -> new SOILWAT2 inputs include: swrc_name (to select a SWRC), ptf_name (to select a pedotransfer function if used), has_swrcp (logical to determine if SWRC parameters are used from new input file or calculated at run-time with selected PTF), and swrc_params (per soil layer parameters of the selected SWRC if used) -> default values (swrc_name = Campbell1974, ptf_name = Cosby1984AndOthers, has_swrcp = FALSE) re-created previous behavior (except for a small fix for when soil moisture values occur above field capacity and below saturation levels)
- switch to SOILWAT2 branch feature_restructure - paths renamed in submodule SOILWAT2 * *.c -> src/ * *.h -> include * pcg/ -> external/pcg/ * googletest/ -> external/googletest/ - makefile gained ability to create required paths at obj/ -> remove obj/ and fixed nested folder structure -> remove nested `.gitignore` for each subfolder of obj/ -> add obj to global `.gitignore`
- the previous commit (5505457) by mistake did not update a few paths -> this is not fixed
- set SOILWAT2 back to branch `release/devel_v7.0.0` (on commit 296f123e35836d29d59dbc5ec4974f7e55f9cfa7) that now includes the completed `feature_restructure`
Updates for new SOILWAT2 project structure - paths renamed in submodule SOILWAT2 * *.c -> src/ * *.h -> include * pcg/ -> external/pcg/ * googletest/ -> external/googletest/ - STEPWAT2 makefile gained ability to create required paths at obj/ as needed
…LWAT2_v700_devel # Conflicts: # sw_src
- The updated submodule (SOILWAT2) has the ability to read new daily weather variables in weath.YYYY. The new variables are: * Cloud cover, (maximum/minimum) relative humidity, (east/north components of) wind speed, shortwave radiation, actual vapor pressure, specific humidity, and dewpoint temperature - "sxw_soilwat.c" gains the include of "SW_Sky.h" to extern the variable, "SW_Sky" - `_sxw_generate_weather()` makes sure monthly input flags are set, so when the weather generator runs, cloud cover, humidity, and wind speed are filled with daily interpolated values from monthly input
…ead_more_daily_input
- for details, see DrylandEcology/SOILWAT2#345 -> "weathsetup.in" gained a new input "description of downward surface shortwave radiation" -> none of that is currently relevant or active for STEPWAT2 - this commit produces identical output to commit c974dc6 on branch feature_SOILWAT2_v700_devel
- no change to STEPWAT2 output
Prepare STEPWAT2 to handle SOILWAT2's additional daily inputs - no impacts on STEPWAT2 output: STEPWAT2 does not utilize new daily inputs
includes - new daily inputs
|
@kpalmqui I'm just about ready to release a major update for SOILWAT2 (will become v7.0.0) -- this PR prepares STEPWAT2 for this update. I tagged you to review this PR mainly to make you aware of the upcoming changes. Would you like me to update the current working branches "forage_output", forage_utilization_output", "sage_update_biomass", and "wildfire_cheatgrass_cycle" from "Seed_Dispersal" following this PR? |
|
@dschlaep that would be great - no need to merge into forage_utilization_output though. I will review shortly. |
dschlaep
added a commit
to DrylandEcology/SOILWAT2
that referenced
this pull request
Jun 9, 2023
Release v7.0.0 see https://github.com/DrylandEcology/SOILWAT2/milestone/13 - Read daily weather before the simulations enhancement (#311) - Calculate climate variables before simulation loop (#317) - Estimate vegetation cover from climate before simulation run (#318) - Implement multiple soil water retention curves (#315) - Soil density: input either for < 2 mm fraction or for whole soil? enhancement (#280) - Re-organize repository with more sub-folders question (#89) - Daily variables for atmospheric demand (#341) - STEPWAT2 updated to work with this release (see DrylandEcology/STEPWAT2#535) - rSOILWAT2 updated to work with this release (see DrylandEcology/rSOILWAT2#214)
|
After more discussion, I will not merge into the other branches (as suggested here #535 (comment)) because those branches are based on master and not Seed_Dispersal. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.