From 9cc43b3b6b6097b2f8589a22d4a123f266084c80 Mon Sep 17 00:00:00 2001 From: Ehsan Nokandi <47088177+enokandi@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:54:57 +0100 Subject: [PATCH 1/3] The following were added to the tad_electricity-source.yaml file: unit types related to oil, Internal combustion as a newly defined technology only for oil, Pumped storage hydro --- .../variable/tag_electricity-source.yaml | 78 ++++++++++++------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/definitions/variable/tag_electricity-source.yaml b/definitions/variable/tag_electricity-source.yaml index 6e54eb0..214ce18 100644 --- a/definitions/variable/tag_electricity-source.yaml +++ b/definitions/variable/tag_electricity-source.yaml @@ -1,31 +1,49 @@ - Electricity Source By Technology: - - Gas|CCGT|w/ CCS: - description: combined-cycle gas turbine with carbon capture and storage - - Gas|CCGT|w/o CCS: - description: combined-cycle gas turbine turbine without carbon capture and storage - - Gas|OCGT |w/ CCS: - description: open-cycle gas turbine with carbon capture and storage - - Gas|OCGT |w/o CCS: - description: open-cycle gas turbine turbine without carbon capture and storage - - Gas|Steam Turbine|w/ CCS: - description: steam turbine with carbon capture and storage - - Gas|Steam Turbine|w/o CCS: - description: steam turbine turbine without carbon capture and storage - - Hydro|Reservoir: - description: hydroelectric power plants with reservoirs - - Hydro|Run of River: - description: hydroelectric power plants without reservoirs - - 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 - - Coal|Hard Coal|w/ CCS: - description: coal power plants with carbon capture and storage - - Coal|Hard Coal|w/o CCS: - description: coal power plants without carbon capture and storage - - Electricity Storage: - description: electricity storage systems - - Transmission and Distribution: - description: electricity transmission and distribution systems + - Gas|CCGT|w/ CCS: + description: combined-cycle gas turbine with carbon capture and storage + - Gas|CCGT|w/o CCS: + description: combined-cycle gas turbine turbine without carbon capture and storage + - Gas|OCGT|w/ CCS: + description: open-cycle gas turbine with carbon capture and storage + - Gas|OCGT|w/o CCS: + description: open-cycle gas turbine turbine without carbon capture and storage + - Gas|Steam Turbine|w/ CCS: + description: steam turbine with carbon capture and storage + - Gas|Steam Turbine|w/o CCS: + description: steam turbine without carbon capture and storage + - Oil|CCGT|w/ CCS: + description: combined-cycle gas turbine with carbon capture and storage + - Oil|CCGT|w/o CCS: + description: combined-cycle gas turbine turbine without carbon capture and storage + - Oil|OCGT|w/ CCS: + description: open-cycle gas turbine with carbon capture and storage + - Oil|OCGT|w/o CCS: + description: open-cycle gas turbine turbine without carbon capture and storage + - Oil|Steam Turbine|w/ CCS: + description: steam turbine with carbon capture and storage + - Oil|Steam Turbine|w/o CCS: + description: steam turbine turbine without carbon capture and storage + - Oil|Internal Combustion|w CCS: + description: Internal combustion engine with carbon capture and storage + - Oil|Internal Combustion|w/o CCS: + description: Internal combustion engine without carbon capture and storage + - Hydro|Reservoir: + description: hydroelectric power plants with reservoirs + - Hydro|Run of River: + description: hydroelectric power plants without reservoirs + - Hydro|Pumped Storage: + description: Pumped storage hydro-power unit + - 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 + - Coal|Hard Coal|w/ CCS: + description: coal power plants with carbon capture and storage + - Coal|Hard Coal|w/o CCS: + description: coal power plants without carbon capture and storage + - Electricity Storage: + description: electricity storage systems + - Transmission and Distribution: + description: electricity transmission and distribution systems From 12cdb10c73b7dd2e2e97a61547008b3afeeea59c Mon Sep 17 00:00:00 2001 From: Ehsan Nokandi <47088177+enokandi@users.noreply.github.com> Date: Fri, 24 Jan 2025 17:05:21 +0100 Subject: [PATCH 2/3] Indentations adjusted in definitions/variable/tag_electricity-source.yaml --- .../variable/tag_electricity-source.yaml | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/definitions/variable/tag_electricity-source.yaml b/definitions/variable/tag_electricity-source.yaml index 214ce18..d7fff38 100644 --- a/definitions/variable/tag_electricity-source.yaml +++ b/definitions/variable/tag_electricity-source.yaml @@ -1,49 +1,49 @@ - Electricity Source By Technology: - - Gas|CCGT|w/ CCS: - description: combined-cycle gas turbine with carbon capture and storage - - Gas|CCGT|w/o CCS: - description: combined-cycle gas turbine turbine without carbon capture and storage - - Gas|OCGT|w/ CCS: - description: open-cycle gas turbine with carbon capture and storage - - Gas|OCGT|w/o CCS: - description: open-cycle gas turbine turbine without carbon capture and storage - - Gas|Steam Turbine|w/ CCS: - description: steam turbine with carbon capture and storage - - Gas|Steam Turbine|w/o CCS: - description: steam turbine without carbon capture and storage - - Oil|CCGT|w/ CCS: - description: combined-cycle gas turbine with carbon capture and storage - - Oil|CCGT|w/o CCS: - description: combined-cycle gas turbine turbine without carbon capture and storage - - Oil|OCGT|w/ CCS: - description: open-cycle gas turbine with carbon capture and storage - - Oil|OCGT|w/o CCS: - description: open-cycle gas turbine turbine without carbon capture and storage - - Oil|Steam Turbine|w/ CCS: - description: steam turbine with carbon capture and storage - - Oil|Steam Turbine|w/o CCS: - description: steam turbine turbine without carbon capture and storage - - Oil|Internal Combustion|w CCS: - description: Internal combustion engine with carbon capture and storage - - Oil|Internal Combustion|w/o CCS: - description: Internal combustion engine without carbon capture and storage - - Hydro|Reservoir: - description: hydroelectric power plants with reservoirs - - Hydro|Run of River: - description: hydroelectric power plants without reservoirs - - Hydro|Pumped Storage: - description: Pumped storage hydro-power unit - - 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 - - Coal|Hard Coal|w/ CCS: - description: coal power plants with carbon capture and storage - - Coal|Hard Coal|w/o CCS: - description: coal power plants without carbon capture and storage - - Electricity Storage: - description: electricity storage systems - - Transmission and Distribution: - description: electricity transmission and distribution systems + - Gas|CCGT|w/ CCS: + description: combined-cycle gas turbine with carbon capture and storage + - Gas|CCGT|w/o CCS: + description: combined-cycle gas turbine turbine without carbon capture and storage + - Gas|OCGT|w/ CCS: + description: open-cycle gas turbine with carbon capture and storage + - Gas|OCGT|w/o CCS: + description: open-cycle gas turbine turbine without carbon capture and storage + - Gas|Steam Turbine|w/ CCS: + description: steam turbine with carbon capture and storage + - Gas|Steam Turbine|w/o CCS: + description: steam turbine without carbon capture and storage + - Oil|CCGT|w/ CCS: + description: combined-cycle gas turbine with carbon capture and storage + - Oil|CCGT|w/o CCS: + description: combined-cycle gas turbine turbine without carbon capture and storage + - Oil|OCGT|w/ CCS: + description: open-cycle gas turbine with carbon capture and storage + - Oil|OCGT|w/o CCS: + description: open-cycle gas turbine turbine without carbon capture and storage + - Oil|Steam Turbine|w/ CCS: + description: steam turbine with carbon capture and storage + - Oil|Steam Turbine|w/o CCS: + description: steam turbine turbine without carbon capture and storage + - Oil|Internal Combustion|w CCS: + description: Internal combustion engine with carbon capture and storage + - Oil|Internal Combustion|w/o CCS: + description: Internal combustion engine without carbon capture and storage + - Hydro|Reservoir: + description: hydroelectric power plants with reservoirs + - Hydro|Run of River: + description: hydroelectric power plants without reservoirs + - Hydro|Pumped Storage: + description: Pumped storage hydro-power unit + - 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 + - Coal|Hard Coal|w/ CCS: + description: coal power plants with carbon capture and storage + - Coal|Hard Coal|w/o CCS: + description: coal power plants without carbon capture and storage + - Electricity Storage: + description: electricity storage systems + - Transmission and Distribution: + description: electricity transmission and distribution systems From d7ed6d5e54fe97772d4b1f0f00d9f753d1e179de Mon Sep 17 00:00:00 2001 From: Daniel Huppmann Date: Mon, 27 Jan 2025 06:42:58 +0100 Subject: [PATCH 3/3] Fix a typo --- definitions/variable/tag_electricity-source.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/variable/tag_electricity-source.yaml b/definitions/variable/tag_electricity-source.yaml index d7fff38..fbdb28c 100644 --- a/definitions/variable/tag_electricity-source.yaml +++ b/definitions/variable/tag_electricity-source.yaml @@ -23,7 +23,7 @@ description: steam turbine with carbon capture and storage - Oil|Steam Turbine|w/o CCS: description: steam turbine turbine without carbon capture and storage - - Oil|Internal Combustion|w CCS: + - Oil|Internal Combustion|w/ CCS: description: Internal combustion engine with carbon capture and storage - Oil|Internal Combustion|w/o CCS: description: Internal combustion engine without carbon capture and storage