toniseibold
d363aeb57d
removing old eurostat data reports as an option, cleaning up code
2024-02-27 12:04:07 +01:00
toniseibold
3298572ced
new energy totals from eurostat 2023 report scaling JRC IDEES data from 2015
2024-02-23 13:53:28 +01:00
Koen van Greevenbroek
db9f234fad
Fix typo in snakemake input
2024-02-20 18:38:21 +01:00
Koen van Greevenbroek
87088904ee
Merge remote-tracking branch 'upstream/master' into no-offwind-fix
2024-02-20 14:41:24 +01:00
Fabian Neumann
184f3a0e03
Merge branch 'scenario-management'
2024-02-20 14:23:05 +01:00
Fabian Neumann
26b202f463
prepare_sector: automatically interpolate in config get() function
2024-02-20 12:34:19 +01:00
Fabian Neumann
719d4dad23
Merge branch 'master' into scenario-management
2024-02-20 12:08:54 +01:00
pre-commit-ci[bot]
d713e3c52b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-20 09:03:57 +00:00
Tom Brown
4f91c6c43d
bugfix: make sure coal demand is there with regional demand
2024-02-20 09:49:19 +01:00
Koen van Greevenbroek
ccb43a5612
Allow absence of offshore wind from sector-coupled networks
2024-02-19 22:45:17 +01:00
Fabian Neumann
16e2286188
update copyright years to 2024
2024-02-19 16:21:48 +01:00
Fabian Neumann
df0eb38a68
_helpers: generalise regular expression in find_opt
2024-02-17 23:38:59 +01:00
Fabian Neumann
cf7018c8c4
plot_summary: remove leftover references to opts wildcard
2024-02-17 23:38:00 +01:00
Fabian Neumann
770d352652
handle that time_resolution can be float
2024-02-17 23:37:31 +01:00
Fabian Neumann
945180f153
allow_missing in collection rules, fixes for myopic, wildcard constraints without function
2024-02-17 23:37:03 +01:00
Fabian Neumann
9f643ea429
_helpers: add inplace keyword argument to update_config_from_wildcards
2024-02-17 20:45:44 +01:00
Fabian Neumann
e898781fda
use wildcard input functions where applicable
2024-02-17 18:35:26 +01:00
Fabian Neumann
95853bb59d
_helpers: allow specifying dedicated shared_resources folder
2024-02-17 18:27:59 +01:00
Fabian Neumann
84c3852c2e
_helpers: remove resource folder separation by wildcard
...
This was not working reliably as the number of input and output wildcards could vary, which the function did not acknowledge
2024-02-17 18:15:43 +01:00
Fabian Neumann
db7c983950
mock_snakemake: remove dangeours empty list as default argument
2024-02-17 18:14:18 +01:00
Fabian Neumann
709b831e06
further adjustments where config_provider needs to be called
2024-02-17 17:51:26 +01:00
Fabian Neumann
35b2228891
Merge branch 'wc-to-cf' into scenario-management
2024-02-17 17:16:28 +01:00
Fabian Neumann
d2a66879de
Merge branch 'master' into scenario-management
2024-02-17 17:04:36 +01:00
Fabian Neumann
dd2416a59e
handle all {opts} and {sector_opts} wildcard values in config
2024-02-17 11:57:16 +01:00
Fabian Neumann
7f1ff0c324
Fix plotting of retrofitted hydrogen pipelines with pathway optimisation.
2024-02-16 16:41:21 +01:00
Fabian Neumann
27f9fb8cba
add back in to_csv export (accidentally deleted)
2024-02-16 16:18:31 +01:00
Fabian Neumann
77753fff0d
Merge branch 'master' into industry-pathway
2024-02-16 15:31:54 +01:00
Fabian Neumann
8ae0669b33
Revert "add_electricity: set locations and units of electricity buses"
...
This reverts commit 472a099881
2024-02-16 15:31:17 +01:00
Fabian Neumann
e9174d4f14
Merge branch 'master' into industry-pathway
2024-02-16 15:15:27 +01:00
Fabian Neumann
93bb4e5f54
add release note, simplify build_industry_sector_ratios_intermediate script
2024-02-16 15:14:18 +01:00
Fabian Neumann
472a099881
add_electricity: set locations and units of electricity buses
2024-02-16 13:30:52 +01:00
Fabian Neumann
4d4badc519
Merge branch 'master' into industry-pathway
2024-02-16 13:01:40 +01:00
Fabian Neumann
6a8ae68aec
Merge branch 'industry-coal-bug'
2024-02-16 12:47:34 +01:00
Fabian Neumann
6bedca13c4
Merge branch 'master' into cl-meoh-unit
2024-02-16 12:40:29 +01:00
Fabian Neumann
84fc63d7a1
Merge branch 'master' into ammonia
2024-02-16 12:14:00 +01:00
Fabian Neumann
67484f9cf0
remove numpy import, add release ntoe
2024-02-16 12:13:35 +01:00
Fabian Neumann
16e42c8fe6
further progress and bugfixes
2024-02-16 11:17:00 +01:00
pre-commit-ci[bot]
4fa504b0db
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-14 17:32:24 +00:00
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
Tom Brown
cc57952402
industrial prod: use EU28 total for denominator for distribution key
...
This makes sure the distribution key is correct when only subsets of
countries are used. This is then consistent with the HVC, MeOH and Cl
totals being EU28 totals.
Without this change, industry production is overestimated when using
subsets of countries.
Or the user has to adjust the totals for industrial production
themselves.
2024-02-14 18:29:43 +01:00
Tom Brown
cbf7ed0d38
for today's industry energy demand, separate MeOH, Cl and HVC
...
I.e. split basic chemicals (without ammonia) into MeOH, Cl and HVC.
This now agrees with scheme for industrial sectors tomorrow.
2024-02-14 18:29:36 +01:00
Tom Brown
c54626cc1a
bugfix: correct units of subtracted chlorine and methanol
...
in build_industry_sector_ratios.py. In the config the units are Mt/a,
they are multiplied by MWh/t, but what is desired is GWh/a.
2024-02-14 18:29:02 +01:00
Tom Brown
ecedea02d6
bugfix: include all countries in ammonia production resource
...
This is so that the full EU28 ammonia demand can be correctly
subtracted in the build_industry_sector_ratios.py script.
No other downstream scripts are affected by this change.
2024-02-14 18:28:22 +01:00
Martha Frysztacki
234f2f247c
Merge branch 'master' into bus-regions
2024-02-14 17:05:43 +01:00
pre-commit-ci[bot]
78b184ad0f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 15:57:49 +00:00
Fabian Neumann
c83db4e84e
add retrieve_cost_data.py script to handle config_provider and move to resources
...
since dependent on config setting
2024-02-12 16:54:33 +01:00
pre-commit-ci[bot]
e0b6ebd174
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 10:54:15 +00:00
Fabian Neumann
40b27b4107
use set_scenario_config everywhere
2024-02-12 11:53:20 +01:00
