From 8877879d7324dd96100c05f3fce111b7f6bc0aa3 Mon Sep 17 00:00:00 2001 From: JKNTNU Date: Wed, 15 Jan 2025 13:32:28 +0100 Subject: [PATCH] Change to dictionary --- .../variable/electricitysources_tags.yaml | 6 ++ .../variable/tag_electricity-source.yaml | 27 ++---- .../tag_existing_electricitysources.yaml | 95 +++++++++++++++++++ definitions/variable/tag_turbine_types.yaml | 8 ++ 4 files changed, 115 insertions(+), 21 deletions(-) create mode 100644 definitions/variable/tag_existing_electricitysources.yaml create mode 100644 definitions/variable/tag_turbine_types.yaml diff --git a/definitions/variable/electricitysources_tags.yaml b/definitions/variable/electricitysources_tags.yaml index 8f7f2f1..f5364d2 100644 --- a/definitions/variable/electricitysources_tags.yaml +++ b/definitions/variable/electricitysources_tags.yaml @@ -5,9 +5,15 @@ - Investment|Energy Supply|Electricity|{Electricity Source}: description: Investment in {Electricity Source} unit: billion USD_2010/yr +- Investment|Energy Supply|Electricity|{Common Electricity Source}: + description: Investment in {Electricity Source} + unit: billion USD_2010/yr - Variable Cost|Electricity|{Electricity Source}: description: Variable cost for generating electricity from {Electricity Source} with the fuel cost unit: EUR/MWh +- Variable Cost|Electricity|{Common Electricity Source}: + description: Variable cost for generating electricity from {Electricity Source} with the fuel cost + unit: EUR/MWh - Capacity|Electricity|{Electricity Source}: description: Installed (available) capacity of {Electricity Source} unit: GW diff --git a/definitions/variable/tag_electricity-source.yaml b/definitions/variable/tag_electricity-source.yaml index ff8f035..f00fc22 100644 --- a/definitions/variable/tag_electricity-source.yaml +++ b/definitions/variable/tag_electricity-source.yaml @@ -7,32 +7,17 @@ description: hydroelectric power plants with reservoirs - Hydro|Run of River: description: hydroelectric power plants without reservoirs - - Lignite|w/o CCS: - description: lignite without carbon capture and storage + - Coal|Lignite|w/ CCS: + description: coal (lignite) power plants without carbon capture and storage + - Coal|Lignite|w/o CCS: + description: coal (lignite) power plants without carbon capture and storage - Waste: description: waste-to-energy plants - - Wind|Offshore: - description: offshore wind power - - Wind|Onshore: - description: onshore wind power - - Solar|PV: - description: photovoltaic solar power - - Biomass: - description: biomass power plants - - Coal|w/ CCS: + - Coal|Hard Coal|w/ CCS: description: coal power plants with carbon capture and storage - - Coal|w/o CCS: + - Coal|Hard Coal|w/o CCS: description: coal power plants without carbon capture and storage - - Geothermal: - description: geothermal power plants - - Nuclear: - description: nuclear power plants - - Ocean: - description: ocean power plants - - Oil: - description: oil power plants - Electricity storage: description: electricity storage systems - Transmission and Distribution: description: electricity transmission and distribution systems - diff --git a/definitions/variable/tag_existing_electricitysources.yaml b/definitions/variable/tag_existing_electricitysources.yaml new file mode 100644 index 0000000..1670cd5 --- /dev/null +++ b/definitions/variable/tag_existing_electricitysources.yaml @@ -0,0 +1,95 @@ +- Common Electricity Source: + - Biomass: + description: purpose-grown bioenergy crops, biogas, crop and forestry residue, + municipal solid waste bioenergy and traditional biomass + - Biomass|w/ CCS: + description: purpose-grown bioenergy crops, biogas, crop and forestry residue, + municipal solid waste bioenergy and traditional biomass + in combination with carbon capture and storage (CCS) + - Biomass|w/o CCS: + description: purpose-grown bioenergy crops, biogas, crop and forestry residue, + municipal solid waste bioenergy and traditional biomass + without carbon capture and storage (CCS) + + - Non-Biomass Renewables: + description: hydro, wind, solar, geothermal, ocean, and other renewable sources + excluding biomass + - Hydro: + description: hydropower + - Solar: + description: solar energy + - Solar|CSP: + description: utility-scale concentrated solar power (CSP) + - Solar|PV: + description: photovoltaics (PV) + - Solar|PV|Residential: + description: residential rooftop photovoltaics (PV) + tier: ^1 + - Solar|PV|Commercial: + description: commercial rooftop photovoltaics (PV) + tier: ^1 + - Solar|PV|Open Land: + description: photovoltaics (PV) on open land (no mixed use) + tier: ^1 + - Solar|PV|Agri-PV: + description: photovoltaics (PV) on agricultural land (mixed use) + tier: ^1 + - Solar|PV|Floating: + description: photovoltaics (PV) on water + tier: ^1 + - Solar|PV|Other: + description: other types of photovoltaics (PV) + tier: ^1 + - Wind: + description: wind power + - Wind|Onshore: + description: onshore wind power + - Wind|Offshore: + description: offshore wind power + + - Geothermal: + description: geothermal sources + - Ocean: + description: oceans + + - Nuclear: + description: nuclear power + - Hydrogen: + description: hydrogen + - Ammonia: + description: ammonia + + - Fossil: + description: fossil fuels including coal, natural gas and conventional/unconventional oil + - Fossil|w/ CCS: + description: fossil fuels including coal, natural gas and conventional/unconventional oil + in combination with carbon capture and storage (CCS) + - Fossil|w/o CCS: + description: fossil fuels including coal, natural gas and conventional/unconventional oil + without carbon capture and storage (CCS) + - Oil: + description: conventional and unconventional crude oil in combination with + carbon capture and storage (CCS) + - Oil|w/ CCS: + description: conventional and unconventional crude oil in combination with + carbon capture and storage (CCS) + - Oil|w/o CCS: + description: conventional and unconventional crude oil without carbon capture + and storage (CCS) + - Gas: + description: natural gas (fossil methane) + - Gas|w/ CCS: + description: natural gas (fossil methane) in combination with carbon capture + and storage (CCS) + - Gas|w/o CCS: + description: natural gas (fossil methane) without carbon capture and storage (CCS) + - Coal: + description: coal including lignite + - Coal|w/ CCS: + description: coal including lignite in combination with carbon capture and + storage (CCS) + - Coal|w/o CCS: + description: coal including lignite without carbon capture and storage (CCS) + - Other: + description: sources that do not fit any other category + \ No newline at end of file diff --git a/definitions/variable/tag_turbine_types.yaml b/definitions/variable/tag_turbine_types.yaml new file mode 100644 index 0000000..deeb006 --- /dev/null +++ b/definitions/variable/tag_turbine_types.yaml @@ -0,0 +1,8 @@ +- Turbine Type: + - CCGT: + description: Combined-cycle gas turbine + - OCGT: + description: Open-cycle gas turbine + - Steam Turbine: + description: steam turbines + \ No newline at end of file