Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion config/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
cfg$extramappings_historic <- ""

#### Current input data revision (<mainrevision>.<subrevision>) ####
cfg$inputRevision <- "8.24"
cfg$inputRevision <- "8.26"

#### Current CES parameter and GDX revision (commit hash) ####
cfg$CESandGDXversion <- "3d8a0d0a3d49c4bb3535cc13ea0b96c5d831ba16"
Expand Down
1 change: 0 additions & 1 deletion core/datainput.gms
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,6 @@ $Onlisting

pm_cf(ttot,regi,te) = f_cf(ttot,regi,te);
***pm_cf(ttot,regi,"h2turbVRE") = 0.15;
pm_cf(ttot,regi,"elh2VRE") = 0.6;
*** short-term fix for new synfuel td technologies
pm_cf(ttot,regi,"tdsyngas") = 0.65;
pm_cf(ttot,regi,"tdsynhos") = 0.6;
Expand Down
16 changes: 8 additions & 8 deletions core/input/generisdata_tech.prn
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ learn 0.10 0.10 0.10
ccap0 0.001 0.001 0.001

*** hydrogen technologies
+ elh2 h2turb h2curt h2turbVRE elh2VRE h22ch4 MeOH
tech_stat 3 5 5 5 3 3
inco0 3500 510 700 510 0.1 700 800
+ elh2 h2turb h2curt h2turbVRE h22ch4 MeOH
tech_stat 3 5 5 5 3 3
inco0 3500 510 700 510 700 800
floorcost 130
constrTme 2 2 2 2 1 2 2
lifetime 30 30 30 30 30 30 30
eta 0.73 0.40 0.62 0.40 0.73 0.8 0.7
omf 0.05 0.03 0.05 0.03 0.00 0.03 0.03
omv 3 24 0 24 12 12
constrTme 2 2 2 2 2 2
lifetime 30 30 30 30 30 30
eta 0.73 0.40 0.62 0.40 0.8 0.7
omf 0.05 0.03 0.05 0.03 0.03 0.03
omv 3 24 0 24 12 12
ccap0 0.00077
learn 0.15
flexibility 16 16
Expand Down
7 changes: 2 additions & 5 deletions core/sets.gms
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ all_te "all energy technologies, including from modules"
fnrs "fast nuclear reactor (simple structure)"
elh2 "hydrogen electrolysis, using grid electricity"
h2turb "hydrogen turbine for electricity production"
elh2VRE "dummy technology: hydrogen electrolysis; to demonstrate the capacities and SE flows inside the storXXX technologies"
h2turbVRE "dummy technology: hydrogen turbine for electricity production; to demonstrate the capacities and SE flows inside the storXXX technologies"
h2curt "hydrogen production from curtailment"
h22ch4 "production of synthetic methane from hydrogen and captured carbon via methanation"
Expand Down Expand Up @@ -1128,7 +1127,6 @@ te(all_te) "energy technologies"
fnrs "fast nuclear reactor (simple structure)"
elh2 "hydrogen electrolysis"
h2turb "hydrogen turbine for electricity production"
elh2VRE "dummy technology: hydrogen electrolysis; to demonstrate the capacities and SE flows inside the storXXX technologies"
h2turbVRE "dummy technology: hydrogen turbine for electricity production; to demonstrate the capacities and SE flows inside the storXXX technologies"
h2curt "hydrogen production from curtailment"
tdels "transmission and distribution for electricity to stationary users"
Expand Down Expand Up @@ -2231,7 +2229,7 @@ char "characteristics of technologies"
min "minimum"
max "maximum"
usehr "number of hours in a year when the technology is used"
elh2VREcapRatio "ratio of elh2VRE capacity to storage technology capacity"
elh2capRatio "ratio of elh2 capacity to storage technology capacity"
h2turbVREcapRatio "ratio of h2turbVRE capacity to storage technology capacity"
batteryVREcapRatio "ratio of battery capacity to storage technology capacity"
priceLow "biochar price path assumption"
Expand Down Expand Up @@ -2491,7 +2489,6 @@ se2se(all_enty,all_enty,all_te) "map secondary energy to secondary energy using
/
seel.seh2.elh2
seh2.seel.h2turb
seel.seh2.elh2VRE
seh2.seel.h2turbVRE
/

Expand Down Expand Up @@ -2821,7 +2818,7 @@ teSe2rlf(all_te,rlf) "mapping for techologies to grades. Currently, the i
igcc,igccc,pc,coaltr,coalgas,coalh2,coalh2c,coalchp,coalhp,coalftrec,coalftcrec,
biotr,biotrmod,biogas,biogasc,bioftrec,bioftcrec,bioh2,bioh2c,biohp,biochp,bioigcc,bioigccc,
biopyronly,biopyrhe,biopyrchp,biopyrliq,
elh2,h2turb,elh2VRE,h2turbVRE,bioethl,bioeths,biodiesel,tnrs,fnrs
elh2,h2turb,h2turbVRE,bioethl,bioeths,biodiesel,tnrs,fnrs
) . 1
/

Expand Down
3 changes: 0 additions & 3 deletions modules/32_power/IntC/bounds.gms
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,4 @@ loop(regi $ (p32_factorStorage(regi,"csp") < 1),
vm_shSeEl.lo(t,regi,"csp") $ (t.val > 2100) = 2;
);

*** Fix capacity to 0 for elh2VRE now that the equation q32_elh2VREcapfromTestor pushes elh2, not anymore elh2VRE, and capital costs are 1
vm_cap.fx(t,regi,"elh2VRE",rlf) = 0;

*** EOF ./modules/32_power/IntC/bounds.gms
10 changes: 5 additions & 5 deletions modules/32_power/IntC/datainput.gms
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ loop(ext_regi$f32_cm_PriceDurSlope_elh2(ext_regi),
*** The value of 1.1 is derived from the regression of the German Langfristzenarien.
p32_flexSeelShare_slope(t,regi,"elh2") = 1.1;

*** Elh2VREcap phase-in factor
p32_phaseInElh2VREcap(t)$(t.val < 2030) = 0;
p32_phaseInElh2VREcap("2030") = 0.25;
p32_phaseInElh2VREcap("2035") = 0.5;
p32_phaseInElh2VREcap(t)$(t.val > 2035) = 1;
*** Elh2cap phase-in factor
p32_phaseInElh2cap(t)$(t.val < 2030) = 0;
p32_phaseInElh2cap("2030") = 0.25;
p32_phaseInElh2cap("2035") = 0.5;
p32_phaseInElh2cap(t)$(t.val > 2035) = 1;

*** EOF ./modules/32_power/IntC/datainput.gms
4 changes: 2 additions & 2 deletions modules/32_power/IntC/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ parameters
o32_dispatchDownPe2se(ttot,all_regi,all_te) "output parameter to check by how much a pe2se te reduced its output below the normal, in % of the normal output."
p32_shThresholdTotVREAddIntCost(ttot) "Total VRE share threshold above which additional integration challenges arise. Increases with time as eg in 2030, there is still little experience with managing systems with 80% VRE share. Unit: Percent"
p32_FactorAddIntCostTotVRE "Multiplicative factor that influences how much the total VRE share increases integration challenges"
p32_phaseInElh2VREcap(ttot) "phase-in factor for electrolysis capacities built from stored VRE electricity, scale up from 2030 to 2040"
p32_phaseInElh2cap(ttot) "phase-in factor for electrolysis capacities built from stored VRE electricity, scale up from 2030 to 2040"
p32_flexSeelShare_slope(ttot,all_regi,all_te) "Slope of relationship between average electricity price for flexible technology and share of this technology in total electricity demand. Unit: [ % percentage of average electricity price / % share in electricity demand]."
;

Expand Down Expand Up @@ -49,7 +49,7 @@ equations
q32_operatingReserve(ttot,all_regi) "operating reserve for necessary flexibility"
q32_h2turbVREcapfromTestor(tall,all_regi) "calculate capacities of dummy seel<--h2 technology from storXXX technologies"
q32_h2turbVREcapfromTestorUp(ttot,all_regi) "constraint h2turbVRE hydrogen turbines to be only built together with storage capacities"
q32_elh2VREcapfromTestor(tall,all_regi) "calculate capacities of dummy seel-->h2 technology from storXXX technologies"
q32_elh2capfromTestor(tall,all_regi) "calculate capacities of dummy seel-->h2 technology from storXXX technologies"
q32_flexAdj(ttot,all_regi,all_te) "calculate flexibility benefit or cost per flexible technology to be used by flexibility tax"
q32_flexPriceShareMin(ttot,all_regi,all_te) "calculate miniumum share of average electricity that flexible technologies can see"
q32_flexPriceShareVRE(ttot,all_regi,all_te) "calculate miniumum share of average electricity that flexible technologies can see given the current VRE share"
Expand Down
6 changes: 3 additions & 3 deletions modules/32_power/IntC/equations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ q32_h2turbVREcapfromTestorUp(t,regi)..
;

*** build additional electrolysis capacities with stored VRE electricity, phase-in from 2030 to 2040
q32_elh2VREcapfromTestor(t,regi)..
q32_elh2capfromTestor(t,regi)..
vm_cap(t,regi,"elh2","1")
=g=
sum(teStor,
p32_storageCap(teStor,"elh2VREcapratio") * vm_cap(t,regi,teStor,"1")
p32_storageCap(teStor,"elh2capratio") * vm_cap(t,regi,teStor,"1")
)
* p32_phaseInElh2VREcap(t)
* p32_phaseInElh2cap(t)
;


Expand Down
2 changes: 1 addition & 1 deletion modules/32_power/IntC/input/f32_storageCap.prn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*** SOF ./modules/32_power/IntC/input/storageCap.prn
storspv storcsp storwindon storwindoff
elh2VREcapratio 0.16 0.12 0.12 0.12
elh2capratio 0.16 0.12 0.12 0.12
h2turbVREcapratio 1.2 0.9 0.9 0.9
batteryVREcapRatio 3 0 1.1 1.1

Expand Down
Loading