Commit Graph

4393 Commits

Author SHA1 Message Date
Thomas Gilon
ed83f1fb4a Add aggregated constraints for wind and possibility to take existing into account in solve_network
# Conflicts:
#	scripts/solve_network.py
2024-04-12 17:14:31 +02:00
Fabian Neumann
5ecd56d53c
Merge pull request #1010 from PyPSA/correct-co2-seq-potentials
Correct co2 potentials
2024-04-10 17:15:03 +02:00
pre-commit-ci[bot]
f3ad1a36c7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-10 15:14:29 +00:00
Fabian Neumann
6bc1363080 allow sequestration potential attributes to be string 2024-04-10 17:13:58 +02:00
Fabian Neumann
3d5f440d99
Merge pull request #1011 from PyPSA/add_prefix_scenario_management
Add prefix scenario management
2024-04-10 16:57:08 +02:00
Fabian Neumann
8a0c12b579 add doc and release notes 2024-04-10 16:56:35 +02:00
Philipp Glaum
05a3c43c30 move prefix from Snakefile to get_dir function 2024-04-10 12:23:28 +02:00
lisazeyen
fd239e2688 adjust configtables 2024-04-10 12:15:33 +02:00
lisazeyen
49db5bfb95 add release notes 2024-04-10 12:13:38 +02:00
lisazeyen
9d9ab98279 add other co2 potentials 2024-04-10 12:06:53 +02:00
Philipp Glaum
74185560e0 initial implementation 2024-04-10 12:04:45 +02:00
Fabian Hofmann
e1502c95dd
Merge pull request #1007 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2024-04-10 11:18:00 +02:00
Fabian Hofmann
b01011b52e
Merge branch 'master' into pre-commit-ci-update-config 2024-04-10 11:02:20 +02:00
Fabian Hofmann
3e333b6eae
Merge pull request #1008 from Climact/feature/fix-custom-busmap 2024-04-09 17:52:24 +02:00
Thomas Gilon
b673b947ea Fix custom busmap read in cluster network 2024-04-09 17:30:38 +02:00
pre-commit-ci[bot]
f1c8b19cf0
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.5.0...v4.6.0)
- [github.com/fsfe/reuse-tool: v3.0.1 → v3.0.2](https://github.com/fsfe/reuse-tool/compare/v3.0.1...v3.0.2)
2024-04-08 19:56:47 +00:00
lisazeyen
ce1e531ad0
Merge pull request #1005 from Climact/feature/fix-typo
Fix typo
2024-04-04 16:02:25 +02:00
Thomas Gilon
6e20afbaee Fix typo 2024-04-04 15:42:02 +02:00
lisazeyen
282651cfba
Merge pull request #1002 from PyPSA/rename-existing-capacities
Rename existing capacities
2024-04-03 17:17:30 +02:00
lisazeyen
d8fbc6d6cd
Merge branch 'master' into rename-existing-capacities 2024-04-03 16:51:41 +02:00
pre-commit-ci[bot]
6ba598f426 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-03 14:51:12 +00:00
lisazeyen
fdfd97a9e2
Merge pull request #1001 from PyPSA/drop-renewables
Drop renewables
2024-04-03 16:46:34 +02:00
lisazeyen
6da50bf25a Merge branch 'master' into rename-existing-capacities 2024-04-03 16:43:33 +02:00
lisazeyen
f0163d3823 update release notes 2024-04-03 16:28:20 +02:00
lisazeyen
f5e78645c7 Merge branch 'master' into drop-renewables 2024-04-03 16:26:49 +02:00
Fabian Neumann
a777872c0e
Merge pull request #991 from Climact/feature/fix-grouping-years-reference
Fix grouping year reference in add_land_use_constraint_m
2024-04-03 11:38:34 +02:00
Fabian Neumann
7141178ef4 Merge branch 'Climact-feature/fix-simplify-network-buses' 2024-04-03 11:36:57 +02:00
Fabian Neumann
83e3f3f163 Merge branch 'feature/fix-simplify-network-buses' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-simplify-network-buses 2024-04-03 11:36:46 +02:00
Fabian Neumann
ec19d24fc4
Merge pull request #999 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2024-04-03 11:30:32 +02:00
Fabian Neumann
185bc8495c
Merge pull request #1000 from PyPSA/solving-fixes
adjust resources perfect foresight and solver settings
2024-04-03 11:30:21 +02:00
lisazeyen
3819e64377
remove solver name 2024-04-02 16:50:09 +02:00
lisazeyen
f715285682
adjust resources perfect foresight 2024-04-02 16:48:37 +02:00
pre-commit-ci[bot]
b34ce8d6f2
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.12.0 → v2.13.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.12.0...v2.13.0)
2024-04-01 19:41:00 +00:00
Fabian Hofmann
d74017e82e
Merge pull request #995 from PyPSA/fix-configfiles-dtype
provide Path object as input to ConfigSettings
2024-03-26 19:03:43 +01:00
Michael Lindner
89dbd53805 provide Path object as input to ConfigSettings 2024-03-26 17:20:10 +01:00
Fabian Hofmann
ecbde16575
Merge pull request #994 from PyPSA/FabianHofmann-patch-3
postprocess: fix typo in benchmark folder
2024-03-26 13:51:34 +01:00
Fabian Hofmann
be7dc0d0bb
postprocess: fix typo in benchmark folder 2024-03-26 13:28:06 +01:00
Fabian Hofmann
da0c327138
Merge pull request #993 from koen-vg/check-scenario-file-exists
Check if scenario file exists before attempting to load
2024-03-26 12:36:57 +01:00
Koen van Greevenbroek
8b2a068b3a Check if scenario file exists before attempting to load
Useful when running the `create_scenarios` rule the first time.
2024-03-26 11:57:21 +01:00
Thomas Gilon
9dae86cd56 Fix index for existing capacities in add_existing_baseyear 2024-03-25 20:11:02 +01:00
Fabian Hofmann
60fe95ddf7
Merge pull request #989 from PyPSA/share-resources
scenario management: fix shared resources
2024-03-25 16:31:21 +01:00
Fabian Hofmann
a725844be9
Merge branch 'master' into share-resources 2024-03-25 16:08:31 +01:00
Thomas Gilon
50466d9593 Fix grouping year reference in add_land_use_constraint_m 2024-03-25 15:44:05 +01:00
Fabian Hofmann
91e0087ce4
Merge pull request #988 from PyPSA/fix-indexing-cluster-weights
cluster_network: ensure correct indexing of weights
2024-03-25 14:54:03 +01:00
Fabian
34f0294264 scenario management: fix shared resources 2024-03-25 14:27:50 +01:00
Fabian
585f9a32a7 cluster_network: ensure correct indexing of weights 2024-03-25 14:16:20 +01:00
Fabian Neumann
d72576aa1a
Merge pull request #986 from Climact/feature/fix-cluster-network-type
Fix type error in cluster_network with "m" configuration
2024-03-22 16:33:26 +01:00
Thomas Gilon
fd01cb0a75 Fix type error in cluster_network with "m" configuration 2024-03-22 16:01:42 +01:00
Thomas Gilon
7e99f3bba7 Fix error with symbol of buses in simplify_network 2024-03-22 10:06:48 +01:00
Fabian Neumann
91c9dd2b82
Merge pull request #973 from koen-vg/fill-missing-domestic-aviation
Fill in missing eurostat data on domestic aviation energy demand
2024-03-21 12:38:37 +01:00