Feature soil organic content #434
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
- SWC-related variables need to be (re-)initialized after soils are updated
- tests for SWRCBulkSoilParameters() - water balance tests with soil organic matter > 0
…maters - for now, set om to 0 for water balance test
Close #397 The implemented approach has two steps: 1) Determine organic matter properties for the soil layers assuming fibric peat characteristics at the soil surface and characteristics of sapric peat at a user-specified depth (with a default of 50 cm). 2) Estimate bulk soil parameters of the soil water retention curve as linear combinations of properties for the mineral soil component and of properties for the organic matter soil component using the proportion of organic matter in the bulk soil as weights. New inputs * siteparam.in: depthSapric * soils.in: fractionWeight_om * swrc_params*.in: swrcpOM[fibric], swrcpOM[sapric] New functions * interpolateFibricSapric() to linearly interpolate organic matter parameter between fibric and sapric characteristics * SWRC_bulkSoilParameters() to calculate parameters of the bulk soil are as the weighted average of parameters of the organic and mineral components Functions with new arguments/behavior * SW_SIT_read() now reads in value for depthSapric from "siteparam.in" * SW_LYR_read() now reads in values for fractionWeight_om from "soils.in" * SW_SWRC_read() now reads in values for swrcpOM[fibric] and swrcpOM[sapric] from "swrc_params*.in" * SW_SIT_init_run() now runs checks for swrcpOM[fibric] and swrcpOM[sapric] and calculates bulk soil SWRCp from organic and mineral soil components via a call to SWRC_bulkSoilParameters() * SW_swcBulk_saturated() gained argument `"fom"` which is passed on to PTF_Saxton2006() if legacy `"Cosby1984AndOthers"` is selected as PTF * SW_swcBulk_minimum() and ui_theta_min() gained argument `"fom"` which is passed on to PTF_RawlsBrakensiek1985() if legacy `"Cosby1984AndOthers"` is selected as PTF * PTF_Saxton2006() gained argument `"fom"` and throws an error if fom > 0.08 (these published equations incorporate influence of organic matter up to 8% which was previously fixed at 0%) * PTF_RawlsBrakensiek1985() gained argument `"fom"` and throws an error if fom > 0 * SW_check_soil_properties() now checks that user-input `fractionWeight_om` is within 0-1 * set_soillayers() gained argument `"pom"` to set a value for `fractionWeight_om`
** This changes simulation output ** * Different outcomes during periods of high infiltration (e.g., snowmelt) and during conditions of low hydraulic conductivity (e.g., frozen soils, sapric organic matter). * Saturated percolation is now limited -- previously, it was unbounded. The upper bound is a function based on saturated hydraulic conductivity (which includes effects of organic matter), frozen soils, and a user-specified `"permeability"` factor. * Bulk soil saturated hydraulic conductivity parameter now accounts for flow pathways through organic matter above a threshold and assumes conductivities through mineral and organic components in series outside of those pathways.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release/devel_v8.1.0 #434 +/- ##
========================================================
+ Coverage 73.33% 73.35% +0.01%
========================================================
Files 20 20
Lines 6233 6308 +75
========================================================
+ Hits 4571 4627 +56
- Misses 1662 1681 +19 ☔ View full report in Codecov by Sentry. |
- SWRC_bulkSoilParameters(): added documentation of argument "swrc_type" to fix documentation - SWRC_bulkSoilParameters(): corrected spelling of argument "swrcOM" to "swrcpOM" - tests "SWFlowSaturatedPercolation", "SWRCBulkSoilParameters" and "SitePTFRawlsBrakensiek1985": clang-tidy: use const variables where appropriate - test "SWFlowSaturatedPercolation": clang-format
- the variable standingWater was previously used uninitialized which lead to NaN when compiled with g++
Previously, SWRC_bulkSoilParameters() was called with "SW_Site->swrcpOM" as argument for "const double swrcpOM[2][SWRC_PARAM_NMAX]" to pass fibric and sapric organic matter SWRC parameters. Problems (here using gcc/g++ v14.2.0): - gcc warning (`CC=gcc make clean all`): "'SWRC_bulkSoilParameters' accessing 96 bytes in a region of size 48 [-Wstringop-overflow=]" - gcc error (`CC=gcc make clean bin_debug_severe`): "invalid use of pointers to arrays with different qualifiers in ISO C before C23 [-Werror=pedantic]" - g++ error (`CXX=g++ make clean test`): "cannot convert 'const double (*)[]' to 'const double (*)[6]'" Option 1: coerce call with "(const double (*)[SWRC_PARAM_NMAX]) SW_Site->swrcpOM" as argument for "const double swrcpOM[][SWRC_PARAM_NMAX]" - gcc warning (`CC=gcc make clean all`) resolved - gcc error (`CC=gcc make clean bin_debug_severe`) resolved - g++ error (`CXX=g++ make clean test`) resolved Option 2: remove "const", i.e., call with "SW_Site->swrcpOM" as argument for "double swrcpOM[][SWRC_PARAM_NMAX]" - gcc warning (`CC=gcc make clean all`) resolved - gcc error (`CC=gcc make clean bin_debug_severe`) resolved - g++ error (`CXX=g++ make clean test`) resolved This commit implements option 2. Thanks to @N1ckP3rsl3y
N1ckP3rsl3y
requested changes
Oct 23, 2024
- commit 8029a9d introduced for the test SWFlowTest.SWFlowSaturatedPercolation a new variable "swc0init' to initialize soil water content - by mistake, the first use of "swc" was, however, not initialized -> this commit now initializes "swc[]" as intended
N1ckP3rsl3y
approved these changes
Oct 23, 2024
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.
See #397
SOILWAT2 now represent the influence of soil organic matter on the soil water retention curve and the saturated hydraulic conductivity parameter
Saturated percolation is now limited. The upper bound is a function based on the saturated hydraulic conductivity parameter (which includes effects of organic matter), frozen soils, and a user-specified
"permeability"factor.New input via
"siteparam.in"to specify the depth at which characteristics of organic matter have completely switched from fibric to sapric peatNew input via
"soils.in"to provide the proportion of soil organic matter to bulk soil by weight for each soil layer.New input via
"swrc_params*.in"to provide parameter values of the soil water retention curve representing fibric and sapric peat.