Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
cfg$extramappings_historic <- ""

#### Current input data revision (<mainrevision>.<subrevision>) ####
cfg$inputRevision <- "7.99"
cfg$inputRevision <- "7.99dev-rosa"

#### Current CES parameter and GDX revision (commit hash) ####
cfg$CESandGDXversion <- "8800bf9e3658cf387e7f6aa87f8a91b20675bce9"
cfg$CESandGDXversion <- "5b90160e524bb650284cd1b6cb9bf3dda86deb8c"

#### Path to a renv.lock file to restore a project's dependencies from. If NULL, all R packages in their currently installed version will be used.
cfg$UseThisRenvLock <- NULL
Expand Down
107 changes: 53 additions & 54 deletions config/scenario_config.csv

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions core/datainput.gms
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,10 @@ pm_cf(ttot,regi,"h2turbVRE")$(ttot.val ge 2025) = pm_cf(ttot,regi,"ngt");
pm_cf(ttot,regi,"tdh2b") = pm_cf(ttot,regi,"tdh2s");
pm_cf(ttot,regi,"tdh2i") = pm_cf(ttot,regi,"tdh2s");

*** RoSa: set CF for biodigestCHP and biodigestGAS
pm_cf(ttot,regi,"biodigestCHP") = 0.9;
pm_cf(ttot,regi,"biodigestGAS") = 0.9;

*** Region- and tech-specific early retirement rates
loop(ext_regi$pm_extRegiEarlyRetiRate(ext_regi),
pm_regiEarlyRetiRate(t,regi,teEarlyReti)$(regi_group(ext_regi,regi)) = pm_extRegiEarlyRetiRate(ext_regi);
Expand Down
24 changes: 12 additions & 12 deletions core/input/generisdata_tech.prn
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ flexibility 0.85 0.7 0.9 0.75

*** biomass technologies
+ 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
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 2800 3100
constrTme 0 1 4 2 4 5 4 4 4 4 4 2 2 4 5
lifetime 35 35 40 40 40 40 40 40 35 35 35 35 35 35 35
Expand All @@ -66,17 +66,17 @@ omf 0.03 0.04 0.04 0.04 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 10.60
flexibility 0.7 0.75 0.7

+ biopyronly biopyrhe biopyrchp biopyrliq biocharuse
tech_stat 1 1 1 3
inco0 1080 1430 1750 3215
floorcost 511 668 989
constrTme 4 4 4 4
eta 0.48 0.48 0.48 0.36
omf 0.04 0.04 0.04 0.05
omv 70 70 70 138
lifetime 30 30 30 40 1
learn 0.10 0.10 0.10
ccap0 0.001 0.001 0.001
+ biopyronly biopyrhe biopyrchp biopyrliq biodigestCHP biodigestGAS biocharuse
tech_stat 1 1 1 3
inco0 1080 1430 1750 3215 1500 2200
floorcost 511 668 989
constrTme 4 4 4 4 2 2
eta 0.48 0.48 0.48 0.36 0.4 0.5
omf 0.04 0.04 0.04 0.05 0.04 0.04
omv 70 70 70 138 50 50
lifetime 30 30 30 40 20 20 1
learn 0.10 0.10 0.10
ccap0 0.001 0.001 0.001

*** hydrogen technologies
+ elh2 h2turb h2curt h2turbVRE elh2VRE h22ch4 MeOH
Expand Down
4 changes: 2 additions & 2 deletions core/input/generisdata_vintages.prn
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ $offtext
36 1.0
41 1.0

+ biopyronly biopyrhe biopyrchp biopyrliq
1 1.0 1.0 1.0 1.0
+ biopyronly biopyrhe biopyrchp biopyrliq biodigestCHP biodigestGAS
1 1.0 1.0 1.0 1.0 1.0 1.0

+ hydro windon windoff spv solhe csp elh2 geohdr geohe h2turb h22ch4 MeOH
1 5.0 10.0 10.0 10.0 4.5 1.0 1.0 10.0 10.0 1 1.0 1.0
Expand Down
Loading