Commit Graph

2068 Commits

Author SHA1 Message Date
Tom Brown
bd8a5ecf2b build_energy_totals: output district heat share to separate file 2024-01-22 08:01:31 +01:00
Tom Brown
6c20ce83d7 move building of daily heat profile to its own script
Previously this was handled inside prepare_sector_network.py.
2024-01-22 08:01:31 +01:00
Tom Brown
fbff32dcfc build_pop_weighted_energy: don't reduce district heat share
Previously the DH share was being multiplied by the population
weighting, reducing the DH share with multiple nodes.
2024-01-22 08:01:31 +01:00
Fabian
d0cb57e9ab make_summary_perfect: reinsert calclulate_<> functions 2024-01-19 12:37:07 +01:00
Fabian
1ffb28b3fc helpers: parse: fix docstring and take original implementation 2024-01-19 12:23:29 +01:00
Fabian
025688bf70 refactor and fix remaining linting problems 2024-01-19 12:17:45 +01:00
Fabian
b1d21813af fix import order 2024-01-19 12:17:45 +01:00
Fabian
f876d78ed4 fix linting: run ruff 2024-01-19 12:17:45 +01:00
Fabian Neumann
195966af45
Merge pull request #871 from PyPSA/feature_kernnetz
wasserstoff kernnetz
2024-01-19 10:51:17 +01:00
Julian Geis
128e1afc00
Update scripts/prepare_sector_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-01-19 10:01:11 +01:00
Julian Geis
9c56c1e929
Update scripts/prepare_sector_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-01-19 09:57:26 +01:00
Julian Geis
88ba4af9ad
Update scripts/prepare_sector_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-01-19 09:56:52 +01:00
Fabian Neumann
85ecb1355a
Merge pull request #861 from PyPSA/fix_clustering
fix clustering bug due to missing countries in n.buses
2024-01-18 19:34:59 +01:00
Fabian Neumann
b0e23652cd
Merge branch 'master' into reformulate-co2-constraint 2024-01-18 19:34:27 +01:00
Fabian Neumann
6d2f2ccec7
Merge pull request #878 from Tomkourou/fix-validation-plots
🐛 fix key_error in validation plots
2024-01-18 18:26:03 +01:00
Fabian Neumann
c0c6ce56e6
Merge branch 'master' into fix_clustering 2024-01-18 18:22:43 +01:00
Fabian Neumann
498f3bffad
Update scripts/base_network.py
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
2024-01-18 18:22:21 +01:00
Fabian Neumann
948bf3ba55
Merge pull request #873 from PyPSA/duplicate-labels-H2-storage
group storage with duplicate labels
2024-01-18 18:18:56 +01:00
Thomas Kouroughli
7c23ef08c5 🐛 fix key_error in validation plots 2024-01-18 17:04:22 +00:00
pre-commit-ci[bot]
35f1c06f75 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-18 13:18:28 +00:00
euronion
ecb0a1f79f Log unhandled exceptions stacktraces in log files 2024-01-18 14:12:17 +01:00
Michael Lindner
dd8db719ac revert accidental changes 2024-01-18 13:53:59 +01:00
JulianGeis
8fe0608f89 Merge remote-tracking branch 'origin/master' into feature_kernnetz 2024-01-18 11:24:02 +01:00
Fabian Hofmann
2a82afb154
Merge branch 'master' into duplicate-labels-H2-storage 2024-01-17 22:21:40 +01:00
pre-commit-ci[bot]
213c4b025e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-17 17:29:47 +00:00
Michael Lindner
fec871c1cc eliminate a few future warnings 2024-01-17 18:28:37 +01:00
pre-commit-ci[bot]
e07f0e5c2b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-17 16:09:39 +00:00
Michael Lindner
4cfb06c55f group storage with duplicate labels 2024-01-17 17:07:19 +01:00
pre-commit-ci[bot]
aaa587d34f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-17 13:51:05 +00:00
Thomas Kouroughli
228ff44f75 ♻️ address pandas FutureWarning 2024-01-17 13:50:32 +00:00
pre-commit-ci[bot]
446b0b3722 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-17 10:36:15 +00:00
JulianGeis
ec4e9aa548 wasserstoff kernnetz 2024-01-17 11:23:29 +01:00
Fabian Neumann
5faab62a1e Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-01-17 10:07:42 +01:00
Fabian Neumann
59a92f686b Merge branch 'feature/warning-bev-profile' of github.com:Climact/pypsa-eur-climact into Climact-feature/warning-bev-profile 2024-01-17 10:07:21 +01:00
Fabian Neumann
c1877fa213
Merge pull request #868 from PyPSA/clip-links-p_max_pu
add clipping for links
2024-01-17 10:05:38 +01:00
martacki
55eddb6e1d Norway currently ignored when building energy totals 2024-01-17 10:01:10 +01:00
pre-commit-ci[bot]
21a223262f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-16 15:53:18 +00:00
Michael Lindner
3f8a55992c locate project dir if pypsa-eur is a submodule 2024-01-16 16:50:54 +01:00
lisazeyen
e51e405d6e
add clipping for links 2024-01-16 11:51:55 +01:00
pre-commit-ci[bot]
0bac08934a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-12 20:34:57 +00:00
lisazeyen
0a789a22dc change type of co2 constraint 2024-01-12 21:33:38 +01:00
lisazeyen
f042c77926 add new constraint on co2 atmoshpere store 2024-01-12 21:33:14 +01:00
Philipp Glaum
8565c124c0 fix bus filter for buses without countries 2024-01-12 16:50:17 +01:00
Philipp Glaum
e9873e7471 Merge remote-tracking branch 'upstream/master' into year-specific-techs 2024-01-11 17:25:50 +01:00
Philipp Glaum
a4802b7018 initial implementation tech specific renewable profiles 2024-01-11 17:23:25 +01:00
Thomas Gilon
cd8001116d Add warning when negative bev availability profile values 2024-01-11 14:11:25 +01:00
Fabian Neumann
a6edce58fb remove wave energy generator 2024-01-11 09:47:09 +01:00
Fabian Neumann
725a0ef8c0 maybe_adjust_cost_and_potentials: cover all flags 2024-01-10 16:17:16 +01:00
pre-commit-ci[bot]
dc90398b12 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-08 12:57:36 +00:00
euronion
c284223a38 Fix error for multi-horizon models 2024-01-08 13:56:02 +01:00
euronion
962517d559 Fix variable names 2024-01-08 09:49:44 +01:00
euronion
61211eb87b Fix variable name 2024-01-08 09:45:14 +01:00
pre-commit-ci[bot]
6e630a85e1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-08 08:33:52 +00:00
euronion
01f201743d Implement everywhere_powerplants 2024-01-08 09:30:21 +01:00
pre-commit-ci[bot]
bf5c323c27 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-05 16:34:22 +00:00
Fabian Neumann
66c9513fbd prepare release notes and amend documentation 2024-01-05 17:20:52 +01:00
Fabian Neumann
6dd9d6a9c1 Merge branch 'fneum/services_heat' 2024-01-05 14:39:29 +01:00
Fabian Neumann
b6cba0388c do not skip gas generator 2024-01-05 14:34:48 +01:00
Fabian Neumann
f68e8d3d61
Merge branch 'master' into wildcard-opts-config 2024-01-05 12:02:11 +01:00
Fabian Neumann
43a502f2ec
Merge pull request #844 from PyPSA/cm
Distinguish sequestered and stored CO2
2024-01-05 11:59:34 +01:00
pre-commit-ci[bot]
29cda7042b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 19:30:31 +00:00
Fabian Neumann
e594f34e00 fix sequestration buses string replacement with pd.Index 2024-01-04 20:30:00 +01:00
pre-commit-ci[bot]
0534f574e9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 19:18:10 +00:00
Fabian Neumann
95c696594e Merge branch 'cm' of github.com:PyPSA/pypsa-eur into cm 2024-01-04 20:15:07 +01:00
pre-commit-ci[bot]
4883287417 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 19:10:07 +00:00
Fabian Neumann
6078b46262 remove duplicate marginal_cost for methanolisation from merge 2024-01-04 20:04:56 +01:00
Fabian
4e03e5a7ec prepare_sector: add VOM for FT and methanolization, always use .at accessor for costs 2024-01-04 19:57:42 +01:00
Fabian
be5331c89c formulate sequestration limit constraint as operational_limit constraint 2024-01-04 19:56:01 +01:00
Fabian
c71c4e7567 add biomass constraint for biomass spatial enabled 2024-01-04 19:54:48 +01:00
Fabian
2d027e80c3 fix capital costs of co2 tanks 2024-01-04 19:54:25 +01:00
Fabian
254d50b1b4 prepare sectors: allow for updating co2 network costs 2024-01-04 19:49:59 +01:00
Fabian Neumann
c1f527b663 build_ship_raster: adjust imports 2024-01-04 19:44:29 +01:00
Fabian Neumann
b135a0cc01 build_ship_raster: performance improvement 2024-01-04 19:42:22 +01:00
Fabian
608a12fed2 prepare_sector: allow planning_horizons wc to be a scalar value 2024-01-04 19:30:20 +01:00
Fabian Neumann
1e5f9e867d build_industrial_distribution_key.py: add dropna to EPRTR emissions 2024-01-04 19:17:49 +01:00
Fabian Neumann
f9fec1a4be more precise restrictive handling of opts cost adjustment flags 2024-01-04 18:58:04 +01:00
Fabian Neumann
9530d63e55 cluster_heat_buses: performance boost and tidy code 2024-01-04 18:57:09 +01:00
Fabian Neumann
cf5f3cbd88 segmentation_clustering: log distribution of snapshot durations (fix) 2024-01-04 18:54:49 +01:00
Fabian Neumann
29b24b1b41 segmentation_clustering: log distribution of snapshot durations 2024-01-04 18:42:47 +01:00
Fabian Neumann
73abb61967 add_brownfield: fix lv_limit reached 2024-01-04 17:05:54 +01:00
pre-commit-ci[bot]
817995c8a2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-04 14:39:30 +00:00
martacki
d6137f8e93 merge branch 'master' into services_heat 2024-01-04 15:38:10 +01:00
Fabian Neumann
34535bcbff custom_extra_functionality: assume same function name as file name 2024-01-04 13:08:14 +01:00
Fabian Neumann
cfd689bbec add snakemake object to custom_extra_functionality arguments 2024-01-04 13:03:03 +01:00
Fabian Neumann
8054ad382c prepare_sector_network: simplify process emissions with outsourced feedstock emissions 2024-01-04 12:47:26 +01:00
Fabian Neumann
593995675e gurobi: avoid double-logging to console 2024-01-04 12:44:47 +01:00
Fabian Neumann
8316861722 Merge branch 'master' into fneum/ariadne 2024-01-04 09:54:27 +01:00
Fabian Neumann
2096131b03
Merge pull request #842 from PyPSA/luisa-2
add option to use LUISA land coverage data
2024-01-04 09:32:55 +01:00
Fabian Neumann
ab1d93279a move LUISA resolution info to a later point 2024-01-04 09:19:29 +01:00
Fabian Neumann
d145758fb7 gracefully handle absent extra_functionality file; add file to path 2024-01-04 09:00:31 +01:00
Fabian Neumann
b4fb395158 Merge branch 'master' into custom-extra-functionality 2024-01-04 08:32:29 +01:00
Fabian Neumann
cd3eddcc3a
Merge pull request #739 from PyPSA/complete-losses
Lossy bidirectional links
2024-01-03 16:54:02 +01:00
Fabian Neumann
94f4383e02 distinguish dataset name and dataset settings 2024-01-03 15:22:13 +01:00
pre-commit-ci[bot]
045eeba4cf [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 14:02:26 +00:00
Fabian Neumann
ecd85d23d3 add option to use LUISA land coverage data 2024-01-03 15:01:43 +01:00
Fabian Neumann
c237862c02
Merge pull request #840 from PyPSA/disable-lvlimit-if-hit
Disable power grid expansion if line volume limit already hit
2024-01-03 13:50:04 +01:00
Fabian Neumann
257b16efd8 print IIS if solver returns status infeasible 2024-01-03 13:47:13 +01:00
Fabian Neumann
deba2a4ed5 tidy code 2024-01-03 13:41:42 +01:00
Fabian Neumann
42f11752ca standardise formatting 2024-01-03 13:35:11 +01:00
Tom Brown
00aa07242a add_brownfield: disable grid expansion if LV already hit
Numerical problems were causing infeasibilities otherwise
2024-01-03 13:33:41 +01:00
Fabian Neumann
b786337d33
Merge pull request #839 from PyPSA/one-node-one-country
compatibility for config with single node in single country
2024-01-03 13:25:39 +01:00
Fabian Neumann
6242675c27
Merge pull request #836 from PyPSA/remove-helmeth
remove helmeth option
2024-01-03 13:24:43 +01:00
Fabian Neumann
8e158d45a8
Merge branch 'master' into improve-build-profiles-logging 2024-01-03 13:24:23 +01:00
Fabian Neumann
c283a3c89c
Merge pull request #838 from PyPSA/remove-conservative-potential-method
renewable_profiles: remove conservative potential estimation method
2024-01-03 13:23:01 +01:00
pre-commit-ci[bot]
d7051e7f66 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 12:16:45 +00:00
Fabian Neumann
bcafbb1e54 compatibility for config with single node in single country 2024-01-03 13:15:43 +01:00
Fabian Neumann
83ecaac4de
Merge branch 'master' into wildcard-opts-config 2024-01-03 13:08:21 +01:00
Fabian Neumann
80f9259bac handle gas pipeline retrofitting with lossy links 2024-01-03 12:57:22 +01:00
Fabian Neumann
72e6c208ef Merge branch 'complete-losses' of github.com:PyPSA/pypsa-eur into complete-losses 2024-01-03 12:47:46 +01:00
Fabian Neumann
05495ce484 fix lossy bidirectional link coupling countraint for myopic 2024-01-03 12:46:42 +01:00
pre-commit-ci[bot]
4606cb131b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 10:44:16 +00:00
Fabian Neumann
29afffb4ca fix potential duplicate renaming of length_original 2024-01-03 11:31:56 +01:00
Fabian Neumann
b937cd7784 Merge branch 'master' into complete-losses 2024-01-03 10:56:37 +01:00
Fabian Neumann
e423945e7d gas_input: ensure all columns exist even if column empty 2024-01-03 10:54:53 +01:00
pre-commit-ci[bot]
38d587944b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 09:35:07 +00:00
Fabian Neumann
6b344c9901 renewable_profiles: remove conservative potential estimation method 2024-01-03 10:33:33 +01:00
pre-commit-ci[bot]
fdb63bc6ca [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 09:29:11 +00:00
Fabian Neumann
92df7bbb9c build_renewable_profiles: improve logging of time passed 2024-01-03 10:27:42 +01:00
Fabian Neumann
9d939fa635 remove helmeth option 2024-01-03 10:12:43 +01:00
Fabian Neumann
1245c93264
Merge branch 'master' into complete-losses 2024-01-03 09:29:55 +01:00
Fabian Neumann
4db59eddc2 Merge branch 'master' into complete-losses 2024-01-03 09:29:14 +01:00
pre-commit-ci[bot]
2b2bad392f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-03 08:08:23 +00:00
Fabian Neumann
0d03d384cc lossy_bidirectional_links: use original length for loss calculation 2024-01-03 09:07:48 +01:00
Fabian Neumann
838ee4d913
Merge pull request #835 from PyPSA/gas-storage
add locations, capacities and costs of existing gas storage
2024-01-03 09:05:19 +01:00
Fabian Neumann
b5ad0f11ee
Merge pull request #834 from PyPSA/all-waste-heat-min-part-load
extended waste heat from PtX, revised minimum part loads
2024-01-03 08:21:57 +01:00
Fabian Neumann
00a8ff5e4a
Merge pull request #833 from PyPSA/biomass-boiler-pelletizing
add biomass boiler pelletizing cost
2024-01-03 08:21:11 +01:00
Fabian Neumann
252f6d2c15 pre-commit formatting 2024-01-03 08:13:01 +01:00
Fabian Neumann
7c058f1ed3 add locations, capacities and costs of existing gas storage 2024-01-03 07:57:45 +01:00
Fabian Neumann
fa03c61187 gas_input: switch production data from scigrid to gem 2024-01-03 07:56:26 +01:00
pre-commit-ci[bot]
fb5b107805 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 18:59:38 +00:00
Fabian Neumann
71b27b524e prevent failure if potential waste heat technologies not present 2024-01-02 19:57:40 +01:00
pre-commit-ci[bot]
777899f686 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 18:45:58 +00:00
Fabian Neumann
872c92d1c0 extended waste heat from PtX, revised minimum part loads 2024-01-02 19:45:02 +01:00
Fabian Neumann
37df47110c biomass_boiler: add pelletizing cost 2024-01-02 19:32:02 +01:00
pre-commit-ci[bot]
815b828311 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 18:11:45 +00:00
Fabian Neumann
631c794cda
Merge branch 'master' into haber-bosch-h2-input 2024-01-02 19:11:23 +01:00
Fabian Neumann
438b40cdb1 haber-bosch: use DECHEMA source for electricity input 2024-01-02 19:09:46 +01:00
Fabian Neumann
5e4a81f828 haber-bosch: use DECHEMA source for hydrogen input 2024-01-02 19:04:34 +01:00
Fabian Neumann
861e7b5fe5
Merge branch 'master' into biogas-upgrade-cc 2024-01-02 18:55:29 +01:00
Fabian Neumann
a10a60b951 rename setting from biomass_upgrading_cc to biogas_upgrading_cc 2024-01-02 18:52:22 +01:00
Fabian Neumann
c5bd95d124 Merge branch 'biogas-upgrade-cc' of github.com:PyPSA/pypsa-eur into biogas-upgrade-cc 2024-01-02 18:49:26 +01:00
Fabian Neumann
9884dee7a0 remove biogas upgrading CC in normal link 2024-01-02 18:48:52 +01:00
pre-commit-ci[bot]
6714858e17 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 17:47:49 +00:00
Fabian Neumann
4b178a7fa1 Merge branch 'master' into biogas-upgrade-cc 2024-01-02 18:46:54 +01:00
Fabian Neumann
fd81058008 add VOM of PtX processes (closes #747) 2024-01-02 18:35:10 +01:00
pre-commit-ci[bot]
2678fdef99 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 17:13:37 +00:00
Fabian Neumann
f2a636c62c bugfix: correct unit of capital_cost of Haber-Bosch 2024-01-02 18:12:49 +01:00
Fabian Neumann
fac257ca97
Merge pull request #821 from PyPSA/md5-checksums
validate checksums for zenodo downloads
2024-01-02 17:23:06 +01:00
pre-commit-ci[bot]
e580ac85d9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 15:33:11 +00:00
Fabian Neumann
30c1a1c857 address deprecation warnings 2024-01-02 16:31:48 +01:00