bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,572 Commits 1 Branch 0 Tags 133 MiB
0534f574e9
Commit Graph

1861 Commits

Author SHA1 Message Date
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
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
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
lisazeyen
21d1109853
Merge branch 'master' into multi-horizon 2023-09-29 08:40:05 +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
Fabian Neumann
5006bc4877 build_biomass_potentials: link to planning_horizons wildcard, interpolate missing years 2023-09-26 15:12:39 +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
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
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
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
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