Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
remind
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jerome Hilaire
remind
Commits
bc11f282
Commit
bc11f282
authored
5 years ago
by
Alois Dirnaichner
Browse files
Options
Downloads
Patches
Plain Diff
Fix compatibility issue with old natgas for transport defs.
parent
2900ae91
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!67
Request to merge the new transport module EDGE-T
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/sets.gms
+5
-3
5 additions, 3 deletions
core/sets.gms
modules/04_PE_FE_parameters/iea2014/sets.gms
+0
-1
0 additions, 1 deletion
modules/04_PE_FE_parameters/iea2014/sets.gms
with
5 additions
and
4 deletions
core/sets.gms
+
5
−
3
View file @
bc11f282
...
@@ -1054,8 +1054,10 @@ $endif
...
@@ -1054,8 +1054,10 @@ $endif
tdelt "transmission and distribution for electricity to transport"
tdelt "transmission and distribution for electricity to transport"
tdbiogas "transmission and distribution for gas from biomass origin to stationary users"
tdbiogas "transmission and distribution for gas from biomass origin to stationary users"
tdfosgas "transmission and distribution for gas from fossil 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"
tdbiogat "transmission and distribution for gas from biomass origin to transportation"
tdfoshos "transmission and distribution for heating oil from fossil 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"
tdh2s "transmission and distribution for hydrogen to stationary users"
tdh2t "transmission and distribution for hydrogen to transportation"
tdh2t "transmission and distribution for hydrogen to transportation"
tdbiodie "transmission and distribution for diesel from biomass origin to stationary users"
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"
...
@@ -2377,7 +2379,7 @@ teRe2rlfDetail(all_te,rlf) "mapping for se techologies to grades"
teFe2rlf(all_te,rlf) "mapping for final energy 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"
teue2rlf(all_te,rlf) "mapping for ES production technologies to grades"
...
...
This diff is collapsed.
Click to expand it.
modules/04_PE_FE_parameters/iea2014/sets.gms
+
0
−
1
View file @
bc11f282
...
@@ -32,7 +32,6 @@ uet2fet(all_enty,all_enty,all_te,all_te) "match ESM fe for ue-items of the tran
...
@@ -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.tdbiodie.tdbiodie
fedie.fedie.tdfosdie.tdfosdie
fedie.fedie.tdfosdie.tdfosdie
feelt.feelt.tdelt.tdelt
feelt.feelt.tdelt.tdelt
fegat.fegat.tdgat.tdgat
/
/
in2enty(all_enty,all_enty,all_te,all_te) "match ESM fe to CES structure"
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"
in2enty2(all_enty,all_enty,all_te,all_te) "alias of in2enty"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment