Code

Hillslope merge#2390

Code

Merged

samsrabin merged 192 commits intomasterESCOMP/CTSM:masterfrom hillslope-mergeESCOMP/CTSM:hillslope-mergeCopy head branch name to clipboardFeb 29, 2024

+3,901-973

Commits

Commits on Jan 9, 2018

• hillslope_hydrology_n01_clm4_5_14_r223

  Show description for 52d5058
  

  swensosc

  authored and

  bjandre

  committed
  52d5058

• hillslope_hydrology_n02_clm4_5_14_r223

  Show description for 1af8d11
  

  swensosc

  authored and

  bjandre

  committed
  1af8d11

• hillslope_hydrology_n03_clm4_5_14_r223

  Show description for ee1fc0e
  

  swensosc

  authored and

  bjandre

  committed
  ee1fc0e

• hillslope_hydrology_n04_clm4_5_14_r226

  Show description for 2d07001
  

  swensosc

  authored and

  bjandre

  committed
  2d07001

• hillslope_hydrology_n05_clm4_5_14_r226

  Show description for fa7b4ec
  

  swensosc

  authored and

  bjandre

  committed
  fa7b4ec

• hillslope_hydrology_n06_clm4_5_14_r226

  Show description for 73b2833
  

  swensosc

  authored and

  bjandre

  committed
  73b2833

• hillslope_hydrology_n07_clm4_5_14_r226

  Show description for 69d35dd
  

  swensosc

  authored and

  bjandre

  committed
  69d35dd

• hillslope_hydrology_n08_clm4_5_14_r226

  Show description for de6ce31
  

  swensosc

  authored and

  bjandre

  committed
  de6ce31

• hillslope_hydrology_n09_clm4_5_14_r226

  Show description for 48f09fc
  

  swensosc

  authored and

  bjandre

  committed
  48f09fc

• hillslope_hydrology_n09_clm4_5_18_r270

  Show description for 78096d5
  

  billsacks

  authored and

  bjandre

  committed
  78096d5

• hillslope_hydrology_n10_clm4_5_18_r270

  Show description for 0faafb1
  

  billsacks

  authored and

  bjandre

  committed
  0faafb1

Commits on Jan 12, 2018

• Merge tag 'clm4_5_18_r270' into hillslope_hydrology

  Show description for 031da7a
  billsacks

  committed
  031da7a

Commits on Jan 17, 2018

• Merge branch 'andre-standalone-dev' into hillslope_hydrology

  Show description for c1b7412
  billsacks

  committed
  c1b7412

• Merge branch 'andre-standalone-dev' into hillslope_hydrology

  billsacks

  committed
  9c3d3ce

Commits on Mar 12, 2018

• Add capability to read in hillslope geomorphology from surface data

  Show description for dbbe17a
  swensosc

  committed
  dbbe17a

Commits on Mar 14, 2018

• initial implementation of slope/aspect effects on incident direct solar radiation

  swensosc

  committed
  7a84847

Commits on Aug 27, 2018

• correct col_ndx assignment

  swensosc

  committed
  be27720

Commits on Aug 30, 2018

• read hillslope geomorphological parametes from file

  swensosc

  committed
  6487698

• merged w/ escomp/master

  swensosc

  committed
  c747ee1

• merge w/ initial isotope refactoring

  swensosc

  committed
  9ee73ba

Commits on Sep 11, 2018

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

  swensosc

  committed
  7310baa

• add tdepth to lnd

  swensosc

  committed
  49010fa

• fix calculattion of col%colu

  swensosc

  committed
  4b9ff7b

Commits on Oct 5, 2018

• add river depth to coupler

  swensosc

  committed
  6019ade

Commits on Oct 18, 2018

• refactor SoilHydrologyMod for case of subsurface backflow

  swensosc

  committed
  0c967fb

Commits on Oct 19, 2018

• add stream depth

  swensosc

  committed
  2d352c2

Commits on Oct 23, 2018

• add ncol minimum in subgridMod

  swensosc

  committed
  6b32610

• merge with hillslope_hydrology

  swensosc

  committed
  3bd204b

Commits on Oct 24, 2018

• fix tdepth

  swensosc

  committed
  51247fa

• fix tdepth

  swensosc

  committed
  bac3e39

Commits on Mar 21, 2019

• merge to master

  swensosc

  committed
  c6be77e

Commits on Apr 3, 2019

• update externals to point to hillslope_hydrology cime and mosart branches

  swensosc

  committed
  77e1cd3

• update CLMBuildNamelist.pm for hillslope_hydrology_inparm

  swensosc

  committed
  b2e4b74

Commits on Apr 4, 2019

• initialize column level direct solar forcing

  swensosc

  committed
  8387050

Commits on Apr 21, 2020

• remove analytical hillslope methods

  swensosc

  committed
  5f54a18

• merge to master

  swensosc

  committed
  6a00ef0

Commits on Apr 22, 2020

• minor cleanup

  swensosc

  committed
  151a474

Commits on Apr 23, 2020

• fix bug in hillslope_area calculation

  swensosc

  committed
  22a433b

• add downscaling in TopoMod

  swensosc

  committed
  f69d6e0

Commits on Apr 24, 2020

• remove urban from endrun message

  swensosc

  committed
  e452966

Commits on Sep 4, 2020

• fix wtlunit recalculation

  swensosc

  committed
  4ee9ace

Commits on Sep 9, 2020

• convert arrayl to integer in surfrdMod

  swensosc

  committed
  11a2911

Commits on Oct 9, 2020

• fix elevation used in TopoMod

  swensosc

  committed
  7fbfe38

Commits on Nov 18, 2020

• add hillslope bedrock field

  swensosc

  committed
  3a50c6a

Commits on Mar 8, 2021

• merge to master

  swensosc

  committed
  556dacc

Commits on Mar 9, 2021

• merge to master

  swensosc

  committed
  b5e62e1

• add precipitation downscaling

  swensosc

  committed
  fbbe876

Commits on Mar 10, 2021

• add conditional to histFileMod

  swensosc

  committed
  d86736e

Commits on Mar 18, 2021

• enable fates multi-column restarts

  swensosc

  committed
  ae6085e

• add units in ColumnType

  swensosc

  committed
  9dd871b

Commits on Mar 23, 2021

• add stream channel to ctsm

  swensosc

  committed
  069c910

Commits on Mar 24, 2021

• add to gridcell balance check

  swensosc

  committed
  cbd6341

Commits on Mar 31, 2021

• fix wtlunit

  swensosc

  committed
  2bf70fd

• scale qdischarge

  swensosc

  committed
  03967e0

• minor formatting

  swensosc

  committed
  5940bd2

Commits on Jul 14, 2021

• add use_hillslope_routing namelist variable

  swensosc

  committed
  3dea895

• re-add tdepth

  swensosc

  committed
  98d1c45

Commits on Jul 19, 2021

• initialize stream_water_lun

  swensosc

  committed
  31585df

Commits on Jul 21, 2021

• fix solar normalization

  swensosc

  committed
  cf9f512

Commits on Sep 3, 2021

• add tdepth to nuopc

  swensosc

  committed
  3e52233

Commits on Sep 7, 2021

• add downscaling flag

  swensosc

  committed
  7df3dde

• add downscaling flag

  Show description for ffc3838
  swensosc

  committed
  ffc3838

• add stream channel variable

  swensosc

  committed
  90bfa0c

• add files

  swensosc

  committed
  3354cfe

Commits on Sep 8, 2021

• update Externals.cfg

  swensosc

  committed
  2ccca4e

• add fill value in histFileMod

  swensosc

  committed
  641b013

Commits on Sep 20, 2021

• add downscale_hillslope_meteorology flag to TopoMod

  swensosc

  committed
  81d4fb2

Commits on Sep 23, 2021

• correct hillslope routing water balance

  swensosc

  committed
  6a9f979

• move streamflow variable

  swensosc

  committed
  e8814ec

• add drain_perched term in lnd2atmMod

  swensosc

  committed
  e8d9c81

Commits on Nov 16, 2021

• merge lateral subsurface flow subroutines

  swensosc

  committed
  230b15c

• fix typo

  swensosc

  committed
  f64b69e

Commits on Dec 3, 2021

• move InitHillslope before SoilStateInitTimeConst

  swensosc

  committed
  0f57012

Commits on Dec 8, 2021

• add downscaling flag to SurfaceAlbedoMod

  swensosc

  committed
  7309558

Commits on Jan 6, 2022

• add coszen_grc restart field

  swensosc

  committed
  7bd8c92

Commits on Apr 15, 2022

• fix hillslope routing water balance

  swensosc

  committed
  d655c0c

• merge to main

  swensosc

  committed
  0655e12

Commits on May 5, 2022

• update hllslope_hydrology to master

  Show description for f640751
  swensosc

  committed
  f640751

• correct frost table value

  swensosc

  committed
  edcf043

Commits on May 6, 2022

• fix inequality in perchedlateralflow

  swensosc

  committed
  7c20b41

Commits on May 13, 2022

• Minor cleanup

  Show description for e1dc2ef
  billsacks

  committed
  e1dc2ef

Commits on May 24, 2022

• add namelist variables and remove omp directives

  swensosc

  committed
  48e3a51

• merge with hillslope_hydrology

  Show description for 54545c0
  swensosc

  committed
  54545c0

• remove origflag and fracice

  swensosc

  committed
  84f14ff

• clean up SoilHydrologyMod

  swensosc

  committed
  602eda0

• remove hill_pftndx from column type

  swensosc

  committed
  4095d6c

• add endrun for streamflow_method

  swensosc

  committed
  286edbe

• Merge branch 'hillslope_hydrology' into hillslope_hydrology

  swensosc

  authored
  fc6e667

• Merge pull request #5 from billsacks/hillslope_hydrology

  Show description for c7caac7
  swensosc

  authored
  c7caac7

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

  Show description for 4060495
  billsacks

  committed
  4060495

• Merge commit 'c3108e8c7' into hillslope_hydrology

  Show description for 4593dff
  billsacks

  committed
  4593dff

• Merge branch 'master' into hillslope_hydrology

  billsacks

  committed
  6800cc8

Commits on May 25, 2022

• add downscaling identifiers to variables

  swensosc

  committed
  71083f4

• reorder topo_col calculation

  swensosc

  committed
  14ffa23

• change downscaling normalization weights

  swensosc

  committed
  84b7093

Commits on May 26, 2022

• add set_c2l_scale call to subgridAveMod routines

  swensosc

  committed
  90bbebd

• add check to CLMBuildNamelist.pm

  swensosc

  committed
  0017cc5

• add namelist variables for pft distribution

  swensosc

  committed
  66e6fbc

• create setSoilLayerClass subroutine

  swensosc

  committed
  cb50d27

Commits on May 27, 2022

• modify solar radiation energy balance check

  swensosc

  committed
  c23fee1

Commits on Jun 1, 2022

• fix circular dependency due to namelist

  swensosc

  committed
  e46c80a

Commits on Jun 3, 2022

• modify subgrid weights

  swensosc

  committed
  93d2e17

• change gridcell average runoff calculation

  swensosc

  committed
  8fa6767

Commits on Jun 7, 2022

• remove qdischarge from HillslopeUpdateStreamWater

  swensosc

  committed
  36627d8

Commits on Jul 15, 2022

• minor cleanup

  swensosc

  committed
  014868e

Commits on Jul 16, 2022

• Remove build-namelist tests of origflag

  Show description for 1b029d0
  billsacks

  committed
  1b029d0

• Remove origflag=1 setting from oldhyd test

  billsacks

  committed
  9ff7241

• Fix build-namelist test count

  Show description for c6f4441
  billsacks

  committed
  c6f4441

Commits on Jul 17, 2022

• Get unit tests passing

  billsacks

  committed
  1b5a4b2

Commits on Jul 18, 2022

• Temporary workaround for bare land smb flux issue

  Show description for 99cfb53
  billsacks

  committed
  99cfb53

• more minor fixes

  swensosc

  committed
  78cbfed

• Merge pull request #6 from billsacks/hillslope_hydrology

  Show description for 64ba19d
  swensosc

  authored
  64ba19d

Commits on Jul 21, 2022

• move initHillslope call earlier

  swensosc

  committed
  607ee4d

Commits on Jul 22, 2022

• update patch%mxy

  swensosc

  committed
  c4d2037

Commits on Aug 4, 2022

• fix circular dependency (use_fun)

  swensosc

  committed
  e4c79e6

• remove comments

  swensosc

  committed
  569cbbd

Commits on Aug 9, 2022

• move allocate statement in HillslopeHydrologyMod

  swensosc

  committed
  5a5ab1d

Commits on Aug 26, 2022

• fix linear soil profile slope

  swensosc

  committed
  96ded97

Commits on Sep 14, 2022

• merge with main

  swensosc

  committed
  d658d57

Commits on Sep 15, 2022

• minor cleanup

  swensosc

  committed
  61eb82f

Commits on Nov 11, 2022

• add illumination threshold for solar downscaling

  swensosc

  committed
  3ef6829

Commits on Nov 18, 2022

• no hillslope columns when lun%wtgcell is zero

  swensosc

  committed
  98636e8

Commits on Feb 3, 2023

• write global indices

  swensosc

  committed
  00e71e1

Commits on May 15, 2023

• add h_slope

  swensosc

  committed
  806c6f6

Commits on Jul 20, 2023

• merge to main

  swensosc

  committed
  dde5250

Commits on Aug 21, 2023

• back out surface water drainage change

  swensosc

  committed
  2d9cb4d

Commits on Aug 22, 2023

• small fixes

  swensosc

  committed
  3f4b9a8

Commits on Sep 11, 2023

• back out two answer changers

  swensosc

  committed
  3034da1

• reintroduce if-block

  swensosc

  committed
  5924c68

Commits on Oct 4, 2023

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

  Show description for 595d95d
  samsrabin

  committed
  595d95d

Commits on Oct 5, 2023

• use find_k_max_indices in surfrdMod

  swensosc

  committed
  4708a4a

Commits on Oct 6, 2023

• Merge branch 'hillslope_hydrology' into hillslope_hydrology-ssr

  samsrabin

  committed
  e1ce650

• Whitespace alignment in CLMBuildNamelist.pm.

  samsrabin

  committed
  d303ccb

• Remove redundant check in CLMBuildNamelist.pm.

  samsrabin

  committed
  bd4a04e

• remove HillslopeDominantPft

  swensosc

  committed
  5491aae

• Do not allow use_hillslope with transient land cover change.

  samsrabin

  committed
  79141f8

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

  samsrabin

  committed
  fa5161f

Commits on Nov 3, 2023

• Add Hillslope test.

  samsrabin

  committed
  53b8719

• Removed NTASKS=-2 from shell_commands.

  samsrabin

  committed
  0e7a9a9

Commits on Nov 28, 2023

• set c_dst

  swensosc

  committed
  dbf6845

• move g assignment out of if-block

  swensosc

  committed
  226f038

• revert last change; instead move forc_solar_col inside if-block

  swensosc

  committed
  e8af14d

• move g

  swensosc

  committed
  d06c3a5

Commits on Dec 1, 2023

• Merge branch 'hillslope_hydrology' into hillslope_hydrology-ssr

  samsrabin

  committed
  89a5671

• Update externals to work on Derecho.

  samsrabin

  committed
  6efd50c

• Misc. whitespace fixes and reversions.

  samsrabin

  committed
  c477363

• Remove a commented-out bit.

  samsrabin

  committed
  c7c8130

Commits on Dec 4, 2023

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

  Show description for 7b77ae0
  samsrabin

  committed
  7b77ae0

• Use DIN_LOC_ROOT in Hillslope test.

  samsrabin

  committed
  55124be

• More whitespace fixes/reversions.

  samsrabin

  committed
  ce9ed80

Commits on Dec 29, 2023

• merge to main

  swensosc

  committed
  50c0e7a

• Merge remote-tracking branch 'escomp' into merge_hillslope_hydrology

  Show description for 989bcd3
  swensosc

  committed
  989bcd3

• merge to main

  swensosc

  committed
  c7c6602

Commits on Jan 8, 2024

• Merge branch 'hillslope_hydrology' into hillslope_hydrology-ssr

  samsrabin

  committed
  a61b080

Commits on Jan 19, 2024

• add check for stream channel

  swensosc

  committed
  44d37e7

• Merge remote-tracking branch 'swensosc/hillslope_hydrology' into hillslope_hydrology-ssr

  samsrabin

  committed
  efbeef4

• Hillslope test: Use fixed fsurdat.

  samsrabin

  committed
  54f765a

• Remove EOL whitespace from HillslopeHydrologyMod.

  samsrabin

  committed
  55e14eb

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

  Show description for 07969f0
  samsrabin

  committed
  07969f0

Commits on Jan 22, 2024

• Alignment changes in HillslopeHydrologyMod.

  samsrabin

  committed
  c5be402

• Check for unrecognized pft_distribution_method in surfrd_hillslope().

  Show description for 51c95e5
  samsrabin

  committed
  51c95e5

• Error on unhandled soil_profile_method in SetHillslopeSoilThickness().

  samsrabin

  committed
  41a7e0d

• Fix logic for missing h_bedrock error check.

  samsrabin

  committed
  b1433a0

• Remove check_npatches, which was hard-coded true.

  samsrabin

  committed
  8abcb55

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

  samsrabin

  committed
  00d2b1e

• HillslopeHydrologyMod: Consistent whitespace in if statements.

  samsrabin

  committed
  8f3d6ab

Commits on Jan 24, 2024

• Check for unrecognized pft_distribution_method in InitHillslope().

  Show description for 04bceb0
  samsrabin

  committed
  04bceb0

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

  samsrabin

  committed
  12721d4

• Add Hillslope_DominantPftUniform and Hillslope_SoilProfileLinear testmods.

  samsrabin

  committed
  4d0da3d

• Add optional do_not_collapse arg to collapse_to_dominant().

  Show description for 03cc0f2
  samsrabin

  committed
  03cc0f2

Commits on Jan 26, 2024

• Use collapse_to_dominant() in surfrd_hillslope().

  Show description for 02d2cf7
  samsrabin

  committed
  02d2cf7

• Functionize & unit-test HillslopeSoilThicknessProfile_linear().

  Show description for fd5ed37
  samsrabin

  committed
  fd5ed37

• Remove a leftover troubleshooting write().

  samsrabin

  committed
  6513894

• Exit early from loop in HillslopeSoilThicknessProfile_linear().

  samsrabin

  committed
  b84720c

• Better unit testing of HillslopeSoilThicknessProfile_linear().

  samsrabin

  committed
  b426ce1

• Cleanup in HillslopeHydrologyUtils test.

  samsrabin

  committed
  65ac615

• Rename to test_collapse_to_dom_do_not_collapse.

  samsrabin

  committed
  689a550

• Add test_collapse_to_dom_do_not_collapse_present_false.

  samsrabin

  committed
  1c8b468

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

  samsrabin

  committed
  0ce76f0

Commits on Jan 27, 2024

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

  samsrabin

  committed
  c36280c

• Reduce nesting in HillslopeHydrologyMod.

  samsrabin

  committed
  0df44c9

• Remove if (masterproc) conditions on error checks outside initialization.

  samsrabin

  committed
  9c0123c

Commits on Jan 29, 2024

• Delete development testmods

  samsrabin

  committed
  a2b5788

• Fully specify namelist settings for Hillslope test.

  samsrabin

  committed
  83e0bec

• Add 3 new hillslope testmods:

  Show description for b026e2e
  samsrabin

  committed
  b026e2e

• Add 4 hillslope tests to testlist_clm.xml:

  Show description for ed5e0ae
  samsrabin

  committed
  ed5e0ae

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

  samsrabin

  committed
  dbae8b6

Commits on Feb 7, 2024

• Merge pull request #9 from samsrabin/hillslope_hydrology-ssr4

  Show description for 220f314
  swensosc

  authored
  220f314

• make variable names consistent

  swensosc

  committed
  14f86af

Commits on Feb 28, 2024

• Merge pull request #1715 from swensosc/hillslope_hydrology

  Show description for b6280df
  samsrabin

  authored
  b6280df

• Hillslope tests now use v1.3 surface dataset.

  samsrabin

  committed
  9f46462

• Update ChangeLog and ChangeSum.

  samsrabin

  committed
  c222737