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

Feature/borescan merge sm peat #524

Merged
merged 75 commits into from
Feb 13, 2022
Merged

Feature/borescan merge sm peat #524

merged 75 commits into from
Feb 13, 2022

Commits on Dec 20, 2021

  1. Merging SM old code with current develop

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    6cdcc7d View commit details
    Browse the repository at this point in the history

  2. define FSW_CHANGE

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    f319d72 View commit details
    Browse the repository at this point in the history

  3. add peat source code "POROS_HighLat"

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    d939ed6 View commit details
    Browse the repository at this point in the history

  4. add vars to srunoff

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    79d3157 View commit details
    Browse the repository at this point in the history

  5. define type

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    be25bcc View commit details
    Browse the repository at this point in the history

  6. adding rzexc type

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    1a82678 View commit details
    Browse the repository at this point in the history

  7. define var types

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    58170b0 View commit details
    Browse the repository at this point in the history

  8. adding vars to sobroutine

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    66b4e67 View commit details
    Browse the repository at this point in the history

  9. more vars need type

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    907a493 View commit details
    Browse the repository at this point in the history

  10. edit

    @biljanaorescanin
    biljanaorescanin committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    d345689 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. minor edit

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    51ca254 View commit details
    Browse the repository at this point in the history

  2. enable NLv4p option in make_bcs

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    4ca7479 View commit details
    Browse the repository at this point in the history

  3. order of arguments

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    57bcb38 View commit details
    Browse the repository at this point in the history

  4. clean up

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    9bf1aa7 View commit details
    Browse the repository at this point in the history

  5. bf1 and bf2 to call CATCH_CALC_SOIL_MOIST

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    43fcbe1 View commit details
    Browse the repository at this point in the history

  6. more cleanup

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    d160893 View commit details
    Browse the repository at this point in the history

  7. bf1 and bf2 were missing here

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    096bd96 View commit details
    Browse the repository at this point in the history

  8. edits

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    e9fb2b9 View commit details
    Browse the repository at this point in the history

  9. typo

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    d85f25e View commit details
    Browse the repository at this point in the history

  10. missing porosity at some calls

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    8560022 View commit details
    Browse the repository at this point in the history

  11. poros in subtoutine calls

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    2bc3180 View commit details
    Browse the repository at this point in the history

  12. wrong code placement

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    14f253e View commit details
    Browse the repository at this point in the history

  13. missing decelaratio

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    3cf5a62 View commit details
    Browse the repository at this point in the history

  14. more edits

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    c78bb0c View commit details
    Browse the repository at this point in the history

  15. fix type

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    f8651e1 View commit details
    Browse the repository at this point in the history

  16. forgot to save change

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    614c6bb View commit details
    Browse the repository at this point in the history

  17. fixing alignment

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    e32e95f View commit details
    Browse the repository at this point in the history

  18. bug fix

    @biljanaorescanin
    biljanaorescanin committed Dec 21, 2021
    2 Configuration menu
    Copy the full SHA
    af94537 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2021

  1. Merge branch 'develop' into feature/borescan_merge_sm_peat

    @biljanaorescanin
    biljanaorescanin committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    f648049 View commit details
    Browse the repository at this point in the history

  2. align list

    @biljanaorescanin
    biljanaorescanin committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    d2daaad View commit details
    Browse the repository at this point in the history

  3. must be 3-character alphanumeric code, insted of NL4p we will have NL5

    @biljanaorescanin
    biljanaorescanin committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    72155b7 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2021

  1. fix for RSURFP2

    @biljanaorescanin
    biljanaorescanin committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    bae955a View commit details
    Browse the repository at this point in the history

  2. typo

    @biljanaorescanin
    biljanaorescanin committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    f3b5184 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2021

  1. missing poros limit

    @biljanaorescanin
    biljanaorescanin committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    0d7740e View commit details
    Browse the repository at this point in the history

  2. handle division by zero

    @biljanaorescanin
    biljanaorescanin committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    cb481da View commit details
    Browse the repository at this point in the history

  3. double check this

    @biljanaorescanin
    biljanaorescanin committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    ec943c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. bug fix

    @biljanaorescanin
    biljanaorescanin committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    3647896 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2022

  1. Merge branch 'develop' into feature/borescan_merge_sm_peat

    @biljanaorescanin
    biljanaorescanin committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    81e3384 View commit details
    Browse the repository at this point in the history

  2. bug fix for CatchCN_CLM 4.5 BCS's file format

    @biljanaorescanin
    biljanaorescanin committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    0233ea0 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. these changes will be updated with separate PR

    @biljanaorescanin
    biljanaorescanin committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    cd9112b View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2022

  1. typo

    @biljanaorescanin
    biljanaorescanin committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    9daf5a0 View commit details
    Browse the repository at this point in the history

  2. cleanup of peat code: 

    - reordered subroutine arguments for consistency
- renamed/explained porosity threshold for PEATCLSM physics
- added decimal point to hardcoded real numbers
- white space and indent cleanup
    @gmao-rreichle
    gmao-rreichle committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    646ede4 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2022

  1. fix bug I introduced

    @biljanaorescanin
    biljanaorescanin committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    47f970c View commit details
    Browse the repository at this point in the history

  2. fixed minor bug introduced in previous commit (poros threshold for PE… 

    …ATCLSM)
    @gmao-rreichle
    gmao-rreichle committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    23d71fc View commit details
    Browse the repository at this point in the history

  3. additional cleanup: 

    - introduced constant for max ZBAR in PEATCLSM specific yield calcs
- changed name of PEATCLSM porosity threshold
- white space changes
    @gmao-rreichle
    gmao-rreichle committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    538193b View commit details
    Browse the repository at this point in the history

  4. fixing typo in previous commit (PEATCLSM poros threshold)

    @gmao-rreichle
    gmao-rreichle committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    b387828 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2022

  1. added constants for PEATCLSM's piecewise linear relation between surf… 

    …ace runoff and AR1
    @gmao-rreichle
    gmao-rreichle committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    4d1c77e View commit details
    Browse the repository at this point in the history

  2. fixed comment in previous commit

    @gmao-rreichle
    gmao-rreichle committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    a076928 View commit details
    Browse the repository at this point in the history

  3. overhauled Scale_Catch.F90 and Scale_CatchCN.F90: 

    - removed outdated and redundant subroutines calc_soil_moist(), rzequil(), partition()
- fixed (hopefully) major bug in Scale_CatchCN.F90 (missing veg1 input to catch_calc_soil_moist())
    @gmao-rreichle
    gmao-rreichle committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    7741de0 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2022

  1. removed obsolete VEGCLS argument from catch_calc_soil_moist() and rel… 

    …ated subroutines(); fixed previous commit
    @gmao-rreichle
    gmao-rreichle committed Jan 29, 2022
    Configuration menu
    Copy the full SHA
    d3d9cab View commit details
    Browse the repository at this point in the history

  2. fixing bug in previous commit

    @gmao-rreichle
    gmao-rreichle committed Jan 29, 2022
    Configuration menu
    Copy the full SHA
    192ce62 View commit details
    Browse the repository at this point in the history

  3. fixed bug in previous commit

    @gmao-rreichle
    gmao-rreichle committed Jan 29, 2022
    Configuration menu
    Copy the full SHA
    dcdad24 View commit details
    Browse the repository at this point in the history

  4. introduced function for zbar calculations; removed redundant zbar cal… 

    …culations
    @gmao-rreichle
    gmao-rreichle committed Jan 29, 2022
    Configuration menu
    Copy the full SHA
    30f91a3 View commit details
    Browse the repository at this point in the history

  5. fixed bug in previous commit

    @gmao-rreichle
    gmao-rreichle committed Jan 29, 2022
    Configuration menu
    Copy the full SHA
    f10f98e View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2022

  1. restrict addition of 1e-20 to area(1) to peat tiles to maintain 0-dif… 

    …f of old physics
    @gmao-rreichle
    gmao-rreichle committed Jan 30, 2022
    Configuration menu
    Copy the full SHA
    65c2fb6 View commit details
    Browse the repository at this point in the history

  2. fixed error in previous commit

    @gmao-rreichle
    gmao-rreichle committed Jan 30, 2022
    Configuration menu
    Copy the full SHA
    59e3121 View commit details
    Browse the repository at this point in the history

  3. replacing hardwired 0.05 with named constant DZTC in gndtmp_cn() (cat… 

    …chmentCN.F90)
    @gmao-rreichle
    gmao-rreichle committed Jan 30, 2022
    Configuration menu
    Copy the full SHA
    e44b03b View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2022

  1. Merged branch 'feature/rreichle/cleancatchconstants' into feature/bor… 

    …escan_merge_sm_peat

Manually resolved conflicts:
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/catch_constants.f90
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/lsm_routines.F90
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/Scale_Catch.F90
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/Scale_CatchCN.F90
Auto-merged:
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/CLM45/CN_DriverMod.F90
- GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_RouteRestarts.F90
    @gmao-rreichle
    gmao-rreichle committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    0d1862e View commit details
    Browse the repository at this point in the history

  2. Merged branch 'develop' into feature/borescan_merge_sm_peat 

    Manually resolved conflicts:
- [..]/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90
Auto-merged:
- [..]/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
- [..]/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90
- [..]/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90
    @gmao-rreichle
    gmao-rreichle committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    f5de16b View commit details
    Browse the repository at this point in the history

  3. fixing errors in manual merge of branch feature/rreichle/cleancatchco… 

    …nstants into feature/borescan_merge_sm_peat
    @gmao-rreichle
    gmao-rreichle committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    e4a8234 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2022

  1. renamed DZTC to DZTSURF to avoid inconsistency with CatchCN's TC vs. TG

    @gmao-rreichle
    gmao-rreichle committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    b3aa6bd View commit details
    Browse the repository at this point in the history

  2. more cleanup (lsm_routines.F90, catch_constants.f90_) 

    - added vectorized catch_calc_zbar() in prep of non-zero-diff change for consistency
- added new PEATCLSM constants to subroutine echo_catch_constants()
    @gmao-rreichle
    gmao-rreichle committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    30ef2dc View commit details
    Browse the repository at this point in the history

  3. Bug fixes: missing ./DTSTEP in RUNSRF calc; PEATCLSM implementation i… 

    …n CatchCN. Changed CATDEF init in PEATCLSM (Scale_Catch[CN].F90).
    @gmao-rreichle
    gmao-rreichle committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    99f1dc9 View commit details
    Browse the repository at this point in the history

  4. Bug fix: PEATCLSM implementation in CatchCN (added missing SWSRF4=WPWET)

    @gmao-rreichle
    gmao-rreichle committed Feb 2, 2022
    Configuration menu
    Copy the full SHA
    666d160 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2022

  1. fixed bug in implementation of catch_calc_zbar()

    @gmao-rreichle
    gmao-rreichle committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    24b04a3 View commit details
    Browse the repository at this point in the history

  2. added function catch_calc_watertabled()

    @gmao-rreichle
    gmao-rreichle committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    4998436 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2022

  1. Merge branch 'develop' into feature/borescan_merge_sm_peat

    @gmao-rreichle
    gmao-rreichle committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    e37b74e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix/rreichle/Catchment_RUNSRF_units' into feature/bo… 

    …rescan_merge_sm_peat:

Manually resolved conflicts:
   [..]/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90
   [..]/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90
   [..]/GEOSland_GridComp/Shared/lsm_routines.F90
    @gmao-rreichle
    gmao-rreichle committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    6904c78 View commit details
    Browse the repository at this point in the history

  3. further clarification of throughfall (THRU[x]) units; fixed typo (bui… 

    …ld error) in previous commit
    @gmao-rreichle
    gmao-rreichle committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    3c4ee1b View commit details
    Browse the repository at this point in the history

  4. additional cleanup: assorted roundoff (non-zero-diff) changes in PEAT… 

    …CLSM :

- enable use of vectorized catch_calc_zbar() to compute WATERTABLED export
- remove unnecessary -1.e-20 in rzdrain()
- simplify ramp function implementation for surface runoff as fn of ar1
    @gmao-rreichle
    gmao-rreichle committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    9dcb682 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. commented out presumably obsolete subroutine process_peatmap() in mod… 

    …_process_hres_data.F90
    @gmao-rreichle
    gmao-rreichle committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    19b87d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/borescan_fix_make_bcs' into feature/borescan_me… 

    …rge_sm_peat
    @gmao-rreichle
    gmao-rreichle committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    03ab65f View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2022

  1. Merge branch 'feature/jkolassa/gndtmp_cn_cleanup' into feature/boresc… 

    …an_merge_sm_peat:

Manually resolved conflicts:
  [..]/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
  [..]/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90
  [..]/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90
  [..]/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90
  [..]/GEOSland_GridComp/Shared/lsm_routines.F90
    @gmao-rreichle
    gmao-rreichle committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    e3553ef View commit details
    Browse the repository at this point in the history

  2. fixes in restart processing; cleanup: 

    - in Scale_Catch[CN].F90, avoid resetting catdef etc for peat tiles
    that are also peat in source (old) restart
- renamed "process_peat" to "use_PEATMAP" for clarity
    @gmao-rreichle
    gmao-rreichle committed Feb 11, 2022
    Configuration menu
    Copy the full SHA
    90f7439 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2022

  1. Merge branch 'develop' into feature/borescan_merge_sm_peat

    @sdrabenh
    sdrabenh committed Feb 13, 2022
    Configuration menu
    Copy the full SHA
    24635de View commit details
    Browse the repository at this point in the history