Commit Graph

3251 Commits

Author SHA1 Message Date
Ekaterina
b0a95aefaa
Merge branch 'PyPSA:master' into fix_retrofit 2023-10-13 13:30:04 +03:00
Fabian Neumann
093ebfa696
Merge pull request #758 from PyPSA/xarray_hotfix
hotfix to overcome xarray chunking error
2023-10-12 17:43:22 +02:00
martacki
29fad3d638 change environment name back to pypsa-eur 2023-10-12 17:11:41 +02:00
martacki
9cde392227 hotfix to overcome xarray chunking error by reverting to an older version 2023-10-12 17:09:03 +02:00
ekatef
dccfabfdac Fix environment 2023-10-12 00:15:47 +03:00
ekatef
460fa00b28 Fix file name 2023-10-11 21:43:51 +03:00
pre-commit-ci[bot]
d10779ca34 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-11 14:27:25 +00:00
Thomas Gilon
4c5ea9e207
Specify input files required to retrieve irena data
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-10-11 16:27:08 +02:00
Thomas Gilon
c8fcbaad6e
Update default value in retrieve.smk
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-10-11 16:24:52 +02:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena 2023-10-11 16:17:15 +02:00
Fabian Neumann
4fc9959f5a
Merge pull request #757 from tgi-climact/feature/SMR-cc-configuration
Add option for SMR CC
2023-10-11 16:07:41 +02:00
Fabian Neumann
892ee30d98
Update config/config.default.yaml 2023-10-11 16:07:00 +02:00
Thomas Gilon
124177b6db Add option for SMR CC 2023-10-11 14:32:47 +02:00
pre-commit-ci[bot]
230c1a327c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-11 12:27:29 +00:00
Thomas Gilon
43e20a26e6 Add rule to update IRENA data for existing infrastructure 2023-10-11 14:26:04 +02:00
ekatef
fcef194566 Reference to a multiindex level by number instead of name 2023-10-11 12:29:38 +03:00
ekatef
7ad60cb7f9 Fix calculation of averages 2023-10-11 12:28:34 +03:00
ekatef
5ee9df000b Make an argument of pd.concat to a list 2023-10-11 12:28:08 +03:00
ekatef
b51d908bfa Fix computation of the mean 2023-10-11 12:27:31 +03:00
ekatef
5ec00c5d9d Fix type definition for a call of difference function 2023-10-11 12:27:10 +03:00
ekatef
f825544c3b Remove duplication in column names 2023-10-11 12:26:30 +03:00
ekatef
4294248518 Re-map country codes to account for "GB" 2023-10-11 12:26:10 +03:00
Fabian Neumann
ee5ce13c26
Merge pull request #755 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-10-10 09:21:44 +02:00
pre-commit-ci[bot]
c019e52956
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0)
- [github.com/snakemake/snakefmt: v0.8.4 → v0.8.5](https://github.com/snakemake/snakefmt/compare/v0.8.4...v0.8.5)
2023-10-09 18:39:01 +00:00
Fabian Neumann
7cb4742c75
Merge pull request #750 from PyPSA/sourcery/master
Sourcery refactored master branch
2023-10-08 17:52:45 +02:00
Fabian Neumann
2bab27e2f3
Merge pull request #718 from PyPSA/coke
add coal and coke demand for integrated steelworks
2023-10-08 11:58:48 +02:00
pre-commit-ci[bot]
f054180a62 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-08 09:20:59 +00:00
Sourcery AI
3c36c60bdd 'Refactored by Sourcery' 2023-10-08 09:20:36 +00:00
Fabian Neumann
679d09c170 follow-up to #637: remove duplicate code and update tsam version 2023-10-08 11:10:09 +02:00
Fabian Hofmann
9cc6761d36
Merge pull request #637 from PyPSA/multi-horizon
Multi horizon
2023-10-05 12:34:21 +02:00
lisazeyen
1eed747bde remove spelling mistakes 2023-10-05 12:03:06 +02:00
lisazeyen
be0214be13 simplify config 2023-10-05 11:23:14 +02:00
Fabian Hofmann
51a90b3433
Merge branch 'master' into multi-horizon 2023-10-05 10:59:14 +02:00
Fabian Hofmann
8986483df4
Merge pull request #743 from PyPSA/readthedocs-apt
readthedocs: remove apt packages
2023-10-05 10:57:47 +02:00
Fabian
18e4099ece re-reconvert graphviz installation 2023-10-05 09:58:25 +02:00
Fabian
345331c301 reinsert graphviz to requirements.txt 2023-10-04 18:21:13 +02:00
Fabian
608faf773a renew dag for tutorial.rst 2023-10-04 18:19:08 +02:00
Fabian
f5fb307f89 fix type, expand codespell ignore list 2023-10-04 17:31:46 +02:00
Fabian
58aa3c03dc revert removal of apt_packages 2023-10-04 17:23:32 +02:00
Fabian Hofmann
9385eb7076
Merge branch 'master' into readthedocs-apt 2023-10-04 17:12:04 +02:00
lisazeyen
0400f344e9
Merge branch 'master' into multi-horizon 2023-10-04 16:12:43 +02:00
lisazeyen
117a7c1f78
update pypsa version to 0.25.2 2023-10-04 16:04:57 +02:00
Fabian Neumann
6321cbca45
Merge pull request #746 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-10-04 10:14:30 +02:00
pre-commit-ci[bot]
4422bf48da
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/codespell-project/codespell: v2.2.5 → v2.2.6](https://github.com/codespell-project/codespell/compare/v2.2.5...v2.2.6)
2023-10-03 00:42:10 +00:00
lisazeyen
213cec729c
remove unrelated changes 2023-09-30 08:45:40 +02:00
lisazeyen
08f1a0f313
remove comments for newer data version 2023-09-30 08:22:41 +02:00
lisazeyen
22fe2448a4
Update scripts/solve_network.py
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
2023-09-30 08:14:54 +02:00
pre-commit-ci[bot]
9765b24c1c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-29 06:40:25 +00:00
lisazeyen
21d1109853
Merge branch 'master' into multi-horizon 2023-09-29 08:40:05 +02:00
Fabian Neumann
dccef102bb
Merge pull request #744 from PyPSA/biomass-time-varying
build_biomass_potentials: link to planning_horizons wildcard, interpo…
2023-09-28 17:33:09 +02:00