Tom Brown
1a477d6b32
move calculation of district heating share to its own script
...
Now the script build_district_heat_share.py does what the old function
create_nodes_for_heating() in prepare_sector_networks.py did.
There is no need to build nodes lists for each heating sector, since
all nodes have district heating now.
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
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 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
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
lisazeyen
0a789a22dc
change type of co2 constraint
2024-01-12 21:33:38 +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
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
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
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
608a12fed2
prepare_sector: allow planning_horizons wc to be a scalar value
2024-01-04 19:30:20 +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
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
8054ad382c
prepare_sector_network: simplify process emissions with outsourced feedstock emissions
2024-01-04 12:47:26 +01:00
Fabian Neumann
8316861722
Merge branch 'master' into fneum/ariadne
2024-01-04 09:54:27 +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
c3bb41c900
Merge branch 'master' into multiyear
2024-01-03 15:14:27 +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
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
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
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
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]
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
Fabian Neumann
43674bcee8
Revert "Add option for carbon capture in integrated steelworks"
2023-12-14 16:30:30 +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
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
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]
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
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]
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
lisazeyen
e8324b9c27
fix bug when oil copper plated
2023-11-24 09:58:24 +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
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]
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
chrstphtrs
2ad9ca8f7b
add regionalised oil load for process emissions from naphtha as feedstock
2023-10-26 11:17:57 +02: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
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
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
124177b6db
Add option for SMR CC
2023-10-11 14:32:47 +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
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
lisazeyen
457a9e23e7
fixes CI perfect
2023-08-31 09:55:38 +02:00
lisazeyen
9ec7442c69
merge master
2023-08-30 12:03:49 +02:00
lisazeyen
c35391d594
move SEG aggregation later
2023-08-29 15:46:58 +02:00
lisazeyen
b362c009f5
drop nan with SEG
2023-08-25 16:44:25 +02:00
lisazeyen
c10afdc857
adjust co2_emission fct
2023-08-24 14:20:14 +02: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
f47ce1c432
add lifetime
2023-08-23 13:24:25 +02: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
41a35ad129
bugfix: use of n.madd with singular value prevented
2023-08-22 11:53:02 +02:00
lisazeyen
e92fc4ff4d
merge master
2023-08-22 10:21:42 +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
5b057575df
prepare_sector_network: make use of biomass transport file optional
2023-08-02 14:39:20 +02:00
Fabian
03e3278f89
prepare_sector: add biomass transport costs for networks wo biomass network
2023-08-02 13:12:08 +02:00
