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
Fabian Neumann
c3bb41c900
Merge branch 'master' into multiyear
2024-01-03 15:14:27 +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
Fabian Neumann
e3539b0e69
heat vent: add bus
2024-01-02 16:31:16 +01:00
pre-commit-ci[bot]
f494dd85b9
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-01-02 15:21:51 +00:00
Tom Brown
1b569dde1b
move code for national CO2 budgets out of extra_functionality
...
This can be added by derived workflows like PyPSA-Eur via
additional_functionality.
Changed additional_functionality to pass snakemake rather than
wildcards and config separately. This gives maximal flexibility.
2024-01-02 16:02:10 +01:00
Fabian Neumann
98e47eab3c
mock_snakemake: adjust to snakemake version 8
2023-12-31 13:00:21 +01:00
Fabian Neumann
fa13eae277
Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality
2023-12-29 17:23:24 +01:00
Fabian Neumann
4b6dd29083
add dummy file and assert path exists
2023-12-29 17:23:11 +01:00
pre-commit-ci[bot]
fba320bfa7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-29 16:20:26 +00:00
Fabian Neumann
8a11bdb4b1
solve_network: option to inject custom extra functionalities from source file
2023-12-29 17:19:19 +01:00
pre-commit-ci[bot]
74cf849ac4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-29 12:40:47 +00:00
martacki
715aa25698
build_energy_totals: avoid deprecation warnings
2023-12-29 13:40:00 +01:00
pre-commit-ci[bot]
de3b6c9573
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-29 11:38:43 +00:00
Fabian Neumann
71985d5e3a
validate checksums for zenodo downloads
2023-12-29 12:34:14 +01:00
Fabian Neumann
e097aa48ae
Merge branch 'master' into misc/deprecations
2023-12-29 11:36:19 +01:00
Fabian Neumann
396fdee6f1
Merge pull request #812 from Climact/fix/typo-prepare-sector-network
...
Fix typo in buses definition for oil boilers in add_industry in prepare_sectors_networks
2023-12-29 10:47:41 +01:00
Fabian Neumann
57b4724ebe
Merge pull request #803 from millingermarkus/master
...
Added co2 storage shadow price output to csv
2023-12-29 10:41:41 +01:00
Martha Frysztacki
ba928bf839
Merge pull request #814 from yerbol-akhmetov/no_gas_gen
...
No gas generators
2023-12-28 10:11:45 +01:00
pre-commit-ci[bot]
125c406013
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-23 08:55:59 +00:00
yerbol-akhmetov
1bee34d57f
remove gas generators
2023-12-23 14:51:01 +06:00
Tom Brown
8a55a55d20
copperplate oil/methanol supply; allow demand to be regional
...
Force a single supply bus for oil/methanol (until we allow
oil/methanol transport). Introduce new config switches
"regional_oil/methanol_demand" that allow demand to be
regionalised. This is important if regional CO2 budgets need to be
enforced.
2023-12-21 16:08:43 +01:00
yerbol-akhmetov
17e9b4d1df
make resistive heaters separate of boilers
2023-12-21 20:59:35 +06:00
yerbol-akhmetov
25cfcaf97b
fix add_waste_heat
2023-12-21 20:54:17 +06:00
Martha Frysztacki
81041aa10e
Merge pull request #809 from yerbol-akhmetov/fix_f_weighting
...
fix f weighting for retro cost
2023-12-21 15:04:06 +01:00
pre-commit-ci[bot]
20b847c627
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-21 13:35:00 +00:00
martacki
7d64a73382
simplify node_name formulation
2023-12-21 11:12:54 +01:00
pre-commit-ci[bot]
5ab9d149ba
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-21 10:07:58 +00:00
martacki
e8eb9df73f
generalize bus name to allow higher spatial resolution
2023-12-21 11:07:23 +01:00
pre-commit-ci[bot]
146fb170d8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-21 09:41:15 +00:00
martacki
bb160d78b1
fix more deprecation warnings
2023-12-21 10:40:10 +01:00
pre-commit-ci[bot]
dfc2f06033
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-21 08:41:19 +00:00
martacki
4d63a3f21b
fix deprecation warnings
2023-12-21 09:37:13 +01:00
pre-commit-ci[bot]
f77f84af6a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-20 19:27:58 +00:00
martacki
a292308c53
select correct sector name in endogeneous retrofitting
2023-12-20 20:11:37 +01:00
yerbol-akhmetov
79f443ecbd
fix f weighting for retro cost
2023-12-20 22:41:11 +06:00
Tom Brown
b3753d73d7
undo addition of script to allow cost modifications
...
This undoes commit 830019a6e5
2023-12-20 09:22:40 +01:00
Fabian
d39b579346
build_biomass_potentials: fix groupby and transpose
2023-12-18 12:56:08 +01:00
Fabian
cc08dff280
simplify_network: revert fillna
2023-12-18 12:44:21 +01:00
martacki
22acdd03a0
omit future deprecation
2023-12-18 11:49:53 +01:00
martacki
ea42b3797d
simplify_network&pandas21: nans not supported
2023-12-18 11:43:04 +01:00
pre-commit-ci[bot]
ea3fdb6c15
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-18 08:58:15 +00:00
martacki
7e543ad0cc
base_network: fix pandas 2.1 issue
2023-12-18 09:57:05 +01:00
Tom Brown
1a7f093e03
solve: pass wildcards and config to additional_functionality
2023-12-15 17:18:36 +01:00
Tom Brown
c5a123b4f4
allow additional functionality for solving to be added by file
...
To add this, overwrite the rule with a new argument:
snakemake.input.additional_functionality
2023-12-15 14:57:03 +01:00
Tom Brown
830019a6e5
add rule that allows cost data to be modified
2023-12-15 09:50:47 +01:00
Fabian Neumann
43674bcee8
Revert "Add option for carbon capture in integrated steelworks"
2023-12-14 16:30:30 +01:00
pre-commit-ci[bot]
f0eae99a07
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-14 12:51:51 +00:00
Markus Millinger
0721a29a02
Merge branch 'PyPSA:master' into master
2023-12-14 13:48:16 +01:00
Fabian Neumann
c304738ea5
fix to restore compatibility with PyPSA v0.26.0
2023-12-12 18:18:03 +01:00
Fabian Neumann
dffe784704
address pandas 2.1.4 deprecation warnings on applymap and fillna(method='bfill')
2023-12-12 17:07:33 +01:00
Fabian Neumann
e0ca38be6e
Merge pull request #719 from PyPSA/blast-furnace-with-cc
...
Add option for carbon capture in integrated steelworks
2023-12-11 20:12:26 +01:00
Fabian Neumann
ea7a66b873
Merge pull request #794 from PyPSA/mv-focus-weights
...
move focus_weights into clustering configuration segment
2023-12-11 20:10:46 +01:00
pre-commit-ci[bot]
aae5ffb6fd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-11 17:25:24 +00:00
Fabian Neumann
0f3fb540ef
finalise ukraine_hackathon branch for merge
2023-12-11 18:24:57 +01:00
Thomas Gilon
889a5dd5a2
Fix typo in buses definition for oil boilers in add_industry in prepare_sector_network
2023-12-11 17:18:31 +01:00
Fabian Neumann
df40fdf904
Merge branch 'master' into ukraine_hackathon
2023-12-11 16:24:40 +01:00
Fabian Neumann
4ed59eb4b4
Merge pull request #798 from tgi-climact/fix/distributed-generators
...
Fix nodal fraction with distributed generators
2023-12-11 14:02:16 +01:00
Fabian Neumann
8d509f4606
Merge pull request #796 from PyPSA/district_heating_share_0
...
district heating bugfix when no progress is assumed
2023-12-11 14:01:57 +01:00
millingermarkus
d6a11c28c9
Added co2 storage shadow price output to csv
2023-12-11 10:49:44 +01:00
Tom Brown
326ed63329
add_brownfield: disable grid expansion if LV already hit
...
Numerical problems were causing infeasibilities otherwise
2023-12-08 17:53:28 +01:00
Tom Brown
00e86e6435
bug fix: route process emissions from steam cracker to correct bus
...
Now naphtha demand causes process emissions from steak crackers to
route to process emissions bus, then rest of CO2 goes to atmosphere.
2023-12-08 13:28:08 +01:00
Tom Brown
2d323d1b87
bug fix: ICE efficiency for land transport was applied twice
...
This was overestimating ICE oil demand by factor 1/0.3.
2023-12-08 12:27:07 +01:00
Tom Brown
bbf9ca2d9b
bug fix: naming of p_set when co2_national is True
...
Without this naming fix, the p_set is a NaN once added
2023-12-08 11:58:28 +01:00
pre-commit-ci[bot]
e3ba0e50a7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-08 09:35:15 +00:00
Thomas Gilon
1352f6c30e
Fix nodal fraction with distributed generators
2023-12-08 10:32:35 +01:00
pre-commit-ci[bot]
429b4ca680
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-06 16:01:04 +00:00
martacki
fd789932dd
district heating bugfix when no progress is assumed
2023-12-06 07:58:20 -08:00
Fabian Neumann
a59eb821ff
for clustering fall back to ipopt when highs is solver
2023-12-06 11:07:04 +01:00
Fabian Neumann
e5bdb4796a
move focus_weights into clustering configuration segment (backward compatible)
2023-12-06 10:09:17 +01:00
Tom Brown
66178a5a27
solve_network: fix sign for country CO2 when bus0=atmosphere
...
So that DAC extracts CO2 rather than pumping into air; for p>0, link
withdraws from bus0, but injects into bus1/2/3, so you have to take
account of this sign difference-
2023-12-04 16:46:45 +01:00
Tom Brown
cea62de438
solve_network: quick fix so duals can be read from CO2 constrain
2023-12-04 16:46:11 +01:00
Fabian Neumann
3b20b5c642
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2023-12-04 14:39:33 +01:00
Fabian Neumann
4df6370198
update environment: matplotlib, xarray, pypsa
2023-12-04 14:39:23 +01:00
lisazeyen
b8e72683cb
improve style
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-12-04 12:28:54 +01:00
pre-commit-ci[bot]
92ccb517f3
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-04 11:20:40 +00:00
lisazeyen
53b9e23dd8
fixes for new package versions
2023-12-04 12:18:03 +01:00
pre-commit-ci[bot]
71dbe2aaf2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-12-04 09:53:03 +00:00
lisazeyen
54c2128419
add heat vent
2023-12-04 10:47:41 +01:00
Fabian Neumann
98797e2e30
follow-up to 7ca769bc
2023-11-29 13:46:28 +01:00
Fabian Neumann
803b860923
move load_raw.csv to resources since it's config file dependent
2023-11-29 13:41:26 +01:00
lisazeyen
3ff925e797
add load shedding for all energy carriers
2023-11-24 10:00:07 +01:00
lisazeyen
e8324b9c27
fix bug when oil copper plated
2023-11-24 09:58:24 +01:00
lisazeyen
afcf5e7d2e
add load shedding for all carriers
2023-11-24 09:53:22 +01:00
pre-commit-ci[bot]
4c66908b74
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-11-23 11:11:49 +00:00
Fabian Neumann
5d6d01f8c0
make CC in blast furnaces optional
2023-11-23 12:11:12 +01:00
chrstphtrs
d9ec127f99
Add process emissions to country emissions constraint, fix snapshot weighting
2023-11-21 14:55:32 +01:00
Fabian Neumann
dfecf35bae
add focus_weights to documentation
2023-11-20 19:45:10 +01:00
Fabian Neumann
014a4cd62e
fix for losses with multi-period investment
2023-11-12 18:42:53 +01:00
Fabian Neumann
065a49c2d7
Merge pull request #772 from PyPSA/land-transport-oil
...
madd oil generator to bus EU oil
2023-11-12 18:23:07 +01:00
Fabian Neumann
c7a4ff7a4d
use existing add_carrier_buses function
2023-11-12 18:22:22 +01:00
chrstphtrs
82ac430fd9
fix spatial resolution for solid biomass links and naphtha oil loads under 'co2_spatial: true' flag
2023-11-08 09:58:02 +01:00
pre-commit-ci[bot]
4f28dfd4fd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-11-06 15:38:05 +00:00
Philipp Glaum
728d74caa8
update floating wind settings
2023-11-06 15:46:46 +01:00
Philipp Glaum
786a2461e2
Merge commit '1bade22' into implement-floating
2023-11-06 14:08:53 +01:00
pre-commit-ci[bot]
4779d076dc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-11-03 13:16:13 +00:00
Irieo
cb2c782dba
scripts: annotate selected functions
2023-11-03 12:51:44 +01:00
Irieo
e61da8618e
bug fix: add_electricity breaks in specific cases
2023-11-03 12:36:40 +01:00
pre-commit-ci[bot]
b9128002bb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-31 16:14:33 +00:00
martacki
5b45fa303c
madd oil generator to bus EU oil
2023-10-31 17:11:06 +01:00
Fabian
75e66be571
helpers: adjust mock_snakemake to be callable with different root dirs
2023-10-31 12:09:39 +01:00
pre-commit-ci[bot]
0e97d39c4c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-30 14:10:56 +00:00
yerbol-akhmetov
33a1c50923
Add cp1252 encoding
2023-10-30 19:18:25 +06:00
chrstphtrs
2ad9ca8f7b
add regionalised oil load for process emissions from naphtha as feedstock
2023-10-26 11:17:57 +02:00
pre-commit-ci[bot]
a31b421c12
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-25 17:35:12 +00:00
ekatef
c1150dfab3
Merge remote-tracking branch 'origin/retrofit_data_fixes' into retrofit_data_fixes
2023-10-25 20:34:43 +03:00
ekatef
8ec0664253
Move column fix for u-values for Poland
2023-10-25 20:33:59 +03:00
martacki
55807898a0
update solar global radiation according to TABULA project
2023-10-25 16:23:41 +02:00
pre-commit-ci[bot]
f24bd46173
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-25 14:11:51 +00:00
ekatef
2952d99dfa
Fix column with total values
2023-10-25 16:42:05 +03:00
ekatef
1ad7035ec4
Fix a column for Poland
2023-10-25 16:28:38 +03:00
chrstphtrs
e2b2eafbc1
add geographical resolution to oil and methanol for options['co2_budget_national'] to include all necessary links in national co2 budget constraints
2023-10-24 16:46:58 +02:00
chrstphtrs
7cb677d0e6
clean up function add_co2limit_country
2023-10-24 16:39:58 +02:00
chrstphtrs
a35f5479ae
add links instead of equal-and-opposite fuel/emissions load pairs for land transport oil (ICEs), naphtha for industry and kerosene for aviation (before summed as 'oil'), shipping oil, shipping methanol, agriculture machinery oil
2023-10-24 14:06:17 +02:00
chrstphtrs
9b9090c76c
add option for additional national carbon budget constraints
2023-10-18 16:59:49 +02:00
Fabian Neumann
7884392326
Merge pull request #748 from PyPSA/follow-up-637
...
follow-up to #637 : remove duplicate code and update tsam version
2023-10-18 10:27:29 +02:00
Fabian Neumann
df5b9e9943
Merge pull request #759 from ekatef/fix_retrofit
...
Update calculations of retrofit costs
2023-10-18 10:26:32 +02:00
pre-commit-ci[bot]
21148e3cc5
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-13 10:36:50 +00:00
Ekaterina
b0a95aefaa
Merge branch 'PyPSA:master' into fix_retrofit
2023-10-13 13:30:04 +03:00
ekatef
460fa00b28
Fix file name
2023-10-11 21:43:51 +03:00
Thomas Gilon
4c5ea9e207
Specify input files required to retrieve irena data
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-10-11 16:27:08 +02:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena
2023-10-11 16:17:15 +02:00
Thomas Gilon
124177b6db
Add option for SMR CC
2023-10-11 14:32:47 +02:00
pre-commit-ci[bot]
230c1a327c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-11 12:27:29 +00:00
Thomas Gilon
43e20a26e6
Add rule to update IRENA data for existing infrastructure
2023-10-11 14:26:04 +02:00
ekatef
fcef194566
Reference to a multiindex level by number instead of name
2023-10-11 12:29:38 +03:00
ekatef
7ad60cb7f9
Fix calculation of averages
2023-10-11 12:28:34 +03:00
ekatef
5ee9df000b
Make an argument of pd.concat to a list
2023-10-11 12:28:08 +03:00
ekatef
b51d908bfa
Fix computation of the mean
2023-10-11 12:27:31 +03:00
ekatef
5ec00c5d9d
Fix type definition for a call of difference function
2023-10-11 12:27:10 +03:00
ekatef
f825544c3b
Remove duplication in column names
2023-10-11 12:26:30 +03:00
ekatef
4294248518
Re-map country codes to account for "GB"
2023-10-11 12:26:10 +03:00
pre-commit-ci[bot]
326aeb682b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-09 14:28:08 +00:00
Fabian Neumann
ce609b6ebe
Merge branch 'master' into ukraine_hackathon
2023-10-09 16:25:49 +02:00
Fabian Neumann
42692c3ca5
UA-MD availability matrix: plot shape_availability
2023-10-09 16:21:04 +02:00
Fabian Neumann
27ebbaba24
UA-MD availability matrix: consider WDPA protection areas as substitute for Natura
2023-10-09 16:20:23 +02:00
Fabian Neumann
9d7b250230
UA-MD availability matrix: consider ship density
2023-10-09 16:19:31 +02:00
Fabian Neumann
9a13748d34
UA-MD availability matrix: adjust corine/copernicus code selection
2023-10-09 16:18:58 +02:00
Fabian Neumann
725cece814
disable multiprocesing for MD-UA availability matrix
2023-10-09 16:18:16 +02:00
Fabian Neumann
a15157c788
add optional function to restore transmission connections to Crimea
2023-10-09 16:16:53 +02:00
Fabian Neumann
b94a797fed
do not remove large unconnected subnetworks
2023-10-09 10:00:10 +02:00
Fabian Neumann
ea99f3c43e
Merge branch 'master' into ukraine_hackathon
2023-10-09 09:53:42 +02:00
Fabian Neumann
7cb4742c75
Merge pull request #750 from PyPSA/sourcery/master
...
Sourcery refactored master branch
2023-10-08 17:52:45 +02:00
Fabian Neumann
8f5a57a278
Merge branch 'master' into blast-furnace-with-cc
2023-10-08 12:01:45 +02:00
Fabian Neumann
2bab27e2f3
Merge pull request #718 from PyPSA/coke
...
add coal and coke demand for integrated steelworks
2023-10-08 11:58:48 +02:00
Fabian Neumann
85c8812702
Merge branch 'master' into complete-losses
2023-10-08 11:58:03 +02:00
Fabian Neumann
b8fee80919
Merge branch 'master' into multiyear
2023-10-08 11:55:11 +02:00
pre-commit-ci[bot]
f054180a62
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-08 09:20:59 +00:00
Sourcery AI
3c36c60bdd
'Refactored by Sourcery'
2023-10-08 09:20:36 +00:00
Fabian Neumann
679d09c170
follow-up to #637 : remove duplicate code and update tsam version
2023-10-08 11:10:09 +02:00
lisazeyen
1eed747bde
remove spelling mistakes
2023-10-05 12:03:06 +02:00
Fabian Hofmann
51a90b3433
Merge branch 'master' into multi-horizon
2023-10-05 10:59:14 +02:00
Fabian
f5fb307f89
fix type, expand codespell ignore list
2023-10-04 17:31:46 +02:00
Fabian Neumann
a751d78ecd
Merge branch 'master' into complete-losses
2023-10-04 10:15:45 +02:00
lisazeyen
08f1a0f313
remove comments for newer data version
2023-09-30 08:22:41 +02:00
lisazeyen
22fe2448a4
Update scripts/solve_network.py
...
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
2023-09-30 08:14:54 +02:00
pre-commit-ci[bot]
d2f8dc25fd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-29 19:24:57 +00:00
virio-andreyana
4ac664b871
use .replace to fix type error
2023-09-29 21:24:29 +02:00
lisazeyen
21d1109853
Merge branch 'master' into multi-horizon
2023-09-29 08:40:05 +02:00
virio-andreyana
3f112534a5
Merge branch 'master' into wildcard-opts-config
2023-09-28 21:12:10 +02:00
pre-commit-ci[bot]
d75b0ae8ab
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-28 19:11:54 +00:00
virio-andreyana
a3a7e19b07
add finishing touches
2023-09-28 21:11:22 +02:00
ekatef
ce8b89d1e2
Fix structure of the grouped dataframe
2023-09-27 14:41:00 +03:00
ekatef
89d140cd7a
Fix a column name in buildings data
2023-09-27 12:51:38 +03:00
ekatef
36fe57938c
Replace pandas.append()
2023-09-27 12:47:23 +03:00
pre-commit-ci[bot]
1e87cf0eeb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-27 06:22:57 +00:00
virio-andreyana
0d1339b1d3
add wildcard options in config for solve network
2023-09-27 08:22:28 +02:00
Fabian Neumann
5006bc4877
build_biomass_potentials: link to planning_horizons wildcard, interpolate missing years
2023-09-26 15:12:39 +02:00
virio-andreyana
01cd1bbb74
add Fabians suggestion
2023-09-23 18:39:11 +02:00
Fabian
f96c2d0589
update solve smk files to properly consider scenanrios
2023-09-22 13:58:08 +02:00
pre-commit-ci[bot]
b2c19eda40
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-15 10:18:03 +00:00
virio-andreyana
502b3a61ba
Merge branch 'wildcard-opts-config' of github.com:PyPSA/pypsa-eur into wildcard-opts-config
2023-09-15 12:17:14 +02:00
virio-andreyana
a14e751ed8
fix snapshot bugs
2023-09-15 12:16:53 +02:00
pre-commit-ci[bot]
668ec9efad
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-15 09:56:18 +00:00
virio-andreyana
7be8cc0773
undo changes in sector networks and simplify config
2023-09-15 11:55:52 +02:00
Fabian Neumann
bde04eeac9
lossy_bidirectional_links: set length of reversed lines to 0 to avoid double counting in line volume limit
2023-09-12 17:29:03 +02:00
Fabian Neumann
666e79e2fd
improve logging for lossy bidirectional links
2023-09-12 17:28:50 +02:00
Fabian Neumann
592bc4eee7
cherry-pick
2023-09-12 17:28:42 +02:00
Fabian Neumann
118cabe8a6
add option to consider compression losses in pipelines as electricity demand
2023-09-12 17:28:00 +02:00
Fabian Neumann
d7cb13246b
link losses: exponential rather than linear model
2023-09-12 17:27:27 +02:00
Fabian Neumann
e4eff27e50
fix capacity synchronisation between forward and backward lossy links
2023-09-12 17:27:09 +02:00
Fabian Neumann
cc162a9e02
option for losses on bidirectional links via link splitting
2023-09-12 17:25:51 +02:00
pre-commit-ci[bot]
3eed341044
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-11 21:04:00 +00:00
virio-andreyana
823df52309
add backward compatible config in wildcards
2023-09-11 22:51:31 +02:00
euronion
02bffdbd06
Fix bug preventing inclusion of custom_powerplants ( #732 )
2023-09-05 17:21:11 +02:00
pre-commit-ci[bot]
3187081ec0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-31 07:56:07 +00:00
lisazeyen
457a9e23e7
fixes CI perfect
2023-08-31 09:55:38 +02:00
lisazeyen
c0152c25a4
first fixes for CI
2023-08-30 15:57:47 +02:00
pre-commit-ci[bot]
64cbfd673c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-30 12:33:27 +00:00
lisazeyen
c278a3159f
add benchmark back
2023-08-30 14:32:57 +02:00
pre-commit-ci[bot]
bdaa646ed6
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-30 10:05:18 +00:00
lisazeyen
9ec7442c69
merge master
2023-08-30 12:03:49 +02:00
lisazeyen
3247fb59e0
clean up
2023-08-30 11:50:49 +02:00
lisazeyen
22d61ad10e
add line expansion with DC links
2023-08-30 11:08:30 +02:00
lisazeyen
c35391d594
move SEG aggregation later
2023-08-29 15:46:58 +02:00
lisazeyen
4cd492bb6f
drop assets which reached end of lifetime
2023-08-28 13:52:55 +02:00
lisazeyen
abb584de45
add H2 boiler and constraint to avoid existing gas boiler back up
2023-08-28 13:31:02 +02:00
lisazeyen
369eaf3457
fix bug carbon budget
2023-08-28 10:21:02 +02:00
lisazeyen
b362c009f5
drop nan with SEG
2023-08-25 16:44:25 +02:00
lisazeyen
0cfd5fab58
add carbon budget constraint
2023-08-25 15:50:26 +02:00
lisazeyen
d646c09d60
intermediate solution back
2023-08-25 14:16:09 +02:00
lisazeyen
3fcf3f2fe6
move max growth assumptions to config
2023-08-25 13:27:34 +02:00
lisazeyen
e6d779a91f
first step add max_growth
2023-08-25 11:56:29 +02:00
lisazeyen
727aab92f5
rm intermediate solution
2023-08-25 10:50:25 +02:00
lisazeyen
ca0d67110e
add land use constraint
2023-08-25 10:49:03 +02:00
lisazeyen
6b07faf7cd
intermediate solution glc transmission
2023-08-24 15:50:37 +02:00
lisazeyen
73df378837
add memory logger
2023-08-24 15:48:06 +02:00
lisazeyen
be23b5c56a
add network plot for perfect
2023-08-24 15:32:23 +02:00
lisazeyen
f2b01fbbe0
plot summary with usual script
2023-08-24 14:43:36 +02:00
lisazeyen
49ec50171b
fix bug network dict
2023-08-24 14:21:02 +02:00
lisazeyen
c10afdc857
adjust co2_emission fct
2023-08-24 14:20:14 +02:00
lisazeyen
e41357e3d5
update carbon plot
2023-08-24 14:19:34 +02:00
Fabian
04a2bea176
scenario-management: use list for including wildcards with shared resource
2023-08-24 13:20:11 +02:00
pre-commit-ci[bot]
b8dee184a9
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-24 09:12:07 +00:00
Fabian Neumann
d0f2d52853
apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary
2023-08-24 11:11:33 +02:00
pre-commit-ci[bot]
b91a7b9c51
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-24 08:19:40 +00:00
Fabian Hofmann
3f3f752e8f
Merge branch 'master' into scenario-management
2023-08-24 10:19:14 +02:00
lisazeyen
3679687ed7
add co2 store lifetime
2023-08-24 08:43:50 +02:00
lisazeyen
445216ae03
adjust co2 glcs
2023-08-24 08:43:29 +02:00
lisazeyen
8c5ca05eb4
add carbon constraint to perfect
2023-08-24 08:42:24 +02:00
Fabian
62c6143863
scenario-management: reenable shared resources, make shared resources wildcards dependent
2023-08-23 17:14:57 +02:00
pre-commit-ci[bot]
a77f0f6ab1
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-23 14:11:34 +02:00
lisazeyen
60b1968eb0
check for missing buses
2023-08-23 13:27:40 +02:00
lisazeyen
6585e2c623
adjust summary and plotting
2023-08-23 13:26:27 +02:00
lisazeyen
20bf1cdaf5
deal with global constraints
2023-08-23 13:26:08 +02:00
lisazeyen
f47ce1c432
add lifetime
2023-08-23 13:24:25 +02:00
pre-commit-ci[bot]
afda8ee1f6
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-23 07:37:30 +00:00
Fabian Neumann
8cdba1c8e4
Merge branch 'master' into blast-furnace-with-cc
2023-08-23 09:37:07 +02:00
Fabian
7b9ab155f4
helpers: fix condition in set_scenario_config
...
prepare_sector: insert set_scenario_config
2023-08-22 18:15:50 +02:00
Fabian Neumann
3ccc63aae4
build_carbon_budget: parse input_co2
2023-08-22 14:49:44 +02:00
Fabian Neumann
401fbb7be7
Merge branch 'fix-plot-summary' of github.com:daniel-rdt/pypsa-eur into daniel-rdt-fix-plot-summary
2023-08-22 14:46:48 +02:00
Fabian Neumann
49b2cd382d
Update scripts/plot_summary.py
...
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
2023-08-22 14:43:15 +02:00
Fabian Neumann
e12cad2789
simplify if-else expression
2023-08-22 14:42:21 +02:00
Fabian Neumann
33305f9761
Merge branch 'feature/myopic_existing_baseyear_fix' of github.com:daniel-rdt/pypsa-eur into daniel-rdt-feature/myopic_existing_baseyear_fix
2023-08-22 14:39:50 +02:00
Fabian Neumann
e4b220ff81
follow-up to #726 : import country converter
2023-08-22 14:29:00 +02:00
Fabian Neumann
59d422a1f9
Merge pull request #726 from PyPSA/industrial_key_duplicates
...
drop duplicates in prepare_hotmaps_database
2023-08-22 14:26:42 +02:00
Fabian Neumann
f4d821ad2a
use country_converter instead of pycountry
2023-08-22 14:22:25 +02:00
Fabian Neumann
41a35ad129
bugfix: use of n.madd with singular value prevented
2023-08-22 11:53:02 +02:00
martavp
46cdf2bf3a
Merge branch 'fix-min-capacity-myopic' of https://github.com/PyPSA/pypsa-eur into fix-min-capacity-myopic
2023-08-22 11:08:57 +02:00
martavp
9cee4384bb
revert commented lines
2023-08-22 11:08:51 +02:00
lisazeyen
890c80e047
remove overrides
2023-08-22 11:00:25 +02:00
lisazeyen
e92fc4ff4d
merge master
2023-08-22 10:21:42 +02:00
pre-commit-ci[bot]
69132bd6e2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-22 06:41:43 +00:00
martavp
2391a5c4e9
fix p_nom_min of renewable generators for myopic approach
...
as described in https://github.com/PyPSA/pypsa-eur/issues/727
2023-08-22 08:31:46 +02:00
pre-commit-ci[bot]
dadc372ecd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-21 14:17:21 +00:00
lisazeyen
8d09e38627
drop duplicates in prepare_hotmaps_database
2023-08-21 16:16:53 +02:00
Fabian
1810bbd4b3
make set_scenario_config robust against mock_snakemake and subworkflow
2023-08-21 12:24:27 +02:00
Fabian Neumann
6cdb194332
sanitize_carriers: do not invent nice names, use carrier where not available
2023-08-21 11:19:16 +02:00
Fabian
ebb5da655e
scenarios: add collect function plot_elec_networks
2023-08-17 12:56:34 +02:00
Fabian
91eff472a7
scenario-management: fix set_scenario_config function; apply config_provider to some direct inputs
2023-08-17 12:31:07 +02:00
Fabian
9d4ce430cc
electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand
2023-08-17 10:17:12 +02:00
Fabian
672d7b9538
force add scenarios.yaml / create_scenarios
2023-08-16 13:45:59 +02:00
Fabian
af2fb1a82e
uptrack changes in scenarios.yaml/create_scenarios.py
2023-08-16 13:37:10 +02:00
Fabian
59fe665616
add exemplary scenarios.yaml
...
add create_scenarios.py
2023-08-16 13:25:52 +02:00
Fabian
32eb114b61
retrieve electricity demand: make online version snakemake params
2023-08-16 13:05:22 +02:00
Fabian
9cd449cf3c
retrieve electricity demand: use script in order to concat time-series
2023-08-16 11:41:48 +02:00
Fabian
b40a8926ff
copy_config: fix import
2023-08-15 16:51:35 +02:00
Fabian
5036964dbe
copy_config: ensure to store updated config
2023-08-15 15:49:57 +02:00
Fabian Hofmann
72e6c2fd80
Merge branch 'master' into scenario-management
2023-08-15 15:16:05 +02:00
Fabian
e28ae59375
introduce scenario-management
2023-08-15 15:06:59 +02:00
Fabian Neumann
d7554bccff
Merge pull request #722 from PyPSA/carbon-management
...
Carbon management
2023-08-14 15:57:46 +02:00
Fabian
fc64649089
build_sequestration: switch to geopandas dissolve rather than groupby
2023-08-14 14:39:51 +02:00
pre-commit-ci[bot]
0d096d7388
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-14 10:40:07 +00:00
Fabian Neumann
def61ae769
industry distribution: use EPRTR as fallback if ETS missing
2023-08-14 12:39:33 +02:00
Fabian Neumann
1c1d45b1f5
add_electricity: make adding carriers in attach_wind_and_solar safer
2023-08-10 15:00:01 +02:00
pre-commit-ci[bot]
eed52d04ae
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-09 13:04:38 +00:00
daniel.rdt
e304efbf3c
fix in co2_emissions_year function and correspondigly in plot_summary and snakemake rule. Also changes to historical_emissions in plot_summary since some countries are not in eea dataset.
2023-08-09 14:49:36 +02:00
Fabian Neumann
0bc7921330
Merge branch 'blast-furnace-with-cc' of github.com:PyPSA/pypsa-eur into blast-furnace-with-cc
2023-08-09 11:03:47 +02:00
Fabian Neumann
830d9762ef
fix typo in definition of coal in spatial namespace
2023-08-09 11:03:42 +02:00
pre-commit-ci[bot]
0420269093
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-09 09:02:40 +00:00
pre-commit-ci[bot]
ac04abb98c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-09 09:02:22 +00:00
Fabian Neumann
dbbc66710a
Merge branch 'coke' into blast-furnace-with-cc
2023-08-09 11:02:07 +02:00
Fabian Neumann
9a68730745
fix: read investment year of time-dependent config
2023-08-09 11:01:58 +02:00
Fabian Neumann
91be48e36f
Add option for carbon capture in integrated steelworks.
2023-08-09 10:58:14 +02:00
pre-commit-ci[bot]
c32d5249e1
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-09 08:12:52 +00:00
Fabian Neumann
ade8a003c6
add coal and coke demand for integrated steelworks ( closes #717 )
2023-08-09 10:11:28 +02:00
Fabian Neumann
8d19043205
handle monthly fuel price download through script
2023-08-06 09:01:56 +02:00
Fabian
62cb6fbdd8
validation: download input data files instead
2023-08-04 17:38:21 +02:00
Fabian Hofmann
17f4c2ddb0
Merge branch 'master' into validation
2023-08-04 15:23:42 +02:00
Fabian
ad6322bcb3
address review commments
2023-08-04 12:58:31 +02:00
Fabian Hofmann
6e7bbe1e08
Merge branch 'master' into validation
2023-08-03 18:28:10 +02:00
Fabian Hofmann
4a8af57a59
simplify network: remove 'underground' column to avoid consense error
2023-08-03 18:19:20 +02:00
Fabian Neumann
8ae568d852
Merge pull request #712 from PyPSA/harmonize-result-stucture
...
harmonize output of solving rules
2023-08-03 11:39:53 +02:00
Fabian
1bf6ea1532
only copy active configuration to results folder
...
use copy config for all solve rules
remove copying of environment
2023-08-02 14:49:32 +02:00
Fabian
5b057575df
prepare_sector_network: make use of biomass transport file optional
2023-08-02 14:39:20 +02:00
Fabian Hofmann
b2ab4bbe56
Merge branch 'master' into biomass-transport-costs
2023-08-02 13:14:13 +02:00
Fabian
03e3278f89
prepare_sector: add biomass transport costs for networks wo biomass network
2023-08-02 13:12:08 +02:00
virio-andreyana
657dd08b53
edit configtables and accept Fneum suggestion
2023-08-02 11:11:41 +02:00
Fabian Hofmann
e6ba640ba3
Merge branch 'master' into validation
2023-08-01 12:24:58 +02:00
Fabian
3417f61f50
monthly prices: adjust manual cost assumptions
2023-08-01 12:11:42 +02:00
Fabian Neumann
9808943f23
build_renewable_profiles considers subsets of cutout time scope; handle client shutdown
2023-08-01 09:54:48 +02:00
pre-commit-ci[bot]
5a31b6f5b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-01 07:45:40 +00:00
Fabian Neumann
ef05d7576c
bugfixes and allow build_renewable_profiles on subset of cutout time scope
2023-08-01 09:45:14 +02:00
pre-commit-ci[bot]
7530c42fbe
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-01 06:43:48 +00:00
Fabian Neumann
23eb3548c5
Merge branch 'master' into ukraine_hackathon
2023-08-01 08:42:47 +02:00
pre-commit-ci[bot]
ade7e17d57
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-31 09:20:35 +00:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation
2023-07-31 11:20:11 +02:00
Fabian
9579198162
validation: further fine-tuning
2023-07-31 11:15:50 +02:00
virio-andreyana
c771f3fac0
Merge branch 'validation' of github.com:PyPSA/pypsa-eur into validation
2023-07-31 01:27:36 +02:00
virio-andreyana
6bf6ec603c
fix cross border flow coloring, country color are more contrasted, and update the config documentations
2023-07-31 01:27:15 +02:00
pre-commit-ci[bot]
7c00f9d451
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-28 13:14:42 +00:00
daniel.rdt
407037a799
fix in add_heating_capacities_installed_before_baseyear to account for case when there is no rural heating demand for some nodes in network
2023-07-28 15:09:13 +02:00
Fabian Neumann
8e6a70b468
prepare release 0.8.1
2023-07-27 11:23:02 +02:00
Fabian Hofmann
6a96931833
Merge branch 'master' into misc/deprecations
2023-07-26 15:04:24 +02:00
Fabian Hofmann
1d5c8c7242
Merge branch 'master' into fneum/line-rating
2023-07-26 14:56:35 +02:00
Fabian
d60be3fece
Merge branch 'master' into validation
2023-07-26 13:01:34 +02:00
Fabian Neumann
ddd1840981
Merge remote-tracking branch 'origin/master' into multiyear
2023-07-26 10:23:32 +02:00
Fabian Neumann
d17430d000
Merge branch 'master' into multilinks-default
2023-07-26 08:48:21 +02:00
pre-commit-ci[bot]
f970ba0fd0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-26 06:48:10 +00:00
Fabian Neumann
5231135d5f
make_summary: explicitly typecast default values
2023-07-26 08:47:49 +02:00
pre-commit-ci[bot]
74be5261fc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-26 05:24:33 +00:00
Fabian Neumann
7575dd0351
handling of natural gas in add_existing_baseyear and add_electricity
2023-07-26 07:24:12 +02:00
Fabian
491345d504
config: move cutout specification to line-rating section
...
test/config: use be-cutout for testing line-rating
2023-07-25 15:08:44 +02:00
Fabian Neumann
93c14dcda1
Merge branch 'master' into ppl-fueltype-fix
2023-07-25 13:10:59 +02:00
Fabian Hofmann
269a08006f
Merge branch 'master' into validation
2023-07-25 12:30:32 +02:00
Fabian
01aaeb730d
cluster_network: introduce efficiency classes for clustering
2023-07-25 12:29:39 +02:00
Fabian Hofmann
3eac0c1127
Merge branch 'master' into multilinks-default
2023-07-24 13:42:50 +02:00
Fabian Hofmann
f0057614b3
Merge branch 'master' into fneum/line-rating
2023-07-24 10:49:15 +02:00
Fabian
474321c638
add_electricity: enable flattening hydro dispatch
...
config.validation: reduce crossborder caps
2023-07-24 10:47:16 +02:00
Fabian Neumann
1541877fdc
Merge branch 'ppl-fueltype-fix' of github.com:PyPSA/pypsa-eur into ppl-fueltype-fix
2023-07-23 15:00:22 +02:00
Fabian Neumann
6110fe784d
wrap comparisons in brackets
2023-07-23 14:59:28 +02:00
pre-commit-ci[bot]
3f3e73a0ec
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-23 09:08:29 +00:00
Fabian Neumann
d45cb71b7a
match build_powerplants FuelType ( closes #754 )
2023-07-23 11:07:45 +02:00
pre-commit-ci[bot]
615684d124
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-22 11:26:42 +00:00
virio-andreyana
d36bdaf6bb
clean plot_validation_cross_border_flows script
2023-07-22 13:26:11 +02:00
virio-andreyana
56cbcfa672
complete plot_validation_cross_border_flows script
2023-07-22 13:24:35 +02:00
lisazeyen
5c90083e9b
merge master
2023-07-21 16:32:11 +02:00
Fabian
c7ef8e8c64
solve network: update mock snakemake
2023-07-20 14:36:22 +02:00
Fabian
793573f655
validate: add line plot for price comparison
2023-07-20 14:36:22 +02:00
Fabian Neumann
268391e204
Merge branch 'master' into master
2023-07-18 14:07:27 +02:00
Fabian Neumann
56e93fe821
Merge branch 'master' into fneum/line-rating
2023-07-18 14:06:11 +02:00
Fabian Neumann
a0366fb2bc
Merge branch 'master' into multilinks-default
2023-07-18 14:05:57 +02:00
Fabian Hofmann
40b87cac04
Merge branch 'master' into validation
2023-07-17 19:24:13 +02:00
Fabian
23b156d2c1
build_monthly_prices: use 2020 as base year for scaling
2023-07-17 17:35:23 +02:00
Fabian Hofmann
dc4286d3e3
Merge branch 'master' into describe-config
2023-07-17 17:33:55 +02:00
Fabian
fcce233a2e
Merge branch 'master' into validation
2023-07-17 16:22:39 +02:00
Fabian
d22c87419b
update enviromnent yaml to install pypsa from master
...
cluster: allow custom strategies for all components
2023-07-17 14:03:16 +02:00
Fabian
8e568cee03
cluster network: remove bus strategies as already handled internally
2023-07-14 16:00:21 +02:00
Fabian
f566142d38
cluster network: update to new clustering module (pypsa v0.25)
2023-07-14 15:47:41 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config
2023-07-14 13:34:20 +02:00
pre-commit-ci[bot]
fc36efaebe
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-13 20:35:05 +00:00
Fabian Neumann
b110810669
no more override_component_attrs for multilinks
2023-07-13 22:31:55 +02:00
Fabian
f020cfa969
validation: plot elec production fix typo
2023-07-13 18:36:14 +02:00
Fabian Hofmann
f90ef3bb73
Merge branch 'master' into validation
2023-07-12 12:32:35 +02:00
Fabian
723350c8ef
solve_network: enable rolling horizon
2023-07-11 17:48:35 +02:00
Fabian
4bb0716414
prepare_network: fix addition of dynamic co2 prices
2023-07-11 16:15:27 +02:00
Fabian Neumann
6af92fcf67
Merge branch 'master' into fneum/line-rating
2023-07-11 14:37:17 +02:00
Fabian
86a4b775fd
remove hardcoded config overwrite
...
plot_validation: adjust carrier labels
2023-07-11 14:25:32 +02:00
Fabian
9fbc626862
adjustments to new due to clustering module
2023-07-11 14:24:57 +02:00
pre-commit-ci[bot]
6492b1a195
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-10 23:02:57 +00:00
lisazeyen
26156943cf
remove TODO comment
...
the clipping of the p_min_pu value cannot be removed since it is used for the retrofitting generators which have to follow the heat demand profile. Otherwise the network becomes infeasibe.
2023-07-10 16:15:27 +02:00
Fabian
c7f67f0641
make fuel prices flexible over years
...
fix marginal cost issue (on pypsa)
minor fixes
2023-07-06 19:14:01 +02:00
Fabian Hofmann
3ea8b26ae0
fix carrier assignment
2023-07-06 15:01:00 +02:00
Fabian
3e64599c4c
plot_electricity_prices: fix header spec
2023-07-05 19:06:32 +02:00
Fabian
406ce3d77e
validation: add structure for price and crossborder comparison
2023-07-05 15:51:36 +02:00
Fabian
9c6e5e0ed0
config: remove unneeded plotting entries
2023-07-05 11:34:07 +02:00
pre-commit-ci[bot]
07add5a10d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-05 09:22:20 +00:00
Fabian Hofmann
9c3f89160a
Merge branch 'master' into validation
2023-07-05 11:21:09 +02:00
Fabian
9958425a44
complete structure for plotting electricity production
2023-07-05 11:07:36 +02:00
Fabian Neumann
19a99f6e03
build_line_rating: fix doc typos
2023-07-03 19:31:34 +02:00
pre-commit-ci[bot]
39c963dd38
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-03 17:27:25 +00:00
Fabian Neumann
f0b44a91ec
Merge branch 'master' into fneum/line-rating
2023-07-03 19:27:05 +02:00
Fabian Neumann
d751f4694d
Update scripts/prepare_network.py
2023-07-03 18:58:15 +02:00
Fabian
879d2925f9
rename "ept" to "Ept"
...
restructure remote rsync with remote
2023-07-03 17:16:20 +02:00
Fabian
f903eba061
draf validate rule & plot statistics rule
2023-07-03 17:13:16 +02:00
Fabian
1f6764d32a
add_electicity: minor fix regarding missing carriers
2023-07-03 15:45:19 +02:00
Fabian
6137a634d4
build_electricity_demand: make data source snapshot dependent
2023-07-03 12:51:26 +02:00
Fabian Neumann
86708838da
Merge branch 'master' into linemaxext-config
2023-06-30 14:51:29 +02:00
pre-commit-ci[bot]
e4651ce711
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-30 11:28:56 +00:00
euronion
16dcad0176
Prevent attempt to re-add existing carriers.
2023-06-30 13:25:20 +02:00
Fabian Hofmann
6004e04354
Merge branch 'master' into validation
2023-06-30 12:07:04 +02:00
Fabian
c5fe195fed
add_electricity: fix set operation
2023-06-30 11:37:53 +02:00
Fabian
701231fdca
build_renewable_profile: fix execution for one thread
2023-06-30 11:34:41 +02:00
Fabian
4c9b8a08e5
use differential config changes in config.validation.yaml
2023-06-29 19:45:42 +02:00
Fabian
3879df7a09
build_monthly_prices: adress warnings
2023-06-29 19:45:42 +02:00
Fabian Hofmann
934879d94e
Merge branch 'master' into validation
2023-06-29 19:45:17 +02:00
Fabian
9e143345bd
follow up on #686
2023-06-29 19:24:38 +02:00
Fabian Hofmann
ebe6c1f1e1
Merge branch 'master' into validation
2023-06-29 17:49:02 +02:00
Fabian Hofmann
e2270ea580
Merge branch 'master' into complete-carrier-set
2023-06-29 16:50:22 +02:00
Fabian
aac339ef0b
Merge branch 'cll-constraint-groupby' into update-clustering-namespace
2023-06-29 16:39:53 +02:00
Fabian
00ec36a12e
add_electricity: filter out nan geocoords in kdtree
2023-06-29 16:38:56 +02:00
Fabian
0dd1933057
solve_network: fix argument for linopy groupby
2023-06-29 16:21:45 +02:00
pre-commit-ci[bot]
d84c7ebf6a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-29 14:02:56 +00:00
Fabian Hofmann
3f946dd83d
Update scripts/add_electricity.py
2023-06-29 16:02:31 +02:00
pre-commit-ci[bot]
a9b0d349f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-29 14:02:21 +00:00
Fabian Hofmann
cf06204e4f
Update scripts/add_electricity.py
2023-06-29 16:02:09 +02:00
Fabian Hofmann
8c7c586b0c
Update scripts/add_extra_components.py
2023-06-29 16:02:03 +02:00
Fabian
2f3005e555
use pypsa.clustering.spatial namespace
2023-06-29 15:37:29 +02:00
pre-commit-ci[bot]
a8f69821dc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-29 12:51:43 +00:00
Fabian
519a4f2a2a
move uc assigment to add_electricity
...
make code backwards-compatible
2023-06-29 14:50:41 +02:00
Fabian Neumann
c5c30bcc32
Merge branch 'master' into fneum/line-rating
2023-06-29 11:42:07 +02:00
pre-commit-ci[bot]
cc6bae282f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-29 06:11:13 +00:00
Fabian Hofmann
07224751e5
Merge branch 'master' into validation
2023-06-29 08:10:52 +02:00
LukasFrankenQ
a36b5c51c7
fixed bug in monthly gas prices
2023-06-28 17:42:17 +01:00
Fabian Hofmann
ab0963540f
Merge branch 'master' into complete-carrier-set
2023-06-21 09:53:19 +02:00
Fabian Neumann
86e5f08fbf
Merge branch 'master' into linemaxext-config
2023-06-20 13:33:18 +02:00
Fabian
a17647a07e
add_electricity: fix cost ref
2023-06-15 19:35:41 +02:00
Fabian
27eea273bd
harmonize params names
2023-06-15 19:12:30 +02:00
Fabian
1d10073514
review params implementation; reproduce objective values in CI
2023-06-15 18:52:25 +02:00
Fabian
45cac01ea3
adjust param accessing in cluster, simplify and build_elec script
2023-06-14 14:39:53 +02:00
Fabian Hofmann
862e54770f
Merge branch 'master' into post-merge-param
2023-06-14 10:11:26 +02:00
Ricardo
b7aa122fda
Fixed issue (most likely) introduced when merging PyPSA-Eur with PyPSA-Eur-Sec
2023-06-12 20:40:51 +02:00
Davide Fioriti
176bebdef0
Update cluster_network to avoid adding deleted links in clustered network
2023-06-09 17:18:25 +02:00
pre-commit-ci[bot]
d6057cb92b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-03 10:10:08 +00:00
virio-andreyana
8dbcca560c
minor fixes in solve_network.py
2023-06-03 12:09:51 +02:00
pre-commit-ci[bot]
286b836c3f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-02 15:18:48 +00:00
Fabian Neumann
ff6f3a1b7e
resolve remaining merge conflicts
2023-06-02 17:12:05 +02:00
Fabian Neumann
59f24122e2
cherry-pick line rating code
2023-06-02 17:08:40 +02:00
Fabian Neumann
ef5320e1b8
merge master
2023-06-02 16:59:06 +02:00
pre-commit-ci[bot]
0f5bb8b893
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-06-02 10:53:11 +00:00
virio-andreyana
83ff639ad5
amend solve_network
2023-06-02 12:52:49 +02:00
pre-commit-ci[bot]
f3e8fe2312
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-27 13:51:00 +00:00
virio-andreyana
e581ca930c
made params more specific
2023-05-27 15:50:37 +02:00
pre-commit-ci[bot]
ead87afce1
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-27 10:23:30 +00:00
virio-andreyana
1c73bb0342
add params for solve_network
2023-05-27 12:22:53 +02:00
Koen van Greevenbroek
312dd81f21
Fix bug with underground H2 storage creation
...
For some small model regions, none of the H2 cavern types specified in
the configuration might actually be available, in which case the line
`h2_caverns = h2_caverns[cavern_types].sum(axis=1)` throws an error.
2023-05-24 11:13:37 +02:00
lisazeyen
ab8ee639f9
update average annual prices
2023-05-24 10:53:40 +02:00
lisazeyen
6e358097c9
change natural gas index to import price
2023-05-24 10:51:16 +02:00
pre-commit-ci[bot]
0f09545d96
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-22 21:56:31 +00:00
virio-andreyana
28d39680c6
Merge branch 'master' into post-merge-param
2023-05-19 16:19:58 +02:00
pre-commit-ci[bot]
216a02fba1
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-19 13:42:45 +00:00
virio-andreyana
c043100ada
add more params in simplify_network.py
2023-05-19 15:42:07 +02:00
pre-commit-ci[bot]
6366dc4c55
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-17 17:26:02 +00:00
virio-andreyana
8af1fe5649
replace the word "config" to "params" in functions
2023-05-17 19:25:45 +02:00
virio-andreyana
8208ac033b
convert param back to config for "logging" and "run", made "enable" more specific
2023-05-17 18:43:30 +02:00
lisazeyen
747bf5d815
add time dependent co2 price
2023-05-17 12:55:17 +02:00
lisazeyen
e9348b8e23
uncomment ship raster, since otherwise not computing
2023-05-17 12:48:45 +02:00
lisazeyen
024da02f8a
add monthly prices to network
2023-05-16 16:16:36 +02:00
lisazeyen
dfdd116206
add rule to build monthly prices
2023-05-16 16:16:36 +02:00
pre-commit-ci[bot]
7d4dacf8bd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-16 11:35:00 +00:00
Fabian Neumann
875fcdd0e2
address geopandas future warning
2023-05-16 13:34:23 +02:00
pre-commit-ci[bot]
e431a9675c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-15 13:02:41 +00:00
Fabian Hofmann
824e6bb18c
Merge branch 'master' into complete-carrier-set
2023-05-15 15:01:57 +02:00
virio-andreyana
1fc48d8753
using python algorithm to edit rules and script
2023-05-15 10:33:17 +02:00
Fabian Neumann
14a34697aa
Merge pull request #666 from PyPSA/fit-for-module
...
retrieve*: handle extraction path via snakemake.output
2023-05-15 08:41:13 +02:00
pre-commit-ci[bot]
38bae672da
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-12 12:51:41 +00:00
Fabian Neumann
8f91963e76
properly reference p_max_pu files
2023-05-12 14:50:58 +02:00
Fabian Neumann
b2216355f1
retrieve_sector_data: add another .parent
2023-05-12 14:10:04 +02:00
Fabian Neumann
67ef38b35e
retrieve*: handle extraction path via snakemake.output
2023-05-12 13:59:41 +02:00
Fabian Neumann
e88b57f422
prepare_network: fix typo
2023-05-12 10:42:06 +02:00
pre-commit-ci[bot]
3343394c65
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-12 07:30:12 +00:00
Fabian Neumann
99963edaaf
add option to limit maximum extension per line/link; linemaxext
2023-05-12 09:29:38 +02:00
Fabian Neumann
5be21dfc5a
add option for piecewise linear transmission loss approximation
2023-05-12 09:07:16 +02:00
Fabian Neumann
e29571535b
remove references to memory logfile in *.smk, add release note
2023-05-12 07:11:41 +02:00
virio-andreyana
1758076815
test param in add_electricity
2023-05-11 20:34:11 +02:00
pre-commit-ci[bot]
7d6d6d2805
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-11 14:59:12 +00:00
virio-andreyana
654f46f868
alpha testing complete vresutils removal
2023-05-11 16:58:35 +02:00
pre-commit-ci[bot]
b21965a986
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-10 08:09:47 +00:00
virio-andreyana
e91068196b
replace vresutils annuity function with add_electricity.py calculate_annuity
2023-05-10 10:02:41 +02:00
virio-andreyana
5c2e3c9fc1
add Shape2Shapes in add_electricit.py
2023-05-10 09:58:25 +02:00
Fabian Hofmann
de16f19bce
Merge branch 'master' into complete-carrier-set
2023-05-03 17:42:29 +02:00
Fabian
13b4327e01
add_extra_components: revert carrier addition
2023-05-03 14:00:10 +02:00
Fabian
4e8bbd67b4
use sanitize_carriers to harmonize carrier adjustments
2023-05-03 13:24:57 +02:00
pre-commit-ci[bot]
f6a40d3696
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-01 22:14:45 +00:00
Fabian Neumann
4bc6a3af4d
Merge branch 'master' into multiyear
2023-04-30 10:54:34 +02:00
pre-commit-ci[bot]
add135fe05
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-30 08:53:00 +00:00
Fabian Neumann
67303deedd
Merge pull request #647 from PyPSA/hydrogen-turbine
...
add plain hydrogen turbine option for re-electrification
2023-04-30 10:44:30 +02:00
pre-commit-ci[bot]
bdeab82b49
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-30 08:44:07 +00:00
Fabian Neumann
51e09f5e61
Address review comments
2023-04-30 10:43:49 +02:00
Fabian Neumann
6acd5da4d4
Merge branch 'multiyear-sec' into multiyear
2023-04-29 18:49:49 +02:00
Fabian Neumann
e16fa286ec
merge master
2023-04-29 12:41:37 +02:00
Fabian Neumann
30beee0959
Merge branch 'master' into multiyear
2023-04-29 12:40:55 +02:00
pre-commit-ci[bot]
699a4bd2e8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-28 01:43:41 +00:00
virio-andreyana
72b75fd9fe
merge add_nice_carrier_names with add_missing_carrier to become add_missing_carrier_with_nice_names(n, config)
2023-04-28 03:43:20 +02:00
virio-andreyana
e24ca89a05
Update scripts/add_electricity.py
...
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
2023-04-27 17:29:20 +02:00
Fabian
2ea394b681
solve_network: disable mem logger
2023-04-27 13:59:15 +02:00
Fabian
9913522e09
reinsert co2 price
2023-04-27 12:11:12 +02:00
lisazeyen
05d9331deb
not cluster conventionals
2023-04-27 10:25:53 +02:00
Fabian
a6ae03d133
fixup non-clustering of conventional generators
2023-04-27 10:11:35 +02:00
pre-commit-ci[bot]
9ae7a93ccb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-26 16:07:28 +00:00
lisazeyen
e6f0d8a990
fix bug load shedding constraint
2023-04-26 18:07:02 +02:00
lisazeyen
a2e3e91630
fix bug in load shedding constraint
2023-04-26 18:05:56 +02:00
Fabian
d962969519
solve_network: solve network fix kwargs
2023-04-26 17:47:49 +02:00
Fabian
dcc7b4cebb
solve_network: fix UC
2023-04-26 17:19:32 +02:00
lisazeyen
956079765c
bug fix uc constraint
2023-04-26 16:19:16 +02:00
Fabian
1a42b0c928
update uc attributes
2023-04-26 15:44:45 +02:00
Fabian
e2119d6229
fix unit_commitment function and file, add it to config.validation
2023-04-26 15:37:46 +02:00
Fabian
9c37eccaec
build_electricity_demand: add BA for 2019
2023-04-26 15:33:25 +02:00
Fabian
630800fdab
determine_cutout_xXyY: add docstring
2023-04-26 15:03:34 +02:00
virio-andreyana
e38a0a9d34
Merge branch 'master' into complete-carrier-set
2023-04-26 09:21:49 +02:00
virio-andreyana
df38edab0a
fix bug in prepare_network.py
2023-04-26 04:28:36 +02:00
Fabian
5fd1b8a8b1
build_elec_demand: fix LU demand for 2019
2023-04-25 17:41:44 +02:00
pre-commit-ci[bot]
74e9d56adb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-25 15:26:28 +00:00
virio-andreyana
756a814c63
Update prepare_sector_network.py
2023-04-25 17:17:32 +02:00
virio-andreyana
d9f9d4853a
Update add_extra_components.py
2023-04-25 17:06:17 +02:00
virio-andreyana
56b6718ba6
Update add_existing_baseyear.py
2023-04-25 17:04:28 +02:00
pre-commit-ci[bot]
2433c00dcb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-25 13:52:57 +00:00
lisazeyen
9fc9476c6b
add UC function
2023-04-25 14:57:56 +02:00
virio-andreyana
71c1a7fbef
add the function add_missing_carrier
...
add_missing_carrier() are applied on python script where new components are added. The function runs ideally after all of the new components are added and before add_nice_carrier_names()
2023-04-25 14:43:04 +02:00
pre-commit-ci[bot]
3625d401c6
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-24 22:09:09 +00:00
virio-andreyana
e550ba915d
Update add_extra_components.py
...
Note:
- battery charger and battery discharger has no nice name nor plot_color
- H2 electrolysis is similar to H2 Electrolysis in the tech_color
- H2 fuel cell is similar to H2 Fuel cell in the tech_color
- H2 pipeline do have have nice name and tech_color, but the addition of it depends on the link being true in config
2023-04-24 14:08:25 +02:00
Fabian Neumann
e20e7bf844
fix addition of load shedding
2023-04-24 12:33:55 +02:00
virio-andreyana
ad9a67509f
Add carrier "AC" and "DC" in base_network.py
2023-04-24 05:05:43 +02:00
euronion
54346b071e
Address pandas deprecation of date_parser for pandas.read_csv
2023-04-22 20:33:38 +02:00
pre-commit-ci[bot]
0a3c177f4b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-22 07:44:59 +00:00
Fabian Neumann
f2e53b59bf
add plain hydrogen turbine option for re-electrification
2023-04-22 09:44:13 +02:00
Fabian
97bdbe636c
follow-up: rename configs to config
2023-04-21 11:05:18 +02:00
Fabian
1f6f7a2039
replace config.yaml by config/config.yaml in doc and docstrings
2023-04-21 10:41:44 +02:00
Fabian
e40011cb3c
Merge branch 'master' into configs-in-one-folder
2023-04-21 10:26:45 +02:00
Fabian
5c8e0080c8
pre-commit: update docformatter version
2023-04-21 10:11:44 +02:00
Fabian Neumann
92895ec378
Merge branch 'master' into fix-reserve-constraint
2023-04-21 10:06:29 +02:00
Fabian
79501b5741
build_biomass: fix geopandas compat with pandas v2.0
2023-04-20 20:37:27 +02:00
Fabian
6d7eae8ad2
build_ship_raster: save reduced ship raster as tif file
2023-04-20 19:56:23 +02:00
Fabian Hofmann
691e0dbb9d
Merge branch 'master' into rioxarray-to-envs
2023-04-20 18:36:31 +02:00
lisazeyen
1cd658c03f
rename constraint
...
rename constraint to fit to other syntax
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
2023-04-20 09:55:50 +02:00
pre-commit-ci[bot]
51785524a3
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-20 07:39:18 +00:00
lisazeyen
27dc9cedfd
fix bugs in reserve constraint
2023-04-20 09:35:53 +02:00
pre-commit-ci[bot]
05b0a81808
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-16 13:32:24 +00:00
virio-andreyana
eca0a89152
Merge branch 'master' into configs-in-one-folder
2023-04-16 15:32:07 +02:00
Ahmad
b877b41019
- incorporated the remaining changes
...
- added a released note about the renaming of build_load_data to build_electricity_demand
2023-04-16 02:28:56 +02:00
pre-commit-ci[bot]
763d77d19d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-14 19:05:46 +00:00
Ahmad
90d8f0ac3f
rename build_load_data to build_electricity_demand
...
Signed-off-by: Ahmad <ahmedwahid16101@gmail.com>
2023-04-14 20:58:38 +02:00
virio-andreyana
f3872c9433
Update copy_config.py
...
insert the new path for config for the copying process, solve the error in rule copy_config
2023-04-12 02:45:28 +02:00
pre-commit-ci[bot]
460bbd080f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-10 22:02:35 +00:00
pre-commit-ci[bot]
5f554ab28f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-04-06 13:57:30 +00:00
lisazeyen
a72a620a60
add global constraints in concat, adjust bio stores
2023-04-05 18:19:35 +02:00
lisazeyen
91d2a4a052
adjust plotting
2023-04-05 18:18:53 +02:00
lisazeyen
f0d6d2be07
add multi-deacde
2023-04-05 15:47:03 +02:00
lisazeyen
5989c287c4
adjust summary functions
2023-04-05 15:45:35 +02:00
lisazeyen
f2ff8beae8
fix plot bugs
2023-04-05 15:45:07 +02:00
lisazeyen
b50954aee4
remove snakemake from function
2023-04-05 15:43:02 +02:00
lisazeyen
d836970004
always add load shedding with 1e2
2023-04-05 10:39:16 +02:00
lisazeyen
57ef5cd259
Merge remote-tracking branch 'origin' into perfect
2023-04-05 10:14:50 +02:00
lisazeyen
247c504604
adjust to new pypsa-eur syntax
2023-04-03 17:39:47 +02:00
lisazeyen
952a6ba1b5
add scripts for perfect foresight
2023-04-03 16:41:15 +02:00
lisazeyen
00544ee6f9
add lifetimes for perfect
2023-04-03 16:39:59 +02:00
Fabian Neumann
55d111e7af
fix land eligibility calculation for UA and MD
2023-03-31 12:06:10 +02:00
Fabian Neumann
eddde8fb3a
convert ipynb to py
2023-03-31 10:43:47 +02:00
pre-commit-ci[bot]
423c3d6999
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-17 11:40:05 +00:00
Fabian Neumann
f8830fcf69
doc: implement review feedback (amend)
2023-03-17 12:39:43 +01:00
pre-commit-ci[bot]
e83b1b0291
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-16 14:56:46 +00:00
Fabian Neumann
6dbfd798b9
encapsulate imports in helpers to minimise requirements for docs
2023-03-16 15:54:52 +01:00
Fabian Neumann
55395c5465
enhance documentation, with instructions for sector-coupled / electricity-only studies
2023-03-15 17:00:06 +01:00
pre-commit-ci[bot]
36fbc53289
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-11 13:28:30 +00:00
Fabian Neumann
6444640c1f
Merge branch 'master' into ukraine_hackathon
2023-03-11 14:28:10 +01:00
Fabian
8ff4685531
follow up
2023-03-10 17:30:51 +01:00
Fabian
373c64a592
solve_network: check if sector_opts is in wildcard
2023-03-10 17:14:01 +01:00
Fabian
6034cc1669
build_sequestration: fix url with docformatter
2023-03-10 16:56:32 +01:00
Fabian
ebc5a99338
follow up: fix img path
2023-03-10 16:12:02 +01:00
Fabian
e9bf639f2d
solve_network: add line breaks in docstring
2023-03-10 16:10:01 +01:00
Fabian
5fe4032e47
solve_network: reinsert docstring
2023-03-10 16:07:21 +01:00
Fabian Hofmann
30b8bb3c94
Update scripts/solve_network.py
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-03-10 16:00:52 +01:00
