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
96f2813a
Commit
96f2813a
authored
4 years ago
by
Alois Dirnaichner
Browse files
Options
Downloads
Patches
Plain Diff
Update parameter name and documentation for bioliquid share to match
the new definition.
parent
5af21282
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!163
Update the Bioshare Parameter to address Bioliquid shares on the SE level
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
config/default.cfg
+2
-2
2 additions, 2 deletions
config/default.cfg
core/bounds.gms
+1
-1
1 addition, 1 deletion
core/bounds.gms
core/declarations.gms
+2
-2
2 additions, 2 deletions
core/declarations.gms
core/equations.gms
+1
-1
1 addition, 1 deletion
core/equations.gms
with
6 additions
and
6 deletions
config/default.cfg
+
2
−
2
View file @
96f2813a
...
@@ -277,7 +277,7 @@ cfg$gms$cm_ccapturescen <- 1 # def <- 1
...
@@ -277,7 +277,7 @@ cfg$gms$cm_ccapturescen <- 1 # def <- 1
cfg$gms$c_bioliqscen
<- 1 # def <- 1
cfg$gms$c_bioliqscen
<- 1 # def <- 1
cfg$gms$c_bioh2scen
<- 1 # def <- 1
cfg$gms$c_bioh2scen
<- 1 # def <- 1
cfg$gms$c_shGreenH2
<- 0 # def <- 0
cfg$gms$c_shGreenH2
<- 0 # def <- 0
cfg$gms$c_shBio
Trans
<- 1 # def <- 1
cfg$gms$c_shBio
liq
<- 1 # def <- 1
cfg$gms$cm_shSynTrans
<- 0 # def <- 0
cfg$gms$cm_shSynTrans
<- 0 # def <- 0
cfg$gms$cm_IndCCSscen
<- 1 # def <- 1
cfg$gms$cm_IndCCSscen
<- 1 # def <- 1
cfg$gms$cm_optimisticMAC
<- 0 # def <- 0
cfg$gms$cm_optimisticMAC
<- 0 # def <- 0
...
@@ -538,7 +538,7 @@ cfg$RunsUsingTHISgdxAsBAU <- NA
...
@@ -538,7 +538,7 @@ cfg$RunsUsingTHISgdxAsBAU <- NA
# (1):
all technologies
# (1):
all technologies
# c_shGreenH2
"lower bound on share of green hydrogen in all hydrogen by 2030"
# c_shGreenH2
"lower bound on share of green hydrogen in all hydrogen by 2030"
# (a
number between 0 and 1): share
# (a
number between 0 and 1): share
# c_shBio
Trans
"upper bound on share of bio
fuels in transport fuel
s from 202
0
onwards"
# c_shBio
liq
"upper bound on share of bio
liquid
s from 202
5
onwards"
# (a
number between 0 and 1): share
# (a
number between 0 and 1): share
# cm_shSynTrans
"lower bound on share of synfuels in transport fuels by 2035"
# cm_shSynTrans
"lower bound on share of synfuels in transport fuels by 2035"
# (a
number between 0 and 1): share
# (a
number between 0 and 1): share
...
...
This diff is collapsed.
Click to expand it.
core/bounds.gms
+
1
−
1
View file @
96f2813a
...
@@ -508,6 +508,6 @@ v_shGreenH2.lo(t,regi)$(t.val gt 2025) = c_shGreenH2;
...
@@ -508,6 +508,6 @@ v_shGreenH2.lo(t,regi)$(t.val gt 2025) = c_shGreenH2;
*** upper bound on bioliquids as a share of transport liquids
*** upper bound on bioliquids as a share of transport liquids
***----------------------------------------------------------------------------
***----------------------------------------------------------------------------
v_shBio
Trans
.up(t,regi)$(t.val > 2020) = c_shBio
Trans
;
v_shBio
liq
.up(t,regi)$(t.val > 2020) = c_shBio
liq
;
*** EOF ./core/bounds.gms
*** EOF ./core/bounds.gms
This diff is collapsed.
Click to expand it.
core/declarations.gms
+
2
−
2
View file @
96f2813a
...
@@ -303,7 +303,7 @@ vm_demSeOth(ttot,all_regi,all_enty,all_te) "other sety demand from cert
...
@@ -303,7 +303,7 @@ vm_demSeOth(ttot,all_regi,all_enty,all_te) "other sety demand from cert
vm_prodSeOth(ttot,all_regi,all_enty,all_te) "other sety production from certain technologies, have to be calculated in additional equations [TWa]"
vm_prodSeOth(ttot,all_regi,all_enty,all_te) "other sety production from certain technologies, have to be calculated in additional equations [TWa]"
v_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen by 2030 [0..1]"
v_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen by 2030 [0..1]"
v_shBio
Trans
(ttot,all_regi) "Share of biofuels in
all final energies used for transportation
. Value between 0 and 1."
v_shBio
liq
(ttot,all_regi)
"Share of biofuels in
SE liquids from 2025 onwards
. Value between 0 and 1."
*** ES layer variables
*** ES layer variables
vm_demFeForEs(ttot,all_regi,all_enty,all_esty,all_teEs) "Final energy which will be used in the ES layer."
vm_demFeForEs(ttot,all_regi,all_enty,all_esty,all_teEs) "Final energy which will be used in the ES layer."
...
@@ -394,7 +394,7 @@ q_es2ppfen(ttot,all_regi,all_in) "Energy services are h
...
@@ -394,7 +394,7 @@ q_es2ppfen(ttot,all_regi,all_in) "Energy services are h
q_shFeCes(ttot,all_regi,all_enty,all_in,all_teEs) "Shares of final energies in production factors."
q_shFeCes(ttot,all_regi,all_enty,all_in,all_teEs) "Shares of final energies in production factors."
*q_shFeCesNorm(ttot,all_regi,all_in) "Shares have to sum to 1."
*q_shFeCesNorm(ttot,all_regi,all_in) "Shares have to sum to 1."
q_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen"
q_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen"
q_shBio
Trans
(ttot,all_regi) "Define the share of biofuels in
all final energies for transportati
on."
q_shBio
liq
(ttot,all_regi) "Define the share of biofuels in
SE liquids from 2025
on."
***----------------------------------------------------------------------------------------
***----------------------------------------------------------------------------------------
***----------------------------------------------trade module------------------------------
***----------------------------------------------trade module------------------------------
...
...
This diff is collapsed.
Click to expand it.
core/equations.gms
+
1
−
1
View file @
96f2813a
...
@@ -831,7 +831,7 @@ q_shGreenH2(t,regi)..
...
@@ -831,7 +831,7 @@ q_shGreenH2(t,regi)..
***---------------------------------------------------------------------------
***---------------------------------------------------------------------------
*' Share of biofuels in transport liquids
*' Share of biofuels in transport liquids
***---------------------------------------------------------------------------
***---------------------------------------------------------------------------
q_shBio
Trans
(t,regi)..
q_shBio
liq
(t,regi)..
sum(se2se(entyPe,"seliqbio",te), vm_prodSe(t,regi,entyPe,"seliqbio",te))
sum(se2se(entyPe,"seliqbio",te), vm_prodSe(t,regi,entyPe,"seliqbio",te))
=e=
=e=
(
(
...
...
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