Commit Graph

4537 Commits

Author SHA1 Message Date
Fabian Neumann
67acbbda8a run: name: all will collect all keys from scenarios.yaml if run: scenarios: enable: true 2024-02-18 10:24:26 +01:00
pre-commit-ci[bot]
831f0779b3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-18 08:57:26 +00:00
Fabian Neumann
20e37c232f copy a scenarios.yaml from scenarios.template.yaml so it is not git tracked 2024-02-18 09:55:45 +01:00
Fabian Neumann
f710923320 Merge branch 'master' into scenario-management 2024-02-18 09:48:12 +01:00
Fabian Neumann
e1ce8a3590 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-02-18 09:47:01 +01:00
Fabian Neumann
3e612950c2 revert part of #925 so that config.default.yaml is still copied and config.yaml remains untracked 2024-02-18 09:46:54 +01:00
Fabian Neumann
d7935e1c06 revert part of #925 so that config.default.yaml is still copied and config.yaml remains untracked 2024-02-18 09:45:37 +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
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
Fabian Neumann
16793d1335 Snakefile: don't use {run} wildcard if just specifying a run name 2024-02-17 20:42:37 +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
Fabian Neumann
95853bb59d _helpers: allow specifying dedicated shared_resources folder 2024-02-17 18:27:59 +01:00
Fabian Neumann
2521dd49b0 Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management 2024-02-17 18:16:51 +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
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
a3c0ffac44
Merge pull request #937 from PyPSA/h2-myopic-plot
Fix plotting of retrofitted hydrogen pipelines with pathway optimisat…
2024-02-16 16:42:21 +01:00
Fabian Neumann
7f1ff0c324 Fix plotting of retrofitted hydrogen pipelines with pathway optimisation. 2024-02-16 16:41:21 +01:00
Fabian Neumann
f59ede8af4
Merge pull request #929 from PyPSA/industry-pathway
Industry pathway
2024-02-16 16:28:34 +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
60406f1bc4
Merge pull request #933 from PyPSA/h2-pipe-losses
update h2 pipe losses
2024-02-16 13:32:30 +01:00
Fabian Neumann
9e8ed7394d
Update config/config.default.yaml 2024-02-16 13:32:24 +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
6d80b332e6 add release note 2024-02-16 12:47:01 +01:00
Fabian Neumann
3f6f17cef6
Merge pull request #930 from PyPSA/cl-meoh-unit
bugfix: correct units of subtracted chlorine and methanol
2024-02-16 12:40:37 +01:00
Fabian Neumann
6bedca13c4
Merge branch 'master' into cl-meoh-unit 2024-02-16 12:40:29 +01:00
Fabian Neumann
7e66c1428d add release note 2024-02-16 12:40:05 +01:00
Fabian Neumann
be3472dee9
Merge pull request #931 from PyPSA/ammonia
bugfix: include all countries in ammonia production resource
2024-02-16 12:14:07 +01:00
Fabian Neumann
84fc63d7a1
Merge branch 'master' into ammonia 2024-02-16 12:14:00 +01:00