Commit Graph

2860 Commits

Author SHA1 Message Date
lisazeyen
6a1438cffd fix heating_system.sector bug 2024-09-11 15:06:17 +02:00
lisazeyen
4315b3a18a fix dropping bug 2024-09-11 14:22:15 +02:00
lisazeyen
c017211700 use snakemake.params 2024-09-11 10:16:09 +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
163f834481
remove snakemake.config
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:35:50 +02:00
lisazeyen
b90f83a659
simplify drop expression
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:35:31 +02:00
Fabian Neumann
f8542e7646
Merge branch 'master' into fix_building_fec 2024-09-10 21:03:49 +02:00
Bobby Xiong
ac606c1f67
Build biomass transport costs from pre-extracted .csv instead of pdf (#1272)
* Removed tabula dependency for building biomass transport costs. Instead use pre-extracted .csvs. Updated rule and script accordingly.

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

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

* Updated script to optionally allow running the script with tabula-py dependency to recreate csv, if needed.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-10 20:51:28 +02:00
lisazeyen
95ac2f5e23
Merge branch 'master' into fix_building_fec 2024-09-10 19:24:15 +02:00
lisazeyen
086beb7bd7
Merge branch 'master' into fix_building_fec 2024-09-10 18:29:38 +02:00
lisazeyen
a7c37759e8
Merge branch 'master' into myopic_hydrogen_network_plotting 2024-09-10 17:00:00 +02:00
cpschau
8a0b6ba911
Hot fix: Rename reindex transport costs for unsustainable biomass (#1271)
* reindex transport costs for unsus biomass

* change index of potential dataframe for unsustainable solid potentials
2024-09-10 16:21:14 +02:00
pre-commit-ci[bot]
e89027e946 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-10 12:04:19 +00:00
daniel.rdt
879c896bea fix bug for plotting of hydrogen network with myopic foresight. 2024-09-10 13:51:34 +02:00
Fabian Neumann
5f45a1be84 build_biomass_transport_costs: do not rename XK to KO 2024-09-10 12:32:42 +02:00
Toni Seibold
9aa9a59bb0
removing scripts. (#1267) 2024-09-09 19:35:15 +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
lisazeyen
861054961a simplify expression 2024-09-09 18:20:30 +02:00
lisazeyen
59984d0600 add function for efficiency 2024-09-09 18:19:18 +02:00
lisazeyen
93ec44de77 use heat_system.sector 2024-09-09 18:10:59 +02:00
Amos Schledorn
5cf706fe4d
Update central heating temperatures based on Euroheat data and AGFW-Hauptbericht (#1264)
* chore: update config.default
Using Euroheat market outlook 2024 and AGFW-Hauptbericht

* feat: extrapolate missing values in central_heating_temperature_profile.run

* update release notes

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

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

* fix: map_temperature_dict_to_onshore regions and correct use of extrapolation function

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

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

* fix: extrapolation_ration in build_central_heating_temperature_profiles.run

* style: remove obsolete time index in min/max fwd, return temperatures

* feat: throw exception if max_fwd_temp < min_fwd_temp or min_fwd_temp < return_temp

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

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

---------

Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-09 14:38:39 +00:00
Fabian Hofmann
0423366db6
prepare_sector_network: fix e_max_pu in unsustainable biomass stores (#1266) 2024-09-09 14:14:16 +02:00
cpschau
53f84f7eea
Follow-Up: Unsustainable Biomass (#1254)
* add oil bus; extend global biomass limit; set unsustainable potentials to zero for overnight

* keep sustainable potentials for switzerland

* remove potential distinction for overnight; additional global constraint for unsustainable solid biomass

* add unsustainable generator suffix

* added unsustainable solid biomass bus; changed global constraints to equality; removed forced emptying of unsustainable solid biomass store

* restored equality constraint for sustainable solid biomass; restored forced emptying of unsustainable store

* remove directory change for debugger

* added tech_color for unsustainable solid biomass

* modified spatial namespaces and removed suffixes
2024-09-08 11:59:37 +02:00
Amos Schledorn
4a3e7924d2
Make overdimensioning factor for heating systems specific to central/decentral heating (#1259)
* chore: make overdim_factor heat-system-specific

* doc: update configtables

* doc: update release notes

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

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

* fix: read overdimensioning factor for industrial oil boilers from options

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

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

---------

Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-08 11:50:25 +02:00
Micha
9f0e46860c
bugfix: determine bus_carrier locally instead of overwriting n.stores (#1262)
* bugfix: determine bus_carrier locally instead of overwriting n.stores

* add release_note

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-08 11:46:09 +02:00
Philipp Glaum
e940e4b73a
Merge branch 'master' into fix_msw 2024-09-04 08:26:50 +02:00
Michael Lindner
34f5d2eb68 bugfix missing oil generator: remove else clause 2024-09-03 16:37:22 +02:00
Philipp Glaum
7b98afc85a fix if condition to add msw 2024-09-03 16:02:28 +02:00
Philipp Glaum
30bcddb66a prepare_sector_networks: account correctely for msw co2
environment.yaml: add license comment
2024-09-03 14:10:20 +02: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
e8353ec031 Merge branch 'master' into prepare-release-v0.12.0 2024-08-30 18:07:38 +02:00
Fabian Neumann
56f2b581bf
Add emissions and fuel consumption from fuel refinieries (#1253)
* Add emissions and fuel consumption from fuel refinieries

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 18:06:41 +02:00
Fabian Neumann
3a1ee934da prepare release v0.12.0 2024-08-30 18:06:26 +02:00
Fabian Neumann
0df54bc370 Squashed commit of the following:
commit a2b82195b872bae11a9e247c53756ca3ae512362
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date:   Fri Aug 30 16:13:36 2024 +0200

    minor adjustments

commit 4f9eb04fec4534abbef10fedd4d9b5c34f064670
Merge: 7b525a51 bf2d82a3
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date:   Fri Aug 30 16:08:58 2024 +0200

    Merge branch 'master' into master

commit 7b525a515a36a4ebb248280546583ac843f6b277
Merge: d9033374 a357ba11
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 13:21:06 2024 +0200

    Merge branch 'master' into master

commit d9033374e4bf0bb70df0828743b9aab69c0cbb27
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:27 2024 +0200

    Update scripts/solve_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit 98e6c5b0f152ca7e064b3c80be26f50040628388
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:21 2024 +0200

    Update scripts/solve_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit be19a2ba2401a2815c09e74d2add24461b3fe2aa
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:15 2024 +0200

    Update scripts/solve_operations_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit 8093eaa399cfea62d1ef93ec4ed5ed46bf5dcc6d
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date:   Mon Aug 26 10:34:08 2024 +0200

    Update scripts/solve_network.py

    Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

commit 746d1761accbe44d3a851430b94844fe3ab43d72
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Aug 21 15:29:12 2024 +0000

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

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

commit f46fdee7f7ceeb9040ee73123fa4a3bd1aa14a56
Author: Daniele Lerede <daniele.lerede@openenergytransition.org>
Date:   Wed Aug 21 17:11:32 2024 +0200

    fix solve_operations_network
2024-08-30 16:15:34 +02:00
Amos Schledorn
bf2d82a384
Dynamic central heating temperatures (#1206)
* feat: Add rule to build central heating temperature profiles, adjust build_cop_profiles accordingly

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

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

* style: make new config settings prettier

* docs: add file headers

* docs: update configtables and module docstring

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

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

* docs: update release notes

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

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

* chore: use smooth ambient temperature through rolling window; remove default vals in class

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

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

* Update doc/configtables/sector.csv

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-30 16:01:46 +02:00
Philipp Glaum
d2f8162d7b
prepare_sector_network: correct if statement (#1252) 2024-08-30 15:56:21 +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
Philipp Glaum
4f8d583d38
prepare_sector_network: fix municipal waste transport links (#1250) 2024-08-30 13:34:06 +00:00
Fabian Neumann
3a1b57515a
industry: steel GEM, ammonia, refinery, cement plants non-EU (#1241)
* industry distribution: split EAF + integrated using GEM GSPT, add ammonia plants

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

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

* add release note [no ci]

* add cement plant data for countries not in Hotmaps

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

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

* add refineries data for countries not in Hotmaps

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 14:53:54 +02:00
Fabian Neumann
e815c36b5c revert ffill of ammonia production 2024-08-30 12:13:15 +02:00
Philipp Glaum
bc09f1df77
prepare_sector_network.py: add oil bus whenever industry is added (#1247)
* prepare_sector_network.py: add oil bus whenever industry is added

* prepare_sector_network: Move added oil and methnaol buses to top of "add_industry", and add oil buses where used in "add_biomass"
2024-08-30 12:06:11 +02:00
Fabian Neumann
2cf6951858 build_ammonia_production: forward fill missing values 2024-08-30 12:02:39 +02:00
Fabian Neumann
b207b4ebe8
remove unused geth2015 hydro capacities (#1246) 2024-08-30 10:26:48 +02:00
Fabian Neumann
1b2ec575bc
retrieve urban population fraction from World Bank API (#1248)
* retrieve urban population fraction from World Bank API

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 10:26:34 +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
Philipp Glaum
7665de61d3 prepare_sector_network: convert e_max_pu timeseries for msw stores to pd.DataFrame. 2024-08-29 15:34:44 +02:00