Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/remindmodel/remind
Browse files Browse the repository at this point in the history
  • Loading branch information
@LaviniaBaumstark
LaviniaBaumstark committed Jul 1, 2022
2 parents f9aa070 + a169ca4 commit 33b4f02
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 31 deletions.
4 changes: 4 additions & 0 deletions core/bounds.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,12 @@ if (cm_ccapturescen eq 2, !! no carbon capture at all
vm_cap.fx(t,regi_capturescen,"igccc",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"coalftcrec",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"coalh2c",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"biogasc",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"bioftcrec",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"bioh2c",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"bioigccc",rlf) = 0;
elseif (cm_ccapturescen eq 3), !! no bio carbon capture:
vm_cap.fx(t,regi_capturescen,"biogasc",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"bioftcrec",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"bioh2c",rlf) = 0;
vm_cap.fx(t,regi_capturescen,"bioigccc",rlf) = 0;
Expand Down Expand Up @@ -149,6 +151,7 @@ if (c_bioh2scen eq 0, !! no bioh2 technologies

*NB* controlling for readyness of advanced bio-energy technologies (introduced for EMF33)
if(c_abtrdy gt 2010,
vm_deltaCap.up(t,regi,"biogasc",rlf)$(t.val lt c_abtrdy AND t.val gt 2005) = 1.0e-6;
vm_deltaCap.up(t,regi,"bioftrec",rlf)$(t.val lt c_abtrdy AND t.val gt 2005) = 1.0e-6;
vm_deltaCap.up(t,regi,"bioh2",rlf)$(t.val lt c_abtrdy AND t.val gt 2005) = 1.0e-6;
vm_deltaCap.up(t,regi,"bioigcc",rlf)$(t.val lt c_abtrdy AND t.val gt 2005) = 1.0e-6;
Expand All @@ -166,6 +169,7 @@ if(c_abtrdy gt 2010,
);

*NB* controlling for investment cost of advance bio-energy technologies (introduced for EMF33)
pm_data(regi, "inco0","biogasc") = c_abtcst * pm_data(regi, "inco0","biogasc");
pm_data(regi, "inco0","bioftrec") = c_abtcst * pm_data(regi, "inco0","bioftrec");
pm_data(regi, "inco0","bioh2") = c_abtcst * pm_data(regi, "inco0","bioh2");
pm_data(regi, "inco0","bioigcc") = c_abtcst * pm_data(regi, "inco0","bioigcc");
Expand Down
5 changes: 3 additions & 2 deletions core/input/generisdata_emi.prn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ pecoal.seliqfos.coalftrec 26.1
pecoal.seliqfos.coalftcrec 7.8 18.3
pecoal.sesofos.coaltr 26.1 0.04415
pecoal.segafos.coalgas 26.1 0.04415
pebiolc.seel.bioigccc -20.0 20.0
pebiolc.seel.bioigcc
pebiolc.seel.bioigccc -20.0 20.0
pebiolc.seel.bioigcc
pebiolc.segabio.biogasc -9.5 9.5
pebiolc.seliqbio.bioftcrec -12.0 12.0
pebiolc.seh2.bioh2c -22.5 22.5
pebiolc.seel.biochp
Expand Down
17 changes: 9 additions & 8 deletions core/input/generisdata_tech.prn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,16 @@ omv 76 61
lifetime 40 40
$endif

+ biotr biotrmod biochp biohp bioigcc bioigccc biogas bioh2 bioh2c bioethl bioeths biodiesel bioftrec bioftcrec
tech_stat 1 3 1 2 3 2 3 3
inco0 10 300 3000 550 2450 3150 1200 1680 2040 2860 590 160 3000 3600
constrTme 0 1 4 2 4 5 4 4 4 4 2 2 4 5

+ biotr biotrmod biochp biohp bioigcc bioigccc biogas biogasc bioh2 bioh2c bioethl bioeths biodiesel bioftrec bioftcrec
tech_stat 1 3 1 3 2 3 2 3 3
inco0 10 300 3000 550 2450 3150 1200 1230 1680 2040 2860 590 160 3000 3600
constrTme 0 1 4 2 4 5 4 4 4 4 4 2 2 4 5
mix0 0.00
eta 1.00 0.95 0.35 0.72 0.39 0.28 0.55 0.61 0.55 0.36 0.55 0.93 0.41 0.41
omf 0.03 0.04 0.04 0.04 0.04 0.04 0.10 0.10 0.07 0.11 0.05 0.04 0.04
omv 30.11 25.00 31.50 50.50 10.90 10.60 10.60 97.27 38.99 5.05 10.60
lifetime 35 35 40 40 40 40 40 35 35 35 35 35 35 35
eta 1.00 0.95 0.35 0.72 0.39 0.28 0.55 0.55 0.61 0.55 0.36 0.55 0.93 0.41 0.41
omf 0.03 0.04 0.04 0.04 0.04 0.04 0.06 0.10 0.10 0.07 0.11 0.05 0.04 0.04
omv 30.11 25.00 31.50 50.50 10.90 12.80 10.60 10.60 97.27 38.99 5.05 10.60
lifetime 35 35 40 40 40 40 40 40 35 35 35 35 35 35 35


+ geohdr geohe hydro wind windoff spv solhe csp
Expand Down
17 changes: 9 additions & 8 deletions core/input/generisdata_tech_SSP1.prn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,16 @@ omv 76 61
lifetime 40 40
$endif

+ biotr biotrmod biochp biohp bioigcc bioigccc biogas bioh2 bioh2c bioethl bioeths biodiesel bioftrec bioftcrec
tech_stat 1 3 1 2 3 2 3 3
inco0 10 300 3000 550 2450 4100 1200 1680 2650 2860 590 160 3000 4680
constrTme 0 1 4 2 4 5 4 4 4 4 2 2 4 5
+ biotr biotrmod biochp biohp bioigcc bioigccc biogas biogasc bioh2 bioh2c bioethl bioeths biodiesel bioftrec bioftcrec
tech_stat 1 3 1 3 2 3 2 3 3
inco0 10 300 3000 550 2450 4100 1200 1230 1680 2650 2860 590 160 3000 4680
constrTme 0 1 4 2 4 5 4 4 4 4 4 2 2 4 5
mix0 0.00
eta 1.00 0.95 0.35 0.72 0.39 0.28 0.55 0.61 0.55 0.36 0.55 0.93 0.41 0.41
omf 0.03 0.04 0.04 0.04 0.04 0.04 0.10 0.10 0.07 0.11 0.05 0.04 0.04
omv 30.11 25.00 31.50 50.50 10.90 10.60 10.60 97.27 38.99 5.05 10.60
lifetime 35 35 40 40 40 40 40 35 35 35 35 35 35 35
eta 1.00 0.95 0.35 0.72 0.39 0.28 0.55 0.55 0.61 0.55 0.36 0.55 0.93 0.41 0.41
omf 0.03 0.04 0.04 0.04 0.04 0.04 0.06 0.10 0.10 0.07 0.11 0.05 0.04 0.04
omv 30.11 25.00 31.50 50.50 10.90 12.80 10.60 10.60 97.27 38.99 5.05 10.60
lifetime 35 35 40 40 40 40 40 40 35 35 35 35 35 35 35


+ geohdr geohe hydro wind windoff spv solhe csp
tech_stat 1
Expand Down
16 changes: 8 additions & 8 deletions core/input/generisdata_tech_SSP5.prn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ omv 76 61
lifetime 40 40
$endif

+ biotr biotrmod biochp biohp bioigcc bioigccc biogas bioh2 bioh2c bioethl bioeths biodiesel bioftrec bioftcrec
tech_stat 1 3 1 2 3 2 3 3
inco0 180 400 3000 550 2450 3150 1200 1680 2040 2860 590 160 3000 3600
constrTme 0 1 4 2 4 5 4 4 4 4 2 2 4 5
+ biotr biotrmod biochp biohp bioigcc bioigccc biogas biogasc bioh2 bioh2c bioethl bioeths biodiesel bioftrec bioftcrec
tech_stat 1 3 1 3 2 3 2 3 3
inco0 180 400 3000 550 2450 3150 1200 1230 1680 2040 2860 590 160 3000 3600
constrTme 0 1 4 2 4 5 4 4 4 4 4 2 2 4 5
mix0 0.00 0.03 0.05
eta 1.00 0.95 0.35 0.72 0.39 0.28 0.55 0.61 0.55 0.36 0.55 0.93 0.41 0.41
omf 0.03 0.04 0.04 0.04 0.04 0.04 0.10 0.10 0.07 0.11 0.05 0.04 0.04
omv 30.11 25.00 31.50 50.50 10.90 10.60 10.60 97.27 38.99 5.05 10.60
lifetime 35 35 40 40 40 40 40 35 35 35 20 20 35 35
eta 1.00 0.95 0.35 0.72 0.39 0.28 0.55 0.55 0.61 0.55 0.36 0.55 0.93 0.41 0.41
omf 0.03 0.04 0.04 0.04 0.04 0.04 0.06 0.10 0.10 0.07 0.11 0.05 0.04 0.04
omv 30.11 25.00 31.50 50.50 10.90 12.80 10.60 10.60 97.27 38.99 5.05 10.60
lifetime 35 35 40 40 40 40 40 40 35 35 35 20 20 35 35

+ geohdr geohe hydro wind windoff spv solhe csp
tech_stat 1
Expand Down
8 changes: 4 additions & 4 deletions core/input/generisdata_vintages.prn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ $ifthen setGlobal cm_ccsfosall
56
$endif

+ biotr biotrmod biohp biochp bioigcc bioigccc biogas bioftrec bioftcrec bioh2 bioh2c bioethl bioeths biodiesel
1 1.0 1.0 3.0 3.0 1.0 1.0 3.0 3.0 3.0 3.0 3.0 3.0 0.1 1.0
6 1.0 1.0 2.0 2.0 1.0 2.0 2.0 2.0 2.0 2.0 2.0 0.01 1.0
11 1.0 2.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
+ biotr biotrmod biohp biochp bioigcc bioigccc biogas biogasc bioftrec bioftcrec bioh2 bioh2c bioethl bioeths biodiesel
1 1.0 1.0 3.0 3.0 1.0 1.0 3.0 1.0 3.0 3.0 3.0 3.0 3.0 0.1 1.0
6 1.0 1.0 2.0 2.0 1.0 2.0 2.0 2.0 2.0 2.0 2.0 0.01 1.0
11 1.0 2.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0
16 1.0 2.0
21 1.0 2.0
26 1.0
Expand Down
13 changes: 12 additions & 1 deletion core/sets.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ $endif
bioigcc "integrated biomass gasification combined cycle"
bioigccc "integrated biomass gasification combined cycle with CCS"
biogas "gasification of biomass"
biogasc "gasification of biomass with capture"
bioftrec "biomass based fischer-tropsch recycle"
bioftcrec "biomass based fischer-tropsch with capture recycle"
bioh2 "biomass to hydrogen"
Expand Down Expand Up @@ -1151,6 +1152,7 @@ $endif
bioigcc "integrated biomass gasification combined cycle"
bioigccc "integrated biomass gasification combined cycle with CCS"
biogas "gasification of biomass"
biogasc "gasification of biomass with capture"
bioftrec "biomass based fischer-tropsch recycle"
bioftcrec "biomass based fischer-tropsch with capture recycle"
bioh2 "biomass to hydrogen"
Expand Down Expand Up @@ -1259,6 +1261,7 @@ $endif
bioigcc "integrated biomass gasification combined cycle"
bioigccc "integrated biomass gasification combined cycle with CCS"
biogas "gasification of biomass"
biogasc "gasification of biomass with capture"
bioftrec "biomass based fischer-tropsch recycle"
bioftcrec "biomass based fischer-tropsch with capture recycle"
bioh2 "biomass to hydrogen"
Expand Down Expand Up @@ -1357,6 +1360,7 @@ $ifthen setGlobal cm_ccsfosall
$endif
coalftcrec "coal based fischer-tropsch with capture recycle"
coalh2c "coal to hydrogen with capture"
biogasc "gasification of biomass with capture"
bioftcrec "biomass based fischer-tropsch with capture recycle"
bioh2c "biomass to hydrogen with capture"
bioigccc "integrated biomass gasification combined cycle with CCS"
Expand All @@ -1375,6 +1379,7 @@ teBio(all_te) "biomass energy systems technologies"
bioigcc "integrated biomass gasification combined cycle"
bioigccc "integrated biomass gasification combined cycle with CCS"
biogas "gasification of biomass"
biogasc "gasification of biomass with capture"
bioftrec "biomass based fischer-tropsch recycle"
bioftcrec "biomass based fischer-tropsch with capture recycle"
bioh2 "biomass to hydrogen"
Expand All @@ -1392,6 +1397,7 @@ teRe(all_te) "renewable technologies including biomass"
bioigcc "integrated biomass gasification combined cycle"
bioigccc "integrated biomass gasification combined cycle with CCS"
biogas "gasification of biomass"
biogasc "gasification of biomass with capture"
bioftrec "biomass based fischer-tropsch recycle"
bioftcrec "biomass based fischer-tropsch with capture recycle"
bioh2 "biomass to hydrogen"
Expand Down Expand Up @@ -1509,6 +1515,7 @@ teBioPebiolc(all_te) "biomass technologies using pebiolc"
bioigcc
bioigccc
biogas
biogasc
bioftrec
bioftcrec
bioh2
Expand Down Expand Up @@ -2383,6 +2390,7 @@ $endif
pebiolc.sesobio.biotr
pebiolc.sesobio.biotrmod
pebiolc.segabio.biogas
pebiolc.segabio.biogasc
pegeo.seel.geohdr
pegeo.sehe.geohe
pehyd.seel.hydro
Expand Down Expand Up @@ -2623,6 +2631,9 @@ $endif
pebiolc.seel.bioigccc.n2o
pebiolc.seel.bioigcc.n2o
pebiolc.segabio.biogas.n2o
pebiolc.segabio.biogasc.co2
pebiolc.segabio.biogasc.cco2
pebiolc.segabio.biogasc.n2o
segabio.fegas.tdbiogas.ch4
segafos.fegas.tdfosgas.ch4
* cco2.pco2.ccscomp.co2
Expand Down Expand Up @@ -2777,7 +2788,7 @@ $IFTHEN.WindOff %cm_wind_offshore% == "1"
$ENDIF.WindOff
spv,csp,refliq,hydro,geohe,geohdr,solhe,ngcc,ngccc,ngt,gaschp,gashp,gash2,gash2c,gastr,gasftrec,gasftcrec,dot,
igcc,igccc,pc,coaltr,coalgas,coalh2,coalh2c,coalchp,coalhp,coalftrec,coalftcrec,
biotr,biotrmod,biogas,bioftrec,bioftcrec,bioh2,bioh2c,biohp,biochp,bioigcc,bioigccc,
biotr,biotrmod,biogas,biogasc,bioftrec,bioftcrec,bioh2,bioh2c,biohp,biochp,bioigcc,bioigccc,
elh2,h2turb,elh2VRE,h2turbVRE,bioethl,bioeths,biodiesel,tnrs,fnrs
$ifthen setGlobal cm_ccsfosall
pcc, pco
Expand Down
1 change: 1 addition & 0 deletions modules/04_PE_FE_parameters/iea2014/datainput.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ p04_prodCoupleGlob("pecoal","seh2","coalh2c","seel") = 0.054;
p04_prodCoupleGlob("pebiolc","seel","biochp","sehe") = 0.72;
p04_prodCoupleGlob("pebiolc","seliqbio","bioftrec","seel") = 0.147; !! from Liu et al. 2011 (Making Fischer-Tropsch Fuels and Electricity from Coal and Biomass: Performance and Cost Analysis)
p04_prodCoupleGlob("pebiolc","seliqbio","bioftcrec","seel") = 0.108; !! from Liu et al. 2011 (Making Fischer-Tropsch Fuels and Electricity from Coal and Biomass: Performance and Cost Analysis)
p04_prodCoupleGlob("pebiolc","segabio","biogasc","seel") = -0.07;
p04_prodCoupleGlob("pebiolc","seliqbio","bioethl","seel") = 0.153;
p04_prodCoupleGlob("segabio","fegas","tdbiogas","seel") = -0.05;
p04_prodCoupleGlob("segafos","fegas","tdfosgas","seel") = -0.05;
Expand Down

0 comments on commit 33b4f02

Please sign in to comment.