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
AmosSchledorn
1d3e39979a
remove duplicate staticmethods
2024-07-29 11:36:46 +02:00
Amos Schledorn
da3ad1725e
Merge branch 'master' into update-district-heating-cops
2024-07-29 10:33:39 +02:00
Micha
f5fe0d062c
Rename ev battery master ( #1116 )
...
* rename EV battery
* add release note
* adjust tech colors
* fix for battery renaming in plot_summary
---------
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 09:50:02 +02:00
Toni Seibold
23ea16dc14
Lifetime of Gas Pipelines ( #1162 )
...
* inf lifetime of gas pipelines avoids adding new links each planning horizon
* p_nom_extendable for existing gas pipelines is set false if retrofitting to H2 is not allowed
* [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 09:47:08 +02:00
pre-commit-ci[bot]
9d485a2185
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-26 18:12:21 +00:00
AmosSchledorn
08c30d8b2e
ensure correct dimensions in forward/return temperature arayx and change naming from "generic" to "default"
2024-07-26 20:08:06 +02:00
AmosSchledorn
f096592b7f
add option to make central heating forward/return temperatures country-specific
2024-07-26 19:45:45 +02:00
AmosSchledorn
e21694473f
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-25 15:12:13 +02:00
pre-commit-ci[bot]
64d0f291d5
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-25 13:11:08 +00:00
AmosSchledorn
8875ab6c38
add licensing info
2024-07-25 15:10:45 +02:00
AmosSchledorn
d297f84ea7
update inputs for add_existing_baseyear
2024-07-25 14:50:27 +02:00
pre-commit-ci[bot]
744aaf71de
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-25 12:33:39 +00:00
AmosSchledorn
b80bb7bb7a
update base year COPs
2024-07-25 14:33:14 +02:00
toniseibold
9b7831974f
excluding emissions from sector ratios development
...
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
just changing the fillna function makes the whole PR cleaner
2024-07-24 18:22:00 +02:00
pre-commit-ci[bot]
8d6feb6a66
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-24 15:05:01 +00:00
AmosSchledorn
b720bd9eca
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-24 15:43:34 +02:00
AmosSchledorn
eb2911cb93
rename __main__ to run
2024-07-24 15:31:48 +02:00
Fabian Neumann
0470f119cf
base_network: use GeoSeries.voronoi_polygons instead of custom solution ( #1172 )
...
* base_network: use GeoSeries.voronoi_polygons instead of custom solution
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* base_network: move voronoi calculations into separate function
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* base_network: fix typo in function voronoi()
* base_network: refine voronoi function
* add release note [no ci]
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-24 15:31:46 +02:00
AmosSchledorn
3fac27ff27
use module structure
2024-07-24 15:03:44 +02:00
Fabian Neumann
eab315291e
remove {scope} wildcard ( #1171 )
...
* remove {scope} wildcard
* do not create removed files
2024-07-24 13:19:57 +02:00
Fabian Neumann
8b1b1144d5
cutouts: update zenodo repository version ( #1176 )
2024-07-24 11:01:00 +02:00
Fabian Neumann
d142d5a50b
aggregate curtailment into single curtailment generator per bus ( #1177 )
...
* add curtailment generator mode
* add documentation
2024-07-24 10:54:15 +02:00
AmosSchledorn
de10492e10
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-23 17:30:51 +02:00
lisazeyen
7451349fed
take eurostat year for transport demand
2024-07-23 15:10:05 +02:00
lisazeyen
8f2cea4d93
Merge branch 'master' into jrc-idees-2020
2024-07-22 21:43:03 +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
lisazeyen
877ca3eb44
change sign sequestration store marginal cost ( #1174 )
2024-07-22 16:44:26 +02:00
pre-commit-ci[bot]
5361facbb7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-22 13:39:06 +00:00
AmosSchledorn
46f9c7b520
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-22 14:45:38 +02:00
Fabian Neumann
b49895a041
determine_availability_matrix_MD_UA: enable parallelism & remove plots ( #1170 )
...
* determine_availability_matrix_MD_UA: enable parallelism through temp files and remove plots
* [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-19 17:43:11 +00:00
Iegor Riepin
ba55971c23
Compatibility of data processing for Ukraine ( #1146 )
...
* data: retrieve gdp and pop raw data for UA,MD
* Updated retrieval code.
* add_electricity script for UA and MD using updated, endogenised GDP and PPP data.
* Outsourced building of gdp and ppp. Only called when UA and/or MD are in country list.
* Accepted suggestion by @fneum in retrieve rule.
* Cleaned determine_availability_matrix_MD_UA.py, removed redundant code
* Updated build_gdp_pop_non_nuts3 script to use the mean to distribute GDP p.c. Added release notes. Bug fixes.
* Bug fixes --> 'ppp' to 'pop'
* Bug fix: only distribute load to buses with substation.
* Updated to download GDP and population raster via PyPSA-Eur zenodo databundle. Removal of dedicated retrieve function. Updated release notes.
* Updated release notes.
* correct input file paths
* update zenodo url for databundle release v0.3.0
* doc: update release_notes
* minor adjustments: benchmark, increase mem_mb, remove plots, handling of optional inputs
---------
Co-authored-by: bobbyxng <bobbyxng@gmail.com>
Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-19 19:23:35 +02:00
AmosSchledorn
560373a864
add DH cops to network
2024-07-19 18:54:30 +02:00
AmosSchledorn
0c7e7cb46b
fix naming, udpate docs
2024-07-19 18:54:19 +02:00
AmosSchledorn
052394fa88
change naming from individual/district heating to denctral/central heating
2024-07-19 15:57:53 +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
AmosSchledorn
f3c898f43d
build district heating heat pump COPs using approximation from Jensen et al. and values from Pieper et al.
2024-07-19 15:39:16 +02:00
AmosSchledorn
167b056def
remove obsolete rural/urban COPs and rename cop_..._total to cop_..._individual_heating
2024-07-19 15:22:50 +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
Amos Schledorn
8fe5921e44
Fix negative district heating progress ( #1168 )
...
* impose minimum district heating progress of 0
* update release_notes
* update configtables
2024-07-19 12:30:26 +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
lisazeyen
ecccc1429f
add rule to retrieve JRC IDEES 2021
2024-07-18 15:39:27 +02:00
Micha
4c05928766
add marginal cost to preven model degeneracy ( #1155 )
2024-07-15 16:41:32 +02:00
Micha
d3b24face6
revert to old config keys ( #1152 )
...
* revert to old config keys
* [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-12 16:22:53 +02:00
Fabian Neumann
2bf59e6aaf
drop-in mirror for broken eurostat energy balance link ( #1147 )
2024-07-12 09:34:49 +02:00
pre-commit-ci[bot]
1de4db5f9c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-09 12:08:57 +00:00
cpschau
fe5487e277
adjust parameters in config update from wildcards
2024-07-09 14:05:43 +02:00
cpschau
f19279e7e0
Add other waste heat technologies, and adjust share
2024-07-09 14:02:45 +02:00
cpschau
e932466b05
FT and electrolyis waste heat for DH as float
2024-07-09 12:05:50 +02:00
Fabian Neumann
b6d11bba6f
build_shapes: default to no tolerance in polygon simplification ( #1137 )
2024-07-09 11:07:15 +02:00
Fabian Neumann
c3151902f6
Compatibility with geopandas version 1 ( #1136 )
...
* address geopandas and pandas deprecations/warnings
* compatibility with geopandas v1
* [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-08 08:29:16 +02:00
pre-commit-ci[bot]
e42b36e83d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 11:40:21 +00:00
millingermarkus
fbacb76e9c
Minor edits to MSW
2024-07-04 13:34:05 +02:00
millingermarkus
c81d208da2
Remove redundant Waste CHP addition
2024-07-04 11:59:32 +02:00
Markus Millinger
521cf0e753
Merge branch 'PyPSA:master' into msw_incineration
2024-07-04 11:53:00 +02:00
pre-commit-ci[bot]
5ca27837f3
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 09:21:00 +00:00
millingermarkus
5c7bb2bf51
Add option to exclude fossil fuels
2024-07-04 11:16:00 +02:00
pre-commit-ci[bot]
ee6d8b1e42
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 08:22:24 +00:00
millingermarkus
c71fa78bfa
Added biomass imports to prepare sector network
2024-07-04 10:18:19 +02:00
Markus Millinger
821eb07e98
Correct costs of BtL and BioSNG
2024-07-04 09:59:45 +02:00
pre-commit-ci[bot]
192a8eb14b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-04 07:30:52 +00:00
Markus Millinger
270ce82b9f
Cost correction
2024-07-04 09:30:22 +02:00
pre-commit-ci[bot]
b934653b65
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-03 10:42:07 +00:00
millingermarkus
84ddfea91e
Added electrobiofuels
2024-07-03 12:38:16 +02:00
pre-commit-ci[bot]
53328e89f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-03 08:07:32 +00:00
millingermarkus
76e15d6862
Carbon capture capital cost for waste CHP
2024-07-03 09:42:15 +02:00
millingermarkus
b5ff1e8f9c
Added note on carbon capture for BioSNG and BtL
2024-07-03 09:38:08 +02:00
millingermarkus
c7ce47dffd
Energy penalty for solid biomass CHP
2024-07-03 09:22:09 +02:00
bobbyxng
6962ba0cfb
Fixed mock_snakemake for snakemake v.8.14: All snakemake settings moved to snakemake.settings.types.
2024-06-20 15:46:14 +02:00
Fabian Neumann
14b8de8348
compatibility with snakemake 8.14 closes #1108
2024-06-20 14:38:04 +02:00
Fabian Neumann
6348c904bd
Merge pull request #1103 from PyPSA/methanol-store-capital-cost
...
non-zero capital_cost for methanol stores
2024-06-17 18:57:35 +02:00
Fabian Neumann
0ead0dc6a4
Merge pull request #1105 from PyPSA/document-heat-rules
...
Document heating rules
2024-06-17 18:56:52 +02:00
Philipp Glaum
ad38016f6d
prepare_sector_network: add floating wind to update cost function
2024-06-17 15:22:33 +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
Michael Lindner
b174a53480
non-zero capital_cost for methanol stores
2024-06-14 11:29:59 +02:00
Micha
37bbbc6225
Fix grouping logic again
2024-06-13 15:03:08 +02:00
Bobby Xiong
0db78a93e6
Fixed bug which generated empty pdfs when calling plot_summary from CI or snakemake. Using .svg exports instead.
2024-06-11 15:10:12 +02:00
Micha
b052a5e54a
Merge branch 'master' into fix-p_nom-existing-renewables
2024-06-10 10:59:49 +02:00
pre-commit-ci[bot]
5168b3fe0b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-06-07 16:02:02 +00:00
Michael Lindner
c24b7f657b
set generator baseyear p_nom to p_nom_min
2024-06-07 17:59:43 +02:00
pre-commit-ci[bot]
47889d728f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-06-07 12:34:51 +00:00
Michael Lindner
136442b87c
revert hotfix for #1016
2024-06-07 14:20:58 +02:00
Toni Seibold
180d93951d
documentation for industry rules ( #1086 )
...
* documentation for industry rules
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-06-05 15:02:44 +02:00
Toni Seibold
d62e959c85
Fix offshore wind capacity by adding it as offwind-AC ( #1089 )
...
* Fix existing offshore wind capacity by adding it as offwind-ac
---------
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-06-04 17:02:56 +02:00
Fabian Neumann
4ceb397de0
skip MD for synthetic load data
2024-06-04 13:56:54 +02:00
LukasFrankenQ
b0d7a45ea7
changed EGS paper link to doi-containing version
2024-06-01 18:21:49 +01:00
LukasFrankenQ
4752840009
improved docs on EGS cost scaling
2024-06-01 00:32:44 +01:00
LukasFrankenQ
2f1d6d20b1
final corrections, improved docs
2024-06-01 00:20:31 +01:00
millingermarkus
b29e1c196e
Added msw incineration
2024-05-30 14:28:34 +02:00
LukasFrankenQ
2801b00100
Merge https://github.com/pypsa/pypsa-eur
2024-05-26 22:38:03 +01:00
Fabian Neumann
7ad930ee2e
bug: add_electricity only add carriers in powerplant dataset for country subset
2024-05-25 21:13:47 +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
422c37827c
time_aggregation: handle case without any temporal aggregation
2024-05-25 15:48:48 +02:00
Fabian Neumann
5397f3fe85
avoid duplicate existing RES capacities ( closes #1016 )
2024-05-24 09:47:23 +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
c600d327b0
Merge branch 'master' of github.com:PyPSA/pypsa-eur into eurostat-march2024
2024-05-21 18:49:41 +02:00
Fabian Neumann
fd7dcb2e8a
Merge pull request #1075 from koen-vg/time-agg-fix
...
Minor bugfixes for new time aggregation implementation
2024-05-21 18:29:18 +02:00
Koen van Greevenbroek
b6fa0043bf
Fix disabling transmission limit for volume limit type
2024-05-21 18:14:31 +02:00
Koen van Greevenbroek
2a6dcc4c12
Minor bugfixes for new time aggregation implementation
2024-05-21 18:09:09 +02:00
pre-commit-ci[bot]
288ccbd513
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-21 14:00:43 +00:00
Fabian Neumann
eb4381be4d
update energy balances April 2023 link
2024-05-21 15:59:46 +02:00
Fabian Neumann
0370deebca
apply pre-commit
2024-05-21 15:30:56 +02:00
Fabian Neumann
da10374158
apply ruff linting
2024-05-21 15:28:24 +02:00
Fabian Neumann
9545b757b0
correctly trigger add_solar_potential_constraints
2024-05-21 15:28:03 +02:00
Fabian Neumann
ca451fe9d5
ruff: safe fixes
2024-05-21 14:55:58 +02:00
Fabian Neumann
d19a3bcb64
time_aggregation: handle case where resolution is bool false
2024-05-21 14:22:21 +02:00
pre-commit-ci[bot]
b29b9e6c5d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-20 20:25:43 +00:00
Fabian Neumann
3f01938eee
Merge branch 'master' into fix_biomass_transport
2024-05-20 22:24:59 +02:00
Fabian Neumann
00efffcc13
move up methanol for industry, to before shipping
2024-05-20 22:06:31 +02:00
Fabian Neumann
0ad3489d3a
Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production
2024-05-20 22:06:15 +02:00
Fabian Neumann
eeb548c03f
Merge branch 'feature/fix-industry-intermediate' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-industry-intermediate
2024-05-20 21:44:19 +02:00
Fabian Neumann
60a26a67a0
simplify check for coal/coke industry demand
2024-05-20 21:08:44 +02:00
Fabian Neumann
476349292c
Merge branch 'feature/fix-non-steel-coal-demand' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-non-steel-coal-demand
2024-05-20 21:01:16 +02:00
Fabian Neumann
a8cd1186b8
clarify differences between Co2L in {sector_opts} and {opts} wildcard ( closes #865 )
2024-05-20 17:18:55 +02:00
Fabian Neumann
c7d8af998c
only apply rolling horizon setting in ( closes #864 )
2024-05-20 17:00:56 +02:00
Fabian Neumann
a2012d8937
pre-commit formatting [no ci]
2024-05-20 15:49:40 +02:00
Fabian Neumann
65b05e92a1
Merge branch 'feature/enhance-agg-p-nom-limits' of github.com:Climact/pypsa-eur-climact into Climact-feature/enhance-agg-p-nom-limits
2024-05-20 15:49:14 +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
Fabian Neumann
408e24de80
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-20 15:01:05 +02:00
Fabian Neumann
c89ce9f045
bugfix: correctly distinguish existing OCGT and CCGT
2024-05-20 15:00:46 +02:00
Fabian Neumann
d2c48b6603
Merge pull request #1071 from SermishaNarayana/master
...
Modification to function "add_operational_reserve_margin" in solve_ne…
2024-05-20 12:45:10 +02:00
Fabian Neumann
7ce15931e5
add simplified power distribution grid losses
2024-05-20 12:41:54 +02:00
pre-commit-ci[bot]
6722e584ba
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-20 10:03:44 +00:00
Sermisha
d7435b6214
Modification to function "add_operational_reserve_margin" in solve_network.py
...
Typecasted pandas dataframes to xarray datasets to allow for multiplication with pypsa variables
2024-05-20 15:30:38 +05:30
Fabian Neumann
6c9fc50a1c
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-20 11:54:20 +02:00
Fabian Neumann
60441ddfdd
pre-commit formatting [no ci]
2024-05-20 11:52:23 +02:00
Fabian Neumann
bf33518135
time_aggregation: add missing logger object
2024-05-20 11:51:45 +02:00
Fabian Neumann
9152425936
remove handling of tsam as optional dependency
2024-05-20 11:51:24 +02:00
Fabian Neumann
9527f4cf77
Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg
2024-05-20 11:38:02 +02:00
Fabian Neumann
cf8ee69f94
Merge pull request #1067 from PyPSA/fix_DC_cluster_issue
...
fix_DC_cluster_issue
2024-05-19 20:19:31 +02:00
pre-commit-ci[bot]
b890149d39
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-18 12:22:30 +00:00
Thomas Gilon
c3dcff8a35
Define methanol energy demand for industry
2024-05-17 16:04:48 +02:00
Philipp Glaum
ac48fdaaf4
base_network.py: connect new tyndp links only to closest AC bus
2024-05-17 14:46:20 +02:00
Parisra
ce14cd6647
Update plot_summary.py
...
-Add 2022 emissions to plot carbon budget
-Add UK emissions to the previous numbers
2024-05-16 17:06:28 +02:00
Fabian Neumann
27009f5060
double solar rooftop PV potentials ( closes #935 )
2024-05-15 18:18:15 +02:00
Fabian Neumann
e4d70fdf4a
remove exogenous rooftop_share
2024-05-15 18:13:49 +02:00
Fabian Neumann
e8779fa5a4
small follow-up to #1066 solar-hsat
2024-05-15 18:02:15 +02:00
Fabian Neumann
44fb8cad1f
Merge pull request #957 from PyPSA/land-transport-fix
...
Land transport fix
2024-05-15 17:13:56 +02:00
Fabian Neumann
1aa4f12c5e
remove adjust_transport_temporal_agg
2024-05-15 16:51:17 +02:00
Fabian Neumann
5b5be71341
use loads instead of links where possible
2024-05-15 16:41:49 +02:00
pre-commit-ci[bot]
a352cc346b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-15 14:18:18 +00:00
lisazeyen
96118ab1f4
Merge branch 'master' into adding_solar_tracking_single_axis
2024-05-15 16:18:13 +02:00
lisazeyen
2223e011a0
merge master
2024-05-15 16:14:25 +02:00
Fabian Neumann
ff603f2c14
Merge branch 'master' into land-transport-fix
2024-05-15 15:25:56 +02:00
Fabian Neumann
ea8fc31a30
link_thresholds as dictionary, not float, more logging messages
2024-05-15 15:15:09 +02:00
lisazeyen
e8de4f308f
rename solar-hsat in config
2024-05-15 15:08:52 +02:00
lisazeyen
6723191031
simplify if statement
2024-05-15 15:04:04 +02:00
lisazeyen
541e267a83
replace print with logger.info
2024-05-15 15:00:42 +02:00
lisazeyen
a9be2825ec
reforumlate constraint
2024-05-15 14:59:34 +02:00
Fabian Neumann
9b50c846a0
solve: add option for post-discretization of lines and links
2024-05-15 14:56:50 +02:00
pre-commit-ci[bot]
5dc2e6862b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-15 14:21:11 +02:00
JulianGeis
26184e370b
add functionality for post discretization of lines and transmission infrastructure links
2024-05-15 14:19:35 +02:00
Koen van Greevenbroek
f8f0b4cea0
Document the new time_aggregation rule
2024-05-15 13:34:20 +02:00
Koen van Greevenbroek
354fffe6f0
Split time agg into own rule; same agg for all planning horizons
2024-05-15 13:26:03 +02:00
pre-commit-ci[bot]
985aecb0c4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 19:39:02 +00:00
Fabian Neumann
d6f9e5f4a6
Merge branch 'feature/fix-gas-retrofit' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-gas-retrofit
2024-05-13 18:05:35 +02:00
Fabian Neumann
cadd33431f
sanitize_locations: avoid attribute error for electricity-only runs ( closes #939 )
2024-05-13 17:59:21 +02:00
Fabian Neumann
788e07a0d1
bugfix to avoid duplicated offshore regions ( closes #396 )
2024-05-13 17:56:28 +02:00
Fabian Neumann
ef395cadf9
Merge pull request #1060 from PyPSA/landfill_master
...
Improve handling of plastics (for `master`)
2024-05-13 17:44:46 +02:00
Fabian Neumann
8fbd60883d
Merge branch 'master' into exclude_shared_resources_master
2024-05-13 17:42:40 +02:00
Fabian Neumann
a9333458b3
handle potentially diverging spatial resolutions of HVC
2024-05-13 17:40:10 +02:00
pre-commit-ci[bot]
c311f7bdf8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:33:35 +00:00
lisazeyen
da9beaa98f
rename Greece iso-code
2024-05-13 17:33:07 +02:00
pre-commit-ci[bot]
b529ab1d3c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:14:35 +00:00
Fabian Neumann
614590b98f
Merge branch 'landfill_master' of github.com:PyPSA/pypsa-eur into landfill_master
2024-05-13 17:14:04 +02:00
Fabian Neumann
649e277c7d
make waste-to-energy work without regional_oil_demand
2024-05-13 17:13:16 +02:00
pre-commit-ci[bot]
a9d0f295fb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 13:41:41 +00:00
Michael Lindner
afa5cc5014
add heating output, correct bus ordering
2024-05-13 15:39:48 +02:00
pre-commit-ci[bot]
1d709913ed
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:39:37 +02:00
Tom Brown
2055fe68ef
add extra bus for HVC, which can either go to air or waste CHP
...
Here we explicitly add the option to generate energy and/or capture
the CO2 from HVC (i.e. plastics). NB: Since waste CHP is expensive,
it's not built.
2024-05-13 15:39:01 +02:00
pre-commit-ci[bot]
f7dc8a7f22
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:36:43 +02:00
Tom Brown
ac0d52e1c3
Allow some plastics sequestered in landfill or built environment
...
I.e. assume some fraction of plastics don't end up being burned or
decaying into air.
2024-05-13 15:36:14 +02:00
Fabian Neumann
5b2d4047df
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-13 14:55:07 +02:00
Fabian Neumann
e322e21771
Merge branch 'feature/add-nodal-supply-energy' of github.com:Climact/pypsa-eur-climact into Climact-feature/add-nodal-supply-energy
2024-05-13 14:54:49 +02:00
pre-commit-ci[bot]
5364e7dfcc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 12:25:07 +00:00
Fabian Neumann
6321a69870
rearrange config settings under 'run: shared_resources:'
2024-05-13 14:23:09 +02:00
pre-commit-ci[bot]
0fb68d11d8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 14:22:05 +02:00
toniseibold
e75e3bd8d7
allow excluding files from shared_resources
2024-05-13 14:21:43 +02:00
pre-commit-ci[bot]
85a2e97f1e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 08:51:21 +00:00
Fabian Neumann
e023872d44
stop using wildcard by default
2024-05-13 10:50:24 +02:00
Fabian Neumann
22b16d54e9
Merge branch 'feature/rename-existing-capacities' of github.com:Climact/pypsa-eur-climact into Climact-feature/rename-existing-capacities
2024-05-13 10:09:21 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating
2024-05-13 10:04:42 +02:00
Fabian Neumann
0d9e0f34fd
Merge branch 'master' into reduced-data-bundle
2024-05-12 15:53:08 +02:00
Philipp Glaum
da617be276
Merge branch 'master' of github.com:PyPSA/pypsa-eur into implement-floating
2024-05-10 13:29:58 +02:00
Fabian Neumann
ff99db5cb5
Update scripts/build_hydro_profile.py
2024-05-07 10:53:07 +02:00
Johannes Schmidt
3b77b4a370
Fix that code works if either ES or PT is present
2024-05-06 18:46:04 +02:00
Johannes Schmidt
9d36d2bc9b
Fix copy_timeslice
...
copy timeslice would add data although country not present in load
2024-05-06 13:37:32 +02:00
Johannes Schmidt
97035092ac
Fix approximate_missing_eia_stats
...
Function crasehd when 'ET' or 'PT' not present in list of countries.
2024-05-06 13:20:53 +02:00
Fabian Neumann
c05cfff765
Merge pull request #1045 from Climact/feature/fix-typo
...
Fix typo
2024-05-06 10:33:19 +02:00
Koen van Greevenbroek
303b526bf1
Fix formatting of link in base_network documentation
2024-05-06 09:09:23 +02:00
Koen van Greevenbroek
ca6f803e28
Update documentation to reflect removal of build_bus_regions rule
2024-05-06 08:52:42 +02:00
Koen van Greevenbroek
76c201ef7d
Integrate build_bus_regions into base_network
...
Fixes a problem with the `build_bus_regions` writing to base.nc
without declaring base.nc as an output.
2024-05-03 14:53:18 +02:00
Thomas Gilon
02e434c8b0
Fix non steel related coal demand during transition (using sector_ratios)
2024-05-02 17:29:07 +02:00
Thomas Gilon
a139bb604a
Merge branch 'master' into feature/add-nodal-supply-energy
2024-05-02 14:28:20 +02:00
Thomas Gilon
45aa714bdc
Add calculate_nodal_supply_energy in make summary
2024-05-02 14:27:30 +02:00
Thomas Gilon
3752929cbb
Merge branch 'master' into feature/fix-typo
2024-05-02 14:22:50 +02:00
Thomas Gilon
54e3d2bb1b
Fix typo
2024-05-02 14:19:58 +02:00
pre-commit-ci[bot]
2d2b0338cc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-29 13:59:11 +00:00
Parisra
ea0e2f66ce
Fix empty array error
...
In case there are no extendable solar generators in the network, the constraint is not implemented. Without this condition, an 'empty array' error will arise.
2024-04-29 15:58:42 +02:00
pre-commit-ci[bot]
c66549c577
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-29 12:34:11 +00:00
Parisra
7a2f07e135
Fix component index error
...
The list of carriers for adjust_renewable_profiles is read from config['electricity']['renewable_carriers'] which includes 'solar-hsat' and would result in 'Components Index(['AL0 0 solar-hsat',...) for attribute p_max_pu of Generator are not in main components dataframe generators' warning for the myopic run if the solar tracking option is false.
2024-04-29 14:33:51 +02:00
Parisra
17b3e1677d
Merge branch 'PyPSA:master' into adding_solar_tracking_single_axis
2024-04-29 14:27:26 +02:00
pre-commit-ci[bot]
3e93c14dd4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-29 11:32:24 +00:00
yerbol-akhmetov
44e32468db
Merge branch 'master' into fix_biomass_transport
2024-04-27 18:09:51 +05:00
Fabian Neumann
33dddbf1ef
Merge branch 'master' into existing-caps-from-pm
2024-04-26 08:39:44 +02:00
Koen van Greevenbroek
a4a2af5404
Fix double space in existing capacities
...
The `name_suffix` variable already includes a space after the bus name.
2024-04-25 18:05:41 +02:00
Fabian Neumann
d101b8a95a
Merge branch 'master' into existing-caps-from-pm
2024-04-25 17:33:48 +02:00
Parisra
fde0cd9aae
Update land_use constraints
...
Add solar-hsat and solar-rooftop to land use constraints
2024-04-25 11:49:14 +02:00
Parisra
9a55c8fa7b
Update potential constraint
...
Only implement constraint if solar-hsat option is selected in config
2024-04-25 11:47:30 +02:00
Parisra
f69ec97a18
Add solar_potential constraint
...
The constraint ensures the combined installed capacity of solar and solar-hsat does not exceed the total solar capacity of the node
2024-04-25 11:45:31 +02:00
Parisra
be876761f2
Add remove option for solar-hsat
...
Add function to remove solar-hsat if the config option is 'False'
2024-04-25 11:37:53 +02:00
Parisra
692d837b14
Update add_electricity_grid_connection
...
Add solar-hsat as technology with a grid connection cost
2024-04-25 11:35:29 +02:00
Parisra
f0187437c1
Update costs
...
Rename 'solar-utility single-axis' (taken from technology data) to solar-hsat
2024-04-25 11:32:58 +02:00
Thomas Gilon
cc49926a23
Fix gas network retrofit
2024-04-23 14:16:29 +02:00
pre-commit-ci[bot]
b313b3940c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-20 10:15:59 +00:00
yerbol-akhmetov
1aa10a1294
Merge branch 'master' into fix_biomass_transport
2024-04-20 15:14:41 +05:00
yerbol-akhmetov
3e1eef2934
revert mocksnakemake
2024-04-20 15:14:24 +05:00
yerbol-akhmetov
aaba8fb115
add OS based encoding
2024-04-20 15:09:54 +05:00
Thomas Gilon
3fe427a0cd
Merge branch 'master' into feature/enhance-agg-p-nom-limits
2024-04-19 17:52:01 +02:00
Thomas Gilon
e90b37e6d7
Improve agg_p_nom_minmax file management
2024-04-19 17:47:40 +02:00
pre-commit-ci[bot]
bc78607926
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-18 15:32:28 +00:00
yerbol-akhmetov
2113b6657f
add logging
2024-04-18 20:31:42 +05:00
Yerbol Akhmetov
b4e322e61e
Merge branch 'master' into update_households_energy
2024-04-18 20:15:02 +05:00
Fabian Neumann
95805a8d72
Merge pull request #1031 from PyPSA/remove_connection_costs
...
Remove connection costs output
2024-04-18 09:34:32 +02:00
Yerbol Akhmetov
0125975246
Merge branch 'master' into update_households_energy
2024-04-17 16:10:52 +05:00
