Commit Graph

4711 Commits

Author SHA1 Message Date
martacki
feb564506a remove connection_costs as snakemake output from simplify_network 2024-04-16 15:41:01 +02:00
cpschau
6ea8d52a81 no directory change before mock_snakemake 2024-04-16 10:43:07 +02:00
cpschau
6aac8c90b4 added release note 2024-04-16 10:30:39 +02:00
cpschau
3cf2d0c059 no addition of straight lines 2024-04-16 10:24:16 +02:00
lisazeyen
a835f505c8
Merge pull request #1029 from PyPSA/Climact-feature/fix-add-land-use-constraint-m
Climact feature/fix add land use constraint m
2024-04-16 10:23:51 +02:00
lisazeyen
e3ccbc0e3f
Merge branch 'master' into Climact-feature/fix-add-land-use-constraint-m 2024-04-16 09:59:56 +02:00
lisazeyen
47fa47788b Merge branch 'master' into Climact-feature/fix-add-land-use-constraint-m 2024-04-16 09:54:59 +02:00
Fabian Neumann
b1433fa3a0
Merge pull request #1028 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2024-04-16 09:54:30 +02:00
pre-commit-ci[bot]
da15ab3ac2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-16 09:43:50 +02:00
lisazeyen
ec96a73baf define active assets consitently 2024-04-16 09:43:50 +02:00
lisazeyen
dd874e0ed8 rename _intervals to _years, shorten definition 2024-04-16 09:43:50 +02:00
Micha
6f09a16b3a Add release note for serendipitous bugfix 2024-04-16 09:43:50 +02:00
lisazeyen
442c8a8c74 adjust valid_grouping_years
change sign, split up conditions for better readibility
2024-04-16 09:43:50 +02:00
lisazeyen
17d44d7f64 add check if minimum grouping year< min build year 2024-04-16 09:43:50 +02:00
Michael Lindner
27f2bd77fb add more grouping years to avoid errors 2024-04-16 09:43:50 +02:00
Michael Lindner
380884e9ab group existing capacities to the earlier grouping_year for consistency with optimized capacities 2024-04-16 09:43:50 +02:00
Fabian Neumann
15345ff1cf skip heat bus for CHPs in places where no central heating 2024-04-16 09:43:50 +02:00
pre-commit-ci[bot]
4429711b15
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black-pre-commit-mirror: 24.3.0 → 24.4.0](https://github.com/psf/black-pre-commit-mirror/compare/24.3.0...24.4.0)
- [github.com/snakemake/snakefmt: v0.10.0 → v0.10.1](https://github.com/snakemake/snakefmt/compare/v0.10.0...v0.10.1)
2024-04-15 19:51:09 +00:00
Fabian Neumann
29adeb2267 add missing atlite import 2024-04-15 15:28:02 +02:00
Fabian Neumann
a1e42db58b change in zenodo urls from record to records 2024-04-15 15:14:02 +02:00
Fabian Neumann
fe1199e981 update shipdensity_global.zip link [no ci] 2024-04-15 15:03:23 +02:00
Fabian Neumann
fb35272fb4 add release notes [no ci] 2024-04-15 15:00:52 +02:00
Fabian Neumann
991eef6d97 update and reduce databundle size 2024-04-15 14:48:34 +02:00
Fabian Neumann
a4d58b70f5
Merge pull request #1020 from PyPSA/cleanup_data_structure
Cleaning up data and resources
2024-04-15 11:24:43 +02:00
lisazeyen
618ecdddeb
Merge branch 'master' into land-transport-fix 2024-04-15 09:13:28 +02:00
lisazeyen
f3e3113b89 Reset file to the version in master branch 2024-04-15 08:45:51 +02:00
lisazeyen
1a51414550 correct conversion kW->MW 2024-04-15 08:43:12 +02:00
Fabian Neumann
622da03d69
Merge pull request #1014 from PyPSA/add-documentation-hackathon
Add to documentation (Hackathon 4/10+11)
2024-04-14 20:09:02 +02:00
Fabian Neumann
1eb598079e
Merge branch 'master' into add-documentation-hackathon 2024-04-14 20:08:49 +02:00
Fabian Hofmann
f362638501
Merge pull request #1024 from SermishaNarayana/master 2024-04-14 12:27:34 +02:00
Sermisha
7a0ca73f3a Update to BAU constraint formulation in function add_BAU_constraints
Constraint formulation was not taking into account the ordering of the carriers
2024-04-14 14:24:01 +05:30
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
Thomas Gilon
98d2c4dd91 Fix p_nom_min of renewables generators for myopic approach and add check of existing capacities in add_land_use_constraint_m 2024-04-12 16:52:59 +02:00
lisazeyen
245ba5c20b rename efficiencies in script 2024-04-12 14:38:56 +02:00
lisazeyen
a424bd2e40 rename efficiencies in config.yaml 2024-04-12 14:37:11 +02:00
pre-commit-ci[bot]
ba93a404ef [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-12 12:29:37 +00:00
lisazeyen
53a6b91b06 clear up units 2024-04-12 14:28:52 +02:00
pre-commit-ci[bot]
ed6fa8f32c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-12 11:59:17 +00:00
lisazeyen
4f8cc63461 clarify units 2024-04-12 13:58:01 +02:00
toniseibold
3b31b99dd2 removing the output file eia_hydro_stats.csv 2024-04-12 10:01:09 +02:00
lisazeyen
980040b1ae
Merge pull request #1021 from PyPSA/brownfield-chp
skip heat bus for CHPs in places where no central heating
2024-04-12 09:48:17 +02:00
lisazeyen
da1ff3be25
Merge branch 'master' into brownfield-chp 2024-04-12 09:32:44 +02:00
Fabian Neumann
038575dfc0 skip heat bus for CHPs in places where no central heating 2024-04-11 19:14:45 +02:00
toniseibold
7dd1d8fb59 delete biomass JRC from license file 2024-04-11 17:46:44 +02:00
cpschau
1867e510e2 remove redundant line 2024-04-11 17:14:17 +02:00
toniseibold
35713e82b4 Remove heat_load_profile_DK_AdamJensen.csv and license comment 2024-04-11 16:44:18 +02:00
lisazeyen
a0436372fe
Merge pull request #1019 from PyPSA/reform-grouping-year-logic
Reform grouping year logic
2024-04-11 16:42:32 +02:00
cpschau
c68e3420c0 clean-up after rebase 2024-04-11 16:42:19 +02:00
cpschau
f2db3c6327 add AC & DC lines 2024-04-11 16:32:35 +02:00
cpschau
4d4b8ea266 n.madd instead of pd.concat 2024-04-11 16:32:25 +02:00