Commit Graph

141 Commits

Author SHA1 Message Date
lisazeyen
4315b3a18a fix dropping bug 2024-09-11 14:22:15 +02:00
pre-commit-ci[bot]
0bdf90280b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-11 07:38:42 +00:00
lisazeyen
82a669635b
removing logging
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:38:21 +02:00
lisazeyen
0ac6a6a1f2
simplify exclude statement
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:38:07 +02:00
pre-commit-ci[bot]
649e48e1a9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-11 07:36:02 +00:00
lisazeyen
b90f83a659
simplify drop expression
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:35:31 +02:00
lisazeyen
d9c872031c
Merge branch 'master' into fix_building_fec 2024-09-09 18:32:09 +02:00
pre-commit-ci[bot]
5465d8cc75 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-09 16:28:09 +00:00
Tom Brown
0bcb215597 use JRC-IDEES thermal energy service instead of FE for buildings
This change consists of:

- reading the final energy (FE) to thermal energy service (TES)
  efficiency for each each country, seperately for gas and oil (this
  efficiency represents e.g. the losses in older non-condensing
  boilers)

- using TES instead of FE for the n.loads, so that it is pure energy
  service instead of including losses in legacy equipment

- using the stored efficiencies for baseyear equipment in
  add_existing_baseyear

In the baseyear (e.g. 2020) this should have no effect on FE, since
the reduction to TES is conpensated by the lower efficiencies of
existing equipment.

In the future (e.g. 2050) this leads to a reduction in heating demand,
since new equipment is more efficient than existing.
2024-09-02 19:32:13 +02:00
Fabian Neumann
88d28de3a1
resolve Kosovo (XK) as separate country (#1249)
* resolve Kosovo (XK) as separate country

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fillna

* add missing key in data/existing_infrastructure/existing_heating_raw.csv

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 15:36:03 +02:00
pre-commit-ci[bot]
bca4f95a07 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-29 13:38:41 +00:00
Fabian Neumann
550bda4b44 eurostat_co2: fix update to 2023 energy balances 2024-08-29 11:49:37 +02:00
Fabian
ca47becc87 build_transport_data: select swiss years according to data selection
use index.unique instead of index.levels where needed
2024-08-19 13:33:28 +02:00
lisazeyen
ad100c494b
increase CH transport data until 2022 2024-08-16 13:57:02 +02:00
pre-commit-ci[bot]
156eccefb7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-09 12:24:39 +00:00
lisazeyen
c5256c1f37 add coke oven transformation output 2024-08-09 14:24:12 +02:00
pre-commit-ci[bot]
6a51a1d94e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-07 09:59:09 +00:00
lisazeyen
7e75aab295 directly read in nan values 2024-08-07 10:47:22 +02:00
lisazeyen
7848e08bc7 create previous idees split for aviation 2024-08-07 10:40:23 +02:00
lisazeyen
8794f53050 rename eurostat_2015 2024-08-07 10:11:07 +02:00
lisazeyen
682d53d1b5 remove /bundle 2024-08-07 10:07:52 +02:00
lisazeyen
5725e8bf22 remove comment about uk flights 2024-08-06 17:47:35 +02:00
lisazeyen
c9557a5988 remove breakpoint 2024-07-31 18:50:41 +02:00
pre-commit-ci[bot]
e37824336e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-31 14:10:11 +00:00
lisazeyen
d48500fc3b use ffill and bfill 2024-07-31 16:06:16 +02:00
lisazeyen
c99cd72727 include Tonis Feedback 2024-07-29 13:36:06 +02:00
pre-commit-ci[bot]
fb26aaf38d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-22 19:42:54 +00:00
lisazeyen
b957f88645 fix bugs and clean up 2024-07-22 21:40:47 +02:00
lisazeyen
53bbc28908 add eurostat data for GB agriculture 2024-07-22 21:15:40 +02:00
pre-commit-ci[bot]
0e1e509006 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-19 13:43:16 +00:00
lisazeyen
39e853e2b3 make sure not to divide by zero 2024-07-19 15:42:44 +02:00
pre-commit-ci[bot]
028d0d6e7a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-19 13:15:38 +00:00
lisazeyen
dea48c965a correct indexing of DH share 2024-07-19 15:15:12 +02:00
lisazeyen
104fa73119 remove rescale to Eurostat 2024-07-19 15:15:12 +02:00
pre-commit-ci[bot]
086d46cdb4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-19 08:21:09 +00:00
lisazeyen
4c46c57fec avoid double download of JRC idees 2024-07-19 10:20:19 +02:00
lisazeyen
5f009590f5 remove todos 2024-07-18 15:48:52 +02:00
pre-commit-ci[bot]
8cc23945b5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-18 13:43:40 +00:00
lisazeyen
957176a20d adjustment to build_energy_totals 2024-07-18 15:39:52 +02:00
AmosSchledorn
c787437350 correct typos in heating rule docs 2024-06-17 11:47:55 +02:00
pre-commit-ci[bot]
4a1933f49a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-06-17 09:44:05 +00:00
AmosSchledorn
d2018e1088 Document heating rules 2024-06-17 11:38:23 +02:00
Fabian Neumann
a60e6fca55 bugfix: ensure separately calculated sums are entered (follow-up to #990) 2024-05-25 18:02:56 +02:00
Fabian Neumann
fd9e93b4b0 transport demand: clarify units in code comments 2024-05-25 17:16:47 +02:00
Fabian Neumann
703b206e1f tidy up update_residential_from_eurostat 2024-05-21 20:16:57 +02:00
Fabian Neumann
4e85ddc5c9 Merge branch 'update_households_energy' of github.com:yerbol-akhmetov/pypsa-eur into yerbol-akhmetov-update_households_energy 2024-05-21 19:02:18 +02:00
Fabian Neumann
da10374158 apply ruff linting 2024-05-21 15:28:24 +02:00
Fabian Neumann
ca451fe9d5 ruff: safe fixes 2024-05-21 14:55:58 +02:00
Fabian Neumann
f76f7879f0 Merge branch 'fix_energy_totals' 2024-05-20 15:38:09 +02:00
Fabian Neumann
f25c594a07 bugfix: include total heavy-duty road freight; do not treat total transport as other but including electricity 2024-05-20 15:37:54 +02:00