Skip to content

Commit ea102d1

Browse files
authored
Merge pull request #3169 from quintel/mekko-main-carriers-electricity
Mekko of the electricity network
2 parents 688b0fd + 4232e46 commit ea102d1

File tree

198 files changed

+1002
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+1002
-96
lines changed

gqueries/general/conversion/electricity/carrier_for_electricity_conversion/electricity_for_synthetic_kerosene_conversion.gql

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
V(
77
FILTER(
88
Q(synthetic_fuels_from_hydrogen_converters),
9-
"kerosene_output_conversion > 0"
9+
"kerosene_output_conversion > 0.0"
1010
),
11-
input_of_electricity
11+
input_of_electricity
1212
)
1313
),
1414
BILLIONS

gqueries/general/conversion/heat/ambient_for_central_heat_conversion.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
DIVIDE(
55
SUM(
66
V(
7-
FILTER(Q(central_heat_producing_converters_sankey), "ambient_heat_input_conversion > 0" ),
7+
FILTER(Q(central_heat_producing_converters_sankey), "ambient_heat_input_conversion > 0.0" ),
88
input_of_ambient_heat
99
)
1010
),

gqueries/general/conversion/heat/geothermal_for_central_heat_conversion.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
DIVIDE(
55
SUM(
66
V(
7-
FILTER(Q(central_heat_producing_converters_sankey), "geothermal_input_conversion > 0"),
7+
FILTER(Q(central_heat_producing_converters_sankey), "geothermal_input_conversion > 0.0"),
88
input_of_geothermal
99
)
1010
),

gqueries/general/conversion/heat/hydro_for_central_heat_conversion.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
DIVIDE(
55
SUM(
66
V(
7-
FILTER(Q(central_heat_producing_converters_sankey), "water_input_conversion > 0"),
7+
FILTER(Q(central_heat_producing_converters_sankey), "water_input_conversion > 0.0"),
88
output_of_steam_hot_water
99
),
1010
),

gqueries/general/conversion/heat/residual_heat_for_central_heat_conversion.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
DIVIDE(
55
SUM(
66
V(
7-
FILTER(Q(central_heat_producing_converters_sankey), "residual_heat_input_conversion > 0"),
7+
FILTER(Q(central_heat_producing_converters_sankey), "residual_heat_input_conversion > 0.0"),
88
output_of_steam_hot_water
99
),
1010
),

gqueries/general/conversion/heat/solar_for_central_heat_conversion.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
DIVIDE(
55
SUM(
66
V(
7-
FILTER(Q(central_heat_producing_converters_sankey), "solar_thermal_input_conversion > 0"),
7+
FILTER(Q(central_heat_producing_converters_sankey), "solar_thermal_input_conversion > 0.0"),
88
output_of_steam_hot_water
99
)
1010
),

gqueries/general/conversion/heat/wind_for_central_heat_conversion.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
DIVIDE(
55
SUM(
66
V(
7-
FILTER(Q(central_heat_producing_converters_sankey), "wind_input_conversion > 0"),
7+
FILTER(Q(central_heat_producing_converters_sankey), "wind_input_conversion > 0.0"),
88
output_of_steam_hot_water
99
),
1010
),

gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/hydrogen_for_synthetic_kerosene_conversion.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
V(
77
FILTER(
88
Q(synthetic_fuels_from_hydrogen_converters),
9-
"kerosene_output_conversion > 0"
9+
"kerosene_output_conversion > 0.0"
1010
),
1111
input_of_hydrogen
1212
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_biogas),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_coal),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_coal_gas),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_diesel),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_gas_power_fuelmix),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_hydro),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_hydrogen),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_lignite),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_network_gas),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_geothermal),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_nuclear),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_oil),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_torrefied_biomass_pellets),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_waste_mix),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
Q(converter_group_electricity_producers_per_plant_type_wood_pellets),
4+
"steam_hot_water_output_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"biogas_input_conversion > 0"
4+
"biogas_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = gas_plants
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"coal_input_conversion > 0"
4+
"coal_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = coal_plants
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"coal_gas_input_conversion > 0"
4+
"coal_gas_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = coal_plants
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"coal_input_conversion > 0 || coal_gas_input_conversion > 0"
4+
"coal_input_conversion > 0 || coal_gas_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = coal_plants
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"gas_power_fuelmix_input_conversion > 0 || network_gas_input_conversion > 0"
4+
"gas_power_fuelmix_input_conversion > 0 || network_gas_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = gas_plants
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
G(electricity_production),
4+
"gas_power_fuelmix_input_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- query = FILTER( G(electricity_production), "geothermal_input_conversion > 0")
1+
- query = FILTER( G(electricity_production), "geothermal_input_conversion > 0.0")
22
- unit = nodes
33
- deprecated_key = electricity_producing_converters_geothermal
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- query = FILTER( G(electricity_production), "water_input_conversion > 0")
1+
- query = FILTER( G(electricity_production), "water_input_conversion > 0.0")
22
- unit = nodes
33
- deprecated_key = electricity_producing_converters_hydro
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Returns the converters which produce electricity using hydrogen
22

33
- query =
4-
FILTER(G(electricity_production), "hydrogen_input_conversion > 0")
4+
FILTER(G(electricity_production), "hydrogen_input_conversion > 0.0")
55
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"lignite_input_conversion > 0"
4+
"lignite_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = electricity_producing_converters_lignite
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"gas_power_fuelmix_input_conversion > 0"
4+
"network_gas_input_conversion > 0.0"
55
)
66
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- query = FILTER(G(electricity_production), "uranium_oxide_input_conversion > 0")
1+
- query = FILTER(G(electricity_production), "uranium_oxide_input_conversion > 0.0")
22
- unit = nodes
33
- deprecated_key = nuclear_plants
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Returns the converters which produce electricity using oil products
22

33
- query =
4-
FILTER(G(electricity_production), "crude_oil_input_conversion > 0") +
5-
FILTER(G(electricity_production), "diesel_input_conversion > 0")
4+
FILTER(G(electricity_production), "crude_oil_input_conversion > 0.0") +
5+
FILTER(G(electricity_production), "diesel_input_conversion > 0.0")
66
- unit = nodes
7-
- deprecated_key = electricity_producing_converters_oil
7+

gqueries/general/converter_groups/electricity_producing_solar_converters.gql gqueries/general/converter_groups/electricity_producers_per_carrier/electricity_producing_solar_converters.gql

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# The output node of the solar PV plant with battery system, energy_battery_solar_electricity, is communicated to the merit order but does not have input of solar radiation, therefore it is added separately here.
22

3-
- query =
3+
- query =
44
V(
55
FILTER(
66
G(electricity_production),
7-
"solar_radiation_input_conversion > 0"
7+
"solar_radiation_input_conversion > 0.0"
88
),
99
energy_battery_solar_electricity
1010
)
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"torrefied_biomass_pellets_input_conversion > 0"
4+
"torrefied_biomass_pellets_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = electricity_producing_converters_biocoal
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Returns the converters which produce electricity using uranium. It works by looking to converters directly fed by the "uranium_distribution" converter that have output of electricity.
22

3-
- query = FILTER(PARENTS(V(energy_distribution_uranium_oxide )), "electricity_output_conversion && electricity_output_conversion > 0")
3+
- query = FILTER(PARENTS(V(energy_distribution_uranium_oxide )), "electricity_output_conversion && electricity_output_conversion > 0.0")
44
- unit = nodes
55
- deprecated_key = electricity_producing_converters_uranium
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"waste_mix_input_conversion > 0"
4+
"waste_mix_input_conversion > 0.0"
55
)
66
- unit = nodes
77
- deprecated_key = electricity_producing_converters_waste

gqueries/general/converter_groups/electricity_producing_wind_converters.gql gqueries/general/converter_groups/electricity_producers_per_carrier/electricity_producing_wind_converters.gql

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# The output node of the inland wind turbine with battery system, energy_battery_wind_electricity, is communicated to the merit order but does not have input of wind, therefore it is added separately here.
22

3-
- query =
3+
- query =
44
V(
55
FILTER(
66
G(electricity_production),
7-
"wind_input_conversion > 0"
7+
"wind_input_conversion > 0.0"
88
),
99
energy_battery_wind_electricity
1010
)
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Returns the converters which produce electricity using wood_pellets. It works by looking to converters directly fed by the "wood_pellets_distribution" converter that have output of electricity.
22

3-
- query = FILTER(G(electricity_production), "wood_pellets_input_conversion > 0")
3+
- query = FILTER(G(electricity_production), "wood_pellets_input_conversion > 0.0")
44
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- query =
22
FILTER(
33
G(electricity_production),
4-
"network_gas_input_conversion > 0"
4+
"biogas_input_conversion > 0.0"
55
)
66
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
G(electricity_production),
4+
"coal_input_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
G(electricity_production),
4+
"coal_gas_input_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
- query =
3+
FILTER(
4+
G(electricity_production),
5+
"diesel_input_conversion > 0.0"
6+
)
7+
- unit = nodes
8+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- query =
2+
FILTER(
3+
G(electricity_production),
4+
"gas_power_fuelmix_input_conversion > 0.0"
5+
)
6+
- unit = nodes
7+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
G(electricity_production),
4+
"geothermal_input_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
G(electricity_production),
4+
"water_input_conversion > 0.0"
5+
)
6+
- unit = nodes
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- query =
2+
FILTER(
3+
G(electricity_production),
4+
"hydrogen_input_conversion > 0.0"
5+
)
6+
- unit = nodes

0 commit comments

Comments
 (0)