Skip to content

Commit e3367f5

Browse files
kndehaankndehaan
authored
Merge pull request #3170 from quintel/mekko-main-carriers-network-gas
Mekko of the central network gas network.
2 parents ea102d1 + a7b43b6 commit e3367f5

File tree

101 files changed

+434
-51
lines changed

Some content is hidden

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

101 files changed

+434
-51
lines changed

‎gqueries/general/conversion/hydrogen/carrier_for_hydrogen_conversion/network_gas_for_hydrogen_conversion_excl_industry_transformation.gql

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Network gas conversion to hydrogen from hydrogen_production group
2+
# Industry transformation is excluded from this query
3+
# natural gas is queried here to also account for SMR
4+
# greengas is queried for completeness
5+
6+
- query =
7+
DIVIDE(
8+
SUM(
9+
V(
10+
EXCLUDE(
11+
G(hydrogen_production),
12+
G(industry_transformation)
13+
),
14+
input_of(
15+
network_gas,
16+
natural_gas,
17+
greengas
18+
)
19+
)
20+
),
21+
BILLIONS
22+
)
23+
- unit = PJ

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_agriculture_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :agriculture"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_buildings_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :buildings"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_bunkers_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :bunkers"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_energy_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :energy"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_households_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :households"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_industry_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :industry"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_other_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :other"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_energetic/final_demand_of_network_gas_in_transport_energetic.gql

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
FILTER(
10+
EG(final_demand),"sector == :transport"), "network_gas? || compressed_network_gas?"
11+
),
12+
"energetic?"
13+
),
14+
value
15+
)
16+
)
17+
/ BILLIONS

‎gqueries/general/final_demand/mece_non_energetic/per_carrier/final_demand_of_network_gas_non_energetic.gql

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Non-energetic final demand of the 'network_gas' and 'compressed_network_gas' carrier group
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
V(
7+
FILTER(
8+
FILTER(
9+
EG(final_demand), "network_gas? || compressed_network_gas?"
10+
),
11+
"!energetic?"
12+
),
13+
value
14+
)
15+
) / BILLIONS

‎gqueries/general/import_export/export/export_of_greengas.gql

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Export of greengas
2+
3+
- query =
4+
DIVIDE(
5+
SUM(
6+
V(
7+
G(energy_export),
8+
input_of(
9+
greengas
10+
)
11+
)
12+
),
13+
BILLIONS
14+
)
15+
- unit = PJ

‎gqueries/general/network_gas/demand/agriculture_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/agriculture_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/buildings_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/buildings_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/bunkers_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/bunkers_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/electricity_production_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/electricity_production_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/energy_network_gas_storage_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/energy_network_gas_storage_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/export_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/export_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/heat_production_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/heat_production_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/households_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/households_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/hydrogen_production_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/hydrogen_production_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/industry_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/industry_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/industry_transformation_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/industry_transformation_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/loss_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/loss_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/network_gas_demand_curve.gql ‎gqueries/general/network_gas/demand_input_curve/network_gas_demand_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/other_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/other_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand/transport_network_gas_input_curve.gql ‎gqueries/general/network_gas/demand_input_curve/transport_network_gas_input_curve.gql

File renamed without changes.

‎gqueries/general/network_gas/demand_per_application/buildings_final_demand_for_network_gas_excluding_space_heating.gql

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Energetic final demand of network gas in buildings excluding heating
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
Q(final_demand_of_natural_gas_in_buildings_appliances_energetic),
7+
Q(final_demand_of_natural_gas_in_buildings_cooling_energetic),
8+
Q(final_demand_of_natural_gas_in_buildings_lighting_energetic),
9+
Q(final_demand_of_greengas_in_buildings_appliances_energetic),
10+
Q(final_demand_of_greengas_in_buildings_cooling_energetic),
11+
Q(final_demand_of_greengas_in_buildings_lighting_energetic)
12+
)

‎gqueries/general/network_gas/demand_per_application/buildings_final_demand_for_network_gas_in_space_heating.gql

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Energetic final demand of network gas in buildings excluding heating
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
Q(final_demand_of_greengas_in_buildings_space_heating_energetic),
7+
Q(final_demand_of_natural_gas_in_buildings_space_heating_energetic)
8+
)

‎gqueries/general/network_gas/demand_per_application/households_final_demand_for_network_gas_excluding_space_heating_and_hot_water.gql

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Energetic final demand of network gas in households excluding heating
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
Q(final_demand_of_natural_gas_in_households_appliances_energetic),
7+
Q(final_demand_of_natural_gas_in_households_cooling_energetic),
8+
Q(final_demand_of_natural_gas_in_households_lighting_energetic),
9+
Q(final_demand_of_natural_gas_in_households_cooking_energetic),
10+
Q(final_demand_of_greengas_in_households_appliances_energetic),
11+
Q(final_demand_of_greengas_in_households_cooling_energetic),
12+
Q(final_demand_of_greengas_in_households_lighting_energetic),
13+
Q(final_demand_of_greengas_in_households_cooking_energetic)
14+
)

‎gqueries/general/network_gas/demand_per_application/households_final_demand_for_network_gas_in_space_heating_and_hot_water.gql

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Energetic final demand of network gas in households excluding heating
2+
3+
- unit = PJ
4+
- query =
5+
SUM(
6+
Q(final_demand_of_natural_gas_in_households_space_heating_energetic),
7+
Q(final_demand_of_natural_gas_in_households_hot_water_energetic),
8+
Q(final_demand_of_greengas_in_households_space_heating_energetic),
9+
Q(final_demand_of_greengas_in_households_hot_water_energetic)
10+
)

‎gqueries/general/network_gas/demand_per_technology/energy_torrefaction_wood_input_of_network_gas.gql

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Input of network gas from energy_torrefaction_wood
2+
3+
- query =
4+
DIVIDE(
5+
V(energy_torrefaction_wood, input_of_network_gas),
6+
BILLIONS
7+
)
8+
- unit = PJ

‎gqueries/general/network_gas/industry_transformation/greengas_in_network_gas_industry_transformation_fertilizers.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
V(energy_chemical_fertilizers_transformation_external_coupling_node, output_of_greengas)
77
)
88
)
9-
9+
- unit = factor

‎gqueries/general/network_gas/industry_transformation/greengas_in_network_gas_industry_transformation_other.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
V(energy_chemical_other_transformation_external_coupling_node, output_of_greengas)
77
)
88
)
9-
9+
- unit = factor

‎gqueries/general/network_gas/industry_transformation/greengas_in_network_gas_industry_transformation_refineries.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
V(energy_chemical_refineries_transformation_external_coupling_node, output_of_greengas)
77
)
88
)
9-
9+
- unit = factor

‎gqueries/general/network_gas/industry_transformation/input_of_greengas_in_industry_transformation.gql

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- unit = PJ
2+
- query =
3+
DIVIDE(
4+
SUM(
5+
V(
6+
G(industry_transformation),
7+
"input_of_greengas"
8+
)
9+
),
10+
BILLIONS
11+
)

‎gqueries/general/network_gas/industry_transformation/input_of_natural_gas_in_industry_transformation.gql

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- unit = PJ
2+
- query =
3+
DIVIDE(
4+
SUM(
5+
V(
6+
G(industry_transformation),
7+
"input_of_natural_gas"
8+
)
9+
),
10+
BILLIONS
11+
)

‎gqueries/general/network_gas/industry_transformation/input_of_network_gas_in_industry_transformation.gql

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- unit = PJ
2+
- query =
3+
SUM(
4+
Q(input_of_natural_gas_in_industry_transformation),
5+
Q(input_of_greengas_in_industry_transformation)
6+
)

‎gqueries/general/network_gas/industry_transformation/natural_gas_in_network_gas_industry_transformation_fertilizers.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
V(energy_chemical_fertilizers_transformation_external_coupling_node, output_of_greengas)
77
)
88
)
9-
9+
- unit = factor

‎gqueries/general/network_gas/industry_transformation/natural_gas_in_network_gas_industry_transformation_refineries.gql

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
V(energy_chemical_refineries_transformation_external_coupling_node, output_of_greengas)
77
)
88
)
9-
9+
- unit = factor

‎gqueries/general/network_gas/industry_transformation/output_of_greengas_in_industry_transformation.gql

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- unit = PJ
2+
- query =
3+
DIVIDE(
4+
SUM(
5+
V(
6+
G(industry_transformation),
7+
"output_of_greengas"
8+
)
9+
),
10+
BILLIONS
11+
)

‎gqueries/general/network_gas/industry_transformation/output_of_natural_gas_in_industry_transformation.gql

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- unit = PJ
2+
- query =
3+
DIVIDE(
4+
SUM(
5+
V(
6+
G(industry_transformation),
7+
"output_of_natural_gas"
8+
)
9+
),
10+
BILLIONS
11+
)

‎gqueries/general/network_gas/industry_transformation/output_of_network_gas_in_industry_transformation.gql

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- unit = PJ
2+
- query =
3+
SUM(
4+
Q(output_of_natural_gas_in_industry_transformation),
5+
Q(output_of_greengas_in_industry_transformation)
6+
)

‎gqueries/general/network_gas/losses/network_gas_distribution_and_treatment_losses.gql

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Losses from network gas distribution and natural gas treatment
2+
3+
- unit = PJ
4+
- query =
5+
DIVIDE(
6+
SUM(
7+
V(energy_distribution_network_gas_loss, demand),
8+
V(energy_treatment_natural_gas, output_of_loss)
9+
),
10+
BILLIONS
11+
)

‎gqueries/general/network_gas/misc/network_gas_exports.gql

-9
This file was deleted.

‎gqueries/general/network_gas/misc/network_gas_losses.gql

-7
This file was deleted.

‎gqueries/general/network_gas/misc/network_gas_use_for_collective_heat_production.gql

-11
This file was deleted.

0 commit comments

Comments
 (0)