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

new damage realization #1601

Merged
merged 15 commits into from
Jul 5, 2024
Merged

new damage realization #1601

merged 15 commits into from
Jul 5, 2024

Conversation

fpiontek
Copy link
Contributor

@fpiontek fpiontek commented Mar 7, 2024

Purpose of this PR

add new damage realization based on the new damage function by Kotz et al. (2024), update TC damage realization to final values from Krichene et al. (2023), fix bugs in SCC integration for runs with delayed start years

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?):

@fpiontek fpiontek requested a review from orichters March 7, 2024 11:05
@orichters orichters added the enhancement New feature or request label Jun 18, 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.

I added many comments, but many of them are minor. If you don't want to address them, that is ok.

main.gms Outdated Show resolved Hide resolved
modules/50_damages/TC/datainput.gms Show resolved Hide resolved
modules/50_damages/TC/datainput.gms Outdated Show resolved Hide resolved
modules/50_damages/KotzWenz/datainput.gms Outdated Show resolved Hide resolved
modules/50_damages/KotzWenz/datainput.gms Outdated Show resolved Hide resolved
modules/51_internalizeDamages/KotzWenzItr/postsolve.gms Outdated Show resolved Hide resolved
scripts/input/run_KotzWenz_damages.R Outdated Show resolved Hide resolved
scripts/input/run_KotzWenz_damages.R Show resolved Hide resolved
@fpiontek fpiontek merged commit 943303b into remindmodel:develop Jul 5, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants