Skip to content
Open
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: 4 additions & 0 deletions docs/release_notes/upcoming.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ ready to be released, carry out the following steps:

## Breaking changes

- Process parameters, flows and availabilities can no longer vary by commission year. To represent
this in MUSE, users should instead create distinct processes for different "vintages" of a
technology (e.g. `WNDFRM_2030`, `WNDFRM_2040`), using the `start_year` and `end_year` fields to
define the range of years over which each vintage can be commissioned.
- Changed the default `pricing_strategy` for SED/SVD commodities from "shadow" to "full_average" ([#1281])
- The individual units of divisible assets are no longer treated as separate assets and are instead
grouped under a single larger asset, affecting a number of output files. The `group_id` column has
Expand Down
48 changes: 24 additions & 24 deletions examples/circularity/process_availabilities.csv
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
process_id,regions,commission_years,time_slice,limits
GASDRV,all,all,annual,..0.9
OAGRSV,all,all,annual,..0.9
GASPRC,all,all,annual,..0.9
OILREF,all,all,annual,..0.9
OILRF2,all,all,annual,..0.9
GASCGT,all,all,annual,..0.9
WNDFRM,all,all,winter.night,..0.486418015
WNDFRM,all,all,winter.day,..0.543166784
WNDFRM,all,all,winter.peak,..0.504433498
WNDFRM,all,all,winter.evening,..0.493173821
WNDFRM,all,all,peak.night,..0.312697296
WNDFRM,all,all,peak.day,..0.489120338
WNDFRM,all,all,peak.peak,..0.454890922
WNDFRM,all,all,peak.evening,..0.331034483
WNDFRM,all,all,summer.night,..0.17951141
WNDFRM,all,all,summer.day,..0.349950739
WNDFRM,all,all,summer.peak,..0.342294159
WNDFRM,all,all,summer.evening,..0.202674173
WNDFRM,all,all,autumn.night,..0.3513019
WNDFRM,all,all,autumn.day,..0.460745954
WNDFRM,all,all,autumn.peak,..0.396340605
WNDFRM,all,all,autumn.evening,..0.364813512
BIOPLL,all,all,annual,..0.95
process_id,regions,time_slice,limits
GASDRV,all,annual,..0.9
OAGRSV,all,annual,..0.9
GASPRC,all,annual,..0.9
OILREF,all,annual,..0.9
OILRF2,all,annual,..0.9
GASCGT,all,annual,..0.9
WNDFRM,all,winter.night,..0.486418015
WNDFRM,all,winter.day,..0.543166784
WNDFRM,all,winter.peak,..0.504433498
WNDFRM,all,winter.evening,..0.493173821
WNDFRM,all,peak.night,..0.312697296
WNDFRM,all,peak.day,..0.489120338
WNDFRM,all,peak.peak,..0.454890922
WNDFRM,all,peak.evening,..0.331034483
WNDFRM,all,summer.night,..0.17951141
WNDFRM,all,summer.day,..0.349950739
WNDFRM,all,summer.peak,..0.342294159
WNDFRM,all,summer.evening,..0.202674173
WNDFRM,all,autumn.night,..0.3513019
WNDFRM,all,autumn.day,..0.460745954
WNDFRM,all,autumn.peak,..0.396340605
WNDFRM,all,autumn.evening,..0.364813512
BIOPLL,all,annual,..0.95
90 changes: 45 additions & 45 deletions examples/circularity/process_flows.csv
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
process_id,commodity_id,regions,commission_years,coeff,type,cost
GASDRV,GASPRD,all,all,1,fixed,
OAGRSV,OILCRD,all,all,1,fixed,
OAGRSV,GASPRD,all,all,0.1,fixed,
GASPRC,GASPRD,all,all,-1.05,fixed,
GASPRC,GASNAT,all,all,1,fixed,
OILREF,OILCRD,all,all,-1.3,fixed,
OILREF,GASOLI,all,all,0.5,fixed,
OILREF,DIESEL,all,all,0.5,fixed,
OILRF2,OILCRD,all,all,-1.31,fixed,
OILRF2,GASOLI,all,all,1,fixed,
WNDFRM,ELCTRI,all,all,1,fixed,
GASCGT,GASNAT,all,all,-1.5,fixed,
GASCGT,ELCTRI,all,all,1,fixed,
H2YGEN,H2YPRD,all,all,-1.5,fixed,
H2YGEN,ELCTRI,all,all,1,fixed,
H2YPRO,ELCTRI,all,all,-1.333,fixed,
H2YPRO,H2YPRD,all,all,1,fixed,
TPETCR,GASOLI,all,all,-2.702702703,fixed,
TPETCR,TPASKM,all,all,1,fixed,
TDIECR,DIESEL,all,all,-2.222222222,fixed,
TDIECR,TPASKM,all,all,1,fixed,
TELCCR,ELCTRI,all,all,-1.754385965,fixed,
TELCCR,TPASKM,all,all,1,fixed,
THYBCR,ELCTRI,all,all,-0.854385965,fixed,
THYBCR,GASOLI,all,all,-1.0,fixed,
THYBCR,TPASKM,all,all,1,fixed,
RGASBR,GASNAT,all,all,-1.15,fixed,
RGASBR,RSHEAT,all,all,1,fixed,
RELCHP,ELCTRI,all,all,-0.33,fixed,
RELCHP,RSHEAT,all,all,1,fixed,
GASDRV,CO2EMT,all,all,5.113,fixed,
OAGRSV,CO2EMT,all,all,7.333,fixed,
GASPRC,CO2EMT,all,all,2.5565,fixed,
OILREF,CO2EMT,all,all,21.999,fixed,
OILRF2,CO2EMT,all,all,22,fixed,
GASCGT,CO2EMT,all,all,76.695,fixed,
TPETCR,CO2EMT,all,all,179.7297297,fixed,
TDIECR,CO2EMT,all,all,154.0222222,fixed,
RGASBR,CO2EMT,all,all,58.7995,fixed,
BIOPRO,BIOPRD,all,all,1.0,fixed,
BIOPLL,BIOPRD,all,all,-1.05,fixed,
BIOPLL,BIOPEL,all,all,1.0,fixed,
RBIOBL,BIOPEL,all,all,-1.2,fixed,
RBIOBL,RSHEAT,all,all,1,fixed,
process_id,commodity_id,regions,coeff,type,cost
GASDRV,GASPRD,all,1,fixed,
OAGRSV,OILCRD,all,1,fixed,
OAGRSV,GASPRD,all,0.1,fixed,
GASPRC,GASPRD,all,-1.05,fixed,
GASPRC,GASNAT,all,1,fixed,
OILREF,OILCRD,all,-1.3,fixed,
OILREF,GASOLI,all,0.5,fixed,
OILREF,DIESEL,all,0.5,fixed,
OILRF2,OILCRD,all,-1.31,fixed,
OILRF2,GASOLI,all,1,fixed,
WNDFRM,ELCTRI,all,1,fixed,
GASCGT,GASNAT,all,-1.5,fixed,
GASCGT,ELCTRI,all,1,fixed,
H2YGEN,H2YPRD,all,-1.5,fixed,
H2YGEN,ELCTRI,all,1,fixed,
H2YPRO,ELCTRI,all,-1.333,fixed,
H2YPRO,H2YPRD,all,1,fixed,
TPETCR,GASOLI,all,-2.702702703,fixed,
TPETCR,TPASKM,all,1,fixed,
TDIECR,DIESEL,all,-2.222222222,fixed,
TDIECR,TPASKM,all,1,fixed,
TELCCR,ELCTRI,all,-1.754385965,fixed,
TELCCR,TPASKM,all,1,fixed,
THYBCR,ELCTRI,all,-0.854385965,fixed,
THYBCR,GASOLI,all,-1.0,fixed,
THYBCR,TPASKM,all,1,fixed,
RGASBR,GASNAT,all,-1.15,fixed,
RGASBR,RSHEAT,all,1,fixed,
RELCHP,ELCTRI,all,-0.33,fixed,
RELCHP,RSHEAT,all,1,fixed,
GASDRV,CO2EMT,all,5.113,fixed,
OAGRSV,CO2EMT,all,7.333,fixed,
GASPRC,CO2EMT,all,2.5565,fixed,
OILREF,CO2EMT,all,21.999,fixed,
OILRF2,CO2EMT,all,22,fixed,
GASCGT,CO2EMT,all,76.695,fixed,
TPETCR,CO2EMT,all,179.7297297,fixed,
TDIECR,CO2EMT,all,154.0222222,fixed,
RGASBR,CO2EMT,all,58.7995,fixed,
BIOPRO,BIOPRD,all,1.0,fixed,
BIOPLL,BIOPRD,all,-1.05,fixed,
BIOPLL,BIOPEL,all,1.0,fixed,
RBIOBL,BIOPEL,all,-1.2,fixed,
RBIOBL,RSHEAT,all,1,fixed,
38 changes: 19 additions & 19 deletions examples/circularity/process_parameters.csv
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
process_id,regions,commission_years,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate
GASDRV,GBR,all,10,0.3,2,25,0.1
OAGRSV,GBR,all,15,0.45,3,25,0.1
GASPRC,GBR,all,7,0.21,0.5,25,0.1
OILREF,GBR,all,9,0.27,0.66,25,0.1
OILRF2,GBR,all,9.1,0.3,0.68,25,0.1
WNDFRM,GBR,all,1000,30,0.4,25,0.1
GASCGT,GBR,all,700,21,0.55,30,0.1
H2YGEN,GBR,all,1200,1,0.6,30,0.1
H2YPRO,GBR,all,15,0.9,0.6,20,0.1
TPETCR,GBR,all,2,0.06,0.2,10,0.1
TDIECR,GBR,all,2.1,0.063,0.18,10,0.1
TELCCR,GBR,all,4,0.18,0.15,10,0.1
THYBCR,GBR,all,1,0.17,0.17,10,0.1
RGASBR,GBR,all,55.56,1.6668,0.16,15,0.1
RELCHP,GBR,all,138.9,4.167,0.17,15,0.1
BIOPRO,all,all,1,0.2,0.25,20,0.09
BIOPLL,all,all,2,0.22,0.26,20,0.1
RBIOBL,all,all,60,1.05,0.2,20,0.1
process_id,regions,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate
GASDRV,GBR,10,0.3,2,25,0.1
OAGRSV,GBR,15,0.45,3,25,0.1
GASPRC,GBR,7,0.21,0.5,25,0.1
OILREF,GBR,9,0.27,0.66,25,0.1
OILRF2,GBR,9.1,0.3,0.68,25,0.1
WNDFRM,GBR,1000,30,0.4,25,0.1
GASCGT,GBR,700,21,0.55,30,0.1
H2YGEN,GBR,1200,1,0.6,30,0.1
H2YPRO,GBR,15,0.9,0.6,20,0.1
TPETCR,GBR,2,0.06,0.2,10,0.1
TDIECR,GBR,2.1,0.063,0.18,10,0.1
TELCCR,GBR,4,0.18,0.15,10,0.1
THYBCR,GBR,1,0.17,0.17,10,0.1
RGASBR,GBR,55.56,1.6668,0.16,15,0.1
RELCHP,GBR,138.9,4.167,0.17,15,0.1
BIOPRO,all,1,0.2,0.25,20,0.09
BIOPLL,all,2,0.22,0.26,20,0.1
RBIOBL,all,60,1.05,0.2,20,0.1
42 changes: 21 additions & 21 deletions examples/missing_commodity/process_availabilities.csv
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
process_id,regions,commission_years,time_slice,limits
GASDRV,all,all,annual,..0.9
GASPRC,all,all,annual,..0.9
BIOPLL,all,all,annual,..0.95
GASCGT,all,all,annual,..0.9
WNDFRM,all,all,winter.night,..0.486418015
WNDFRM,all,all,winter.day,..0.543166784
WNDFRM,all,all,winter.peak,..0.504433498
WNDFRM,all,all,winter.evening,..0.493173821
WNDFRM,all,all,peak.night,..0.312697296
WNDFRM,all,all,peak.day,..0.489120338
WNDFRM,all,all,peak.peak,..0.454890922
WNDFRM,all,all,peak.evening,..0.331034483
WNDFRM,all,all,summer.night,..0.17951141
WNDFRM,all,all,summer.day,..0.349950739
WNDFRM,all,all,summer.peak,..0.342294159
WNDFRM,all,all,summer.evening,..0.202674173
WNDFRM,all,all,autumn.night,..0.3513019
WNDFRM,all,all,autumn.day,..0.460745954
WNDFRM,all,all,autumn.peak,..0.396340605
WNDFRM,all,all,autumn.evening,..0.364813512
process_id,regions,time_slice,limits
GASDRV,all,annual,..0.9
GASPRC,all,annual,..0.9
BIOPLL,all,annual,..0.95
GASCGT,all,annual,..0.9
WNDFRM,all,winter.night,..0.486418015
WNDFRM,all,winter.day,..0.543166784
WNDFRM,all,winter.peak,..0.504433498
WNDFRM,all,winter.evening,..0.493173821
WNDFRM,all,peak.night,..0.312697296
WNDFRM,all,peak.day,..0.489120338
WNDFRM,all,peak.peak,..0.454890922
WNDFRM,all,peak.evening,..0.331034483
WNDFRM,all,summer.night,..0.17951141
WNDFRM,all,summer.day,..0.349950739
WNDFRM,all,summer.peak,..0.342294159
WNDFRM,all,summer.evening,..0.202674173
WNDFRM,all,autumn.night,..0.3513019
WNDFRM,all,autumn.day,..0.460745954
WNDFRM,all,autumn.peak,..0.396340605
WNDFRM,all,autumn.evening,..0.364813512
40 changes: 20 additions & 20 deletions examples/missing_commodity/process_flows.csv
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
process_id,commodity_id,regions,commission_years,coeff,type,cost
GASDRV,GASPRD,all,all,1.0,fixed,
GASPRC,GASPRD,all,all,-1.05,fixed,
GASPRC,GASNAT,all,all,1.0,fixed,
BIOPRO,BIOPRD,all,all,1.0,fixed,
BIOPLL,BIOPRD,all,all,-1.05,fixed,
BIOPLL,BIOPEL,all,all,1.0,fixed,
WNDFRM,ELCTRI,all,all,1.0,fixed,
GASCGT,GASNAT,all,all,-1.5,fixed,
GASCGT,ELCTRI,all,all,1.0,fixed,
RGASBR,GASNAT,all,all,-1.15,fixed,
RGASBR,RSHEAT,all,all,1.0,fixed,
RELCHP,ELCTRI,all,all,-0.33,fixed,
RELCHP,RSHEAT,all,all,1.0,fixed,
GASDRV,CO2EMT,all,all,5.113,fixed,
GASPRC,CO2EMT,all,all,2.5565,fixed,
GASCGT,CO2EMT,all,all,76.695,fixed,
RGASBR,CO2EMT,all,all,58.7995,fixed,
RBIOBL,BIOPEL,all,all,-1.2,fixed,
RBIOBL,RSHEAT,all,all,1,fixed,
process_id,commodity_id,regions,coeff,type,cost
GASDRV,GASPRD,all,1.0,fixed,
GASPRC,GASPRD,all,-1.05,fixed,
GASPRC,GASNAT,all,1.0,fixed,
BIOPRO,BIOPRD,all,1.0,fixed,
BIOPLL,BIOPRD,all,-1.05,fixed,
BIOPLL,BIOPEL,all,1.0,fixed,
WNDFRM,ELCTRI,all,1.0,fixed,
GASCGT,GASNAT,all,-1.5,fixed,
GASCGT,ELCTRI,all,1.0,fixed,
RGASBR,GASNAT,all,-1.15,fixed,
RGASBR,RSHEAT,all,1.0,fixed,
RELCHP,ELCTRI,all,-0.33,fixed,
RELCHP,RSHEAT,all,1.0,fixed,
GASDRV,CO2EMT,all,5.113,fixed,
GASPRC,CO2EMT,all,2.5565,fixed,
GASCGT,CO2EMT,all,76.695,fixed,
RGASBR,CO2EMT,all,58.7995,fixed,
RBIOBL,BIOPEL,all,-1.2,fixed,
RBIOBL,RSHEAT,all,1,fixed,
20 changes: 10 additions & 10 deletions examples/missing_commodity/process_parameters.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
process_id,regions,commission_years,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate
GASDRV,all,all,10.0,0.3,2.0,25,0.1
GASPRC,all,all,7.0,0.21,0.5,25,0.1
BIOPRO,all,all,1.0,0.2,0.25,20,0.09
BIOPLL,all,all,2.0,0.22,0.26,20,0.1
WNDFRM,all,all,1000.0,30.0,0.4,25,0.1
GASCGT,all,all,700.0,21.0,0.55,30,0.1
RGASBR,all,all,55.56,1.6668,0.16,15,0.1
RELCHP,all,all,138.9,4.167,0.17,15,0.1
RBIOBL,all,all,60,1.05,0.2,20,0.1
process_id,regions,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate
GASDRV,all,10.0,0.3,2.0,25,0.1
GASPRC,all,7.0,0.21,0.5,25,0.1
BIOPRO,all,1.0,0.2,0.25,20,0.09
BIOPLL,all,2.0,0.22,0.26,20,0.1
WNDFRM,all,1000.0,30.0,0.4,25,0.1
GASCGT,all,700.0,21.0,0.55,30,0.1
RGASBR,all,55.56,1.6668,0.16,15,0.1
RELCHP,all,138.9,4.167,0.17,15,0.1
RBIOBL,all,60,1.05,0.2,20,0.1
8 changes: 4 additions & 4 deletions examples/muse1_default/process_availabilities.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
process_id,regions,commission_years,time_slice,limits
gassupply1,R1,all,annual,..0.9
gasCCGT,R1,all,annual,..0.9
windturbine,R1,all,annual,..0.4
process_id,regions,time_slice,limits
gassupply1,R1,annual,..0.9
gasCCGT,R1,annual,..0.9
windturbine,R1,annual,..0.4
24 changes: 12 additions & 12 deletions examples/muse1_default/process_flows.csv
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
process_id,commodity_id,regions,commission_years,coeff,type,cost
gassupply1,gas,R1,all,1,fixed,
gasCCGT,gas,R1,all,-1.67,fixed,
gasCCGT,electricity,R1,all,1,fixed,
gasCCGT,CO2f,R1,all,91.67,fixed,
windturbine,wind,R1,all,-1,fixed,
windturbine,electricity,R1,all,1,fixed,
gasboiler,gas,R1,all,-1.16,fixed,
gasboiler,heat,R1,all,1,fixed,
gasboiler,CO2f,R1,all,64.71,fixed,
heatpump,electricity,R1,all,-0.4,fixed,
heatpump,heat,R1,all,1,fixed,
process_id,commodity_id,regions,coeff,type,cost
gassupply1,gas,R1,1,fixed,
gasCCGT,gas,R1,-1.67,fixed,
gasCCGT,electricity,R1,1,fixed,
gasCCGT,CO2f,R1,91.67,fixed,
windturbine,wind,R1,-1,fixed,
windturbine,electricity,R1,1,fixed,
gasboiler,gas,R1,-1.16,fixed,
gasboiler,heat,R1,1,fixed,
gasboiler,CO2f,R1,64.71,fixed,
heatpump,electricity,R1,-0.4,fixed,
heatpump,heat,R1,1,fixed,
12 changes: 6 additions & 6 deletions examples/muse1_default/process_parameters.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
process_id,regions,commission_years,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate
gassupply1,R1,all,0,0,2.55,60,0.1
gasCCGT,R1,all,23.78234399,0,0,60,0.1
windturbine,R1,all,36.30771182,0,0,60,0.1
gasboiler,R1,all,3.8,0,0,60,0.1
heatpump,R1,all,8.866667,0,0,60,0.1
process_id,regions,capital_cost,fixed_operating_cost,variable_operating_cost,lifetime,discount_rate
gassupply1,R1,0,0,2.55,60,0.1
gasCCGT,R1,23.78234399,0,0,60,0.1
windturbine,R1,36.30771182,0,0,60,0.1
gasboiler,R1,3.8,0,0,60,0.1
heatpump,R1,8.866667,0,0,60,0.1
Loading
Loading