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.

Sign up for GitHub

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

Jump to bottom

update deep el vre assumption switch to match current data, and also … #1372

Merged
merged 4 commits into from
Oct 12, 2023
Merged

update deep el vre assumption switch to match current data, and also … #1372

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebc2cb1
update deep el vre assumption switch to match current data, and also …
cchrisgong Aug 3, 2023
6d9e6f2
debug: changing quotation marks
cchrisgong Aug 3, 2023
c25a688
implement the deepEl numbers as absolute values
cchrisgong Oct 11, 2023
f597faf
restore floor values
cchrisgong Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions core/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,37 +138,37 @@ $include "./core/input/generisdata_trade.prn"
!! Modify spv and storspv parameters for optimistic VRE supply assumptions
if (cm_VRE_supply_assumptions eq 1,
if (fm_dataglob("learn","spv") ne 0.207,
abort "fm_dataglob('learn','spv') is to be modified, but changed externally";
abort "input data in core/input/generisdata_tech.prn has been externally changed, so fm_dataglob('learn','spv') specified here no longer matches the data there; code here needs to be updated to the new input data";
else
fm_dataglob("learn","spv") = 0.257;
);

if (fm_dataglob("inco0","storspv") ne 8350,
abort "fm_dataglob('inco0','storspv') is to be modified, but changed externally";
if (fm_dataglob("inco0","storspv") ne 7720,
abort "input data in core/input/generisdata_tech.prn has been externally changed, so fm_dataglob('inco0','storspv') specified here no longer matches the data there; code here needs to be updated to the new input data";
else
fm_dataglob("inco0","storspv") = 7000;
fm_dataglob("inco0","storspv") = 6470;
);

if (fm_dataglob("incolearn","storspv") ne 5710,
abort "fm_dataglob('incolearn','storspv') is to be modified, but changed externally";
if (fm_dataglob("incolearn","storspv") ne 5440,
abort "input data in core/input/generisdata_tech.prn has been externally changed, so fm_dataglob('incolearn','storspv') specified here no longer matches the data there; code here needs to be updated to the new input data";
else
fm_dataglob("incolearn","storspv") = 4240;
fm_dataglob("incolearn","storspv") = 4040;
Copy link
Member

Choose a reason for hiding this comment

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

The whole point of these checks is to ensure that ad-hoc modifications done via some so black Excel magic by @FalkoUeckerdt are not applied to data they were not based on.
This change just takes new, updated data, and declares those changes valid. Unless Falko green-lights them or provides updated modifications, this cannot be merged.

);

if (fm_dataglob("learn","storspv") ne 0.10,
abort "fm_dataglob('learn','storspv') is to be modified, but changed externally";
abort "input data in core/input/generisdata_tech.prn has been externally changed, so fm_dataglob('learn','storspv') specified here no longer matches the data there; code here needs to be updated to the new input data";
else
fm_dataglob("learn","storspv") = 0.12;
);
elseif cm_VRE_supply_assumptions eq 2,
if (fm_dataglob("incolearn","spv") ne 5060,
abort "fm_dataglob('incolearn','spv') is to be modified, but changed externally";
abort "input data in core/input/generisdata_tech.prn has been externally changed, so fm_dataglob('incolearn','spv') specified here no longer matches the data there; code here needs to be updated to the new input data";
else
fm_dataglob("incolearn","spv") = 5010;
);
elseif cm_VRE_supply_assumptions eq 3,
if (fm_dataglob("incolearn","spv") ne 5060,
abort "fm_dataglob('incolearn','spv') is to be modified, but changed externally";
abort "input data in core/input/generisdata_tech.prn has been externally changed, so fm_dataglob('incolearn','spv') specified here no longer matches the data there; code here needs to be updated to the new input data";
else
fm_dataglob("incolearn","spv") = 4960;
);
Expand Down
Loading