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.

Sign up for GitHub

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

Jump to bottom

Phydro merge into main #222

Draft
wants to merge 77 commits into
base: master
Choose a base branch
from
Draft

Phydro merge into main #222

wants to merge 77 commits into from

Commits on Sep 11, 2023

  1. enable run with extra columns in driver data

    @jaideep777
    jaideep777 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    73df4f2 View commit details
    Browse the repository at this point in the history

  2. code compiles with phydro module PROVIDED mod file is first created

    @jaideep777
    jaideep777 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    193079b View commit details
    Browse the repository at this point in the history

  3. basic working gpp calc; compiles correctly; use_phydro option

    @jaideep777
    jaideep777 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    b1d9b27 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. working gpp from instantaneous model

    @jaideep777
    jaideep777 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    032a02c View commit details
    Browse the repository at this point in the history

  2. correct unit for obs LE, identified numerical issue in gs with ET_DIF… 

    …FUSION
    @jaideep777
    jaideep777 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    0c1d7f2 View commit details
    Browse the repository at this point in the history

  3. phydro now takes pa rather than elv as input

    @jaideep777
    jaideep777 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    bfa6c57 View commit details
    Browse the repository at this point in the history

  4. add netrad to averager, fix output units

    @jaideep777
    jaideep777 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    97936d1 View commit details
    Browse the repository at this point in the history

  5. jaideep's comments on equations in waterbal

    @jaideep777
    jaideep777 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    8adda14 View commit details
    Browse the repository at this point in the history

  6. working latent energy calcs in waterbal

    @jaideep777
    jaideep777 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    f052df8 View commit details
    Browse the repository at this point in the history

  7. add use_pml as program option; add pml comparison in vignette

    @jaideep777
    jaideep777 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    cd0cc9c View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. feed back wcont from waterbal to phydro

    @jaideep777
    jaideep777 committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    7088d63 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. all params are now supplied from R

    @jaideep777
    jaideep777 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    0f0d093 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. working version with all vars in the right classes

    @jaideep777
    jaideep777 committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    0880620 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. basic working kphio calib with pmodel; with whc in params

    @jaideep777
    jaideep777 committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    a39b3ef View commit details
    Browse the repository at this point in the history

  2. working gensa/bayesian calibration with gpp and le

    @jaideep777
    jaideep777 committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    52033ad View commit details
    Browse the repository at this point in the history

  3. add full calibration in vignette

    @jaideep777
    jaideep777 committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    d04e469 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. fix NaN in e; <--- All sites calibrated here

    @jaideep777
    jaideep777 committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    b7f5781 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. fix pmodel calibration (separate vignette)

    @jaideep777
    jaideep777 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    ac03b51 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. param env dependencies plot

    @jaideep777
    jaideep777 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    230b9a8 View commit details
    Browse the repository at this point in the history

  2. try calib with alpha/gamma fixed

    @jaideep777
    jaideep777 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    237824d View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Pull changes from upstream master into phydro_new

    @jaideep777
    jaideep777 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    613a5f2 View commit details
    Browse the repository at this point in the history

  2. modify vignette to ensure that code works with pulled changes

    @jaideep777
    jaideep777 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    5bab098 View commit details
    Browse the repository at this point in the history

  3. get forcing_acclim dataframe into fortran

    @jaideep777
    jaideep777 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    ffc9097 View commit details
    Browse the repository at this point in the history

  4. add acclimation forcing

    @jaideep777
    jaideep777 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    4a9aeff View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2024

  1. add 2-param SWP function; limit SWP for numerical stability; bash script

    @jaideep777
    jaideep777 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    a9a275a View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. completed pipeline for batch calibration

    @jaideep777
    jaideep777 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    7d91975 View commit details
    Browse the repository at this point in the history

  2. read data and output paths from cmdline args

    @jaideep777
    jaideep777 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    1c86008 View commit details
    Browse the repository at this point in the history

  3. update script with data/output dir inputs

    @jaideep777
    jaideep777 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    497fe22 View commit details
    Browse the repository at this point in the history

  4. first run for all 250 sites attempted here.

    @jaideep777
    jaideep777 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    17efddd View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. try P/PET to regulate le_soil; output lwp, le_soil; script to generat… 

    …e site list
    @jaideep777
    jaideep777 committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    b45ad15 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. improved calib script; trial with const kphio

    @jaideep777
    jaideep777 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    2c5b1f6 View commit details
    Browse the repository at this point in the history

  2. add r2 and nrmse outputs

    @jaideep777
    jaideep777 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    ef0ed2e View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. include obs quantities in phydro_output for convenience

    @jaideep777
    jaideep777 committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    7ff00b8 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. using p50 priors

    @jaideep777
    jaideep777 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    da09478 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. narrower alpha prior; r2 map

    @jaideep777
    jaideep777 committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    17f5896 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. nothing really

    @stineb
    stineb committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    0514f72 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:computationales/rsofun

    @stineb
    stineb committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    f18238a View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. use new cwdx80_forcing nc file

    @jaideep777
    jaideep777 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    57a9fc6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from geco-bern/master 

    update jaideep777/master from geco-bern/master
    @jaideep777
    jaideep777 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    188b2e6 View commit details
    Browse the repository at this point in the history

  3. update phydro_new with changes from upstream/master

    @jaideep777
    jaideep777 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    ae3f04a View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. revert some changes to ensure phydro runs. Working for AU-ASM

    @jaideep777
    jaideep777 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    301c3cd View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. CRITICAL BUGFIX: lines were silently deleted during merge, restore them

    @jaideep777
    jaideep777 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    e1204e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. minor bugfixes, prototype multi-site calib, add new cost fn for phydro

    @jaideep777
    jaideep777 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    21055fb View commit details
    Browse the repository at this point in the history

  2. export phydro cost fn

    @jaideep777
    jaideep777 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    2be7e39 View commit details
    Browse the repository at this point in the history

  3. bugfix in cost fn phydro

    @jaideep777
    jaideep777 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    098f789 View commit details
    Browse the repository at this point in the history

  4. minor bugfix

    @jaideep777
    jaideep777 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    1de60cb View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge pull request #213 from jaideep777/phydro_new 

    Phydro implementation
    @stineb
    stineb committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    16b8264 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. trial run with phydro cost fn

    @jaideep777
    jaideep777 committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    905176f View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. add driver visualization in vignette; add vignette with new-format data

    @jaideep777
    jaideep777 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a89eae1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'hotfix/newdataformat' into phydro_new

    @jaideep777
    jaideep777 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a65e110 View commit details
    Browse the repository at this point in the history

  3. updated vignettes for using pmodel and phydro with old and new data f… 

    …ormats
    @jaideep777
    jaideep777 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    84beb01 View commit details
    Browse the repository at this point in the history

  4. gapfill and use forcing_acclim in phydro vignette

    @jaideep777
    jaideep777 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    c4ff2f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. add ET formulation for pmodel (similar to phydro); move soil LE calcs… 

    … to waterbal
    @jaideep777
    jaideep777 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    8535b09 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Merge pull request #216 from jaideep777/phydro_new 

    New driver data + ET formulation for pmodel
    @stineb
    stineb committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    30e131c View commit details
    Browse the repository at this point in the history

  2. nothing much, just for the looks

    @stineb
    stineb committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    b3c77a6 View commit details
    Browse the repository at this point in the history

  3. implemented root zone water storage capacity-based soil moisture stre… 

    …ss function
    @stineb
    stineb committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    a2dd4d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Merge branch 'phydro' of github.com:geco-bern/rsofun into phydro

    @stineb
    stineb committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    2dbe7c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. replace ET_* with T_* in phydro options; reserving ET for splash+phydro

    @jaideep777
    jaideep777 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    500d79f View commit details
    Browse the repository at this point in the history

  2. add 3 ET options via: using_gs, using_pml

    @jaideep777
    jaideep777 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    8ae7fb3 View commit details
    Browse the repository at this point in the history

  3. R interface for all ET options; update vignette to demonstrate

    @jaideep777
    jaideep777 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    4d5950e View commit details
    Browse the repository at this point in the history

  4. remove nested functions

    @jaideep777
    jaideep777 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    9d5fc70 View commit details
    Browse the repository at this point in the history

  5. delete unnecessary files from vignettes; use default settings with wa… 

    …rning
    @jaideep777
    jaideep777 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    55c4dfa View commit details
    Browse the repository at this point in the history

  6. add new format demo data

    @jaideep777
    jaideep777 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    60575ed View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Merge pull request #219 from jaideep777/phydro_new 

    Resolve compilation issue; 3 ET options
    @stineb
    stineb committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    106a0e9 View commit details
    Browse the repository at this point in the history

  2. nothing much. just niceifications.

    @stineb
    stineb committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    cdcdefe View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. implemented PML in waterbal routine (to be used in combination with p… 

    …-model). Successful compilation. Not tested.
    @stineb
    stineb committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    c4f8cf3 View commit details
    Browse the repository at this point in the history

  2. tested: identical results for gs-coupled ET with diffusion (not PML).

    @stineb
    stineb committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    5de81fb View commit details
    Browse the repository at this point in the history

  3. got PML with P-model Gs running. Complemented vignette. Performs very… 

    … good.
    @stineb
    stineb committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    21f4e98 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. nothing much

    @stineb
    stineb committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    a234d36 View commit details
    Browse the repository at this point in the history

  2. bugfix to make le follow aet consistently

    @stineb
    stineb committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    c1509f1 View commit details
    Browse the repository at this point in the history

  3. added script for demo

    @stineb
    stineb committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    f9a6a20 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Update test-model-runs for PHYDRO

    @fabern
    fabern committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    af63378 View commit details
    Browse the repository at this point in the history

  2. fix warning: Unknown or uninitialised column: forcing_acclim

    @fabern
    fabern committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    1e4bb4e View commit details
    Browse the repository at this point in the history

  3. Deactivate printing soilmstress

    @fabern
    fabern committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    6ff8a82 View commit details
    Browse the repository at this point in the history

  4. test: Add consistency check for LE and AET (and soil vs canopy)

    @fabern
    fabern committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f1366e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. added minimal number to avoid division by zero for surface conductanc… 

    …e when soil moisture (wcont) is zero.
    @stineb
    stineb committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    a598e0c View commit details
    Browse the repository at this point in the history

  2. resolved merge conflict

    @stineb
    stineb committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    51961c0 View commit details
    Browse the repository at this point in the history