From bc11f282007a5eba14b25dd011983859ad69d2e6 Mon Sep 17 00:00:00 2001 From: Alois Dirnaichner <aloisdir@pik-potsdam.de> Date: Wed, 8 Jan 2020 20:30:37 +0100 Subject: [PATCH] Fix compatibility issue with old natgas for transport defs. --- core/sets.gms | 8 +++++--- modules/04_PE_FE_parameters/iea2014/sets.gms | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/sets.gms b/core/sets.gms index 06f6de7..1106c0f 100755 --- a/core/sets.gms +++ b/core/sets.gms @@ -1054,8 +1054,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" @@ -2377,7 +2379,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" diff --git a/modules/04_PE_FE_parameters/iea2014/sets.gms b/modules/04_PE_FE_parameters/iea2014/sets.gms index 756ae34..c77461c 100644 --- a/modules/04_PE_FE_parameters/iea2014/sets.gms +++ b/modules/04_PE_FE_parameters/iea2014/sets.gms @@ -32,7 +32,6 @@ uet2fet(all_enty,all_enty,all_te,all_te) "match ESM fe for ue-items of the tran fedie.fedie.tdbiodie.tdbiodie fedie.fedie.tdfosdie.tdfosdie feelt.feelt.tdelt.tdelt - fegat.fegat.tdgat.tdgat / in2enty(all_enty,all_enty,all_te,all_te) "match ESM fe to CES structure" in2enty2(all_enty,all_enty,all_te,all_te) "alias of in2enty" -- GitLab