Merge pull request #6 from romainsacchi/update

Update
romainsacchi · Jan 23, 2024 · be2efa2 · be2efa2
2 parents b48db8f + 4aa5f0e
commit be2efa2
Show file tree

Hide file tree

Showing 111 changed files with 6,644 additions and 8,172 deletions.
diff --git a/carculator_utils/background_systems.py b/carculator_utils/background_systems.py
@@ -269,7 +269,7 @@ def find_fuel_shares(
                             "biodiesel", "RER", years
                         )
 
-                elif fuel_type == "cng":
+                elif fuel_type == "methane":
                     if country in self.biomethane.country.values:
                         secondary_share = self.get_share_biofuel(
                             "biomethane", country, years
@@ -312,7 +312,7 @@ def define_fuel_blends(
         fuel_to_powertrains_map = {
             "diesel": ["ICEV-d", "HEV-d", "PHEV-d", "PHEV-c-d"],
             "petrol": ["ICEV-p", "HEV-p", "PHEV-p", "PHEV-c-p"],
-            "cng": ["ICEV-g"],
+            "methane": ["ICEV-g"],
             "hydrogen": ["FCEV"],
         }