Emissionfactors 2024

README.md

@@ -77,14 +77,14 @@ $ pytest
 
 ### Emission factors
 
-- [Probas](https://www.probas.umweltbundesamt.de/php/index.php)
-- [UBA (2021). "Umweltfreundlich mobil"](https://www.umweltbundesamt.de/en/publikationen/umweltfreundlich-mobil)
-- [GOV.UK (2020). Greenhouse gas reporting: conversion factors 2020](https://www.gov.uk/government/publications/greenhouse-gas-reporting-conversion-factors-2020)
+- [Carbon footprint (2023). International electricity factors](https://www.carbonfootprint.com/international_electricity_factors.html)
+- [GOV.UK (2023). Greenhouse gas reporting: conversion factors 2023](https://www.gov.uk/government/publications/greenhouse-gas-reporting-conversion-factors-2023)
+- [mobitoool (2023). mobitool-Faktoren v3.0](https://www.mobitool.ch/de/tools/mobitool-faktoren-v2-1-25.html)
 
 ### Conversion factors
 
 - [BAFA (2020): Merkblatt zur Ermittlung des Gesamtenergieverbrauchs](https://www.bafa.de/SharedDocs/Downloads/DE/Energie/ea_ermittlung_gesamtenergieverbrauch.html)
-- [Krajnc, N. (2015): Wood fuels handbook, FAO](https://agris.fao.org/agris-search/search.do?recordID=XF2017001919)
+- [Krajnc, N. (2015): Wood fuels handbook, FAO](http://large.stanford.edu/courses/2017/ph240/timcheck1/docs/fao-krajnc-2015.pdf)
 
 ### Detour coefficients and constants
 

co2calculator/calculate.py

@@ -20,7 +20,6 @@
 
 from ._types import Kilogram, Kilometer
 from .constants import (
-    KWH_TO_TJ,
     Size,
     CarFuel,
     BusFuel,
@@ -68,9 +67,7 @@ def calc_co2_electricity(
     # Get the co2 factor
     co2e = emission_factors.get(params.dict())
 
-    # co2 equivalents for heating and electricity refer to a consumption of 1 TJ
-    # so consumption needs to be converted to TJ
-    return consumption * energy_share / KWH_TO_TJ * co2e
+    return consumption * energy_share * co2e
 
 
 def calc_co2_heating(
@@ -110,9 +107,7 @@ def calc_co2_heating(
     else:
         consumption_kwh = consumption
 
-    # co2 equivalents for heating and electricity refer to a consumption of 1 TJ
-    # so consumption needs to be converted to TJ
-    return consumption_kwh * area_share / KWH_TO_TJ * co2e
+    return consumption_kwh * area_share / co2e
 
 
 def calc_co2_businesstrip(
@@ -122,7 +117,6 @@ def calc_co2_businesstrip(
     distance: Kilometer = None,
     size: Size = None,
     fuel_type: CarFuel | BusFuel | TrainFuel = None,
-    occupancy: int = None,
     seating: FlightClass | FerryClass = None,
     passengers: int = None,
     roundtrip: bool = False,
@@ -137,7 +131,6 @@ def calc_co2_businesstrip(
     :param fuel_type: Fuel type of the vehicle
         [average, cng, diesel, electric, gasoline, hybrid, hydrogen, plug-in_hybrid]
         - only used for car, bus and train
-    :param occupancy: Occupancy of the vehicle in % [20, 50, 80, 100] - only used for bus
     :param seating: seating class ["average", "Economy class", "Premium economy class", "Business class", "First class"]
                     - only used for plane
     :param passengers: Number of passengers in the vehicle (including the participant), number from 1 to 9
@@ -147,7 +140,6 @@ def calc_co2_businesstrip(
     :type distance: Kilometer
     :type size: str
     :type fuel_type: str
-    :type occupancy: int
     :type seating: str
     :type passengers: int
     :type roundtrip: bool
@@ -211,7 +203,6 @@ def calc_co2_commuting(
     weekly_distance: Kilometer,
     size: Size = None,
     fuel_type: BusFuel | CarFuel | TrainFuel = None,
-    occupancy: int = None,
     passengers: int = None,
 ) -> Kilogram:
     """Calculate co2 emissions for commuting per mode of transport
@@ -220,13 +211,11 @@ def calc_co2_commuting(
     :param weekly_distance: distance in km per week
     :param size: size of car or bus if applicable: [small, medium, large, average]
     :param fuel_type: fuel type of car, bus or train if applicable
-    :param occupancy: occupancy [%], if applicable/known (only for bus): [20, 50, 80, 100]
     :param passengers: number of passengers, if applicable (only for car)
     :type transportation_mode: str
     :type weekly_distance: Kilometer
     :type size: str
     :type fuel_type: str
-    :type occupancy: int
     :type passengers: int
     :return: total weekly emissions for the respective mode of transport
     :rtype: Kilogram

co2calculator/constants.py

@@ -7,7 +7,6 @@
 import iso3166
 import pandas as pd
 
-KWH_TO_TJ = 277777.77777778
 
 DF_AIRPORTS = pd.read_csv(
     "https://davidmegginson.github.io/ourairports-data/airports.csv"
@@ -17,26 +16,20 @@
 class HeatingFuel(enum.Enum):
     """Enum for heating fuel types"""
 
-    HEAT_PUMP_AIR = "heat_pump_air"
-    HEAT_PUMP_GROUND = "heat_pump_ground"
-    HEAT_PUMP_WATER = "heat_pump_water"
-    LIQUID_GAS = "liquid_gas"
     OIL = "oil"
-    PELLETS = "pellets"
-    SOLAR = "solar"
-    WOODCHIPS = "woodchips"
-    ELECTRICITY = "electricity"
-    GAS = "gas"
     COAL = "coal"
-    DISTRICT_HEATING = "district_heating"
+    GAS = "gas"
+    WOOD_PELLETS = "wood pellets"
+    WOOD_CHIPS = "wood chips"
+    LPG = "liquid_gas"
 
 
 @enum.unique
 class ElectricityFuel(str, enum.Enum):
     """Enum for electricity fuel types"""
 
-    GERMAN_ENERGY_MIX = "german_energy_mix"
-    SOLAR = "solar"
+    PRODUCTION_FUEL_MIX = "production fuel mix"
+    RESIDUAL_FUEL_MIX = "residual fuel mix"
 
 
 @enum.unique
@@ -87,7 +80,6 @@ class FlightClass(str, enum.Enum):
     """Enum for flight classes"""
 
     ECONOMY = "economy_class"
-    PREMIUM_ECONOMY = "premium_economy_class"
     BUSINESS = "business_class"
     FIRST = "first_class"
     AVERAGE = "average"
@@ -106,9 +98,9 @@ class FerryClass(str, enum.Enum):
 class FlightRange(str, enum.Enum):
     """Enum for flight ranges"""
 
-    DOMESTIC = "domestic"
     SHORT_HAUL = "short-haul"
     LONG_HAUL = "long-haul"
+    AVERAGE = "average"
 
 
 @enum.unique