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

Hillslope merge #2390

Merged
merged 192 commits into from
Feb 29, 2024
Merged

Hillslope merge #2390

merged 192 commits into from
Feb 29, 2024

Commits on Jan 9, 2018

  1. hillslope_hydrology_n01_clm4_5_14_r223 

    first set of changes for hillslope hydrology global implementation
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    52d5058 View commit details
    Browse the repository at this point in the history

  2. hillslope_hydrology_n02_clm4_5_14_r223 

    added new routines
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    1af8d11 View commit details
    Browse the repository at this point in the history

  3. hillslope_hydrology_n03_clm4_5_14_r223 

    removed intials
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    ee1fc0e View commit details
    Browse the repository at this point in the history

  4. hillslope_hydrology_n04_clm4_5_14_r226 

    merged to r226
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    2d07001 View commit details
    Browse the repository at this point in the history

  5. hillslope_hydrology_n05_clm4_5_14_r226 

    added hillslope factory modules
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    fa7b4ec View commit details
    Browse the repository at this point in the history

  6. hillslope_hydrology_n06_clm4_5_14_r226 

    fixed positive drainage in soilhydrologymod
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    73b2833 View commit details
    Browse the repository at this point in the history

  7. hillslope_hydrology_n07_clm4_5_14_r226 

    fixed patch%column assinment in histfilemod
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    69d35dd View commit details
    Browse the repository at this point in the history

  8. hillslope_hydrology_n08_clm4_5_14_r226 

    added getglobalindex to histfilemod
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    de6ce31 View commit details
    Browse the repository at this point in the history

  9. hillslope_hydrology_n09_clm4_5_14_r226 

    update SoilHydrology
    @swensosc @bjandre
    swensosc authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    48f09fc View commit details
    Browse the repository at this point in the history

  10. hillslope_hydrology_n09_clm4_5_18_r270 

    Update to clm4_5_18_r270
    @billsacks @bjandre
    billsacks authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    78096d5 View commit details
    Browse the repository at this point in the history

  11. hillslope_hydrology_n10_clm4_5_18_r270 

    break long line, needed for nag
    @billsacks @bjandre
    billsacks authored and bjandre committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    0faafb1 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. Merge tag 'clm4_5_18_r270' into hillslope_hydrology 

    tag clm4_5_18_r270 from svn

No changes here, just doing the merge so history shows us being
up-to-date with r270
    @billsacks
    billsacks committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    031da7a View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Merge branch 'andre-standalone-dev' into hillslope_hydrology 

    Will allow running from a standalone checkout
    @billsacks
    billsacks committed Jan 17, 2018
    Configuration menu
    Copy the full SHA
    c1b7412 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'andre-standalone-dev' into hillslope_hydrology

    @billsacks
    billsacks committed Jan 17, 2018
    Configuration menu
    Copy the full SHA
    9c3d3ce View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. Add capability to read in hillslope geomorphology from surface data 

    file.
    @swensosc
    swensosc committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    dbbe17a View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. initial implementation of slope/aspect effects on incident direct sol… 

    …ar radiation
    @swensosc
    swensosc committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    7a84847 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. correct col_ndx assignment

    @swensosc
    swensosc committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    be27720 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. read hillslope geomorphological parametes from file

    @swensosc
    swensosc committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    6487698 View commit details
    Browse the repository at this point in the history

  2. merged w/ escomp/master

    @swensosc
    swensosc committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    c747ee1 View commit details
    Browse the repository at this point in the history

  3. merge w/ initial isotope refactoring

    @swensosc
    swensosc committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    9ee73ba View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2018

  1. add stream depth from routing model; note, requires cime/mosart changes

    @swensosc
    swensosc committed Sep 11, 2018
    Configuration menu
    Copy the full SHA
    7310baa View commit details
    Browse the repository at this point in the history

  2. add tdepth to lnd

    @swensosc
    swensosc committed Sep 11, 2018
    Configuration menu
    Copy the full SHA
    49010fa View commit details
    Browse the repository at this point in the history

  3. fix calculattion of col%colu

    @swensosc
    swensosc committed Sep 11, 2018
    Configuration menu
    Copy the full SHA
    4b9ff7b View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2018

  1. add river depth to coupler

    @swensosc
    swensosc committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    6019ade View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2018

  1. refactor SoilHydrologyMod for case of subsurface backflow

    @swensosc
    swensosc committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    0c967fb View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. add stream depth

    @swensosc
    swensosc committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    2d352c2 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2018

  1. add ncol minimum in subgridMod

    @swensosc
    swensosc committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    6b32610 View commit details
    Browse the repository at this point in the history

  2. merge with hillslope_hydrology

    @swensosc
    swensosc committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    3bd204b View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. fix tdepth

    @swensosc
    swensosc committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    51247fa View commit details
    Browse the repository at this point in the history

  2. fix tdepth

    @swensosc
    swensosc committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    bac3e39 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. merge to master

    @swensosc
    swensosc committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    c6be77e View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2019

  1. update externals to point to hillslope_hydrology cime and mosart bran… 

    …ches
    @swensosc
    swensosc committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    77e1cd3 View commit details
    Browse the repository at this point in the history

  2. update CLMBuildNamelist.pm for hillslope_hydrology_inparm

    @swensosc
    swensosc committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    b2e4b74 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. initialize column level direct solar forcing

    @swensosc
    swensosc committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    8387050 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. remove analytical hillslope methods

    @swensosc
    swensosc committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    5f54a18 View commit details
    Browse the repository at this point in the history

  2. merge to master

    @swensosc
    swensosc committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    6a00ef0 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. minor cleanup

    @swensosc
    swensosc committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    151a474 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. fix bug in hillslope_area calculation

    @swensosc
    swensosc committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    22a433b View commit details
    Browse the repository at this point in the history

  2. add downscaling in TopoMod

    @swensosc
    swensosc committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    f69d6e0 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. remove urban from endrun message

    @swensosc
    swensosc committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    e452966 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2020

  1. fix wtlunit recalculation

    @swensosc
    swensosc committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    4ee9ace View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. convert arrayl to integer in surfrdMod

    @swensosc
    swensosc committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    11a2911 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. fix elevation used in TopoMod

    @swensosc
    swensosc committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    7fbfe38 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. add hillslope bedrock field

    @swensosc
    swensosc committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    3a50c6a View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. merge to master

    @swensosc
    swensosc committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    556dacc View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. merge to master

    @swensosc
    swensosc committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    b5e62e1 View commit details
    Browse the repository at this point in the history

  2. add precipitation downscaling

    @swensosc
    swensosc committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    fbbe876 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. add conditional to histFileMod

    @swensosc
    swensosc committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    d86736e View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. enable fates multi-column restarts

    @swensosc
    swensosc committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    ae6085e View commit details
    Browse the repository at this point in the history

  2. add units in ColumnType

    @swensosc
    swensosc committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    9dd871b View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. add stream channel to ctsm

    @swensosc
    swensosc committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    069c910 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. add to gridcell balance check

    @swensosc
    swensosc committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    cbd6341 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2021

  1. fix wtlunit

    @swensosc
    swensosc committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    2bf70fd View commit details
    Browse the repository at this point in the history

  2. scale qdischarge

    @swensosc
    swensosc committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    03967e0 View commit details
    Browse the repository at this point in the history

  3. minor formatting

    @swensosc
    swensosc committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    5940bd2 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. add use_hillslope_routing namelist variable

    @swensosc
    swensosc committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    3dea895 View commit details
    Browse the repository at this point in the history

  2. re-add tdepth

    @swensosc
    swensosc committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    98d1c45 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. initialize stream_water_lun

    @swensosc
    swensosc committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    31585df View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2021

  1. fix solar normalization

    @swensosc
    swensosc committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    cf9f512 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2021

  1. add tdepth to nuopc

    @swensosc
    swensosc committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    3e52233 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2021

  1. add downscaling flag

    @swensosc
    swensosc committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    7df3dde View commit details
    Browse the repository at this point in the history

  2. add downscaling flag 

    Merge branch 'hillslope_hydrology' of github.com:swensosc/ctsm into hillslope_hydrology
    @swensosc
    swensosc committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    ffc3838 View commit details
    Browse the repository at this point in the history

  3. add stream channel variable

    @swensosc
    swensosc committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    90bfa0c View commit details
    Browse the repository at this point in the history

  4. add files

    @swensosc
    swensosc committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    3354cfe View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2021

  1. update Externals.cfg

    @swensosc
    swensosc committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    2ccca4e View commit details
    Browse the repository at this point in the history

  2. add fill value in histFileMod

    @swensosc
    swensosc committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    641b013 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2021

  1. add downscale_hillslope_meteorology flag to TopoMod

    @swensosc
    swensosc committed Sep 20, 2021
    Configuration menu
    Copy the full SHA
    81d4fb2 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. correct hillslope routing water balance

    @swensosc
    swensosc committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    6a9f979 View commit details
    Browse the repository at this point in the history

  2. move streamflow variable

    @swensosc
    swensosc committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    e8814ec View commit details
    Browse the repository at this point in the history

  3. add drain_perched term in lnd2atmMod

    @swensosc
    swensosc committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    e8d9c81 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2021

  1. merge lateral subsurface flow subroutines

    @swensosc
    swensosc committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    230b15c View commit details
    Browse the repository at this point in the history

  2. fix typo

    @swensosc
    swensosc committed Nov 16, 2021
    Configuration menu
    Copy the full SHA
    f64b69e View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. move InitHillslope before SoilStateInitTimeConst

    @swensosc
    swensosc committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    0f57012 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2021

  1. add downscaling flag to SurfaceAlbedoMod

    @swensosc
    swensosc committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    7309558 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. add coszen_grc restart field

    @swensosc
    swensosc committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    7bd8c92 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2022

  1. fix hillslope routing water balance

    @swensosc
    swensosc committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    d655c0c View commit details
    Browse the repository at this point in the history

  2. merge to main

    @swensosc
    swensosc committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    0655e12 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2022

  1. update hllslope_hydrology to master 

    Merge remote-tracking branch 'escomp/master' into merge_hillslope_hydrology
    @swensosc
    swensosc committed May 5, 2022
    Configuration menu
    Copy the full SHA
    f640751 View commit details
    Browse the repository at this point in the history

  2. correct frost table value

    @swensosc
    swensosc committed May 5, 2022
    Configuration menu
    Copy the full SHA
    edcf043 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2022

  1. fix inequality in perchedlateralflow

    @swensosc
    swensosc committed May 6, 2022
    Configuration menu
    Copy the full SHA
    7c20b41 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. Minor cleanup 

    Remove unused variables, clean up indentation, fix / add some comments,
remove some commented-out old lines of code.

The one change that actually changes any code is moving the calculations
of fsds_vis_d and fsds_nir_d a few lines down, back to where they used
to be, to keep them next to the related variables. From a read of the
surrounding code, this move looks safe.
    @billsacks
    billsacks committed May 13, 2022
    Configuration menu
    Copy the full SHA
    e1dc2ef View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. add namelist variables and remove omp directives

    @swensosc
    swensosc committed May 24, 2022
    Configuration menu
    Copy the full SHA
    48e3a51 View commit details
    Browse the repository at this point in the history

  2. merge with hillslope_hydrology 

    Merge branch 'hillslope_hydrology' of github.com:swensosc/ctsm into merge_hillslope_hydrology
    @swensosc
    swensosc committed May 24, 2022
    Configuration menu
    Copy the full SHA
    54545c0 View commit details
    Browse the repository at this point in the history

  3. remove origflag and fracice

    @swensosc
    swensosc committed May 24, 2022
    Configuration menu
    Copy the full SHA
    84f14ff View commit details
    Browse the repository at this point in the history

  4. clean up SoilHydrologyMod

    @swensosc
    swensosc committed May 24, 2022
    Configuration menu
    Copy the full SHA
    602eda0 View commit details
    Browse the repository at this point in the history

  5. remove hill_pftndx from column type

    @swensosc
    swensosc committed May 24, 2022
    Configuration menu
    Copy the full SHA
    4095d6c View commit details
    Browse the repository at this point in the history

  6. add endrun for streamflow_method

    @swensosc
    swensosc committed May 24, 2022
    Configuration menu
    Copy the full SHA
    286edbe View commit details
    Browse the repository at this point in the history

  7. Merge branch 'hillslope_hydrology' into hillslope_hydrology

    @swensosc
    swensosc authored May 24, 2022
    Configuration menu
    Copy the full SHA
    fc6e667 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #5 from billsacks/hillslope_hydrology 

    Minor cleanup
    @swensosc
    swensosc authored May 24, 2022
    Configuration menu
    Copy the full SHA
    c7caac7 View commit details
    Browse the repository at this point in the history

  9. Merge tag 'ctsm5.1.dev097' into hillslope_hydrology 

    Update ccs_config to fix issue on izumi and maybe elsewhere

Point to latest ccs_config

This fixes an issue I had on izumi where I couldn't run
anything (ESMCI/ccs_config_cesm#45).
    @billsacks
    billsacks committed May 24, 2022
    Configuration menu
    Copy the full SHA
    4060495 View commit details
    Browse the repository at this point in the history

  10. Merge commit 'c3108e8c7' into hillslope_hydrology 

    Merging with strategy 'ours' to discard the changes here: These
changes (all to SoilHydrologyMod.F90) already exist (in a slightly
different form) on the hillslope_hydrology branch.
    @billsacks
    billsacks committed May 24, 2022
    Configuration menu
    Copy the full SHA
    4593dff View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into hillslope_hydrology

    @billsacks
    billsacks committed May 24, 2022
    Configuration menu
    Copy the full SHA
    6800cc8 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. add downscaling identifiers to variables

    @swensosc
    swensosc committed May 25, 2022
    Configuration menu
    Copy the full SHA
    71083f4 View commit details
    Browse the repository at this point in the history

  2. reorder topo_col calculation

    @swensosc
    swensosc committed May 25, 2022
    Configuration menu
    Copy the full SHA
    14ffa23 View commit details
    Browse the repository at this point in the history

  3. change downscaling normalization weights

    @swensosc
    swensosc committed May 25, 2022
    Configuration menu
    Copy the full SHA
    84b7093 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2022

  1. add set_c2l_scale call to subgridAveMod routines

    @swensosc
    swensosc committed May 26, 2022
    Configuration menu
    Copy the full SHA
    90bbebd View commit details
    Browse the repository at this point in the history

  2. add check to CLMBuildNamelist.pm

    @swensosc
    swensosc committed May 26, 2022
    Configuration menu
    Copy the full SHA
    0017cc5 View commit details
    Browse the repository at this point in the history

  3. add namelist variables for pft distribution

    @swensosc
    swensosc committed May 26, 2022
    Configuration menu
    Copy the full SHA
    66e6fbc View commit details
    Browse the repository at this point in the history

  4. create setSoilLayerClass subroutine

    @swensosc
    swensosc committed May 26, 2022
    Configuration menu
    Copy the full SHA
    cb50d27 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2022

  1. modify solar radiation energy balance check

    @swensosc
    swensosc committed May 27, 2022
    Configuration menu
    Copy the full SHA
    c23fee1 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. fix circular dependency due to namelist

    @swensosc
    swensosc committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    e46c80a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. modify subgrid weights

    @swensosc
    swensosc committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    93d2e17 View commit details
    Browse the repository at this point in the history

  2. change gridcell average runoff calculation

    @swensosc
    swensosc committed Jun 3, 2022
    Configuration menu
    Copy the full SHA
    8fa6767 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. remove qdischarge from HillslopeUpdateStreamWater

    @swensosc
    swensosc committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    36627d8 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. minor cleanup

    @swensosc
    swensosc committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    014868e View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2022

  1. Remove build-namelist tests of origflag 

    origflag=1 is no longer supported. origflag=0 is now implicitly the case
all the time; the two failure tests of origflag=0 are already covered by
other failure tests ("Zeng w lower=flux", "Zeng w lower=zeroflux": those
simply set soilwater_movement_method=0 explicitly, whereas the tests I'm
removing have that implicit due to clm4_5 physics).
    @billsacks
    billsacks committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    1b029d0 View commit details
    Browse the repository at this point in the history

  2. Remove origflag=1 setting from oldhyd test

    @billsacks
    billsacks committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    9ff7241 View commit details
    Browse the repository at this point in the history

  3. Fix build-namelist test count 

    Fix for removal of the origflag tests
    @billsacks
    billsacks committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    c6f4441 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2022

  1. Get unit tests passing

    @billsacks
    billsacks committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    1b5a4b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

  1. Temporary workaround for bare land smb flux issue 

    Temporary workaround for #204 that
allows the error check to remain in place usually but still lets
hillslope hydrology runs pass.
    @billsacks
    billsacks committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    99cfb53 View commit details
    Browse the repository at this point in the history

  2. more minor fixes

    @swensosc
    swensosc committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    78cbfed View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from billsacks/hillslope_hydrology 

    Hillslope hydrology
    @swensosc
    swensosc authored Jul 18, 2022
    Configuration menu
    Copy the full SHA
    64ba19d View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. move initHillslope call earlier

    @swensosc
    swensosc committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    607ee4d View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. update patch%mxy

    @swensosc
    swensosc committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    c4d2037 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. fix circular dependency (use_fun)

    @swensosc
    swensosc committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    e4c79e6 View commit details
    Browse the repository at this point in the history

  2. remove comments

    @swensosc
    swensosc committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    569cbbd View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. move allocate statement in HillslopeHydrologyMod

    @swensosc
    swensosc committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    5a5ab1d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. fix linear soil profile slope

    @swensosc
    swensosc committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    96ded97 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. merge with main

    @swensosc
    swensosc committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    d658d57 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. minor cleanup

    @swensosc
    swensosc committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    61eb82f View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. add illumination threshold for solar downscaling

    @swensosc
    swensosc committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    3ef6829 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. no hillslope columns when lun%wtgcell is zero

    @swensosc
    swensosc committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    98636e8 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. write global indices

    @swensosc
    swensosc committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    00e71e1 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. add h_slope

    @swensosc
    swensosc committed May 15, 2023
    Configuration menu
    Copy the full SHA
    806c6f6 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. merge to main

    @swensosc
    swensosc committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    dde5250 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. back out surface water drainage change

    @swensosc
    swensosc committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    2d9cb4d View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. small fixes

    @swensosc
    swensosc committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3f4b9a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. back out two answer changers

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

  2. reintroduce if-block

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

Commits on Oct 4, 2023

  1. Merge tag 'ctsm5.1.dev142' into hillslope_hydrology-ssr 

    b4b changes to Python scripts, history lists, tech note, and clm_time_manager.

* Add system and unit tests for making fsurdat with all crops everywhere (#2081)
* Rework master_list* files etc. (#2087)
* Fixes to methane Tech Note (#2091)
* Add is_doy_in_interval() function (#2158)
* Avoid using subprocess.run() in FSURDATMODIFYCTSM (#2125)

Closes issues:
* Add unit test for making fsurdat with all crops everywhere (#2079)
* Rework master_list_(no)?fates.rst? (#2083)
* conda run -n can fail if a conda environment is already active (#2109)
* conda fails to load for SystemTests (#2111)
    @samsrabin
    samsrabin committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    595d95d View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. use find_k_max_indices in surfrdMod

    @swensosc
    swensosc committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    4708a4a View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Merge branch 'hillslope_hydrology' into hillslope_hydrology-ssr

    @samsrabin
    samsrabin committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    e1ce650 View commit details
    Browse the repository at this point in the history

  2. Whitespace alignment in CLMBuildNamelist.pm.

    @samsrabin
    samsrabin committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    d303ccb View commit details
    Browse the repository at this point in the history

  3. Remove redundant check in CLMBuildNamelist.pm.

    @samsrabin
    samsrabin committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    bd4a04e View commit details
    Browse the repository at this point in the history

  4. remove HillslopeDominantPft

    @swensosc
    swensosc committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    5491aae View commit details
    Browse the repository at this point in the history

  5. Do not allow use_hillslope with transient land cover change.

    @samsrabin
    samsrabin committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    79141f8 View commit details
    Browse the repository at this point in the history

  6. Compile fixes from merge of ctsm5.1.dev142.

    @samsrabin
    samsrabin committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    fa5161f View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Add Hillslope test.

    @samsrabin
    samsrabin committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    53b8719 View commit details
    Browse the repository at this point in the history

  2. Removed NTASKS=-2 from shell_commands.

    @samsrabin
    samsrabin committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    0e7a9a9 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. set c_dst

    @swensosc
    swensosc committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    dbf6845 View commit details
    Browse the repository at this point in the history

  2. move g assignment out of if-block

    @swensosc
    swensosc committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    226f038 View commit details
    Browse the repository at this point in the history

  3. revert last change; instead move forc_solar_col inside if-block

    @swensosc
    swensosc committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    e8af14d View commit details
    Browse the repository at this point in the history

  4. move g

    @swensosc
    swensosc committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    d06c3a5 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Merge branch 'hillslope_hydrology' into hillslope_hydrology-ssr

    @samsrabin
    samsrabin committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    89a5671 View commit details
    Browse the repository at this point in the history

  2. Update externals to work on Derecho.

    @samsrabin
    samsrabin committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    6efd50c View commit details
    Browse the repository at this point in the history

  3. Misc. whitespace fixes and reversions.

    @samsrabin
    samsrabin committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    c477363 View commit details
    Browse the repository at this point in the history

  4. Remove a commented-out bit.

    @samsrabin
    samsrabin committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    c7c8130 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge tag 'ctsm5.1.dev156' into hillslope_hydrology-ssr 

    Do not use Meier roughness by default, even with 5.1

ctsm5.1.dev155 had turned on Meier2022 surface roughness calculation by default for 5.1 compsets. Several bugs have recently emerged that were not caught by pre-merge testing, so this tag reverts that change. Thus, the ZengWang2007 method is default for all compsets again.

# Conflicts:
#	src/biogeochem/DryDepVelocity.F90
#	src/biogeophys/SurfaceAlbedoMod.F90
    @samsrabin
    samsrabin committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    7b77ae0 View commit details
    Browse the repository at this point in the history

  2. Use DIN_LOC_ROOT in Hillslope test.

    @samsrabin
    samsrabin committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    55124be View commit details
    Browse the repository at this point in the history

  3. More whitespace fixes/reversions.

    @samsrabin
    samsrabin committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    ce9ed80 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. merge to main

    @swensosc
    swensosc committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    50c0e7a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'escomp' into merge_hillslope_hydrology 

    merge to main
    @swensosc
    swensosc committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    989bcd3 View commit details
    Browse the repository at this point in the history

  3. merge to main

    @swensosc
    swensosc committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    c7c6602 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Merge branch 'hillslope_hydrology' into hillslope_hydrology-ssr

    @samsrabin
    samsrabin committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    a61b080 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. add check for stream channel

    @swensosc
    swensosc committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    44d37e7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'swensosc/hillslope_hydrology' into hill… 

    …slope_hydrology-ssr
    @samsrabin
    samsrabin committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    efbeef4 View commit details
    Browse the repository at this point in the history

  3. Hillslope test: Use fixed fsurdat.

    @samsrabin
    samsrabin committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    54f765a View commit details
    Browse the repository at this point in the history

  4. Remove EOL whitespace from HillslopeHydrologyMod.

    @samsrabin
    samsrabin committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    55e14eb View commit details
    Browse the repository at this point in the history

  5. Merge tag 'ctsm5.1.dev164' into hillslope_hydrology-ssr 

    Compatibility and tests for FATES 2-Stream

This set of changes enables compatibility and testing for FATES two-stream radiation scattering. Two stream radiation is selected by setting the FATES parameter file variable fates_rad_mod = 2.  This is an alternative to Norman radiation.  The FATES default radiation model will continue to be Norman for the time being, but is expected to transition to two-stream in the near future.
    @samsrabin
    samsrabin committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    07969f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Alignment changes in HillslopeHydrologyMod.

    @samsrabin
    samsrabin committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c5be402 View commit details
    Browse the repository at this point in the history

  2. Check for unrecognized pft_distribution_method in surfrd_hillslope(). 

    This ensures that any methods added in the future are handled here.
    @samsrabin
    samsrabin committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    51c95e5 View commit details
    Browse the repository at this point in the history

  3. Error on unhandled soil_profile_method in SetHillslopeSoilThickness().

    @samsrabin
    samsrabin committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    41a7e0d View commit details
    Browse the repository at this point in the history

  4. Fix logic for missing h_bedrock error check.

    @samsrabin
    samsrabin committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    b1433a0 View commit details
    Browse the repository at this point in the history

  5. Remove check_npatches, which was hard-coded true.

    @samsrabin
    samsrabin committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    8abcb55 View commit details
    Browse the repository at this point in the history

  6. Un-nest "if (masterproc)" in HillslopeHydrologyMod.

    @samsrabin
    samsrabin committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    00d2b1e View commit details
    Browse the repository at this point in the history

  7. HillslopeHydrologyMod: Consistent whitespace in if statements.

    @samsrabin
    samsrabin committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    8f3d6ab View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Check for unrecognized pft_distribution_method in InitHillslope(). 

    This ensures that any methods added in the future are handled here.
    @samsrabin
    samsrabin committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    04bceb0 View commit details
    Browse the repository at this point in the history

  2. Point Hillslope test at testdata/ instead of surfdata/.

    @samsrabin
    samsrabin committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    12721d4 View commit details
    Browse the repository at this point in the history

  3. Add Hillslope_DominantPftUniform and Hillslope_SoilProfileLinear test… 

    …mods.
    @samsrabin
    samsrabin committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    4d0da3d View commit details
    Browse the repository at this point in the history

  4. Add optional do_not_collapse arg to collapse_to_dominant(). 

    This logical array, where .true. will prevent individual gridcells from being collapsed. Includes unit testing.
    @samsrabin
    samsrabin committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    03cc0f2 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Use collapse_to_dominant() in surfrd_hillslope(). 

    For the Uniform and DominantPftLowland values of hillslope_pft_distribution_method
    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    02d2cf7 View commit details
    Browse the repository at this point in the history

  2. Functionize & unit-test HillslopeSoilThicknessProfile_linear(). 

    Squash-"merge" of hillslope_hydrology-functionize_linear into hillslope_hydrology-ssr3
    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    fd5ed37 View commit details
    Browse the repository at this point in the history

  3. Remove a leftover troubleshooting write().

    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    6513894 View commit details
    Browse the repository at this point in the history

  4. Exit early from loop in HillslopeSoilThicknessProfile_linear().

    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    b84720c View commit details
    Browse the repository at this point in the history

  5. Better unit testing of HillslopeSoilThicknessProfile_linear().

    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    b426ce1 View commit details
    Browse the repository at this point in the history

  6. Cleanup in HillslopeHydrologyUtils test.

    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    65ac615 View commit details
    Browse the repository at this point in the history

  7. Rename to test_collapse_to_dom_do_not_collapse.

    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    689a550 View commit details
    Browse the repository at this point in the history

  8. Add test_collapse_to_dom_do_not_collapse_present_false.

    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    1c8b468 View commit details
    Browse the repository at this point in the history

  9. Fix expected vs. actual in assertEqual() in test_surfrdUtils.

    @samsrabin
    samsrabin committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    0ce76f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. Delete 'found on surface data set' msgs from HillslopeHydrologyMod.

    @samsrabin
    samsrabin committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    c36280c View commit details
    Browse the repository at this point in the history

  2. Reduce nesting in HillslopeHydrologyMod.

    @samsrabin
    samsrabin committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    0df44c9 View commit details
    Browse the repository at this point in the history

  3. Remove if (masterproc) conditions on error checks outside initializat… 

    …ion.
    @samsrabin
    samsrabin committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    9c0123c View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. Delete development testmods

    @samsrabin
    samsrabin committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    a2b5788 View commit details
    Browse the repository at this point in the history

  2. Fully specify namelist settings for Hillslope test.

    @samsrabin
    samsrabin committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    83e0bec View commit details
    Browse the repository at this point in the history

  3. Add 3 new hillslope testmods: 

    (The latter 2 have no theme; they are intended to exercise all options.)
* HillslopeFromFile
* HillslopeC
* HillslopeD
    @samsrabin
    samsrabin committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    b026e2e View commit details
    Browse the repository at this point in the history

  4. Add 4 hillslope tests to testlist_clm.xml: 

    Suites aux_clm and hillslope:
* ERP_D_P64x2_Ld10.f10_f10_mg37.I2000Clm51Bgc.derecho_intel.clm-Hillslope
* SMS_D_Mmpi-serial_Ld5.5x5_amazon.I1850Clm51Bgc.derecho_gnu.clm-HillslopeC
* SMS_D_Ld3.f10_f10_mg37.I2000Clm51Bgc.izumi_nag.clm-HillslopeD

Suite hillslope:
* SMS_D_Ld3.f10_f10_mg37.I1850Clm51Bgc.derecho_intel.clm-HillslopeFromFile
    @samsrabin
    samsrabin committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    ed5e0ae View commit details
    Browse the repository at this point in the history

  5. Change an intent(out) to inout, satisfying nag test.

    @samsrabin
    samsrabin committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    dbae8b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Merge pull request #9 from samsrabin/hillslope_hydrology-ssr4 

    Hillslope hydrology pre-merge changes
    @swensosc
    swensosc authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    220f314 View commit details
    Browse the repository at this point in the history

  2. make variable names consistent

    @swensosc
    swensosc committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    14f86af View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge pull request #1715 from swensosc/hillslope_hydrology 

    Hillslope hydrology
    @samsrabin
    samsrabin authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    b6280df View commit details
    Browse the repository at this point in the history

  2. Hillslope tests now use v1.3 surface dataset.

    @samsrabin
    samsrabin committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    9f46462 View commit details
    Browse the repository at this point in the history

  3. Update ChangeLog and ChangeSum.

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