Development for v6.3.0 #249
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
Contributor
N1ckP3rsl3y
commented
Dec 18, 2024
N1ckP3rsl3y
commented
- Update SOILWAT2 to v8.1.0
- Update function calls where the name has changes and/or the argument(s) changed - SOILWAT2 no longer has `files_nc.in` - Switch the following types: RealD -> double and RealF -> float - SW_WEATHER_HIST is no longer a pointer to a pointer, but is one array of SW_WEATHER_HIST instances - SOILWAT2 now provides a function that handles the calculations/setting of weather data * Remove calculations from `rSW2_set_weather_hist()` * Store all weather data in a temporary location * Call SOILWAT2's function `SW_WTH_setWeatherValues()` to calculate/set the weather - Update names changes of and within the struct SW_PATH_INPUTS - Update the setting of `swrcp` to set `swrcpOM` and `swrcpMineralSoil`
- Update the use flag `inputsProvideSWRCp` over `site_has_swrcpMineralSoil` - New helper function to `onSet_SW_SIT_tranp()` * Move the setting of transpiration from `onSet_SW_SIT()` * Set after we read soil information
dschlaep
reviewed
Dec 19, 2024
C code * Update column names to hold information for organic matter * Update the transferring of fraction organic matter between R and C * Update the setting of swrcp mineral soil to go to and from `swrcpMineralSoil` instead of `swrcp` * New function `onGet_SW_omSWRCp()` and `onSet_SW_omSWRCp()` to transfer swrcp organic matter between R and C, used to set SW_SOILS slots R code * Class `swSoils` gains new slot - omSWRCp - Add new prototype for omSWRCp - Check that slot exists and is the correct size - Add reset/setReplace method - Add slot to `sw_upgrade` method
C code * New column name "depth_sapric" * Update `onGet/Set_SW_SIT()` to transfer `depthSapric` to/from R and C R code * Add new slot "depth_sapric" to swSite * Make sure that depth_sapric is provided * Create replace/set/generic methods for "depth_sapric"
- sw_upgrade() for "swSite": new upgrade_soilLayers() to add new column "som_frac" (and set it to default values of 0) - new soilLayer_dataColumns() - fix documentation
Bugfixes for "omSWRCp" - fix onGet_SW_omSWRCp(): values were incorrectly copied; row and column names were mixed up - fix onSet_SW_SWRCp(): values were incorrectly copied; remove unused variable "isMineral" that prevented "site_has_swrcpMineralSoil" from being set correctly - fix export `swSoils_omSWRCp<-()` - fix names given to "swSoils" slot "omSWRCp": row and column names were mixed up - fix documentation New objects - sw2_list_omSWRCp: list of a matrix for each implemented SWRC with parameters for fibric and sapric peat New behavior - example code, vignette, and unit tests now set swSoils_omSWRCp() according to the selected SWRC - fix validity check for "swSoils"
- add missing variable "debug" for debug mode
- rSW_CTL_obtain_inputs() now calls onSet_SW_SOILS() before onSet_SW_SIT_transp() -- this change was needed because onSet_SW_SIT_transp() requires soil depth information that is only available after it was obtained by onSet_SW_SOILS() - see SOILWAT2 commit "Input specification of transpiration regions changed from layers to soil depth" (DrylandEcology/SOILWAT2@8c6432f)
- Update SOILWAT2 to commit d2adb224252a1c163056f255518ba1c038981efa "Merge pull request #444 from DrylandEcology/bugfix441_consistentSnow" on branch release/devel_v8.1.0 - Reflect SOILWAT2 updates to echo_*()
- Update SOILWAT2 to commit a916418790fe586894c2ccdadaf56867a75f4daf on branch release/devel_v8.1.0 - Reflect SOILWAT2 updates to sw_init_args()
- SOILWAT2 commit "Bugfix440 soil temperature" DrylandEcology/SOILWAT2@d029b28 (2025 Jan 28) introduced a new user input to select the method for estimating surface temperature
- SOILWAT2 commit d20da03d196ccb344a8eefcc89df5feebaab5cb2 "Consistently clean output directory" (2025 Jan 24) modified the position of eLog in the enumerator SW_FileIndex - onSet_SW_F() no longer copies rSOILWAT2's swFiles@InFiles to SOILWAT2's txtInFiles -- these are unused if rSOILWAT2 sets values - sw_consts() now reflects new value of `eLog` which updates `rSW2_glovars[["kSOILWAT2"]][["InFiles"]]` Additionally: - Removed unused MyFileName
- Update to released SOILWAT2 v8.1.0 - Update package data
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #249 +/- ##
==========================================
- Coverage 59.26% 59.17% -0.09%
==========================================
Files 44 44
Lines 8899 8944 +45
==========================================
+ Hits 5274 5293 +19
- Misses 3625 3651 +26 ☔ View full report in Codecov by Sentry. |
dschlaep
approved these changes
Feb 4, 2025
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.