bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,261 Commits 1 Branch 0 Tags 133 MiB
74339b5648
Commit Graph

557 Commits

Author SHA1 Message Date
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
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
lisazeyen
5c90083e9b merge master 2023-07-21 16:32:11 +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 Neumann
86708838da
Merge branch 'master' into linemaxext-config 2023-06-30 14:51:29 +02: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
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 Hofmann
862e54770f
Merge branch 'master' into post-merge-param 2023-06-14 10:11:26 +02:00
virio-andreyana
e581ca930c made params more specific 2023-05-27 15:50:37 +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
virio-andreyana
28d39680c6
Merge branch 'master' into post-merge-param 2023-05-19 16:19:58 +02: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
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
99963edaaf add option to limit maximum extension per line/link; linemaxext 2023-05-12 09:29:38 +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
Fabian Hofmann
de16f19bce
Merge branch 'master' into complete-carrier-set 2023-05-03 17:42:29 +02:00
Fabian
4e8bbd67b4 use sanitize_carriers to harmonize carrier adjustments 2023-05-03 13:24:57 +02: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
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
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
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
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
5c8e0080c8 pre-commit: update docformatter version 2023-04-21 10:11:44 +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
b50954aee4 remove snakemake from function 2023-04-05 15:43:02 +02:00
lisazeyen
00544ee6f9 add lifetimes for perfect 2023-04-03 16:39:59 +02:00
Fabian
99a9ea8beb adress review comments 2023-03-10 15:58:53 +01:00
Fabian
f8d178c714 prepare_sector: revert taking mean 
config.overnight: revert hourly resolution
 2023-03-10 14:26:31 +01:00
Fabian
4f0ddf2e95 fix Nyears scaling 2023-03-10 14:12:22 +01:00
Fabian Neumann
abe4df543e add minimal description of all scripts 2023-03-09 12:45:43 +01:00
Fabian Neumann
8f5775d9cc Merge branch 'merge-pypsa-eur-sec' into sec-subset-countries 2023-03-09 11:28:07 +01:00
Fabian Neumann
22846d7b1b sector-coupled: run on subset of selected countries 2023-03-09 11:04:41 +01:00
pre-commit-ci[bot]
f128cc3e3c [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 07:36:43 +00:00
Fabian Neumann
483f3e1b82 eliminate manual country code conversion, adjust mock_snakemake to ll wildcard 2023-03-09 08:36:18 +01:00
pre-commit-ci[bot]
d45bee628e [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-07 17:25:45 +00:00
Fabian
5cf2b8174a scripts: apply linting fixes 2023-03-07 17:21:00 +01:00
pre-commit-ci[bot]
27c0d3a2d2 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 18:18:20 +00:00
Fabian Neumann
541b83b049 merge helper.py into _helpers.py 2023-03-06 19:16:37 +01:00
Fabian Neumann
3bdf3b6f5e use mock_snakemake from pypsa-eur 2023-03-06 19:09:45 +01:00