Correct distance calculations to calculate hot pollutant emissions

romainsacchi · Sep 4, 2023 · c5f0fae · c5f0fae
1 parent f1ff1d2
commit c5f0fae
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/carculator_utils/__init__.py b/carculator_utils/__init__.py
@@ -18,7 +18,7 @@
     "ExportInventory",
     "VehicleInputParameters",
 )
-__version__ = (1, 0, 8)
+__version__ = (1, 0, 9)
 
 from pathlib import Path
 

diff --git a/carculator_utils/data/emission_factors/car/EF_HBEFA42_exhaust.csv b/carculator_utils/data/emission_factors/car/EF_HBEFA42_exhaust.csv
@@ -301,17 +301,17 @@ ICEV-p,3,Particulate matters 2.5,0.001747005
 ICEV-p,4,Particulate matters 2.5,0.000915532
 ICEV-p,5,Particulate matters 2.5,0.001035399
 ICEV-p,6,Particulate matters 2.5,0.000483016
-ICEV-p,6.1,Particulate matters 2.5,0.000165737
-ICEV-p,6.3,Particulate matters 2.5,0.000549115
-ICEV-p,6.2,Particulate matters 2.5,0.0004489
+ICEV-p,6.1,Particulate matters 2.5,0.0006
+ICEV-p,6.2,Particulate matters 2.5,0.000549115
+ICEV-p,6.3,Particulate matters 2.5,0.0006
 ICEV-p,7,Particulate matters 2.5,0.000143099
 ICEV-d,1,Particulate matters 2.5,0.044551854
 ICEV-d,2,Particulate matters 2.5,0.030457491
 ICEV-d,3,Particulate matters 2.5,0.01689492
 ICEV-d,4,Particulate matters 2.5,0.01545938
 ICEV-d,5,Particulate matters 2.5,0.000914321
-ICEV-d,6.1,Particulate matters 2.5,0.00027642
 ICEV-d,6,Particulate matters 2.5,0.000309991
+ICEV-d,6.1,Particulate matters 2.5,0.00027642
 ICEV-d,6.2,Particulate matters 2.5,0.000245139
 ICEV-d,6.3,Particulate matters 2.5,0.000228196
 ICEV-d,7,Particulate matters 2.5,0.000221361

diff --git a/carculator_utils/hot_emissions.py b/carculator_utils/hot_emissions.py
@@ -225,7 +225,7 @@ def get_hot_emissions(
             year=lifetime_km.coords["year"].values,
         )
 
-        distance = self.velocity.sum(dim="second") / 1000
+        distance = self.velocity.sum(dim="second") / 3600
 
         # Emissions for each second of the driving cycle equal:
         # a * energy consumption
@@ -250,7 +250,7 @@ def get_hot_emissions(
             },
         )
 
-        # bit of a manual calibration for N2O and NH3
+        # a bit of a manual calibration for N2O and NH3
         # as they do not correlate with fuel consumption
 
         if self.vehicle_type == "car":
@@ -430,7 +430,7 @@ def get_hot_emissions(
             "component",
         )
 
-        emissions.loc[dict(component=engine_wear.coords["component"].values)] = (
+        emissions.loc[dict(component=engine_wear.coords["component"].values)] += (
             energy_consumption * engine_wear
         ).values
 

diff --git a/dev/Input data.xlsx b/dev/Input data.xlsx
diff --git a/setup.py b/setup.py
@@ -35,7 +35,7 @@ def package_files(directory):
 
 setup(
     name="carculator_utils",
-    version="1.0.8",
+    version="1.0.9",
     packages=packages,
     author="Romain Sacchi <romain.sacchi@psi.ch>",
     python_requires=">=3.9",