Commit Graph

3224 Commits

Author SHA1 Message Date
Fabian Neumann
f75e18596d
Merge pull request #771 from PyPSA/mock_snakemake_root_dir
helpers: adjust mock_snakemake to be callable with different root directory
2023-11-02 08:18:04 +01:00
Fabian
71f88fd063 update release notes 2023-10-31 12:14:02 +01:00
Fabian
75e66be571 helpers: adjust mock_snakemake to be callable with different root dirs 2023-10-31 12:09:39 +01:00
Fabian Neumann
f35ecbe4a0
Merge pull request #767 from ekatef/retrofit_data_fixes
Minor fixes for retrofit calculations
2023-10-26 10:10:36 +02:00
pre-commit-ci[bot]
a31b421c12 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-25 17:35:12 +00:00
ekatef
c1150dfab3 Merge remote-tracking branch 'origin/retrofit_data_fixes' into retrofit_data_fixes 2023-10-25 20:34:43 +03:00
ekatef
8ec0664253 Move column fix for u-values for Poland 2023-10-25 20:33:59 +03:00
martacki
55807898a0 update solar global radiation according to TABULA project 2023-10-25 16:23:41 +02:00
pre-commit-ci[bot]
f24bd46173 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-25 14:11:51 +00:00
ekatef
2952d99dfa Fix column with total values 2023-10-25 16:42:05 +03:00
ekatef
1ad7035ec4 Fix a column for Poland 2023-10-25 16:28:38 +03:00
Fabian Neumann
9ce125bd44
Merge pull request #765 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-10-24 08:49:56 +02:00
pre-commit-ci[bot]
a1276b3964
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 23.9.1 → 23.10.0](https://github.com/psf/black/compare/23.9.1...23.10.0)
2023-10-23 18:37:54 +00:00
Fabian Neumann
f63129e63e
Merge pull request #763 from PyPSA/add-tech-color-coal-for-industry
Add tech_color for 'coal for industry' in config
2023-10-18 17:41:30 +02:00
chrstphtrs
c81b707113 Add tech_color for 'coal for industry' in config 2023-10-18 16:44:52 +02:00
Fabian Neumann
7884392326
Merge pull request #748 from PyPSA/follow-up-637
follow-up to #637: remove duplicate code and update tsam version
2023-10-18 10:27:29 +02:00
Fabian Neumann
df5b9e9943
Merge pull request #759 from ekatef/fix_retrofit
Update calculations of retrofit costs
2023-10-18 10:26:32 +02:00
Fabian Neumann
c254e95bb5
Merge pull request #756 from tgi-climact/feature/retrieve-irena
Add rule to update IRENA renewables capacities
2023-10-18 09:48:53 +02:00
Fabian Neumann
1e2159b5e0
Merge pull request #760 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-10-17 18:00:05 +02:00
pre-commit-ci[bot]
055cbc4fb2
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.10.0 → v2.11.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.10.0...v2.11.0)
2023-10-16 18:21:48 +00:00
ekatef
6f0a73f169 Release dask constraint 2023-10-13 14:52:20 +03:00
ekatef
f88ce0ea07 Adjust data structure 2023-10-13 14:51:25 +03:00
pre-commit-ci[bot]
21148e3cc5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-13 10:36:50 +00:00
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