split pm_fedem into industry and buildings#2329
Draft
fbenke-pik wants to merge 1 commit intoremindmodel:developfrom
Draft
split pm_fedem into industry and buildings#2329fbenke-pik wants to merge 1 commit intoremindmodel:developfrom
fbenke-pik wants to merge 1 commit intoremindmodel:developfrom
Conversation
fbenke-pik
commented
Apr 14, 2026
| loop((entyFe,ppfUePrc), | ||
| p37_demFeTarget(ttot,regi,entyFe,ppfUePrc) = sum(tePrc2ue(tePrc,opmoPrc,ppfUePrc), pm_outflowPrcHist(ttot,regi,tePrc,opmoPrc) * p37_specFeDemTarget(entyFe,tePrc,opmoPrc)); | ||
| p37_demFeActual(ttot,regi,entyFe,ppfUePrc) = sum((fe2ppfen_no_ces_use(entyFe,all_in),ue2ppfenPrc(ppfUePrc,all_in)), pm_fedemand(ttot,regi,all_in) * sm_EJ_2_TWa); | ||
| p37_demFeActual(ttot,regi,entyFe,ppfUePrc) = sum((fe2ppfen_no_ces_use(entyFe,all_in),ue2ppfenPrc(ppfUePrc,all_in)), pm_fedemand_ind(ttot,regi,all_in) * sm_EJ_2_TWa); |
Contributor
Author
There was a problem hiding this comment.
Does this really only need industry demands?
fbenke-pik
commented
Apr 14, 2026
|
|
||
| *** CES calibration tarjectories industry and buildings | ||
| pm_fedemand(tall,all_regi,all_in) "read-in parameter for final energy and production trajectories used for the CES parameter calibration in industry and buildings [TWa]" | ||
| pm_fedemand_ind(tall,all_regi,all_in) "read-in parameter for final energy and production trajectories used for the CES parameter calibration in industry [TWa]" |
Contributor
Author
There was a problem hiding this comment.
should it be all_in still after the split? define sets for fedem build and ind?
fbenke-pik
commented
Apr 14, 2026
| pm_fedemand(t,regi,cal_ppf_buildings_dyn36) = f_fedemand_build(t,regi,"%cm_demScen%","%cm_rcp_scen_build%",cal_ppf_buildings_dyn36); | ||
| $endif.cm_rcp_scen_build | ||
| *** use cm_demScen for Industry and Buildings | ||
| pm_fedemand_ind(tall,all_regi,in) = f_fedemand_ind(tall,all_regi,"%cm_demScen%",in); |
Contributor
Author
There was a problem hiding this comment.
what should be the indexing here?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose of this PR
Please explain your PR here.
Type of change
Indicate the items relevant for your PR by replacing ◻️ with ☑️.
Do not delete any lines. This makes it easier to understand which areas are affected by your changes and which are not.
Parts concerned
Impact
Checklist
Do not delete any line. Leave unfinished elements unchecked so others know how far along you are.
In the end all checkboxes must be ticked before you can merge.
make test) after my final commit and all tests pass (FAIL 0)remind2if and where it was neededforbiddenColumnNamesin readCheckScenarioConfig.R in case the PR leads to deprecated switchesCHANGELOG.mdcorrectly (added, changed, fixed, removed, input data/calibration)Further information (optional)