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

Adding hourly storage level to MainResults #33

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Adding hourly storage level to MainResults #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b97223
Adding data to .gitignore, so i can use the data repository instead
Mathias157 Oct 8, 2024
3c2acda
Adding storage level to mainresults
Mathias157 Oct 17, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
**/*.gpr
**/*.dat
**/*.cmd
**/data
**/data/*.inc
**/model/Balmorel.l*
**/output/economic/*.*
Expand Down
1 change: 0 additions & 1 deletion base/data
Open in desktop
Submodule data deleted from ebe4d2
25 changes: 24 additions & 1 deletion base/output/OUTPUT_SUMMARY.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ PARAMETER EMI_YCRAG(Y,C,RRR,AAA,G,FFF,TECH_TYPE,UNITS) "Annual CO2 emissions(kto
PARAMETER CURT_YCRAGFST(Y,C,RRR,AAA,G,FFF,SSS,TTT,COMMODITY,TECH_TYPE,UNITS) "Hourly energy curtailment per country, region, area, technology, fuel, hour and technology type (MWh)";
PARAMETER CURT_YCRAGF(Y,C,RRR,AAA,G,FFF,COMMODITY,TECH_TYPE,UNITS) "Hourly energy curtailment per country, region, area, technology, fuel, hour and technology type (MWh)";
PARAMETER EL_BALANCE_YCRST(Y,C,RRR,EL_BAL_TYPE,SSS,TTT,UNITS) "Hourly electricity balance per country, region, and type (MWh)";
PARAMETER STORAGE_LEVEL(Y, C, RRR, AAA, G, COMMODITY, TECH_TYPE, SSS, TTT, UNITS) "Hourly storage content (MWh)";
PARAMETER H_BALANCE_YCRAST(Y,C,RRR,AAA,H_BAL_TYPE,SSS,TTT,UNITS) "Hourly heat balance per country, region, area and type (MWh)";
$ifi %HYDROGEN%==yes PARAMETER H2_PRICE_YCR(Y,C,RRR,PRICE_CATEGORY,UNITS) "Average Hydrogen Prices for each region (money/MWh)";
$ifi %HYDROGEN%==yes PARAMETER H2_PRICE_YCRST(Y,C,RRR,SSS,TTT,UNITS) "Hourly hydrogen Prices for each region (money/MWh)";
Expand Down Expand Up @@ -229,6 +230,14 @@ $ifi %DECOM%==yes G_STO_YCRAF(Y,C,IR,IA,IGE,FFF,'ELECTRICITY',TECH_TYPE,'DECOMMI
$ifi %DECOM%==yes -IOF0001*VDECOM_EXO_ACCUM.L(Y,IA,IGE)*(1$(NOT IGHYRS(IGE)) + HYRSMAXVOL_G(IA,IGE)$IGHYRS(IGE))
;

** ELECTRICITY STORAGE CONTENTS
STORAGE_LEVEL(Y, C, IR, IA, IGE, 'ELECTRICITY', 'INTERSEASONAL-ELECT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGE) AND (IGESTOS(IGE) OR IGHYRS(IGE))) =
VESTOVOLT.L(Y, IA, IGE, S, T)
;
STORAGE_LEVEL(Y, C, IR, IA, IGE, 'ELECTRICITY', 'INTRASEASONAL-ELECT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGE) AND IGESTO(IGE)) =
VESTOVOLT.L(Y, IA, IGE, S, T)
;

* ------------- END OF ELECTRICITY CAPACITY --------------

* ------------- HEAT STORAGE --------------
Expand All @@ -249,6 +258,14 @@ $ifi %DECOM%==yes G_STO_YCRAF(Y,C,IR,IA,IGH,FFF,'HEAT',TECH_TYPE,'DECOMMISSIONIN
$ifi %DECOM%==yes -IOF0001*VDECOM_EXO_ACCUM.L(Y,IA,IGH)
;

** HEAT STORAGE CONTENTS
STORAGE_LEVEL(Y, C, IR, IA, IGH, 'HEAT', 'INTERSEASONAL-HEAT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGH) AND IGHSTOS(IGH)) =
VHSTOVOLT.L(Y, IA, IGH, S, T)
;
STORAGE_LEVEL(Y, C, IR, IA, IGH, 'HEAT', 'INTRASEASONAL-HEAT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGH) AND IGHSTO(IGH)) =
VHSTOVOLT.L(Y, IA, IGH, S, T)
;

* ------------- END OF HEAT STORAGE --------------

$ifi not %HYDROGEN%==yes $goto NO_HYDROGEN_STORAGE
Expand All @@ -269,6 +286,12 @@ IOF0001*VGKNACCUMNET.L(Y,IA,IHYDROGEN_GH2STO)
$ifi %DECOM%==yes G_STO_YCRAF(Y,C,IR,IA,IHYDROGEN_GH2STO,FFF,'HYDROGEN',TECH_TYPE,'DECOMMISSIONING','GWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IHYDROGEN_GH2STO) AND IGF(IHYDROGEN_GH2STO,FFF) AND GTECH_TYPE(IHYDROGEN_GH2STO,TECH_TYPE) AND IGDECOMEXOPOT(Y,IA,IHYDROGEN_GH2STO))=
$ifi %DECOM%==yes -IOF0001*VDECOM_EXO_ACCUM.L(Y,IA,IHYDROGEN_GH2STO)
;

** HYDROGEN STORAGE CONTENTS
STORAGE_LEVEL(Y, C, IR, IA, IHYDROGEN_GH2STO, 'HYDROGEN', 'H2-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IHYDROGEN_GH2STO)) =
VHYDROGEN_STOVOL_T.L(Y, IA, IHYDROGEN_GH2STO, S, T)
;

* ------------- END OF HYDROGEN STORAGE --------------
$label NO_HYDROGEN_STORAGE

Expand Down Expand Up @@ -1626,7 +1649,7 @@ H_BALANCE_YCRAST(Y,C,IR,IA,'PRICE',S,T,'Money_per_MWh')$(CCCRRR(C,IR) AND RRRAAA

execute_unload "MainResults.gdx" ECO_G_YCRAG,ECO_X_YCR,OBJ_YCR,EL_PRICE_YCR,EL_PRICE_YCRST,PRO_YCRAGFST,EL_DEMAND_YCRST,EL_DEMAND_YCR,
H_DEMAND_YCRAST,H_DEMAND_YCRA,PRO_YCRAGF,H_PRICE_YCRAST,H_PRICE_YCRA,G_CAP_YCRAF,G_STO_YCRAF,X_CAP_YCR,X_FLOW_YCRST,X_FLOW_YCR,F_CONS_YCRAST,F_CONS_YCRA,EMI_YCRAG,
EL_BALANCE_YCRST,CURT_YCRAGFST,CURT_YCRAGF,H_BALANCE_YCRAST
EL_BALANCE_YCRST,CURT_YCRAGFST,CURT_YCRAGF,H_BALANCE_YCRAST,STORAGE_LEVEL

$ifi %HEATTRANS%==yes ,XH_CAP_YCA,XH_FLOW_YCAST,XH_FLOW_YCA,ECO_XH_YCRA
$ifi %HYDROGEN%==yes ,H2_PRICE_YCRST,H2_PRICE_YCR,BIOMETH_PRICE_YST,XH2_CAP_YCR, XH2_FLOW_YCRST,XH2_FLOW_YCR,ECO_XH2_YCR,H2_DEMAND_YCRST,H2_DEMAND_YCR
Expand Down