Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for upcoming SOILWAT2 release v7.0.0 #535

Merged
merged 21 commits into from
Jun 9, 2023

Commits on Oct 5, 2022

  1. Set SOILWAT2 to feature_read_weather

    - SOILWAT2 commit "Isolate "allWeather" functionality from global variables"
    - updated "weathsetup.in": removed obsolete "first year of historical weather"
    dschlaep committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    8e6d144 View commit details
    Browse the repository at this point in the history
  2. Incorporate SOILWAT2's new weather workflow

    - 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
    dschlaep committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    755b3e9 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Set SOILWAT2 to feature_veg_estimation

    - updated "veg.in": new input to select SOILWAT2-side method for estimation vegetation parameters from climate
    -> not relevant for STEPWAT2 and turned off
    dschlaep committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    d641e3b View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Prepare for upcoming SOILWAT2 release v7.0.0

    - 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)
    dschlaep committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    657153f View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. Update SOILWAT2 with new SWRC functionality

    - 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)
    dschlaep committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    eb67f2c View commit details
    Browse the repository at this point in the history
  2. Updates for new SOILWAT2 project structure

    - 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`
    dschlaep committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    5505457 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2022

  1. Clean up "Updates for new SOILWAT2 project structure"

    - the previous commit (5505457) by mistake did not update a few paths
    -> this is not fixed
    dschlaep committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    ec1896b View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2022

  1. Wrap up updates for re-structured SOILWAT2

    - set SOILWAT2 back to branch `release/devel_v7.0.0` (on commit 296f123e35836d29d59dbc5ec4974f7e55f9cfa7) that now includes the completed `feature_restructure`
    dschlaep committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    912a4b0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #536 from DrylandEcology/feature_SOILWAT2_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
    dschlaep committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    26cecad View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2023

  1. Merge branch 'Seed_Dispersal' (with SOILWAT2 v6.7.0) into feature_SOI…

    …LWAT2_v700_devel
    
    # Conflicts:
    #	sw_src
    dschlaep committed Jan 14, 2023
    Configuration menu
    Copy the full SHA
    c871c2f View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Updated Submodule

    Nicholas Persley committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    777cf5b View commit details
    Browse the repository at this point in the history
  2. STEPWAT2 handles more daily weather variables

    - 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
    Nicholas Persley committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    95b7b2f View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Configuration menu
    Copy the full SHA
    a890167 View commit details
    Browse the repository at this point in the history
  2. Removed unnecessary "flag" in _sxw_generate_weather()

    Nicholas Persley committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    bbd3c65 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Configuration menu
    Copy the full SHA
    c974dc6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2a87eca View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. SOILWAT2 updated handling of solar radiation inputs

    - 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
    dschlaep committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    6fcc81e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Update SOILWAT2 to latest commit on read_more_daily_input

    - no change to STEPWAT2 output
    dschlaep committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    fa0dcd8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #539 from DrylandEcology/read_more_daily_input

    Prepare STEPWAT2 to handle SOILWAT2's additional daily inputs
    
    - no impacts on STEPWAT2 output: STEPWAT2 does not utilize new daily inputs
    dschlaep committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    1e97e9e View commit details
    Browse the repository at this point in the history
  3. Update SOILWAT2 to latest version on devel_v7.0.0

    includes
    - new daily inputs
    dschlaep committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    0f1d102 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Configuration menu
    Copy the full SHA
    9037e90 View commit details
    Browse the repository at this point in the history