Skip to content
Snippets Groups Projects
Unverified Commit a5d4820f authored by Lavinia Baumstark's avatar Lavinia Baumstark Committed by GitHub
Browse files

Merge pull request #67 from MariannaR/tobemerged 

Request to merge the new transport module EDGE-T
parents a3eca5b2 3a573f84
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 161 additions and 49 deletions
.gitignore
+ 10
− 0
View file @ a5d4820f
......@@ -92,6 +92,7 @@ modules/29_CES_parameters/calibrate/input/p29_capitalQuantity.cs4r
modules/29_CES_parameters/calibrate/input/p29_efficiency_growth.cs4r
modules/29_CES_parameters/calibrate/input/pm_es_demand.cs4r
modules/29_CES_parameters/calibrate/input/pm_fe_demand.cs4r
modules/29_CES_parameters/calibrate/input/pm_trp_demand.cs4r
modules/29_CES_parameters/calibrate/input/p29_cesdata_price.cs4r
modules/29_CES_parameters/calibrate/input/f29_capitalUnitProjections.cs4r
modules/29_CES_parameters/calibrate/input/
......@@ -118,6 +119,15 @@ modules/33_CDR/weathering/input/f33_maxProdGradeRegiWeathering.cs3r
modules/35_transport/complex/input/f35_factorVintages.cs3r
modules/35_transport/complex/input/f35_transp_eff.cs3r
modules/35_transport/complex/input/pm_bunker_share_in_nonldv_fe.cs4r
modules/35_transport/edge_esm/input/SW.cs4r
modules/35_transport/edge_esm/input/UCD_NEC_iso.cs4r
modules/35_transport/edge_esm/input/esCapCost.cs4r
modules/35_transport/edge_esm/input/fe2es.cs4r
modules/35_transport/edge_esm/input/fe_demand_tech.cs4r
modules/35_transport/edge_esm/input/harmonized_intensities.cs4r
modules/35_transport/edge_esm/input/logit_exponent.cs4r
modules/35_transport/edge_esm/input/price_nonmot.cs4r
modules/35_transport/edge_esm/input/value_time.cs4r
modules/36_buildings/services_putty/input/p36_floorspace_scen.cs4r
modules/36_buildings/services_putty/input/p36_serviceInputs.cs4r
modules/36_buildings/services_putty/input/p36_serviceOutputs.cs4r
......
config/default.cfg
+ 9
− 1
View file @ a5d4820f
......@@ -22,7 +22,7 @@ cfg$title <- "default"
cfg$regionmapping <- "config/regionmappingH12.csv"
#### Current input data revision (<mainrevision>.<subrevision>) ####
cfg$revision <- 5.937
cfg$revision <- 5.938
#### Force the model to download new input data ####
cfg$force_download <- FALSE
......@@ -357,6 +357,8 @@ cfg$gms$cm_CO2priceRegConvEndYr <- 2050 # def <- 2050
cfg$gms$c_regi_nucscen <- "all" # def <- "all"
cfg$gms$c_regi_capturescen <- "all" # def <- "all"
cfg$gms$cm_EDGEtr_scen <- "Conservative_liquids" # def <- "Conservative_liquids"
#-----------------------------------------------------------------------------
# FLAGS
#-----------------------------------------------------------------------------
......@@ -440,6 +442,7 @@ cfg$files2export$start <- c("config/conopt3.opt",
"core/magicc/read_DAT_SURFACE_TEMP.R",
"core/input/historical/historical.mif",
"scripts/input/exoGAINSAirpollutants.R",
"scripts/iterative/EDGE_transport.R",
"config/input.gdx",
"config/input_ref.gdx",
"core/magicc",
......@@ -690,6 +693,11 @@ cfg$RunsUsingTHISgdxAsBAU <- NA
# specify regions to which nucscen, capturescen should apply to (e.g. c_regi_nucscen <- "JPN,USA")
# c_regi_nucscen
# c_regi_capturescen
# cfg$gms$cm_EDGEtr_scen "the EDGE-T scenario"
# ("Conservative_liquids") very conservative scenario with high reliance on fossil fuels in the transport sector
# ("Electricity_push") vehicles with electric drivetrains get some initial push on shares and preferences, leads to ~70% takeover by 2050
# ("Hydrogen_push") similar to the "Electricity_push" scenario, but FCEV penetration is much less as FCEVs remain rather expensive.
# ("Smart_lifestyles_Electricity_push") similar to "Electricity_push" but with reduced overall demand and increased acceptance of small cars, busses and trains.
##-------------------- flags --------------------------------------------------
# cm_SlowConvergence off !! def = off
#*RP* Turn on a slower convergence scheme where each conopt file is used twice, thus conopt1 is used for itr 1+2, conopt.op2 for itr 3+4, conopt.op3 for itr 5+6, conopt.op4 for itr 7+8, conopt.op5 from itr 9 on.
......
core/datainput.gms
+ 8
− 8
View file @ a5d4820f
......@@ -151,7 +151,7 @@ $include "./core/input/generisdata_tech_SSP1.prn"
table f_dataglob_SSP5(char,all_te) "Techno-economic assumptions consistent with SSP5"
$include "./core/input/generisdata_tech_SSP5.prn"
;
*JH* 20140604 (25th Anniversary of Tiananmen) New nuclear assumption for SSP5
*JH* New nuclear assumption for SSP5
if (cm_nucscen eq 6,
f_dataglob_SSP5("inco0","tnrs") = 6270; !! increased from 4000 to 6270 with the update of technology costs in REMIND 1.7 to keep the percentage increase between SSP2 and SSP5 constant
);
......@@ -1108,14 +1108,14 @@ $offdelim
;
*** ----- Emission factor of final energy carriers -----------------------------------
*GL* demand side emission factor of final energy carriers in MtCO2/EJ
*** www.eia.gov/oiaf/1605/excel/Fuel%20EFs_2.xls
*AD* Updated Demand Side Emission Factors
*** https://www.umweltbundesamt.de/sites/default/files/medien/1968/publikationen/co2_emission_factors_for_fossil_fuels_correction.pdf
p_ef_dem(entyFe) = 0;
p_ef_dem("fedie") = 69.3;
p_ef_dem("fehos") = 69.3;
p_ef_dem("fepet") = 68.5;
p_ef_dem("fegas") = 50.3;
p_ef_dem("fesos") = 90.5;
p_ef_dem("fedie") = 74;
p_ef_dem("fehos") = 73;
p_ef_dem("fepet") = 73;
p_ef_dem("fegas") = 55;
p_ef_dem("fesos") = 96;
*** some balances are not matching by small amounts;
......
core/declarations.gms
+ 0
− 1
View file @ a5d4820f
......@@ -116,7 +116,6 @@ pm_fe2es(tall,all_regi,all_teEs) "Conversion factor from fin
pm_shFeCes(ttot,all_regi,all_enty,all_in,all_teEs) "Final energy shares for CES nodes"
p_adj_coeff_Orig(ttot,all_regi,all_te) "initial value of p_adj_coeff"
p_adj_seed_te_Orig(ttot,all_regi,all_te) "initial value of p_adj_seed_te"
p_varyAdj_mult_adjSeedTe(ttot,all_regi) "Multiplicative factor to adjust adjustment cost parameter p_adj_seed_te according to CO2 price level"
......
core/input/generisdata_tech.prn
+ 7
− 0
View file @ a5d4820f
......@@ -94,6 +94,13 @@ eta 0.95 0.85 0.85 1.00 1.00
omf 0.03 0.02 0.02 0.03 0.03 0.02 0.06
lifetime 45 45 45 30 30 45 45
+ tdbiogat tdfosgat
inco0 360 360
mix0 1.00 1.00
eta 0.85 0.85
omf 0.02 0.02
lifetime 45 45
+ tdbiosos tdfossos tdhes tdbiodie tdfosdie tdbiopet tdfospet tdelt
inco0 60 60 600 600 600 600 600 6000
mix0 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00
......
core/input/generisdata_tech_SSP1.prn
+ 7
− 0
View file @ a5d4820f
......@@ -94,6 +94,13 @@ eta 0.95 0.85 0.85 1.00 1.00
omf 0.03 0.02 0.02 0.03 0.03 0.02 0.06
lifetime 45 45 45 30 30 45 45
+ tdbiogat tdfosgat
inco0 360 360
mix0 1.00 1.00
eta 0.85 0.85
omf 0.02 0.02
lifetime 45 45
+ tdbiosos tdfossos tdhes tdbiodie tdfosdie tdbiopet tdfospet tdelt
inco0 60 60 240 600 600 600 600 3000
mix0 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00
......
core/input/generisdata_tech_SSP5.prn
+ 7
− 0
View file @ a5d4820f
......@@ -95,6 +95,13 @@ eta 0.95 0.85 0.85 1.00 1.00
omf 0.03 0.02 0.02 0.03 0.03 0.02 0.06
lifetime 45 45 45 30 30 45 45
+ tdbiogat tdfosgat
inco0 360 360
mix0 1.00 1.00
eta 0.85 0.85
omf 0.02 0.02
lifetime 45 45
+ tdbiosos tdfossos tdhes tdbiodie tdfosdie tdbiopet tdfospet tdelt
inco0 60 60 240 600 600 600 600 6000
mix0 1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00
......
core/input/generisdata_vintages.prn
+ 14
− 0
View file @ a5d4820f
......@@ -127,6 +127,20 @@ $endif
56 5.0 5.0 5.0 6.0 6.0
+ tdbiogat tdfosgat
1 6.0 6.0
6 6.0 6.0
11 6.0 6.0
16 6.0 6.0
21 6.0 6.0
26 6.0 6.0
31 5.0 5.0
36 5.0 5.0
41 5.0 5.0
46 5.0 5.0
51 5.0 5.0
56 5.0 5.0
+ tdbiosos tdfossos tdhes tdbiodie tdfosdie tdbiopet tdfospet tdelt
1 5.0 5.0 5.0 6.0 6.0 6.0 6.0 5.0
6 5.0 5.0 5.0 6.0 6.0 6.0 6.0 5.0
......
core/sets.gms
+ 19
− 16
View file @ a5d4820f
......@@ -407,10 +407,10 @@ all_esty "energy services"
esdie_frgt_lo
esdie_frgt_sm
eselt_frgt_sm
* esh2t_pass_sm
* esgat_pass_sm
* esh2t_frgt_sm
* esgat_frgt_sm
esh2t_pass_sm
esgat_pass_sm
esh2t_frgt_sm
esgat_frgt_sm
*** Buildings module: Energy services (useful energy)
ueshheb "buildings space heating district heat"
......@@ -601,13 +601,13 @@ all_teEs "energy service technologies"
te_espet_pass_sm "short-to-medium distance passenger transport CES node"
te_esdie_pass_sm "short-to-medium distance passenger transport CES node"
te_eselt_pass_sm "short-to-medium distance passenger transport CES node"
* te_esh2t_pass_sm "short-to-medium distance passenger transport CES node"
* te_esgat_pass_sm "short-to-medium distance passenger transport CES node"
te_esh2t_pass_sm "short-to-medium distance passenger transport CES node"
te_esgat_pass_sm "short-to-medium distance passenger transport CES node"
te_esdie_pass_lo "long distance passenger transport (aviation) CES node"
te_esdie_frgt_sm "short-to-medium distance freight transport CES node"
te_eselt_frgt_sm "short-to-medium distance freight transport CES node"
* te_esh2t_frgt_sm "short-to-medium distance freight transport CES node"
* te_esgat_frgt_sm "short-to-medium distance freight transport CES node"
te_esh2t_frgt_sm "short-to-medium distance freight transport CES node"
te_esgat_frgt_sm "short-to-medium distance freight transport CES node"
te_esdie_frgt_lo "long distance freight transport CES node"
*** Buildings module
......@@ -1058,8 +1058,10 @@ $endif
tdelt "transmission and distribution for electricity to transport"
tdbiogas "transmission and distribution for gas from biomass origin to stationary users"
tdfosgas "transmission and distribution for gas from fossil origin to stationary users"
tdbiohos "transmission and distribution for heating oil from biomass origin to transportation"
tdfoshos "transmission and distribution for heating oil from fossil origin to transportation"
tdbiogat "transmission and distribution for gas from biomass origin to transportation"
tdfosgat "transmission and distribution for gas from biomass origin to transportation"
tdbiohos "transmission and distribution for heating oil from biomass origin to stationary users"
tdfoshos "transmission and distribution for heating oil from fossil origin to stationary users"
tdh2s "transmission and distribution for hydrogen to stationary users"
tdh2t "transmission and distribution for hydrogen to transportation"
tdbiodie "transmission and distribution for diesel from biomass origin to stationary users"
......@@ -1410,6 +1412,7 @@ enty(all_enty) "all types of quantities"
feelt "final energy electricity for transport"
fetf "final energy transport fuels"
feh2t "final energy hydrogen transport"
fegat "final energy nat. gas for transport"
co2 "carbon dioxide emissions"
ch4 "methane emissions"
n2o "n2o emissions from the energy system"
......@@ -2082,18 +2085,18 @@ se2fe(all_enty,all_enty,all_te) "map secondary energy to end-use energy using
/
seel.feels.tdels
segabio.fegas.tdbiogas
segafos.fegas.tdfosgas
segafos.fegas.tdfosgas
seliqbio.fehos.tdbiohos
seliqfos.fehos.tdfoshos
seliqfos.fehos.tdfoshos
sesobio.fesos.tdbiosos
sesofos.fesos.tdfossos
sesofos.fesos.tdfossos
seh2.feh2s.tdh2s
sehe.fehes.tdhes
seel.feelt.tdelt
seliqbio.fepet.tdbiopet
seliqfos.fepet.tdfospet
seliqfos.fepet.tdfospet
seliqbio.fedie.tdbiodie
seliqfos.fedie.tdfosdie
seliqfos.fedie.tdfosdie
seh2.feh2t.tdh2t
/
......@@ -2358,7 +2361,7 @@ teRe2rlfDetail(all_te,rlf) "mapping for se techologies to grades"
teFe2rlf(all_te,rlf) "mapping for final energy to grades"
/
(tdels,tdelt,tdbiogas,tdfosgas,tdbiohos,tdfoshos,tdh2s,tdh2t,tdbiodie,tdfosdie,tdbiopet,tdfospet,tdbiosos,tdfossos,tdhes) . 1
(tdels,tdelt,tdbiogas,tdfosgas,tdbiogat,tdfosgat,tdbiohos,tdfoshos,tdh2s,tdh2t,tdbiodie,tdfosdie,tdbiopet,tdfospet,tdbiosos,tdfossos,tdhes) . 1
/
teue2rlf(all_te,rlf) "mapping for ES production technologies to grades"
......
main.gms
+ 13
− 12
View file @ a5d4820f
......@@ -72,9 +72,9 @@
*
* Regionscode: 690d3718e151be1b450b394c1064b1c5
*
* Input data revision: 5.937
* Input data revision: 5.938
*
* Last modification (input data): Thu Jan 16 14:11:39 2020
* Last modification (input data): Fri Feb 14 10:03:25 2020
*
*###################### R SECTION END (VERSION INFO) ###########################
......@@ -328,8 +328,8 @@ cm_fetaxscen = 3; !! def = 3
cm_multigasscen = 2; !! def = 2
cm_permittradescen = 1; !! def = 1
cm_limit_peur_scen = 1; !! def = 1
$setGlobal cm_oil_scen medOil !! def = medOil
$setGlobal cm_gas_scen medGas !! def = medGas
$setGlobal cm_oil_scen medOil !! def = medOil
$setGlobal cm_gas_scen medGas !! def = medGas
$setGlobal cm_coal_scen medCoal !! def = medCoal
cm_rentdiscoil = 0.2; !! def 0.2
cm_rentdiscoil2 = 0.9; !! def 0.9
......@@ -384,6 +384,7 @@ cm_noReboundEffect = 0;
$setGlobal cm_EsubGrowth low !! def = low
$setGlobal c_scaleEmiHistorical on !! def = on
$setGlobal cm_EDGEtr_scen Conservative_liquids !! def = Conservative_liquids
$setGlobal c_regi_nucscen all !! def = all
$setGlobal c_regi_capturescen all !! def = all
......@@ -393,15 +394,15 @@ $setGlobal c_regi_capturescen all !! def = all
*** --------------------------------------------------------------------------------------------------------------------------------------------------------------------
*--------------------flags------------------------------------------------------------
$SETGLOBAL cm_SlowConvergence off !! def = off
$setGlobal cm_nash_mode debug !! def = parallel
$setGlobal cm_nash_mode parallel !! def = parallel
$setGlobal c_EARLYRETIRE on !! def = on
$setGlobal cm_OILRETIRE off !! def = off
$setglobal cm_INCONV_PENALTY on !! def = on
$setGlobal cm_so2_out_of_opt on !! def = on
$setGlobal c_skip_output off !! def = off
$setGlobal cm_MOFEX off !! def = off
$setGlobal cm_conoptv conopt3 !! def = conopt3
$setGlobal cm_ccsfosall off !! def = off
$setGlobal cm_OILRETIRE off !! def = off
$setglobal cm_INCONV_PENALTY on !! def = on
$setGlobal cm_so2_out_of_opt on !! def = on
$setGlobal c_skip_output off !! def = off
$setGlobal cm_MOFEX off !! def = off
$setGlobal cm_conoptv conopt3 !! def = conopt3
$setGlobal cm_ccsfosall off !! def = off
$setGlobal cm_APscen SSP2 !! def = SSP2
$setGlobal cm_magicc_calibrateTemperature2000 uncalibrated !! def=uncalibrated
......
modules/21_tax/on/datainput.gms
+ 7
− 0
View file @ a5d4820f
......@@ -76,6 +76,13 @@ $offdelim
p21_tau_fe_tax_transport(ttot,all_regi,feForUe) = f21_tau_fe_tax_transport(ttot,all_regi,feForUe);
p21_tau_fe_sub_transport(ttot,all_regi,feForUe) = f21_tau_fe_sub_transport(ttot,all_regi,feForUe);
p21_tau_fe_tax_transport(ttot,all_regi,feForEs) = f21_tau_fe_tax_transport(ttot,all_regi,feForEs);
p21_tau_fe_sub_transport(ttot,all_regi,feForEs) = f21_tau_fe_sub_transport(ttot,all_regi,feForEs);
p21_tau_fe_tax_transport(ttot,all_regi,"fegat") = p21_tau_fe_tax_transport(ttot,all_regi,"fedie");
p21_tau_fe_sub_transport(ttot,all_regi,"fegat") = p21_tau_fe_sub_transport(ttot,all_regi,"fedie");
loop ( fe_tax_sub_sbi(all_in, in), !! Pathways I from FE to the CES
p21_tau_fe_tax_bit_st(ttot,all_regi,in) = f21_tau_fe_tax_bit_st(ttot,all_regi,all_in); !! ppfen in stationary/buildings_industry : all but transport ppfen
p21_tau_fe_sub_bit_st(ttot,all_regi,in) = f21_tau_fe_sub_bit_st(ttot,all_regi,all_in); !! ppfen in stationary/buildings_industry : all but transport ppfen
......
modules/21_tax/on/equations.gms
+ 7
− 3
View file @ a5d4820f
......@@ -96,10 +96,14 @@ v21_emiALLco2neg(t,regi) =e= -vm_emiAll(t,regi,"co2") + v21_emiALLco2neg_slack(t
***---------------------------------------------------------------------------
q21_taxrevFEtrans(t,regi)$(t.val ge max(2010,cm_startyear))..
v21_taxrevFEtrans(t,regi)
=g= SUM(feForUe(enty),
=g= SUM(feForEs(enty),
(p21_tau_fe_tax_transport(t,regi,feForEs) + p21_tau_fe_sub_transport(t,regi,feForEs) ) * SUM(se2fe(enty2,enty,te), vm_prodFe(t,regi,enty2,enty,te))
) +
SUM(feForUe(enty),
(p21_tau_fe_tax_transport(t,regi,feForUe) + p21_tau_fe_sub_transport(t,regi,feForUe) ) * SUM(se2fe(enty2,enty,te), vm_prodFe(t,regi,enty2,enty,te))
)
- p21_taxrevFEtrans0(t,regi) ;
- p21_taxrevFEtrans0(t,regi) ;
***---------------------------------------------------------------------------
*' Calculation of final Energy taxes in Buildings_Industry or Stationary: effective tax rate (tax - subsidy) times FE use in sector
......@@ -163,7 +167,7 @@ v21_taxrevSO2(t,regi) =g= p21_tau_so2_tax(t,regi) * vm_emiTe(t,regi,"so2")
*' Documentation of overall tax approach is above at q21_taxrev.
***---------------------------------------------------------------------------
q21_taxrevBio(t,regi)$(t.val ge max(2010,cm_startyear))..
v21_taxrevBio(t,regi) =g= v21_tau_bio(t) * vm_fuExtr(t,regi,"pebiolc","1") * vm_pebiolc_price(t,regi)
v21_taxrevBio(t,regi) =g= v21_tau_bio(t) * vm_fuExtr(t,regi,"pebiolc","1") * vm_pebiolc_price(t,regi)
- p21_taxrevBio0(t,regi);
***---------------------------------------------------------------------------
......
modules/21_tax/on/postsolve.gms
+ 3
− 1
View file @ a5d4820f
......@@ -26,7 +26,9 @@ p21_taxrevCCS0(ttot,regi) = cm_frac_CCS * pm_data(regi,"omf","ccsinje") * pm_inc
p21_taxrevNetNegEmi0(ttot,regi) = cm_frac_NetNegEmi * pm_taxCO2eq(ttot,regi) * v21_emiALLco2neg.l(ttot,regi);
p21_taxrevFEtrans0(ttot,regi) = SUM(feForUe(enty),
(p21_tau_fe_tax_transport(ttot,regi,feForUe) + p21_tau_fe_sub_transport(ttot,regi,feForUe) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
);
)+
SUM(feForEs(enty), (p21_tau_fe_tax_transport(ttot,regi,feForEs) + p21_tau_fe_sub_transport(ttot,regi,feForEs) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
);
p21_taxrevFEBuildInd0(ttot,regi) = SUM(ppfen(in)$( NOT ppfenFromUe(in)),
(p21_tau_fe_tax_bit_st(ttot,regi,ppfen) + p21_tau_fe_sub_bit_st(ttot,regi,ppfen) ) * vm_cesIO.l(ttot,regi,ppfen)
);
......
modules/21_tax/on/presolve.gms
+ 3
− 1
View file @ a5d4820f
......@@ -25,7 +25,9 @@ p21_taxrevNetNegEmi0(ttot,regi) = cm_frac_NetNegEmi * pm_taxCO2eq(ttot,regi) * v
p21_emiALLco2neg0(ttot,regi) = v21_emiALLco2neg.l(ttot,regi);
p21_taxrevFEtrans0(ttot,regi) = SUM(feForUe(enty),
(p21_tau_fe_tax_transport(ttot,regi,feForUe) + p21_tau_fe_sub_transport(ttot,regi,feForUe) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
);
)+
SUM(feForEs(enty), (p21_tau_fe_tax_transport(ttot,regi,feForEs) + p21_tau_fe_sub_transport(ttot,regi,feForEs) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
);
p21_taxrevFEBuildInd0(ttot,regi) = SUM(ppfen(in)$( NOT ppfenFromUe(in)),
(p21_tau_fe_tax_bit_st(ttot,regi,ppfen) + p21_tau_fe_sub_bit_st(ttot,regi,ppfen) ) * vm_cesIO.l(ttot,regi,ppfen)
);
......
modules/29_CES_parameters/calibrate/datainput.gms
+ 15
− 0
View file @ a5d4820f
......@@ -167,8 +167,16 @@ p29_esdemand "energy service demand"
$ondelim
$include "./modules/29_CES_parameters/calibrate/input/pm_es_demand.cs4r"
$offdelim
/
p29_trpdemand "transport demand"
/
$ondelim
$include "./modules/29_CES_parameters/calibrate/input/pm_trp_demand.cs4r"
$offdelim
/
p29_efficiency_growth "efficency growth for ppf beyond calibration"
/
$ondelim
......@@ -260,6 +268,13 @@ pm_cesdata(t,regi,in,"quantity") $ p29_fedemand(t,regi,"%cm_GDPscen%",in)
*** Load exogenous ES trajectories
pm_cesdata(t,regi,in,"quantity") $ p29_esdemand(t,regi,"%cm_GDPscen%",in)
= p29_esdemand(t,regi,"%cm_GDPscen%",in);
*** Load exogenous transport demand - required for the EDGE transport module
$ifthen.edgesm %transport% == "edge_esm"
pm_cesdata(t,regi,in,"quantity") $ p29_trpdemand(t,regi,"%cm_GDPscen%",in)
= p29_trpdemand(t,regi,"%cm_GDPscen%",in);
$endif.edgesm
*** Load capital quantities
pm_cesdata(t,regi,ppfKap,"quantity") = p29_capitalQuantity(t,regi,"%cm_GDPscen%",ppfKap);
......
modules/29_CES_parameters/calibrate/declarations.gms
+ 1
− 0
View file @ a5d4820f
......@@ -17,6 +17,7 @@ Parameters
p29_effGr(tall,all_regi,all_in) "growth of factor efficiency from input.gdx"
p29_fedemand(tall,all_regi,all_GDPscen,all_in) "final energy demand"
p29_cesdata_price(tall,all_regi,all_in) "exogenous prices in case they are needed"
p29_trpdemand(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_in) "transport demand for the edge_esm transport module, unit: trillion passenger/ton km"
p29_esdemand(tall,all_regi,all_GDPscen,all_in) "energy service demand"
p29_efficiency_growth(tall,all_regi,all_GDPscen,all_in) "efficency level paths for ppf beyond calibration"
p29_capitalQuantity(tall,all_regi,all_GDPscen,all_in) "capital quantities"
......
modules/29_CES_parameters/calibrate/preloop.gms
+ 29
− 3
View file @ a5d4820f
......@@ -309,9 +309,35 @@ pm_cesdata(t,regi,in_29,"price") $ (( not ((ord(t) le 1) or (ord(t) eq card(t)))
Display p29_alpha, p29_beta;
*** for entrp_frgt_lo
*** pass on to pm_cesdata and ensure the resulting price is positive
loop (ttot$( ttot.val ge 2005 AND ttot.val lt 2020),
pm_cesdata(ttot,regi_dyn29(regi),in_29,"price")$(ppf_29(in_29))
pm_cesdata(ttot,regi_dyn29(regi),"entrp_frgt_lo","price")
= max(
1e-3,
( pm_cesdata(ttot,regi,"entrp_frgt_lo","price")
+ p29_alpha(regi,"entrp_frgt_lo") + p29_beta(regi,"entrp_frgt_lo") * ttot.val
)
/ 2
);
);
*** Set minimal price for all periods
loop (ttot$( ttot.val ge 2005),
pm_cesdata(ttot,regi_dyn29(regi),"entrp_frgt_lo","price")
= max(
1e-3,
pm_cesdata(ttot,regi,"entrp_frgt_lo","price")
);
);
display "after entrp_frgt_lo smoothening", pm_cesdata;
*** for all other modes
*** pass on to pm_cesdata and ensure the resulting price is positive
loop (ttot$( ttot.val ge 2005 AND ttot.val lt 2020),
pm_cesdata(ttot,regi_dyn29(regi),in_29,"price")$(ppf_29(in_29) AND (NOT sameas(in_29, "entrp_frgt_lo")))
= max(
1e-2,
( pm_cesdata(ttot,regi,in_29,"price")
......@@ -323,14 +349,14 @@ pm_cesdata(t,regi,in_29,"price") $ (( not ((ord(t) le 1) or (ord(t) eq card(t)))
*** Set minimal price for all periods
loop (ttot$( ttot.val ge 2005),
pm_cesdata(ttot,regi_dyn29(regi),in_29,"price")$(ppf_29(in_29))
pm_cesdata(ttot,regi_dyn29(regi),in_29,"price")$(ppf_29(in_29) AND (NOT sameas(in_29, "entrp_frgt_lo")))
= max(
1e-2,
pm_cesdata(ttot,regi,in_29,"price")
);
);
display "after all but entrp_frgt_lo smoothening", pm_cesdata;
*** Smooth prices for the whole period for elements in or below the putty-clay structure
***Problem if there are several ppfIO_putty below each other, prices are then smoothed twice
......
modules/31_fossil/grades2poly/datainput.gms
+ 1
− 1
View file @ a5d4820f
......@@ -60,7 +60,7 @@ p31_fosadjco_xi5xi6(regi,"xi6","pegas")=1/1;
*RP* Define bound on total PE uranium use in Megatonnes of metal uranium (U3O8, the stuff that is traded at 40-60US$/lb).
s31_max_disp_peur = 23;
*JH* 20140604 (25th Anniversary of Tiananmen) New nuclear assumption for SSP5
*JH* 20140604 New nuclear assumption for SSP5
if (cm_nucscen eq 6,
s31_max_disp_peur = 23*10;
);
......
modules/31_fossil/timeDepGrades/datainput.gms
+ 1
− 1
View file @ a5d4820f
......@@ -132,7 +132,7 @@ $include "./modules/31_fossil/timeDepGrades/input/p31_datafosdyn.inc";
*RP* Define bound on total PE uranium use in Megatonnes of metal uranium (U3O8, the commodity that is traded at 40-60US$/lb).
s31_max_disp_peur = 23;
*JH* 20140604 (25th Anniversary of Tiananmen) New nuclear assumption for SSP5
*JH* 20140604 New nuclear assumption for SSP5
if (cm_nucscen eq 6,
s31_max_disp_peur = 23*10;
);
......
modules/35_transport/complex/declarations.gms
+ 0
− 1
View file @ a5d4820f
......@@ -20,7 +20,6 @@ p35_pass_FE_share_transp(all_regi) "Share of 'non-LDV passenger FE' i
p35_pass_nonLDV_ES_efficiency(ttot,all_regi) "Non-LDV passenger energy service per non-LDV FE. Unit: bn pkm/EJ"
p35_passLDV_ES_efficiency(ttot,all_regi) "LDV passenger energy service per non-LDV FE. Only correct if applied to CES-input, as BEV and H2FCV have higher efficiencies. Unit: bn pkm/EJ"
p35_freight_ES_efficiency(ttot,all_regi) "Freight energy service per freight FE. Unit: bn tkm/EJ"
pm_bunker_share_in_nonldv_fe(tall,all_regi) "Share of bunkers in non-LDV transport - fedie"
p35_share_seliq_t(ttot,all_regi) "share of liquids used for transport sector (fedie + fepet). Unit 0..1"
p35_share_seh2_t(ttot,all_regi) "share of hydrogen used for transport sector (feh2t). Unit 0..1"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment