Skip to content

conflict resolutions and fixes to canopy layer diagnostics#2

Merged
jkshuman merged 89 commits intojkshuman:fire_mortalityfrom
rgknox:fire_mortality
Jan 8, 2019
Merged

conflict resolutions and fixes to canopy layer diagnostics#2
jkshuman merged 89 commits intojkshuman:fire_mortalityfrom
rgknox:fire_mortality

Conversation

@rgknox
Copy link

@rgknox rgknox commented Jan 7, 2019

Description:

Collaborators:

Expectation of Answer Changes:

Checklist:

  • My change requires a change to the documentation.
  • I have updated the in-code documentation .AND. (the technical note .OR. the wiki) accordingly.
  • I have read the CONTRIBUTING document.
  • FATES PASS/FAIL regression tests were run
  • If answers were expected to change, evaluation was performed and provided

Test Results:

CTSM (or) E3SM (specify which) test hash-tag:

CTSM (or) E3SM (specify which) baseline hash-tag:

FATES baseline hash-tag:

Test Output:

xuchongang and others added 30 commits June 14, 2018 10:07
reduce the elimination threshold for living biomass to accomodate grasses
update the height allometry for spartina
…ized

put the copy_cohort after InitHydrCohort
1. seed germination only happens during the growing season
2. allocate carbon to reproduction after passing maximum height
…owth, and traced logic more explicitly for each of those cases
… into xuchongang/dense_forest_ready_to_merge
rgknox and others added 18 commits December 19, 2018 16:59
Added new fields from the coastal veg PR to the 14 parameter cdl file
Remove the reducing effect of high wind speeds on fire behavior.
Also remove the fire_wind_max that triggers this reducing effect.
New reserach shows that there is not a reducing link between
wind speed and fire behavior, specifically rate of spread.
Andela et al 2018 https://doi.org/10.5194/essd-2018-89

User interface changes?: Yes, remove fire_wind_max parameter

Code review: JKShuman

Test suite: Cheyenne
Test baseline:
Test namelist changes: none
Test answer changes: expect changes, dependant on wind conditions
Test summary: tested for compile on Cheyenne
Code review: JKShuman

Test suite: Hobart
Test summary: 2 year test run
Remove Lasslop wind effect on fire ROS
Fix to net assimilation tracker used for trimming
@jkshuman jkshuman merged commit 898ac97 into jkshuman:fire_mortality Jan 8, 2019
jkshuman pushed a commit that referenced this pull request May 20, 2019
…ster

integrate minor updates to crown-conservation
jkshuman pushed a commit that referenced this pull request Jun 4, 2019
jkshuman pushed a commit that referenced this pull request Aug 18, 2020
update my fork with original
jkshuman pushed a commit that referenced this pull request Aug 18, 2020
Deconflict PR 632 with FATES master (commit 8abef14)
jkshuman pushed a commit that referenced this pull request Jan 28, 2022
glemieux pushed a commit that referenced this pull request Mar 10, 2022
adrifoster pushed a commit that referenced this pull request Oct 26, 2023
adrifoster pushed a commit that referenced this pull request Oct 26, 2023
Update to `sci.1.57.2_api.23.0.0` and add distance utilities
adrifoster pushed a commit that referenced this pull request Oct 26, 2023
Adding the fates_rad_model to the parameter file
adrifoster pushed a commit that referenced this pull request Oct 26, 2023
memory and restart updates to TRS
adrifoster pushed a commit that referenced this pull request Oct 26, 2023
Small quality of life update to cohort age in create_cohort
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants