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

Grazing #1140

Merged
merged 25 commits into from
Feb 18, 2025
+2,240 −10
Merged

Grazing #1140

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ee5ef88
adding land use parameters to file: grazing, PFT max canopy coverage
ckoven May 2, 2023
bc633e2
Merge branch 'luh2' into grazing
ckoven Jul 6, 2023
dbd692d
starting to add grazing parameterization
ckoven Jul 10, 2023
580df9e
more grazing updates
ckoven Jul 11, 2023
c62e98d
Merge branch 'luh2' into grazing_merge
ckoven Aug 14, 2023
cab4ee7
merged luh2 and resolved conflicts
ckoven Sep 18, 2023
cb5ea6d
fixed merged conflict
ckoven Sep 18, 2023
dcbf787
Merge branch 'luh2' into grazing_merge
ckoven Sep 19, 2023
2b36e09
Merge branch 'luh2' into grazing_merge
ckoven Oct 5, 2023
9e035dd
Merge branch 'luh2' into grazing_merge
ckoven Oct 16, 2023
3f755f0
merged main and resolved conflicts
ckoven Dec 19, 2023
4e818e8
changed hite to height
ckoven Dec 19, 2023
b67019d
changed grazing rate to 4%/day
ckoven Dec 19, 2023
53a6a44
merged main and resolved conflicts
ckoven Jul 19, 2024
636e003
read the grazing parameters
ckoven Jul 19, 2024
2b87e44
set all grazing_rate parameters to zero
ckoven Jul 24, 2024
c039964
compile-time bugfixes
ckoven Jul 25, 2024
e7b236b
added grazing carbon flux history variable
ckoven Oct 31, 2024
ac5bf38
add api37 parameter file and xml patch file
glemieux Jan 11, 2025
b3113b7
Merge tag 'sci.1.80.6_api.37.0.0' into grazing_merge
glemieux Jan 13, 2025
6fa3079
correct woody logic check
glemieux Jan 21, 2025
4b100b2
fix error to EDPhysiologyMod.F90 when nutrients are on
ckoven Jan 22, 2025
76225c9
Apply suggestions from code review
ckoven Jan 24, 2025
b619100
Apply suggestions from code review
ckoven Jan 27, 2025
da70f55
added herbivory flux to restart data
ckoven Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'luh2' into grazing_merge
@ckoven
ckoven committed Sep 19, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit dcbf787684d9fcd8666fe4cecf38a03ea17f0113

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.