Commit Graph

43 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
b45df1724b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-14 17:31:52 +00:00
Tom Brown
e14bae345b new script to interpolate industry sector ratios today to tomorrow
For each country we gradually switch industry processes from today's
specific energy carrier usage per ton material output to the
best-in-class energy consumption of tomorrow in the
industry_sector_ratios.csv.

This is done on a per-country basis. The ratio of today to tomorrow's
energy consumption is set with the
config["industry"]["sector_ratios_fraction_future"] parameter.
2024-02-14 18:29:56 +01:00
Tom Brown
7f3ad792a9 use production to determine today's energy demand for basic chemicals
This uniformises how demand for basic chemicals is calculated.

We also avoid unnecessary use of ammonia production separately.
2024-02-14 18:29:50 +01:00
pre-commit-ci[bot]
39890630ef [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-05 18:23:51 +00:00
Koen van Greevenbroek
4c0491341c Move build_existing_heating_distribution rule 2024-02-02 08:49:29 +01:00
Fabian Neumann
6c593a551b build_hourly_heat_demand: only pass subset of snapshot config 2024-01-22 18:07:33 +01:00
Fabian Neumann
9865a97089 apply automated formatting 2024-01-22 09:29:32 +01:00
Tom Brown
1a477d6b32 move calculation of district heating share to its own script
Now the script build_district_heat_share.py does what the old function
create_nodes_for_heating() in prepare_sector_networks.py did.

There is no need to build nodes lists for each heating sector, since
all nodes have district heating now.
2024-01-22 08:01:31 +01:00
Tom Brown
bd8a5ecf2b build_energy_totals: output district heat share to separate file 2024-01-22 08:01:31 +01:00
Tom Brown
6c20ce83d7 move building of daily heat profile to its own script
Previously this was handled inside prepare_sector_network.py.
2024-01-22 08:01:31 +01:00
Fabian Neumann
f68e8d3d61
Merge branch 'master' into wildcard-opts-config 2024-01-05 12:02:11 +01:00
pre-commit-ci[bot]
7b1600164f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 19:19:02 +00:00
Fabian Neumann
62bcded800 build_sector.smk: simplify gas infrastructure rules 2024-01-04 19:12:04 +01:00
Fabian Neumann
83ecaac4de
Merge branch 'master' into wildcard-opts-config 2024-01-03 13:08:21 +01:00
Fabian Neumann
7c058f1ed3 add locations, capacities and costs of existing gas storage 2024-01-03 07:57:45 +01:00
Fabian Neumann
fa03c61187 gas_input: switch production data from scigrid to gem 2024-01-03 07:56:26 +01:00
Fabian Neumann
67438f3292 change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability 2023-12-11 16:03:45 +01:00
ekatef
f88ce0ea07 Adjust data structure 2023-10-13 14:51:25 +03:00
virio-andreyana
3f112534a5
Merge branch 'master' into wildcard-opts-config 2023-09-28 21:12:10 +02:00
pre-commit-ci[bot]
9424ec1bb8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-26 13:13:25 +00:00
Fabian Neumann
5006bc4877 build_biomass_potentials: link to planning_horizons wildcard, interpolate missing years 2023-09-26 15:12:39 +02:00
virio-andreyana
01cd1bbb74 add Fabians suggestion 2023-09-23 18:39:11 +02:00
pre-commit-ci[bot]
668ec9efad [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-15 09:56:18 +00:00
virio-andreyana
7be8cc0773 undo changes in sector networks and simplify config 2023-09-15 11:55:52 +02:00
pre-commit-ci[bot]
3eed341044 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-11 21:04:00 +00:00
virio-andreyana
823df52309 add backward compatible config in wildcards 2023-09-11 22:51:31 +02:00
Fabian Neumann
d0f2d52853 apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary 2023-08-24 11:11:33 +02:00
Fabian
f205ff9536 prepare_sectors: make biomass transport costs conditional again 2023-08-02 14:05:05 +02:00
Fabian
03e3278f89 prepare_sector: add biomass transport costs for networks wo biomass network 2023-08-02 13:12:08 +02:00
Fabian Neumann
2c586e76e0 update global energy monitor LNG terminal data 2023-07-31 09:07:10 +02:00
Fabian Neumann
b110810669 no more override_component_attrs for multilinks 2023-07-13 22:31:55 +02:00
Fabian
27eea273bd harmonize params names 2023-06-15 19:12:30 +02:00
Fabian
1d10073514 review params implementation; reproduce objective values in CI 2023-06-15 18:52:25 +02:00
virio-andreyana
b67a00903a
using higher keys for industries 2023-05-31 10:54:27 +02:00
pre-commit-ci[bot]
f3e8fe2312 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-27 13:51:00 +00:00
virio-andreyana
e581ca930c made params more specific 2023-05-27 15:50:37 +02:00
virio-andreyana
8208ac033b
convert param back to config for "logging" and "run", made "enable" more specific 2023-05-17 18:43:30 +02:00
virio-andreyana
1fc48d8753
using python algorithm to edit rules and script 2023-05-15 10:33:17 +02:00
pre-commit-ci[bot]
f717ce9d3d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-08 18:26:43 +00:00
Fabian Neumann
bf895de7cc add logfiles to all rules 2023-03-08 19:22:00 +01:00
Fabian Neumann
701d3a141a data/bundle files may be ancient 2023-03-08 18:03:49 +01:00
Fabian Neumann
8eb37bc263 add conda directive to all rules for use with --use-conda 2023-03-08 17:44:25 +01:00
Fabian Neumann
6bae022d44 modularise Snakefile using rules/*.smk files 2023-03-08 17:29:01 +01:00