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
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]
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
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
