Update inventory.py

The disposal of the second battery was ignored.
romainsacchi · Sep 8, 2021 · 48bac40 · 48bac40
1 parent 2fc87a7
commit 48bac40
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/carculator_truck/inventory.py b/carculator_truck/inventory.py
@@ -5242,7 +5242,14 @@ def set_inputs_in_A_matrix(self, array):
             ],
             -self.number_of_cars :,
         ] = (
-            array[self.array_inputs["energy battery mass"], :]
+                        (
+                                array[self.array_inputs["energy battery mass"], :]
+                                * (
+                                        1
+                                        + array[
+                                            self.array_inputs["battery lifetime replacements"]]
+                                )
+                        )
             / array[self.array_inputs["lifetime kilometers"]]
             / (array[self.array_inputs["total cargo mass"]] / 1000)
         )
@@ -6749,7 +6756,14 @@ def set_inputs_in_A_matrix_for_export(self, array):
                 )
             ],
             -self.number_of_cars :,
-        ] = array[self.array_inputs["energy battery mass"], :]
+        ] = (
+            array[self.array_inputs["energy battery mass"], :]
+            * (
+                    1
+                    + array[
+                      self.array_inputs["battery lifetime replacements"]]
+            )
+        )
 
         # Noise emissions
         self.A[