PecanProject / pecan

The Predictive Ecosystem Analyzer (PEcAn) is an integrated ecological bioinformatics toolbox.
www.pecanproject.org
Other
202 stars 230 forks source link

Neon initial soil carbon fraction calculation #3059

Closed Qianyuxuan closed 1 year ago

Qianyuxuan commented 1 year ago

Description

Motivation and Context

Review Time Estimate

Types of changes

Checklist:

DongchenZ commented 1 year ago

The code is outdated, @Qianyuxuan you probably need to do a git pull from PEcAn develop branch and then update the code accordingly.

dlebauer commented 1 year ago

@Qianyuxuan key step is to resolve this conflict https://github.com/PecanProject/pecan/pull/3059/conflicts

mdietze commented 1 year ago

@Qianyuxuan please respond to the issues your collaborators have raised in place, rather than deleting this branch and opening a second, virtually identical PR. The PR review process does not function if your collaborators cannot see what has changed from version to version and how you have responded.

mdietze commented 1 year ago

@dlebauer looks like @Qianyuxuan responded to your change request. Could you confirm and "approve" so this can be merged?

Qianyuxuan commented 1 year ago

@dlebauer Sorry, just realized I didn't reply to you. The conflict has been resolved and the "select" function has been updated.

mdietze commented 1 year ago

@Qianyuxuan now that Github Actions is working for us again, I was hoping that you could resolve the conflicts in this PR so that we can pull it in finally

Qianyuxuan commented 1 year ago

@mdietze Hi Mike, just to let you know I have resolved the conflict. Please let me know if there are other issues.