AmosSchledorn
7542d57820
style: move get_country_from_node_name function from _helpers tu run
2024-08-13 17:07:20 +02:00
Philipp Glaum
d14ced2549
cleanup
2024-08-12 10:43:13 +02:00
Philipp Glaum
5c577b6290
remove methanol transport because it has no impact
2024-08-12 10:38:01 +02:00
Philipp Glaum
77385721b6
Merge remote-tracking branch 'upstream/master' into add_methanol_techs
2024-08-12 09:52:25 +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
9b8139abbe
add docstring
2024-08-09 14:24:12 +02:00
lisazeyen
c5256c1f37
add coke oven transformation output
2024-08-09 14:24:12 +02:00
lisazeyen
fe9185ef3f
Merge branch 'master' into jrc-idees-2020
2024-08-09 14:17:25 +02:00
lisazeyen
70db93fd32
correct sheet name chemical feedstocks
2024-08-09 13:14:47 +02:00
AmosSchledorn
6c9bcae6f0
Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures
2024-08-08 17:20:23 +02:00
pre-commit-ci[bot]
a914366391
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-08 15:13:34 +00:00
AmosSchledorn
b31767cb20
Merge branch 'country-specific-dh-forward-temperatures' of https://github.com/PyPSA/pypsa-eur into country-specific-dh-forward-temperatures
2024-08-08 17:00:09 +02:00
AmosSchledorn
130ee49dbd
add option to make central heating forward/return temperatures country-specific
2024-08-08 16:57:41 +02:00
pre-commit-ci[bot]
cfed67f794
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-08 14:46:09 +00:00
AmosSchledorn
69c6ea0e12
use relative imports of scripts.definitions where possible
2024-08-07 17:55:29 +02:00
cpschau
f8d0efbe99
Addition of unsustainable biomass potentials ( #1139 )
...
* add columns to potential df defined by difference to eurostat
* add network components
* add unsustainable bioliquids
* replaced stores by generators, still infeasible
* remove municipal waste
* remove separate treatment of waste from biomass potential calculation
* phase out unsustainble biomass potentials
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* phase-out unsustainable bioliquids
* remove waste_incineration from build_sector rule
* multiple potential calculation for different planning horizons
* raised costs of unsustainable solid biomass
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* stores instead of generators
* change snakemake inputs
* add phas-eout to config
* add techcolor for unsustainable bioliquids
* add config parameter to disable inclusion of unsustainable bioenergy potentials
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* add biomass to params
* remove call of snakemake object in define_spatial
* Quick resolve of review part 1 (config parameters, if-clause-reduction, bioliquid spatial, fix bioliquid link capacity
* Quick resolve of review part 2 (config table, helper function, fixed build_eurostat, removed dir-change, forced unsustainable usage, reverted overnight distinction in Snakefile)
* Cast of planning_horizon parameter to int type after test run
* added JRC fuel costs for solid and liquid biofuels, BtL VOM
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* clean-up after master merge
* adressed review (increase threads for build_eurostat, fixed e_max_pu of Stores, changed version of technology-data); added release note
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <35347358+lisazeyen@users.noreply.github.com>
2024-08-07 15:52:00 +00:00
Fabian Neumann
fb41016c60
EEZ: Update EEZ to v12, auto-download and remove from databundle ( #1188 )
...
* eez: update to version 12, autodownload, remove pycountry
* eez: do not simplify as it distorts topology
* remove missed merge conflicts
2024-08-07 15:28:55 +02:00
Fabian Neumann
c907d59253
remove unused rule prepare_links_p_nom ( #1203 )
...
* remove rule
* [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-07 15:20:08 +02:00
pre-commit-ci[bot]
7f76bf8e84
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-07 12:37:46 +00:00
AmosSchledorn
80603fda6e
update config and script
2024-08-07 13:33:59 +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
95903eeca7
Merge branch 'master' into jrc-idees-2020
2024-08-07 11:58:22 +02:00
lisazeyen
5bf36c218c
add ch data as csv
2024-08-07 11:49:33 +02: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
6b3fc18386
include review fneum build_industrial_production_per_country
2024-08-07 10:33:47 +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
2c7e30bb17
remove ammonia demand script
2024-08-06 17:46:23 +02:00
AmosSchledorn
d903f4ace9
Merge branch 'update-district-heating-cops' into country-specific-dh-forward-temperatures
2024-08-06 15:51:22 +02:00
AmosSchledorn
0e8fb80bc4
clean up, improve docs
2024-08-05 16:11:18 +02:00
AmosSchledorn
2e35bef480
rename "enums" to "definitions" and write modules in snake case
2024-08-05 15:08:05 +02:00
AmosSchledorn
4fe8eeeffa
rename "enums" to "definitions" and write modules in snake case
2024-08-05 15:07:46 +02:00
Philipp Glaum
b298d58d61
fix missing biomass-to-methanol due to wrong if statement
2024-08-05 13:27:43 +02:00
AmosSchledorn
268ff93783
fix boiler buses for existing heating
2024-08-05 12:07:24 +02:00
Philipp Glaum
975716250a
add bus0 for methanol-to-kerosene process
2024-08-05 12:00:15 +02:00
AmosSchledorn
d40ff8e963
Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops
2024-08-05 11:45:23 +02:00
AmosSchledorn
f593983ea0
update copyright notic in heatSector
2024-08-05 11:45:12 +02:00
pre-commit-ci[bot]
61bb225a34
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-05 09:42:45 +00:00
AmosSchledorn
7bd0c16ddd
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-08-05 11:42:18 +02:00
AmosSchledorn
390085aaad
update add_existing_baseyear
2024-08-05 11:35:34 +02:00
AmosSchledorn
5773877f64
Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops
2024-08-05 11:35:11 +02:00
AmosSchledorn
5362c37696
update myopic mode to heat system declarations
2024-08-05 11:27:52 +02:00
pre-commit-ci[bot]
e0b5fe9048
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-05 08:46:30 +00:00
lisazeyen
7447a3d0c9
Merge remote-tracking branch 'origin' into msw_incineration
2024-08-05 10:38:25 +02:00
lisazeyen
a56834e51e
add switch for msw waste
2024-08-05 10:38:11 +02:00
Philipp Glaum
8579689f2a
Merge remote-tracking branch 'upstream/master' into bio_methanol
2024-08-05 10:11:55 +02:00
Philipp Glaum
acb0a8d7af
get methanol to kerosene cost form technology data
2024-08-05 10:08:04 +02:00
Fabian Neumann
ddf0da2687
base_network: bugfix - bring voronoi cells in correct order
2024-08-04 16:01:51 +02:00
pre-commit-ci[bot]
0259e066e4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 15:28:14 +00:00
AmosSchledorn
10e0b30a40
Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops
2024-08-02 17:27:18 +02:00
AmosSchledorn
a990a898ef
update naming in add_existing_baseyear
2024-08-02 17:27:16 +02:00
pre-commit-ci[bot]
6b924ecfb0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 15:15:11 +00:00
AmosSchledorn
3ccdde3467
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-08-02 17:14:31 +02:00
AmosSchledorn
e5152897e1
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-08-02 17:03:51 +02:00
AmosSchledorn
bbf64a2fde
Refactor module structure
2024-08-02 17:03:34 +02:00
pre-commit-ci[bot]
f58322c3e5
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 15:02:11 +00:00
lisazeyen
b62db80435
fix bug with e_max_pu
2024-08-02 17:01:22 +02:00
pre-commit-ci[bot]
3149bfd926
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 14:47:24 +00:00
lisazeyen
69c6a4dca4
set e_max_pu to force municipal waste to be used
2024-08-02 16:45:57 +02:00
AmosSchledorn
318e05c9fb
refactor naming
2024-08-02 16:29:54 +02:00
lisazeyen
68e9593b01
merge master
2024-08-02 15:58:01 +02:00
AmosSchledorn
4a6dd2fe33
fix naming bugs
2024-08-02 15:56:37 +02:00
pre-commit-ci[bot]
e28c66e43c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 13:27:42 +00:00
lisazeyen
2d79673d5e
merge master
2024-08-02 15:23:35 +02:00
lisazeyen
eb81cfb714
change units from EJ->TWh and clean up
2024-08-02 15:13:47 +02:00
lisazeyen
8c5cd4be83
Merge branch 'master' into becc_energy_penalty
2024-08-02 14:35:01 +02:00
pre-commit-ci[bot]
c7a186863e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 12:07:18 +00:00
lisazeyen
8bfca9ce69
enable electrobiofuels also without biomass spatially resolved
2024-08-02 14:05:42 +02:00
lisazeyen
8efa832f95
Merge remote-tracking branch 'origin' into ebiofuels
2024-08-02 13:39:02 +02:00
lisazeyen
648ea20ec1
Merge branch 'master' into msw_incineration
2024-08-02 13:34:31 +02:00
Fabian Neumann
baa8a827f5
change FRESNA references to PyPSA
2024-08-02 11:42:30 +02:00
pre-commit-ci[bot]
de3f679f33
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-01 15:54:24 +00:00
lisazeyen
b2d346f02c
some simplifications
2024-08-01 17:47:21 +02:00
lisazeyen
dcde6a9f58
Merge remote-tracking branch 'origin' into nofossil
2024-08-01 17:38:57 +02:00
AmosSchledorn
b0150bd65d
refactor prepare_sector_network.add_heat using Enums
2024-08-01 11:59:26 +02:00
lisazeyen
c9557a5988
remove breakpoint
2024-07-31 18:50:41 +02:00
pre-commit-ci[bot]
d273de8600
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-31 15:01:50 +00:00
AmosSchledorn
caa260fddb
update class docs
2024-07-31 17:01:27 +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
52c8037a3e
merge master
2024-07-31 16:09:33 +02:00
lisazeyen
d48500fc3b
use ffill and bfill
2024-07-31 16:06:16 +02:00
Fabian Neumann
4c1ec3559d
some small adjustments to run as single node model ( #1183 )
...
* some small adjustments to run as single node model
* [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-07-31 11:53:20 +02:00
lisazeyen
c52737db72
small fixes in docstrings
2024-07-30 15:28:08 +02:00
lisazeyen
b92f0d0c30
update industry sector ratios to new JRC data
2024-07-30 15:26:28 +02:00
pre-commit-ci[bot]
1fe54513cd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-29 16:33:52 +00:00
AmosSchledorn
29479c50d0
pass heat source/system type to prepare_sector_network and add_existing_baseyear
2024-07-29 18:29:27 +02:00
lisazeyen
b0e00249aa
adjust mapping energy demand per ct
2024-07-29 17:37:06 +02:00
lisazeyen
2f3fde26d0
update ammonia demand data to 2022
2024-07-29 16:09:38 +02:00
lisazeyen
aa820fa046
change industry reference year to 2019
2024-07-29 16:00:37 +02:00
lisazeyen
314f6c6f0f
retrieve ammonia demand data
2024-07-29 16:00:13 +02:00
lisazeyen
fb2ab4c50b
update ammonia data
2024-07-29 15:44:30 +02:00
lisazeyen
201889424c
update industry to new JRC-idees
2024-07-29 15:39:01 +02:00
Philipp Glaum
5c1d8178f1
Merge branch 'methanol_to_master' into bio_methanol
2024-07-29 14:51:50 +02:00
Philipp Glaum
d142717563
add methanol techs for master to branch
2024-07-29 14:49:57 +02:00
lisazeyen
c99cd72727
include Tonis Feedback
2024-07-29 13:36:06 +02:00
Fabian Neumann
e9e0a0da20
address fillna(method='{b|f}fill') deprecation ( #1181 )
...
* address fillne(method='{b|f}fill') deprecation
* [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-07-29 11:56:14 +02:00
Fabian Neumann
936b490303
address groupby(axis=...) deprecation ( #1182 )
2024-07-29 09:51:20 +00:00
AmosSchledorn
ff12480713
Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops
2024-07-29 11:38:32 +02:00
