-
Notifications
You must be signed in to change notification settings - Fork 129
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 alternative 32_power realizations that are not used anymore #1769
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6a1f2ab
Removed alternative 32_power realizations that are not used anymore
lecfab 77a8666
rename vm_capDistr, vm_demSeOth, vm_prodSeOth, pm_boundCapCCS, pm_cap0
lecfab 4d4e905
Clean learning equation
lecfab d6d27fd
re-delete realizations after their resurrection due to rebase
lecfab 44edeec
Merge branch 'remindmodel:develop' into powerRealizationsRebased
lecfab 12d2efb
2020-2015 is not 15
lecfab File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -156,12 +156,12 @@ q_balSe(t,regi,enty2)$( entySe(enty2) AND (NOT (sameas(enty2,"seel"))) ).. | |
- vm_emiMacSector(t,regi,"ch4wstl") | ||
) | ||
)$( sameas(enty2,"segabio") AND t.val gt 2005 ) | ||
+ sum(prodSeOth2te(enty2,te), vm_prodSeOth(t,regi,enty2,te) ) | ||
+ sum(prodSeOth2te(enty2,te), v_prodSeOth(t,regi,enty2,te) ) !! *** RLDC removal | ||
+ vm_Mport(t,regi,enty2) | ||
=e= | ||
sum(se2fe(enty2,enty3,te), vm_demSe(t,regi,enty2,enty3,te)) | ||
+ sum(se2se(enty2,enty3,te), vm_demSe(t,regi,enty2,enty3,te)) | ||
+ sum(demSeOth2te(enty2,te), vm_demSeOth(t,regi,enty2,te) ) | ||
+ sum(demSeOth2te(enty2,te), v_demSeOth(t,regi,enty2,te) ) !! *** RLDC removal | ||
+ vm_Xport(t,regi,enty2) | ||
; | ||
|
||
|
@@ -259,37 +259,34 @@ q_shFeCes(t,regi,entyFe,in,teEs)$feViaEs2ppfen(entyFe,in,teEs).. | |
*' Definition of capacity constraints for primary energy to secondary energy transformation: | ||
***-------------------------------------------------------------------------- | ||
q_limitCapSe(t,regi,pe2se(enty,enty2,te)).. | ||
vm_prodSe(t,regi,enty,enty2,te) | ||
=e= | ||
sum(teSe2rlf(te,rlf), | ||
vm_capFac(t,regi,te) * pm_dataren(regi,"nur",rlf,te) | ||
* vm_cap(t,regi,te,rlf) | ||
)$(NOT teReNoBio(te)) | ||
+ | ||
sum(teRe2rlfDetail(te,rlf), | ||
( 1$teRLDCDisp(te) + pm_dataren(regi,"nur",rlf,te)$(NOT teRLDCDisp(te)) ) * vm_capFac(t,regi,te) | ||
* vm_capDistr(t,regi,te,rlf) | ||
)$(teReNoBio(te)) | ||
vm_prodSe(t,regi,enty,enty2,te) | ||
=e= | ||
sum(teSe2rlf(te,rlf), | ||
vm_capFac(t,regi,te) * pm_dataren(regi,"nur",rlf,te) * vm_cap(t,regi,te,rlf) | ||
)$(NOT teReNoBio(te)) | ||
+ | ||
sum(teRe2rlfDetail(te,rlf), | ||
pm_dataren(regi,"nur",rlf,te) * vm_capFac(t,regi,te) * v_capDistr(t,regi,te,rlf) | ||
)$(teReNoBio(te)) | ||
; | ||
|
||
***---------------------------------------------------------------------------- | ||
*' Definition of capacity constraints for secondary energy to secondary energy transformation: | ||
***--------------------------------------------------------------------------- | ||
q_limitCapSe2se(t,regi,se2se(enty,enty2,te)).. | ||
vm_prodSe(t,regi,enty,enty2,te) | ||
=e= | ||
sum(teSe2rlf(te,rlf), | ||
vm_capFac(t,regi,te) * pm_dataren(regi,"nur",rlf,te) | ||
* vm_cap(t,regi,te,rlf) | ||
); | ||
vm_prodSe(t,regi,enty,enty2,te) | ||
=e= | ||
sum(teSe2rlf(te,rlf), | ||
vm_capFac(t,regi,te) * pm_dataren(regi,"nur",rlf,te) * vm_cap(t,regi,te,rlf) | ||
); | ||
|
||
***--------------------------------------------------------------------------- | ||
*' Definition of capacity constraints for secondary energy to final energy transformation: | ||
***--------------------------------------------------------------------------- | ||
q_limitCapFe(t,regi,te).. | ||
sum((entySe,entyFe)$(se2fe(entySe,entyFe,te)), vm_prodFe(t,regi,entySe,entyFe,te)) | ||
=l= | ||
sum(teFe2rlf(te,rlf), vm_capFac(t,regi,te) * vm_cap(t,regi,te,rlf)); | ||
sum((entySe,entyFe)$(se2fe(entySe,entyFe,te)), vm_prodFe(t,regi,entySe,entyFe,te)) | ||
=l= | ||
sum(teFe2rlf(te,rlf), vm_capFac(t,regi,te) * vm_cap(t,regi,te,rlf)); | ||
|
||
***--------------------------------------------------------------------------- | ||
*' Definition of capacity constraints for CCS technologies: | ||
|
@@ -327,7 +324,7 @@ q_cap(ttot,regi,te2rlf(te,rlf))$(ttot.val ge cm_startyear).. | |
|
||
|
||
q_capDistr(t,regi,teReNoBio(te)).. | ||
sum(teRe2rlfDetail(te,rlf), vm_capDistr(t,regi,te,rlf) ) | ||
sum(teRe2rlfDetail(te,rlf), v_capDistr(t,regi,te,rlf) ) | ||
=e= | ||
vm_cap(t,regi,te,"1") | ||
; | ||
|
@@ -398,17 +395,20 @@ q_capCumNet(t0,regi,teLearn)$(NOT (pm_data(regi,"tech_stat",teLearn) eq 4)).. | |
qm_fuel2pe(t,regi,peRicardian(enty)).. | ||
vm_prodPe(t,regi,enty) | ||
=e= | ||
sum(pe2rlf(enty,rlf2),vm_fuExtr(t,regi,enty,rlf2))-(vm_Xport(t,regi,enty)-(1-pm_costsPEtradeMp(regi,enty))*vm_Mport(t,regi,enty))$(tradePe(enty)) - | ||
sum(pe2rlf(enty2,rlf2), (pm_fuExtrOwnCons(regi, enty, enty2) * vm_fuExtr(t,regi,enty2,rlf2))$(pm_fuExtrOwnCons(regi, enty, enty2) gt 0)); | ||
|
||
sum(pe2rlf(enty,rlf2), vm_fuExtr(t,regi,enty,rlf2)) | ||
- (vm_Xport(t,regi,enty) - (1-pm_costsPEtradeMp(regi,enty)) * vm_Mport(t,regi,enty))$(tradePe(enty)) | ||
- sum(pe2rlf(enty2,rlf2), | ||
(pm_fuExtrOwnCons(regi, enty, enty2) * vm_fuExtr(t,regi,enty2,rlf2))$(pm_fuExtrOwnCons(regi, enty, enty2) gt 0) | ||
) | ||
; | ||
***--------------------------------------------------------------------------- | ||
*' Definition of resource constraints for renewable energy types: | ||
***--------------------------------------------------------------------------- | ||
*ml* assuming maxprod to be technical potential | ||
q_limitProd(t,regi,teRe2rlfDetail(teReNoBio(te),rlf)).. | ||
pm_dataren(regi,"maxprod",rlf,te) | ||
=g= | ||
( 1$teRLDCDisp(te) + pm_dataren(regi,"nur",rlf,te)$(NOT teRLDCDisp(te)) ) * vm_capFac(t,regi,te) * vm_capDistr(t,regi,te,rlf); | ||
pm_dataren(regi,"nur",rlf,te) * vm_capFac(t,regi,te) * v_capDistr(t,regi,te,rlf); | ||
|
||
***----------------------------------------------------------------------------- | ||
*' Definition of competition for geographical potential for renewable energy types: | ||
|
@@ -417,47 +417,49 @@ q_limitProd(t,regi,teRe2rlfDetail(teReNoBio(te),rlf)).. | |
q_limitGeopot(t,regi,peReComp(enty),rlf).. | ||
p_datapot(regi,"limitGeopot",rlf,enty) | ||
=g= | ||
sum(te$teReComp2pe(enty,te,rlf), (vm_capDistr(t,regi,te,rlf) / (pm_data(regi,"luse",te)/1000))); | ||
sum(te$teReComp2pe(enty,te,rlf), (v_capDistr(t,regi,te,rlf) / (pm_data(regi,"luse",te)/1000))); | ||
|
||
*** learning curve for investment costs | ||
*** deactivate learning for tech_stat 4 technologies before 2025 as they are not built before | ||
***--------------------------------------------------------------------------- | ||
*' Learning curve for investment costs: | ||
*' (deactivate learning for tech_stat 4 technologies before 2025 as they are not built before) | ||
***--------------------------------------------------------------------------- | ||
q_costTeCapital(t,regi,teLearn)$(NOT (pm_data(regi,"tech_stat",teLearn) eq 4 AND t.val le 2020)) .. | ||
vm_costTeCapital(t,regi,teLearn) | ||
=e= | ||
*** special treatment for first time steps: using global estimates better | ||
*** matches historic values | ||
( fm_dataglob("learnMult_wFC",teLearn) | ||
*** floor costs defined regionally | ||
pm_data(regi,"floorcost",teLearn) | ||
*** until 2005: using global estimates better matches historic values | ||
+ ( fm_dataglob("learnMult_wFC",teLearn) | ||
* ( ( sum(regi2, vm_capCum(t,regi2,teLearn)) | ||
+ pm_capCumForeign(t,regi,teLearn) | ||
) | ||
** fm_dataglob("learnExp_wFC",teLearn) | ||
) | ||
)$( t.val le 2005 ) | ||
*** special treatment for 2010, 2015: start divergence of regional values by using a | ||
*** t-split of global 2005 to regional 2020 in order to phase-in the observed 2020 regional | ||
*** variation from input-data | ||
+ ( (2020 - t.val)/15 * fm_dataglob("learnMult_wFC",teLearn) | ||
*** 2005 to 2020: linear transition from global 2005 to regional 2020 | ||
*** to phase-in the observed 2020 regional variation from input-data | ||
+ ( (2020 - t.val) / (2020-2015) * fm_dataglob("learnMult_wFC",teLearn) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why did you replace 15 by 2020-2015 = 5? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just to hide some bugs for more fun in the future 🤷 It's a mistake thanks for digging and finding it! |
||
* ( sum(regi2, vm_capCum(t,regi2,teLearn)) | ||
+ pm_capCumForeign(t,regi,teLearn) | ||
) | ||
** fm_dataglob("learnExp_wFC",teLearn) | ||
|
||
+ (t.val - 2005)/15 * pm_data(regi,"learnMult_wFC",teLearn) | ||
+ (t.val - 2005) / (2020-2015) * pm_data(regi,"learnMult_wFC",teLearn) | ||
* ( sum(regi2, vm_capCum(t,regi2,teLearn)) | ||
+ pm_capCumForeign(t,regi,teLearn) | ||
) | ||
** pm_data(regi,"learnExp_wFC",teLearn) | ||
)$( (t.val gt 2005) AND (t.val lt 2020) ) | ||
|
||
$ifthen.floorscen %cm_floorCostScen% == "default" | ||
*** assuming linear convergence of regional learning curves to global values until 2050 | ||
+ ( (pm_ttot_val(t) - 2020) / 30 * fm_dataglob("learnMult_wFC",teLearn) | ||
*** 2020 to 2050: assuming linear convergence of regional learning curves to global values | ||
+ ( (pm_ttot_val(t) - 2020) / (2050-2020) * fm_dataglob("learnMult_wFC",teLearn) | ||
* ( sum(regi2, vm_capCum(t,regi2,teLearn)) | ||
+ pm_capCumForeign(t,regi,teLearn) | ||
) | ||
** fm_dataglob("learnExp_wFC",teLearn) | ||
|
||
+ (2050 - pm_ttot_val(t)) / 30 * pm_data(regi,"learnMult_wFC",teLearn) | ||
+ (2050 - pm_ttot_val(t)) / (2050-2020) * pm_data(regi,"learnMult_wFC",teLearn) | ||
* ( sum(regi2, vm_capCum(t,regi2,teLearn)) | ||
+ pm_capCumForeign(t,regi,teLearn) | ||
) | ||
|
@@ -484,15 +486,12 @@ $ifthen.floorscen %cm_floorCostScen% == "techtrans" | |
$endif.floorscen | ||
|
||
$ifthen.floorscen %cm_floorCostScen% == "default" | ||
*** globally harmonized costs after 2050 | ||
*** after 2050: globally harmonized costs | ||
+ ( fm_dataglob("learnMult_wFC",teLearn) | ||
* (sum(regi2, vm_capCum(t,regi2,teLearn)) + pm_capCumForeign(t,regi,teLearn) ) | ||
**(fm_dataglob("learnExp_wFC",teLearn)) | ||
)$(t.val gt 2050) | ||
$endif.floorscen | ||
|
||
*** floor costs | ||
+ pm_data(regi,"floorcost",teLearn) | ||
; | ||
|
||
|
||
|
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is
!! *** RLDC removal
intended to conway any information?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no, they are anchors for remaining todos (related to this SeOth issue with which you helped me today)