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.

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

Lpjguess sda #3438

Closed
wants to merge 2 commits into from
Closed

Conversation

yinghaoSunn
Copy link
Contributor

Description

Motivation and Context

Review Time Estimate

  • Immediately
  • Within one week
  • When possible

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My change requires a change to the documentation.
  • My name is in the list of CITATION.cff
  • I agree that PEcAn Project may distribute my contribution under any or all of
    • the same license as the existing code,
    • and/or the BSD 3-clause license.
  • I have updated the CHANGELOG.md.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@mdietze
Copy link
Member

mdietze commented Feb 13, 2025

I thought in the last (big) LPJ-GUESS PR that someone (chris?) had caught that the NCSA licence comments at the top of each file were out-of-date and should be removed. Here they've crept back in. Beyond re-removing them, I'd also encourage you to take a close look at the code being merged in to make sure that git correctly resolved the discrepancies between Istem's version (and the fixes you and Hannah made to it) and Matt's. Indeed, GH is holding up this PR with the notice "This branch has conflicts that must be resolved" but surprisingly isn't saying what files have such conflicts, nor is it saying that the PR is out-of-date with the main develop branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants