bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,645 Commits 1 Branch 0 Tags 133 MiB
bf5c323c27
Commit Graph

3645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
a5ba2565a0 correct config location 2023-12-29 17:30:03 +01:00
pre-commit-ci[bot]
876a28b688 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-29 16:23:55 +00:00
Fabian Neumann
fa13eae277 Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality 2023-12-29 17:23:24 +01:00
Fabian Neumann
4b6dd29083 add dummy file and assert path exists 2023-12-29 17:23:11 +01:00
pre-commit-ci[bot]
fba320bfa7 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-29 16:20:26 +00:00
Fabian Neumann
8a11bdb4b1 solve_network: option to inject custom extra functionalities from source file 2023-12-29 17:19:19 +01:00
Fabian Neumann
0f6887793b
Merge pull request #820 from PyPSA/pypsa-0.26.1 
increase pypsa min version to 0.26.1
 2023-12-29 15:43:09 +01:00
pre-commit-ci[bot]
74cf849ac4 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-29 12:40:47 +00:00
martacki
715aa25698 build_energy_totals: avoid deprecation warnings 2023-12-29 13:40:00 +01:00
pre-commit-ci[bot]
de3b6c9573 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-29 11:38:43 +00:00
Fabian Neumann
71985d5e3a validate checksums for zenodo downloads 2023-12-29 12:34:14 +01:00
Fabian Neumann
a54d00d745
Merge pull request #819 from PyPSA/retrieve-to-data 
Retrieve GLC and WDPA to data directory, not resources
 2023-12-29 11:37:14 +01:00
Fabian Neumann
e097aa48ae
Merge branch 'master' into misc/deprecations 2023-12-29 11:36:19 +01:00
Fabian Neumann
9761988859 increase pypsa min version to 0.26.1 2023-12-29 11:32:53 +01:00
Fabian Neumann
02b0996dac remove write-protection on resources/natura.tiff 2023-12-29 11:29:19 +01:00
Fabian Neumann
4f815a9cd7 move wdpa and glc datasets to data directory and protect 2023-12-29 11:29:01 +01:00
Fabian Neumann
6ee82e030f
Merge pull request #818 from PyPSA/wdpa-no-bYYYY 
WDPA time-invariant resource files
 2023-12-29 11:22:24 +01:00
Fabian Neumann
accffe7bc2 wdpa time-invariant filenames in build_electricity.smk 2023-12-29 11:21:24 +01:00
Fabian Neumann
c5f48f957d wdpa: give snakemake appearance of time-invariant wdpa files 2023-12-29 11:20:40 +01:00
Fabian Neumann
471c97d499 wdpa: correct _shp url 2023-12-29 11:20:14 +01:00
Fabian Neumann
396fdee6f1
Merge pull request #812 from Climact/fix/typo-prepare-sector-network 
Fix typo in buses definition for oil boilers in add_industry in prepare_sectors_networks
 2023-12-29 10:47:41 +01:00
Fabian Neumann
40b7cc1f51
Merge pull request #811 from PyPSA/fix/retrieve-wdpa 
Check WDPA url also a month forward
 2023-12-29 10:46:29 +01:00
Fabian Neumann
57b4724ebe
Merge pull request #803 from millingermarkus/master 
Added co2 storage shadow price output to csv
 2023-12-29 10:41:41 +01:00
Fabian Neumann
9551642c95
Merge pull request #815 from PyPSA/pre-commit-ci-update-config 
[pre-commit.ci] pre-commit autoupdate
 2023-12-29 10:39:04 +01:00
Martha Frysztacki
ba928bf839
Merge pull request #814 from yerbol-akhmetov/no_gas_gen 
No gas generators
 2023-12-28 10:11:45 +01:00
Martha Frysztacki
a74fa9b3c2
Merge branch 'master' into services_heat 2023-12-28 10:10:34 +01:00
Martha Frysztacki
61c54152b1
Merge pull request #813 from yerbol-akhmetov/issue1_issue2 
Resolve waste heat and resistive heaters (issue1 and issue2)
 2023-12-28 10:07:12 +01:00
yerbol-akhmetov
0f41ff79cf update configtable for resistive_heaters 2023-12-28 13:53:15 +06:00
yerbol-akhmetov
640a4b1b2e update boilers description in confitables 2023-12-28 13:51:30 +06:00
pre-commit-ci[bot]
3c3d49017e
[pre-commit.ci] pre-commit autoupdate 
updates:
- [github.com/psf/black: 23.12.0 → 23.12.1](https://github.com/psf/black/compare/23.12.0...23.12.1)
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.11.0 → v2.12.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.11.0...v2.12.0)
 2023-12-25 18:33:27 +00:00
pre-commit-ci[bot]
125c406013 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-23 08:55:59 +00:00
yerbol-akhmetov
1bee34d57f remove gas generators 2023-12-23 14:51:01 +06:00
yerbol-akhmetov
12096d1f2f update configtable by adding resistive_heaters 2023-12-23 12:55:50 +06:00
yerbol-akhmetov
a3688a74fd add resistive_heaters option to config.default 2023-12-23 12:31:31 +06:00
pre-commit-ci[bot]
fec641ce0a [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-22 13:41:25 +00:00
euronion
d817212896 Fix missing bYYYY 2023-12-22 14:40:30 +01:00
Fabian Hofmann
97b20bc170
Merge branch 'master' into fix/retrieve-wdpa 2023-12-21 23:16:11 +01:00
Fabian Hofmann
ea6bcc9b20
Merge branch 'master' into fix/retrieve-wdpa 2023-12-21 23:15:58 +01:00
Fabian Hofmann
b5f8e8d206
Merge branch 'master' into fix/retrieve-wdpa 2023-12-21 23:14:56 +01:00
Fabian Hofmann
c3fd0e2177
Merge pull request #810 from PyPSA/env/restrict-snakemake 2023-12-21 23:14:28 +01:00
pre-commit-ci[bot]
3a474af71f [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-21 17:40:48 +00:00
euronion
25c5751565 Check WDPA url also a month forward 2023-12-21 18:39:06 +01:00
euronion
31f77bc888 Update environment.yaml 2023-12-21 17:52:34 +01:00
euronion
f251e89269 Update release_notes.rst 2023-12-21 17:52:31 +01:00
Tom Brown
8a55a55d20 copperplate oil/methanol supply; allow demand to be regional 
Force a single supply bus for oil/methanol (until we allow
oil/methanol transport). Introduce new config switches
"regional_oil/methanol_demand" that allow demand to be
regionalised. This is important if regional CO2 budgets need to be
enforced.
 2023-12-21 16:08:43 +01:00
yerbol-akhmetov
17e9b4d1df make resistive heaters separate of boilers 2023-12-21 20:59:35 +06:00
yerbol-akhmetov
25cfcaf97b fix add_waste_heat 2023-12-21 20:54:17 +06:00
Martha Frysztacki
81041aa10e
Merge pull request #809 from yerbol-akhmetov/fix_f_weighting 
fix f weighting for retro cost
 2023-12-21 15:04:06 +01:00
pre-commit-ci[bot]
20b847c627 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-12-21 13:35:00 +00:00
euronion
17a4f53b9d Restrict snakemake version to < 8.0.0 2023-12-21 11:57:24 +01:00