Deconflicting PR640 fire variable update with PR 642 - Githubissues

ckoven / fates

repository for the Functionally Assembled Terrestrial Ecosystem Simulator (FATES)

Other

0 stars 0 forks source link

Deconflicting PR640 fire variable update with PR 642 #9

Closed glemieux closed 4 years ago

glemieux commented 4 years ago

Description:

After merging https://github.com/NGEET/fates/pull/640 to FATES master, this PR branch (https://github.com/NGEET/fates/pull/642) is in conflict with the master branch. The old fire variables were present in this branch and needed to be removed. This was a pre-merge of master so includes code from https://github.com/NGEET/fates/pull/649 and https://github.com/NGEET/fates/pull/637.

Collaborators:

Expectation of Answer Changes:

None expected compared to original PR642 tests

Checklist:

[ ] My change requires a change to the documentation.
[ ] I have updated the in-code documentation .AND. (the technical note .OR. the wiki) accordingly.
[x] 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:

No tests run. Deconflicting only.

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

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

FATES baseline hash-tag:

Test Output: