Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add hydrogen SE and FE and gross trade SE #354

Merged
merged 2 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
47 changes: 42 additions & 5 deletions definitions/variable/energy/energy-secondary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@
description: Curtailment of electricity production due to oversupply from
variable renewable sources (typically from wind and solar)
unit: [EJ/yr, GWh]
- Secondary Energy|Electricity|Curtailment|Solar:
description: Curtailment of electricity from solar
unit: [EJ/yr, GWh]
- Secondary Energy|Electricity|Curtailment|Solar|PV:
description: Curtailment of electricity from solar PV
unit: [EJ/yr, GWh]
- Secondary Energy|Electricity|Curtailment|Wind:
description: Curtailment of electricity from wind
unit: [EJ/yr, GWh]
- Secondary Energy|Electricity|Curtailment|Wind|Offshore:
description: Curtailment of electricity from wind offshore
unit: [EJ/yr, GWh]
- Secondary Energy|Electricity|Curtailment|Wind|Onshore:
description: Curtailment of electricity from wind onshore
unit: [EJ/yr, GWh]

- Secondary Energy|Electricity|Storage:
description: electricity storage from other periods used
unit: [EJ/yr, GWh]
Expand All @@ -41,10 +57,16 @@
description: Total production of biogas
unit: EJ/yr
- Secondary Energy|Gases|Fossil:
description: total production of gas from fossils
description: total production of gases from fossils
unit: EJ/yr
- Secondary Energy|Gases|Electricity:
description: total production of gas from electricity (power to gas)
description: total production of gases from electricity (power to gas)
(if hydrogen is not explicitly modeled as an intermediate product)
unit: EJ/yr
- Secondary Energy|Gases|Hydrogen:
description: Production of gases from hydrogen (if hydrogen is explicitly
modeled as a commodity and not an implicit intermediate product of the
transformation technologies)
unit: EJ/yr
- Secondary Energy|Gases|Other:
description: total production of gases from sources that do not fit any other category
Expand All @@ -56,10 +78,13 @@
description: Total production of fossil natural gas
unit: EJ/yr
- Secondary Energy|Heat:
description: Total heat generation
description: Total centralized heat generation
unit: EJ/yr
- Secondary Energy|Heat|{Fuel}:
description: Total heat generation from {Fuel}
description: Total centralized heat generation from {Fuel}
unit: EJ/yr
- Secondary Energy|Heat|Electricity|Heat Pumps:
description: Total centralized heat generation from heat pumps ("Electricity" is already covered in {Fuel})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be a copy-paste error with {Fuel}

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, I am failing to see the copy-paste error - could you clarify? @danielhuppmann

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a tag {Fuel} in the description but no corresponding tag in the variable name - and the whole second part of the description doesn’t make sense to me…

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant to explain why there is an explicit Electricity|Heat Pumps version of the Secondary Energy|Heat| variable, but no explicit Electricity version - that one is already included in the {Fuel} version of Secondary Energy|Heat|.

But I can easily remove this explanation if you find it self-explanatory

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still don’t understand what you want to say. But in any case, please remove the curly brackets because are reserved for tags that are automatically replaced - and they can only be replaced if the same tag is present in the variable name itself.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to know. I just updated it accordingly

unit: EJ/yr
- Secondary Energy|Heat|Nuclear:
description: centralized heat generation from nuclear energy
Expand Down Expand Up @@ -125,7 +150,13 @@
description: total production of fossil liquid synfuels from facilities without CCS
unit: EJ/yr
- Secondary Energy|Liquids|Electricity:
description: total production of liquid fuels from electricity (efuels)
description: total production of liquid fuels from electricity (efuels)
(if hydrogen is not explicitly modeled as an intermediate product)
unit: EJ/yr
- Secondary Energy|Liquids|Hydrogen:
description: Production of liquids from hydrogen (if hydrogen is explicitly
modeled as a commodity and not an implicit intermediate product of the
transformation technologies)
unit: EJ/yr
- Secondary Energy|Liquids|Other:
description: total production of liquids from sources that do not fit any other category
Expand Down Expand Up @@ -216,6 +247,12 @@
description: Net exports of electricity
notes: at the global level these should add up to the trade losses only
unit: EJ/yr
- Trade|Gross Export|Secondary Energy|Electricity|Volume:
description: Gross exports of electricity
unit: EJ/yr
- Trade|Gross Imports|Secondary Energy|Electricity|Volume:
description: Gross imports of electricity
unit: EJ/yr
- Trade|Secondary Energy|Hydrogen|Volume:
description: Net exports of hydrogen
notes: at the global level these should add up to the trade losses only
Expand Down
16 changes: 14 additions & 2 deletions definitions/variable/tag_fe_carriers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@
weight: Gases|Biomass

- Gases|Electricity:
description: synthetic gaseous efuels ("power-to-gas")
description: synthetic gaseous efuels ("power-to-gas") (if hydrogen
is not explicitly modeled as an intermediate product)
weight: Gases|Electricity

- Gases|Hydrogen:
description: synthetic gaseous efuels from hydrogen (if hydrogen is explicitly modeled as a
commodity and not an implicit intermediate product of the transformation technologies)
weight: Gases|Hydrogen

- Gases|Fossil:
description: synthetic or derived gases of fossil origin
weight: Gases|Fossil
Expand Down Expand Up @@ -55,9 +61,15 @@
weight: Liquids|Biomass

- Liquids|Electricity:
description: synthetic liquid efuels ("power-to-liquid")
description: synthetic liquid efuels ("power-to-liquid") (if hydrogen
is not explicitly modeled as an intermediate product)
weight: Liquids|Electricity

- Liquids|Hydrogen:
description: liquid fuels from hydrogen (if hydrogen is explicitly modeled as a
commodity and not an implicit intermediate product of the transformation technologies)
weight: Liquids|Hydrogen

- Liquids|Fossil:
description: liquids from fossil origin (conventional & unconventional petroleum, coal-to-liquids, gas-to-liquids)
weight: Liquids|Fossil
Expand Down
Loading