Commit Graph

284 Commits

Author SHA1 Message Date
Fabian Neumann
38c90155f1 add release notes 2024-02-18 11:48:55 +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
b543bf37c9 retrieve.smk: do not protect gas network data 2024-02-17 20:48:46 +01:00
Fabian Neumann
68f2e086c5 postprocess.smk: add missing wildcard call 2024-02-17 20:48:17 +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
388ea65847 common.smk: use update_config to simplify merge_configs 2024-02-17 20:44:22 +01:00
Fabian Neumann
d335275e0f build_electricity: add missing wildcard call 2024-02-17 20:43:11 +01:00
pre-commit-ci[bot]
cc3d7a4cbb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-17 17:35:54 +00:00
Fabian Neumann
e898781fda use wildcard input functions where applicable 2024-02-17 18:35:26 +01:00
pre-commit-ci[bot]
de244414df [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-17 16:56:03 +00:00
Fabian Neumann
b14d84eb39 Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management 2024-02-17 17:55:35 +01:00
Fabian Neumann
709b831e06 further adjustments where config_provider needs to be called 2024-02-17 17:51:26 +01:00
pre-commit-ci[bot]
b8d57a6566 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-17 16:39:13 +00:00
Fabian Neumann
89d0fa24b6 further adjustments to latest master branch commits 2024-02-17 17:38:46 +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
4d4badc519 Merge branch 'master' into industry-pathway 2024-02-16 13:01:40 +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
martacki
a22b19dcc4 use new swiss data for building energy totals 2024-02-15 16:28:24 +01: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
Fabian Neumann
dbbfbaf1f3 Merge branch 'master' into scenario-management 2024-02-14 10:45:43 +01:00
Fabian Neumann
c3feb0e283 handle complicated config-dependent inputs using unpack() with input functions 2024-02-12 16:56:00 +01: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
Fabian Neumann
fa931cc2b1 alternative approach 2 2024-02-12 13:54:28 +01:00
Fabian Neumann
1e5163b66b alternative approach 2024-02-12 13:45:42 +01:00
Fabian Neumann
5840a9aa11 remove inefficient _helper.py file search 2024-02-12 12:17:13 +01:00
Fabian Neumann
87f5a11bbe Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management 2024-02-12 11:53:49 +01:00
Fabian Neumann
9400b6dd75 do not use config_provider outside rule definitions 2024-02-12 11:53:37 +01:00
pre-commit-ci[bot]
1a883debb5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-12 10:00:05 +00:00
Fabian Neumann
6b013dbd40 Merge branch 'master' into scenario-management 2024-02-12 10:59:37 +01:00
Fabian Neumann
09ada56bf1 finishing touches and release notes 2024-02-12 10:49:45 +01:00
Fabian
94f72d7276 electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2024-02-12 10:08:39 +01:00
Fabian
2bd8021058 retrieve electricity demand: make online version snakemake params 2024-02-12 09:48:42 +01:00
Fabian
5c7bbcd94d retrieve electricity demand: use script in order to concat time-series 2024-02-12 09:48:28 +01:00
pre-commit-ci[bot]
4ff06046fc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 17:09:49 +00:00
Fabian Neumann
a9dad3f34e add new resources(), logs(), benchmarks(), config_providers() 2024-02-10 18:09:23 +01:00
pre-commit-ci[bot]
e838b63ded [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 16:22:38 +00:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
Fabian Neumann
3691f9f4c1 update version compatibility handling 2024-02-09 13:59:15 +01:00
Fabian Neumann
b9c71c3c15 add logs to plot_*_network rules 2024-02-07 18:52:01 +01:00
Fabian Neumann
602375af8c
Merge branch 'master' into fneum/year-specific-techs 2024-02-06 13:56:14 +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
Fabian Neumann
f0ec1d6716
Merge branch 'master' into perfect-foresight-fixes 2024-02-05 12:18:53 +01:00
Fabian Neumann
a834ff222a streamline code for year-dependent technologies (turbines/panels) 2024-02-05 12:10:35 +01:00
Fabian Neumann
bb4eb123e5 Merge branch 'year-specific-techs' of github.com:p-glaum/pypsa-eur into p-glaum-year-specific-techs 2024-02-05 09:06:32 +01:00