Fabian Neumann
6a8ae68aec
Merge branch 'industry-coal-bug'
2024-02-16 12:47:34 +01:00
Fabian Neumann
6d80b332e6
add release note
2024-02-16 12:47:01 +01:00
Fabian Neumann
3f6f17cef6
Merge pull request #930 from PyPSA/cl-meoh-unit
...
bugfix: correct units of subtracted chlorine and methanol
2024-02-16 12:40:37 +01:00
Fabian Neumann
6bedca13c4
Merge branch 'master' into cl-meoh-unit
2024-02-16 12:40:29 +01:00
Fabian Neumann
7e66c1428d
add release note
2024-02-16 12:40:05 +01:00
Fabian Neumann
be3472dee9
Merge pull request #931 from PyPSA/ammonia
...
bugfix: include all countries in ammonia production resource
2024-02-16 12:14:07 +01:00
Fabian Neumann
84fc63d7a1
Merge branch 'master' into ammonia
2024-02-16 12:14:00 +01:00
Fabian Neumann
67484f9cf0
remove numpy import, add release ntoe
2024-02-16 12:13:35 +01:00
Fabian Neumann
dc14082985
Merge pull request #922 from PyPSA/bus-regions
...
create a bus for every unique coordinate, not only substations
2024-02-16 12:07:53 +01:00
Fabian Neumann
c22e47cd58
add release note
2024-02-16 12:07:37 +01:00
Fabian Neumann
abc4538251
Merge pull request #934 from PyPSA/swiss_all_years
...
Change default energy totals year to 2013
2024-02-16 11:45:15 +01:00
martacki
ccbf835976
fix typo to make pre-commit.ci happy
2024-02-16 09:49:00 +01:00
martacki
6196fd6892
change default energy totals year to 2013 to comply with default weather year
2024-02-15 16:29:29 +01:00
martacki
a22b19dcc4
use new swiss data for building energy totals
2024-02-15 16:28:24 +01:00
martacki
16955d24ab
data: upload swiss energy totals data for all years
2024-02-15 16:27:44 +01:00
pre-commit-ci[bot]
4fa504b0db
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-14 17:32:24 +00:00
Tom Brown
c54626cc1a
bugfix: correct units of subtracted chlorine and methanol
...
in build_industry_sector_ratios.py. In the config the units are Mt/a,
they are multiplied by MWh/t, but what is desired is GWh/a.
2024-02-14 18:29:02 +01:00
Tom Brown
ecedea02d6
bugfix: include all countries in ammonia production resource
...
This is so that the full EU28 ammonia demand can be correctly
subtracted in the build_industry_sector_ratios.py script.
No other downstream scripts are affected by this change.
2024-02-14 18:28:22 +01:00
Martha Frysztacki
234f2f247c
Merge branch 'master' into bus-regions
2024-02-14 17:05:43 +01:00
Fabian Neumann
9c592d9f73
add config/config.yaml to .gitignore
2024-02-14 10:49:40 +01:00
Fabian Neumann
44d0859640
Merge pull request #925 from PyPSA/default-config
...
use default config as base configuration
2024-02-13 07:39:56 +01:00
Fabian Neumann
a13da7bab7
Merge pull request #926 from PyPSA/efficient-helper-source-path
...
remove inefficient _helper.py file search
2024-02-13 07:38:39 +01:00
Fabian Neumann
b725a754cc
Merge branch 'default-config' of github.com:PyPSA/pypsa-eur into default-config
2024-02-12 13:57:04 +01:00
Fabian Neumann
69e20e3448
need at least one entry for config/config.yaml to read as yaml
2024-02-12 13:55:32 +01:00
Fabian Neumann
fa931cc2b1
alternative approach 2
2024-02-12 13:54:28 +01:00
Fabian Neumann
1e5163b66b
alternative approach
2024-02-12 13:45:42 +01:00
Fabian Neumann
5840a9aa11
remove inefficient _helper.py file search
2024-02-12 12:17:13 +01:00
pre-commit-ci[bot]
abe06a68fb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 11:11:04 +00:00
Fabian Neumann
fe143ff8fe
use default config as base configuration
2024-02-12 12:10:05 +01:00
Fabian Neumann
e8c8d72b3f
Merge pull request #924 from PyPSA/merged-electricity-demand
...
Merged electricity demand sources (powerstatistics, OPSD)
2024-02-12 10:56:13 +01:00
Fabian Neumann
09ada56bf1
finishing touches and release notes
2024-02-12 10:49:45 +01:00
Fabian Neumann
49171901d7
selective cherry-pick from 91eff472a7
2024-02-12 10:12:03 +01:00
Fabian
94f72d7276
electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand
2024-02-12 10:08:39 +01:00
Fabian
2bd8021058
retrieve electricity demand: make online version snakemake params
2024-02-12 09:48:42 +01:00
Fabian
5c7bbcd94d
retrieve electricity demand: use script in order to concat time-series
2024-02-12 09:48:28 +01:00
pre-commit-ci[bot]
17105b8125
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-10 18:18:00 +00:00
Tom Brown
8781e69066
bugfix: coal emissions for industry weren't tracked
...
Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
2024-02-10 19:17:06 +01:00
Fabian Neumann
cbb3ab36a6
Merge pull request #920 from PyPSA/env-versions
...
update version compatibility handling
2024-02-09 17:00:11 +01:00
Fabian Neumann
201d0ddcfe
build_shapes: handle europe_shape multipolygon with shapely>=2 ( closes #852 )
2024-02-09 15:48:54 +01:00
Fabian Neumann
4b6199de42
create a bus for every unique coordinate, not only substations ( closes #699 )
2024-02-09 15:43:27 +01:00
Fabian Neumann
3691f9f4c1
update version compatibility handling
2024-02-09 13:59:15 +01:00
Fabian Neumann
e0dafc50b3
add missing heat pump colors
2024-02-09 10:15:11 +01:00
Fabian Neumann
682ff4fee3
Merge pull request #918 from PyPSA/fneum/cp-from-ariadne2
...
Merge from `ariadne2`
2024-02-07 18:56:58 +01:00
Fabian Neumann
b9c71c3c15
add logs to plot_*_network rules
2024-02-07 18:52:01 +01:00
pre-commit-ci[bot]
3e411fe79d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-07 16:27:22 +00:00
Fabian Neumann
7ad5dcc3ee
add release notes and documentation
2024-02-07 17:25:09 +01:00
Tom Brown
92d00a0c83
add new default to overdimension heating in individual buildings
...
This allows them to cover heat demand peaks e.g. 10% higher than
those in the data.
The disadvantage of manipulating the costs is that the capacity is
then not quite right. This way at least the costs are right.
Doing it properly would require introducing artificial peaks, but this
creates new problems (e.g. what is going on with wind/solar/other
demand).
2024-02-07 17:18:04 +01:00
Tom Brown
6d94439bbb
for existing heating use new default_heating_lifetime
...
This is because old costs default (25) is longer than all heating
technologies (20). Script was distributing across 25 years, then
throwing out boilers older than 20 years, an inconsistent
behaviour.
Now existing boilers are smoothly distributed across 20 years.
2024-02-07 17:15:37 +01:00
Fabian Neumann
d7f3f16a9b
autoformat
2024-02-07 17:15:08 +01:00
Tom Brown
f38681f134
correctly source the existing heating technologies for buildings
...
The source URL has changed. It represents the year 2012 and is only
for buildings, not district heating. So the capacities for urban
central are now set to zero from this source.
2024-02-07 17:13:53 +01:00
