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 hydrology pre-merge changes #9

Merged
merged 287 commits into from
Feb 7, 2024
Merged

Hillslope hydrology pre-merge changes #9

merged 287 commits into from
Feb 7, 2024

Conversation

samsrabin
Copy link

@samsrabin samsrabin commented Jan 26, 2024 •
edited
Loading

Description of changes

@swensosc, this PR contains all the changes I'm requesting before we bring hillslopes into the master CTSM branch (ESCOMP#1715). It's a work in progress for now, but should be ready soon. Let me know if you'd like me to walk you through my changes.

Major

  • Update to ctsm5.1.dev164
  • Functionize and unit-test Linear hillslope_pft_distribution_method (fd5ed37)
  • Use collapse_to_dominant() for Uniform and DominantPftLowland hillslope_pft_distribution_method, extending it to allow only some gridcells to get collapsed (02d2cf7)

Minor

  • Add Hillslope testmods
  • Add Hillslope tests to aux_clm and new hillslope test suite (ed5e0ae)
  • Remove a redundant check in CLMBuildNamelist.pm (bd4a04e)
  • Do not allow use_hillslope with transient land cover change (79141f8)
  • Fix logic for missing h_bedrock error check (b1433a0)

Trivial

  • Remove some commented-out code
  • Miscellaneous whitespace and style improvements

Specific notes

Contributors other than yourself, if any: None

Are answers expected to change (and if so in what way)? Yes, but only roundoff-level, and only with some options.

Any User Interface Changes (namelist or namelist defaults changes)? No

Testing performed, if any:

  • Functionizing HillslopeSoilThicknessProfile_linear() caused no diffs
  • Using collapse_to_dominant for pft_uniform_dominant_pft and pft_lowland_dominant_pft caused only roundoff-level diffs
  • New testmods (and tests added to CLM test suites) work.

@samsrabin
Add NYRS_CROP_ACTIVE history variable.
8197954 
This necessitates nyrs_crop_active being changed from integer to real(r8).
@samsrabin
Merge branch 'master-NYRS_CROP_ACTIVE' into refactor-crop-gdd-runmeans
b693456
@samsrabin
Run fixes.
4308802
@samsrabin
Only call tillage_init_century() if doing tillage.
6c0049a
@samsrabin
Allow tillage with FATES.
e85505e 
Still won't work with use_crop false. FATES handles coarse woody debris separately, but I haven't added handling of that, so implicitly tillage just doesn't affect CWD.
@samsrabin
Added note about GDP dependence in old code.
d144df9
@samsrabin
Reorder tillage_mults_allphases fill for consistency.
44eeaf7
@samsrabin
Removed an old comment in TillageMod.
35b7f23
@samsrabin
TillageMod now has its own copies of indices for soil pools.
9090a6e
@samsrabin
Initialize tillage for MIMICS; not yet applying.
8c43072
@samsrabin
Added note.
a5e770e
@samsrabin
Only pass one patch's idop to get_tillage_multipliers().
07a259f
@samsrabin
Generalize tillage to work with multiple active crop patches.
48b697e 
Multiple active crop patches per column shouldn't be possible YET, but perhaps eventually it will be.
@samsrabin
Merge branch 'tillage-multi-patch' into tillage-dev
70e65c3
@samsrabin
Merge branch 'tillage-dev' into tillage-mimics
13f898c
@samsrabin
Moved TillageMod.F90 to soilbiogeochem/
eb3171d
@samsrabin
Tillage now applied to MIMICS.
955ec7f
@samsrabin
Compile fixes.
6c4e019
@samsrabin
Merge branch 'tillage-mimics' into tillage-dev
f9a03e6
@samsrabin
Added script to add tillage parameters to params file.
d629ddd
@samsrabin
Tillage multipliers now read from params file.
c148410
@samsrabin
Add git status info to params file.
de88db0
@samsrabin
Save paramfile as NETCDF3_CLASSIC.
49b15ad
@samsrabin
Replaced logical do_tillage_* with integer tillage_intensity.
0441df0
@samsrabin
Removed unused 'use' in readParams_netcdf().
163147e
@samsrabin
Renamed nphases to ntill_intensities_max for consistency with netCDF …
23a89d6 
…dim name.
@samsrabin
Move present(idop) checks to beginning of decomp_rates_* subroutines.
f61f983
@samsrabin
Rework get_apply_tillage_multipliers() to j;c loop instead of c;j.
c1757d1
@samsrabin
Slice decomp_k by column and soil layer before passing to get_apply_t…
8cfeafe 
…illage_multipliers().
@samsrabin
Merge branch 'tillage-dev' into tillage
750f5b9
@samsrabin
HillslopeHydrologyMod: Consistent whitespace in if statements.
8f3d6ab
@samsrabin
Check for unrecognized pft_distribution_method in InitHillslope().
04bceb0 
This ensures that any methods added in the future are handled here.
@samsrabin
Point Hillslope test at testdata/ instead of surfdata/.
12721d4
@samsrabin
Add Hillslope_DominantPftUniform and Hillslope_SoilProfileLinear test…
4d0da3d 
…mods.
@samsrabin
Add optional do_not_collapse arg to collapse_to_dominant().
03cc0f2 
This logical array, where .true. will prevent individual gridcells from being collapsed. Includes unit testing.
@samsrabin
Use collapse_to_dominant() in surfrd_hillslope().
02d2cf7 
For the Uniform and DominantPftLowland values of hillslope_pft_distribution_method
@samsrabin
Functionize & unit-test HillslopeSoilThicknessProfile_linear().
fd5ed37 
Squash-"merge" of hillslope_hydrology-functionize_linear into hillslope_hydrology-ssr3
@samsrabin samsrabin changed the title Hillslope hydrology ssr4 Hillslope hydrology pre-merge changes Jan 26, 2024
@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
@samsrabin samsrabin marked this pull request as ready for review January 29, 2024 20:55
@samsrabin
Copy link
Author

@swensosc This is ready for your review! Let me know if you want to walk through it together.

@swensosc swensosc merged commit 220f314 into swensosc:hillslope_hydrology Feb 7, 2024
1 check passed
swensosc pushed a commit that referenced this pull request Jun 5, 2024
@ekluzek
Remove res and hgrid from namelist definition, this is no longer needed
5220301 
fixes ESCOMP#2179 and #9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@samsrabin @swensosc @glemieux @rgknox @ekluzek