Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/update' into update
Browse files Browse the repository at this point in the history
  • Loading branch information
@romainsacchi
romainsacchi committed Feb 11, 2024
2 parents 5099630 + 4942078 commit 70c30ce
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions tests/test_inventory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,29 +96,29 @@ def test_fuel_blend():
for fuels in [
("diesel", "hydrogen - electrolysis - PEM", "methane"),
(
"diesel - biodiesel - palm oil",
"hydrogen - smr - natural gas",
"methane - biomethane - sewage sludge",
"diesel - biodiesel - palm oil",
"hydrogen - smr - natural gas",
"methane - biomethane - sewage sludge",
),
(
"diesel - biodiesel - rapeseed oil",
"hydrogen - smr - natural gas with CCS",
"methane - synthetic - coal",
"diesel - biodiesel - rapeseed oil",
"hydrogen - smr - natural gas with CCS",
"methane - synthetic - coal",
),
(
"diesel - biodiesel - cooking oil",
"hydrogen - wood gasification",
"methane - synthetic - biological",
"diesel - biodiesel - cooking oil",
"hydrogen - wood gasification",
"methane - synthetic - biological",
),
(
"diesel - synthetic - FT - coal - economic allocation",
"hydrogen - atr - biogas",
"methane - synthetic - biological - MSWI",
"diesel - synthetic - FT - coal - economic allocation",
"hydrogen - atr - biogas",
"methane - synthetic - biological - MSWI",
),
(
"diesel - synthetic - methanol - cement - economic allocation",
"hydrogen - wood gasification with CCS",
"methane - synthetic - electrochemical - MSWI",
"diesel - synthetic - methanol - cement - economic allocation",
"hydrogen - wood gasification with CCS",
"methane - synthetic - electrochemical - MSWI",
),
]:
fb = {
Expand Down

0 comments on commit 70c30ce

Please sign in to comment.