virio-andreyana
8dbcca560c
minor fixes in solve_network.py
2023-06-03 12:09:51 +02:00
Fabian Neumann
391f821d6e
resolve remaining merge conflicts
2023-06-02 17:28:23 +02:00
Fabian Neumann
546d9b0610
adjust new rules to merged format
2023-06-02 17:27:24 +02:00
pre-commit-ci[bot]
286b836c3f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-02 15:18:48 +00:00
Fabian Neumann
2072aa4a99
add dynamic line rating to CI
2023-06-02 17:16:38 +02:00
Fabian Neumann
8a6b2667b5
fix unresolved merge conflict in config.default.yaml
2023-06-02 17:13:12 +02:00
Fabian Neumann
ff6f3a1b7e
resolve remaining merge conflicts
2023-06-02 17:12:05 +02:00
Fabian Neumann
59f24122e2
cherry-pick line rating code
2023-06-02 17:08:40 +02:00
Fabian Neumann
ef5320e1b8
merge master
2023-06-02 16:59:06 +02:00
pre-commit-ci[bot]
0f5bb8b893
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-02 10:53:11 +00:00
virio-andreyana
83ff639ad5
amend solve_network
2023-06-02 12:52:49 +02:00
virio-andreyana
b67a00903a
using higher keys for industries
2023-05-31 10:54:27 +02:00
pre-commit-ci[bot]
f3e8fe2312
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-27 13:51:00 +00:00
virio-andreyana
e581ca930c
made params more specific
2023-05-27 15:50:37 +02:00
pre-commit-ci[bot]
ead87afce1
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-27 10:23:30 +00:00
virio-andreyana
1c73bb0342
add params for solve_network
2023-05-27 12:22:53 +02:00
Max Parzen
80eadcf24a
Merge pull request #674 from LucieRC/master
...
Update Discord link README.md
2023-05-25 14:39:25 +01:00
lucie_rc
dc043d8aef
Update Discord link README.md
2023-05-24 15:46:53 +03:00
Fabian Neumann
015a6a19f3
Merge pull request #672 from koen-vg/fix-h2-underground-storage
...
Fix bug with underground H2 storage creation
2023-05-24 11:39:32 +02:00
Koen van Greevenbroek
312dd81f21
Fix bug with underground H2 storage creation
...
For some small model regions, none of the H2 cavern types specified in
the configuration might actually be available, in which case the line
`h2_caverns = h2_caverns[cavern_types].sum(axis=1)` throws an error.
2023-05-24 11:13:37 +02:00
lisazeyen
ab8ee639f9
update average annual prices
2023-05-24 10:53:40 +02:00
lisazeyen
6e358097c9
change natural gas index to import price
2023-05-24 10:51:16 +02:00
lisazeyen
b2730a6d47
fix wrong input path
2023-05-24 10:26:31 +02:00
Fabian Neumann
0c95b5a840
Merge pull request #671 from PyPSA/pre-commit-ci-update-config
...
[pre-commit.ci] pre-commit autoupdate
2023-05-23 08:50:19 +02:00
pre-commit-ci[bot]
0f09545d96
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-22 21:56:31 +00:00
pre-commit-ci[bot]
d2f6138ca5
[pre-commit.ci] pre-commit autoupdate
...
updates:
- [github.com/PyCQA/docformatter: v1.6.5 → v1.7.1](https://github.com/PyCQA/docformatter/compare/v1.6.5...v1.7.1 )
2023-05-22 21:56:04 +00:00
virio-andreyana
28d39680c6
Merge branch 'master' into post-merge-param
2023-05-19 16:19:58 +02:00
pre-commit-ci[bot]
216a02fba1
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-19 13:42:45 +00:00
virio-andreyana
c043100ada
add more params in simplify_network.py
2023-05-19 15:42:07 +02:00
virio-andreyana
d97a543463
missing a coma in build_electricity.smk
2023-05-17 19:37:47 +02:00
pre-commit-ci[bot]
6366dc4c55
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-17 17:26:02 +00:00
virio-andreyana
8af1fe5649
replace the word "config" to "params" in functions
2023-05-17 19:25:45 +02:00
virio-andreyana
8208ac033b
convert param back to config for "logging" and "run", made "enable" more specific
2023-05-17 18:43:30 +02:00
lisazeyen
d6d2088360
adjust config
2023-05-17 13:07:03 +02:00
lisazeyen
4854d8b4dc
add data for monthly prices
2023-05-17 12:56:40 +02:00
lisazeyen
747bf5d815
add time dependent co2 price
2023-05-17 12:55:17 +02:00
lisazeyen
e9348b8e23
uncomment ship raster, since otherwise not computing
2023-05-17 12:48:45 +02:00
lisazeyen
6b10bfa9a6
not cluster conventional, temporal dependent co2price
2023-05-17 12:47:26 +02:00
Fabian Neumann
859e32ff9c
Merge pull request #668 from PyPSA/0523-deprecations
...
address geopandas future warning
2023-05-17 09:18:00 +02:00
Max Parzen
c1bc7c0f62
Merge pull request #670 from PyPSA/pz-max-patch-1
...
Update support.rst
2023-05-16 21:05:00 +01:00
Max Parzen
8d6d661071
Update support.rst
2023-05-16 20:44:22 +01:00
lisazeyen
024da02f8a
add monthly prices to network
2023-05-16 16:16:36 +02:00
lisazeyen
dfdd116206
add rule to build monthly prices
2023-05-16 16:16:36 +02:00
Fabian Neumann
2b62c015aa
Merge pull request #669 from lilanger/patch-1
...
Update supply_demand.rst
2023-05-16 15:03:35 +02:00
Lissy Langer
7fad9e2635
Update supply_demand.rst
...
Heat pump COP equations signs are wrong: https://pubs.rsc.org/en/content/articlelanding/2012/EE/c2ee22653g
2023-05-16 14:57:45 +02:00
Fabian Neumann
dabce64bc7
Merge pull request #667 from PyPSA/pre-commit-ci-update-config
...
[pre-commit.ci] pre-commit autoupdate
2023-05-16 13:43:45 +02:00
pre-commit-ci[bot]
7d4dacf8bd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-16 11:35:00 +00:00
Fabian Neumann
875fcdd0e2
address geopandas future warning
2023-05-16 13:34:23 +02:00
pre-commit-ci[bot]
748cfaec65
[pre-commit.ci] pre-commit autoupdate
...
updates:
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.8.0 → v2.9.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.8.0...v2.9.0 )
2023-05-15 22:01:44 +00:00
pre-commit-ci[bot]
e431a9675c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-15 13:02:41 +00:00
