Commit Graph

4307 Commits

Author SHA1 Message Date
Fabian Neumann
2ce7d78dbb revert accidental addition of personal config file 2024-01-24 16:23:44 +01:00
Fabian Neumann
5077ecebc5
Merge branch 'master' into fix-source-path 2024-01-24 16:19:19 +01:00
Fabian Neumann
b0c9121b78
Merge branch 'master' into io-api-option 2024-01-24 16:16:20 +01:00
Fabian Neumann
90fb679a8f
Merge pull request #895 from koen-vg/plotting-port-fix
Fix plotting: compatibility with 4th link port
2024-01-24 16:14:18 +01:00
Koen van Greevenbroek
d8d3b2f2ab Fix plotting: compatibility with 4th link port 2024-01-24 15:48:33 +01:00
Koen van Greevenbroek
e4a130353f Make copying default config file compatible with snakemake module 2024-01-24 14:47:20 +01:00
Koen van Greevenbroek
1fab74c463 avoid the use use of workflow.source_path
The above function returns a path to a cached source file, which
changes for every run, causing the resulting parameter to change and
the solve_network rule to re-run
2024-01-24 14:39:50 +01:00
pre-commit-ci[bot]
9843397b5a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-24 10:48:55 +00:00
Koen van Greevenbroek
3e32dbccb5 Add support for the linopy io_api option 2024-01-24 11:23:56 +01:00
Fabian Neumann
2bee36be87 follow-up to #891: remove remaining solar+p3 references 2024-01-24 10:17:26 +01:00
Fabian Neumann
da1e2862b3
Merge pull request #890 from PyPSA/air-hp-rural
add air-sourced heat pumps to rural areas
2024-01-24 10:15:01 +01:00
Fabian Neumann
17d0e161f9
Merge pull request #891 from koen-vg/default-solar-potential
Don't include triple solar potential option by default
2024-01-24 10:14:01 +01:00
Koen van Greevenbroek
b1ce26d270 Don't include triple solar potential option by default 2024-01-24 09:37:01 +01:00
pre-commit-ci[bot]
bdc36dc5da [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-23 17:43:04 +00:00
Fabian Neumann
7ac2169ea2
Merge branch 'master' into air-hp-rural 2024-01-23 18:42:44 +01:00
Fabian Neumann
2d12f7ddd0 add air-sourced heat pumps to rural areas 2024-01-23 18:41:52 +01:00
Fabian Neumann
2932167e34
Merge pull request #889 from PyPSA/read-solver-threads
correctly read number of solver threads in rule definition
2024-01-23 18:21:35 +01:00
Fabian Neumann
9f0555863b powerplantmatching: block version 0.5.9 with breaking bug 2024-01-23 18:19:46 +01:00
Fabian Neumann
eeb3d0789b correctly read number of solver threads in rule definition 2024-01-23 18:03:14 +01:00
Fabian Neumann
cea3cf122e
Merge pull request #885 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2024-01-23 17:03:54 +01:00
Fabian Neumann
fb2e9da23c
Merge pull request #888 from koen-vg/retrieval-env
Make data retrieval rules use their own minimal conda env
2024-01-23 17:03:15 +01:00
pre-commit-ci[bot]
58ac6629fe [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-23 15:35:11 +00:00
Koen van Greevenbroek
48974edc8d Make data retrieval rules use their own minimal conda env
This means that the main conda environment can be changed for
development purposes without necessitating the re-running of data
retrieval due to software environment change by default.
2024-01-23 16:27:12 +01:00
pre-commit-ci[bot]
2173abdff3
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/fsfe/reuse-tool: v2.1.0 → v3.0.1](https://github.com/fsfe/reuse-tool/compare/v2.1.0...v3.0.1)
2024-01-22 18:20:52 +00:00
Fabian Neumann
083bae8e3e Merge branch 'fneum/ariadne2' of github.com:PyPSA/pypsa-eur into fneum/ariadne2 2024-01-22 18:07:55 +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
a9ac68b50e bugfix: correct way to identify if entry is in snakemake.input 2024-01-22 14:31:35 +01:00
Fabian Neumann
a2315c289e cluster_gas_network: generalise so it can be used elsewhere 2024-01-22 14:31:10 +01:00
pre-commit-ci[bot]
025f48c0c2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-22 09:11:09 +00:00
Fabian Neumann
fd57311094 build_district_heat_share: make safe for single-country runs 2024-01-22 10:10:40 +01:00
pre-commit-ci[bot]
757fbcc464 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-22 08:32:00 +00:00
Fabian Neumann
31c7c10fc5 git-blame-ignore-revs: add automated formatting commit 2024-01-22 09:30:53 +01:00
Fabian Neumann
9865a97089 apply automated formatting 2024-01-22 09:29:32 +01:00
Fabian Neumann
d3cf329456 correctly read number of solver threads in rule definition 2024-01-22 09:28:51 +01:00
Fabian Neumann
2183e742b2 add release notes, minor code improvements 2024-01-22 09:18:26 +01:00
Tom Brown
d98ad95332 move building of distribution of existing heating to own script
This makes the distribution of existing heating to urban/rural,
residential/services and spatially more transparent.
2024-01-22 08:01:31 +01:00
Tom Brown
9897cd6f05 only add district heating (DH) for nodes with non-zero DH share 2024-01-22 08:01:31 +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
Tom Brown
fbff32dcfc build_pop_weighted_energy: don't reduce district heat share
Previously the DH share was being multiplied by the population
weighting, reducing the DH share with multiple nodes.
2024-01-22 08:01:31 +01:00
Fabian Neumann
3750cc5350
Merge pull request #883 from PyPSA/td-0.6.2
update technology-data to 0.6.2 by default
2024-01-21 16:45:46 +01:00
Fabian Neumann
9d441a3132
Merge pull request #881 from PyPSA/correct-solver-threads
correctly retrieve solver threads and add back memory logfile
2024-01-19 19:01:35 +01:00
Fabian Neumann
77f49d4404 update technology-data to 0.6.2 by default 2024-01-19 19:00:33 +01:00
pre-commit-ci[bot]
58b012e03d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-19 16:00:21 +00:00
Fabian Neumann
6705a2cf45
Merge pull request #882 from PyPSA/copt-default-settings
COPT solver provide sensible default settings
2024-01-19 17:00:15 +01:00
Fabian Neumann
01c1b9161b COPT solver provide sensible default settings 2024-01-19 16:59:39 +01:00
Fabian Neumann
9b3e68a6a8 correctly retrieve solver threads and add back memory logfile 2024-01-19 16:58:05 +01:00
Fabian Hofmann
67cf85ce04
Merge pull request #880 from PyPSA/linting-refactor
Linting refactor
2024-01-19 13:22:00 +01:00
Fabian
d0cb57e9ab make_summary_perfect: reinsert calclulate_<> functions 2024-01-19 12:37:07 +01:00