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

Conversation

samsrabin
Copy link
Collaborator

See #1715. This makes one minor change and updates ChangeLog/Sum.

swensosc and others added 30 commits January 8, 2018 21:32
@swensosc @bjandre
hillslope_hydrology_n01_clm4_5_14_r223
52d5058 
first set of changes for hillslope hydrology global implementation
@swensosc @bjandre
hillslope_hydrology_n02_clm4_5_14_r223
1af8d11 
added new routines
@swensosc @bjandre
hillslope_hydrology_n03_clm4_5_14_r223
ee1fc0e 
removed intials
@swensosc @bjandre
hillslope_hydrology_n04_clm4_5_14_r226
2d07001 
merged to r226
@swensosc @bjandre
hillslope_hydrology_n05_clm4_5_14_r226
fa7b4ec 
added hillslope factory modules
@swensosc @bjandre
hillslope_hydrology_n06_clm4_5_14_r226
73b2833 
fixed positive drainage in soilhydrologymod
@swensosc @bjandre
hillslope_hydrology_n07_clm4_5_14_r226
69d35dd 
fixed patch%column assinment in histfilemod
@swensosc @bjandre
hillslope_hydrology_n08_clm4_5_14_r226
de6ce31 
added getglobalindex to histfilemod
@swensosc @bjandre
hillslope_hydrology_n09_clm4_5_14_r226
48f09fc 
update SoilHydrology
@billsacks @bjandre
hillslope_hydrology_n09_clm4_5_18_r270
78096d5 
Update to clm4_5_18_r270
@billsacks @bjandre
hillslope_hydrology_n10_clm4_5_18_r270
0faafb1 
break long line, needed for nag
@billsacks
Merge tag 'clm4_5_18_r270' into hillslope_hydrology
031da7a 
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
Merge branch 'andre-standalone-dev' into hillslope_hydrology
c1b7412 
Will allow running from a standalone checkout
@billsacks
Merge branch 'andre-standalone-dev' into hillslope_hydrology
9c3d3ce
@swensosc
Add capability to read in hillslope geomorphology from surface data
dbbe17a 
file.
@swensosc
initial implementation of slope/aspect effects on incident direct sol…
7a84847 
…ar radiation
@swensosc
correct col_ndx assignment
be27720
@swensosc
read hillslope geomorphological parametes from file
6487698
@swensosc
merged w/ escomp/master
c747ee1
@swensosc
merge w/ initial isotope refactoring
9ee73ba
@swensosc
add stream depth from routing model; note, requires cime/mosart changes
7310baa
@swensosc
add tdepth to lnd
49010fa
@swensosc
fix calculattion of col%colu
4b9ff7b
@swensosc
add river depth to coupler
6019ade
@swensosc
refactor SoilHydrologyMod for case of subsurface backflow
0c967fb
@swensosc
add stream depth
2d352c2
@swensosc
add ncol minimum in subgridMod
6b32610
@swensosc
merge with hillslope_hydrology
3bd204b
@swensosc
fix tdepth
51247fa
@swensosc
fix tdepth
bac3e39
samsrabin and others added 20 commits January 26, 2024 14:46
@samsrabin
Functionize & unit-test HillslopeSoilThicknessProfile_linear().
fd5ed37 
Squash-"merge" of hillslope_hydrology-functionize_linear into hillslope_hydrology-ssr3
@samsrabin
Remove a leftover troubleshooting write().
6513894
@samsrabin
Exit early from loop in HillslopeSoilThicknessProfile_linear().
b84720c
@samsrabin
Better unit testing of HillslopeSoilThicknessProfile_linear().
b426ce1
@samsrabin
Cleanup in HillslopeHydrologyUtils test.
65ac615
@samsrabin
Rename to test_collapse_to_dom_do_not_collapse.
689a550
@samsrabin
Add test_collapse_to_dom_do_not_collapse_present_false.
1c8b468
@samsrabin
Fix expected vs. actual in assertEqual() in test_surfrdUtils.
0ce76f0
@samsrabin
Delete 'found on surface data set' msgs from HillslopeHydrologyMod.
c36280c
@samsrabin
Reduce nesting in HillslopeHydrologyMod.
0df44c9
@samsrabin
Remove if (masterproc) conditions on error checks outside initializat…
9c0123c 
…ion.
@samsrabin
Delete development testmods
a2b5788
@samsrabin
Fully specify namelist settings for Hillslope test.
83e0bec
@samsrabin
Add 3 new hillslope testmods:
b026e2e 
(The latter 2 have no theme; they are intended to exercise all options.)
* HillslopeFromFile
* HillslopeC
* HillslopeD
@samsrabin
Add 4 hillslope tests to testlist_clm.xml:
ed5e0ae 
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
Change an intent(out) to inout, satisfying nag test.
dbae8b6
@swensosc
Merge pull request #9 from samsrabin/hillslope_hydrology-ssr4
220f314 
Hillslope hydrology pre-merge changes
@swensosc
make variable names consistent
14f86af
@samsrabin
Merge pull request #1715 from swensosc/hillslope_hydrology
b6280df 
Hillslope hydrology
@samsrabin
Hillslope tests now use v1.3 surface dataset.
9f46462
@samsrabin samsrabin requested a review from ekluzek February 28, 2024 18:01
@samsrabin samsrabin self-assigned this Feb 28, 2024
@ekluzek ekluzek added enhancement new capability or improved behavior of existing capability tag: enh - new science size: large Large project that will take a few weeks or more labels Feb 28, 2024
ekluzek
ekluzek approved these changes Feb 28, 2024
View reviewed changes
Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The approvals for this are really happening in #1715. And this has been extensively been looked at by others. This is just bringing in the main parts of Hilslope there, while approval and other smaller changes happen in #1715.

So I am approving this as is.

@samsrabin samsrabin merged commit 07051e3 into master Feb 29, 2024
3 checks passed
@samsrabin samsrabin deleted the hillslope-merge branch February 29, 2024 05:21
@samsrabin samsrabin added the science Enhancement to or bug impacting science label Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekluzek ekluzek ekluzek approved these changes

Assignees

@samsrabin samsrabin

Labels
enhancement new capability or improved behavior of existing capability science Enhancement to or bug impacting science size: large Large project that will take a few weeks or more
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@samsrabin @ekluzek @swensosc @billsacks