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

Fix merge bug of windoff PR #1843

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Conversation

lecfab
Copy link
Contributor

@lecfab lecfab commented Sep 26, 2024

Purpose of this PR

Should have been with #1782, please merge directly.
During windoff PR merge, there was duplication of input line parameter p_inco0(ttot,all_regi,all_te), causing gams compile to fail.

Type of change

(Make sure to delete from the Type-of-change list the items not relevant to your PR)

  • Bug fix
  • Refactoring
  • New feature
  • Minor change (default scenarios show only small differences)
  • Fundamental change
  • This change requires a documentation update

Checklist:

  • My code follows the coding etiquette
  • I performed a self-review of my own code
  • I explained my changes within the PR, particularly in hard-to-understand areas
  • I checked that the in-code documentation is up-to-date
  • I adjusted the reporting in remind2 where it was needed
  • I adjusted forbiddenColumnNames in readCheckScenarioConfig.R in case the PR leads to deprecated switches
  • All automated model tests pass (FAIL 0 in the output of make test)
  • The changelog CHANGELOG.md has been updated correctly

Further information (optional):

  • Test runs are here:
  • Comparison of results (what changes by this PR?):

@lecfab lecfab marked this pull request as ready for review September 26, 2024 10:13
@lecfab lecfab changed the title forgotten bit in Offshore PR Fix merge bug of windoff PR Sep 26, 2024
Copy link
Contributor

@orichters orichters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks good, assuming you tested that properly

@lecfab lecfab merged commit 828e456 into remindmodel:develop Sep 26, 2024
2 checks passed
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.

2 participants