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

refactor and clean up FE demand calculations #468

Merged
merged 15 commits into from
Feb 19, 2024

Conversation

fbenke-pik
Copy link
Contributor

@fbenke-pik fbenke-pik commented Feb 6, 2024

Depends on PR remindmodel/remind#1543

This PR moves introduction of duplicate scenarios (Navigate, Campaigners) to the latest point possible

  • Duplication no longer happens in readStationary, convertStationary, calcFeDemandIndustry
  • Instead, it now happens in calcFeDemandBuildings and calcFEdemand
  • I verified, that this does not change content of the generated inputdata files.

This PR removes files no longer needed in REMIND because of the deletion of the complex transport module

  • removes code generating the following files f35_factorVintages.cs3r, f35_transp_eff.cs3r, f35_bunkers_fe.cs4r, pm_boundCapEV
  • removes f21_vehiclesSubsidies.cs4r and calcTransportSubsidies, as they contain no longer used data apCarElT and apCarH2T
  • removes apcarelt, aptrnelt, apcarh2t, apcarpet, apcardit, apcardiefft, apcardieffH2t from f_cf.cs3r

@fbenke-pik fbenke-pik changed the title Fe demand scen fix refactor FE demand calculations Feb 6, 2024
@fbenke-pik fbenke-pik changed the title refactor FE demand calculations refactor and clean up FE demand calculations Feb 7, 2024
@fbenke-pik fbenke-pik mentioned this pull request Feb 8, 2024
@fbenke-pik fbenke-pik marked this pull request as ready for review February 16, 2024 11:19
@fbenke-pik
Copy link
Contributor Author

fbenke-pik commented Feb 16, 2024

This PR moves introduction of duplicate scenarios (Navigate, Campaigners) to the latest point possible

  • Duplication no longer happens in readStationary, convertStationary, calcFeDemandIndustry
  • Instead, it now happens in calcFeDemandBuildings and calcFEdemand
  • I verified, that this does not change content of the generated inputdata files.

@robinhasse @0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q this affects code you are working with, but hopefully should make things easier.

Copy link
Contributor

@robinhasse robinhasse left a comment

Choose a reason for hiding this comment

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

Thanks, Falk!

@fbenke-pik fbenke-pik merged commit 4d77d22 into pik-piam:master Feb 19, 2024
2 checks passed
@fbenke-pik fbenke-pik deleted the feDemandScenFix branch February 19, 2024 09:29
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