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

Remove industry/fixed_shares #1941

Merged
merged 28 commits into from
Jan 23, 2025
Merged

Conversation

fbenke-pik
Copy link
Contributor

@fbenke-pik fbenke-pik commented Jan 6, 2025

Purpose of this PR

  • Remove the industry realization fixed_shares.
  • Rename variables and parameters that are no longer shared across modules.

See also

Type of change

  • Refactoring
  • 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
  • All automated model tests pass (FAIL 0 in the output of make test)
  • The changelog CHANGELOG.md has been updated correctly

Further information

Test runs are here:

  • /p/tmp/benke/remind/output/
  • /p/tmp/benke/remind/compScen-fixed-shares-2025-01-22_11.16.31-H12.pdf

Comparison of results (what changes by this PR?):

  • should be mostly the same, no dramatic changes (but not identical, as we removed some older code portions, e.g. from 11_aerosols)

@fbenke-pik fbenke-pik force-pushed the refactor branch 3 times, most recently from 0627776 to f1fd1cc Compare January 7, 2025 11:31
@fbenke-pik fbenke-pik changed the title WIP Remove industry/fixed_shares Jan 7, 2025
@@ -505,28 +505,6 @@ vm_emiFgas.fx(ttot,all_regi,all_enty) = f_emiFgas(ttot,all_regi,"%c_SSP_forcing_
display vm_emiFgas.L;


*** Bugfix. For some reason the model cannot reduce the production of district heating to 0
Copy link
Contributor Author

@fbenke-pik fbenke-pik Jan 15, 2025

Choose a reason for hiding this comment

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

@LaviniaBaumstark Can this really be removed, or does it have to be refactored?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@robertpietzcker Can you comment on this? Can all of this deleted, or should we keep the fix for "feheb" only, or does this have to be refactored?

Copy link
Contributor

Choose a reason for hiding this comment

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

if the runs work without I think it can be deleted. as the description said, it was never clear why this was needed - the model should have been able to stay at 0 anyway

core/presolve.gms Outdated Show resolved Hide resolved
@fbenke-pik fbenke-pik marked this pull request as ready for review January 22, 2025 13:22
Copy link
Contributor

@robertpietzcker robertpietzcker left a comment

Choose a reason for hiding this comment

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

impressive work, Falk!

as the runs look good and show no significant changes in FE or emissions for industry or buildings, I think it can be merged.

@@ -501,6 +491,13 @@ all_enty "all types of quantities"
perm "Carbon permit"
peog "aggregated oil and gas, only relevant for calibration because IEA only provides aggregated data"
bfco2 "CO2 emission from blast furnace"

Copy link
Member

Choose a reason for hiding this comment

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

nice, that you put them al togehter at teh and with the comment

standalone/MOFEX/MOFEX.gms Outdated Show resolved Hide resolved
@fbenke-pik fbenke-pik merged commit 20afc76 into remindmodel:develop Jan 23, 2025
2 checks passed
@fbenke-pik fbenke-pik deleted the refactor branch January 23, 2025 13:54
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.

4 participants