Update precalculated values

romainsacchi · May 16, 2022 · 5b286c2 · 5b286c2
1 parent 1f2fa62
commit 5b286c2
Show file tree

Hide file tree

Showing 44 changed files with 2,754 additions and 2,713 deletions.
diff --git a/carculator_truck/data/A_matrix.csv b/carculator_truck/data/A_matrix.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2005.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2005.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2010.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2010.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2020.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2020.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2030.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2030.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2040.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2040.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2050.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-Base_2050.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2005.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2005.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2010.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2010.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2020.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2020.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2030.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2030.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2040.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2040.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2050.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_remind_SSP2-PkBudg1300_2050.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_static 3.8 cutoff.csv b/carculator_truck/data/IAM/B_matrix_trucks_ilcd_midpoint_static 3.8 cutoff.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2005.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2005.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2010.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2010.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2020.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2020.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2030.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2030.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2040.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2040.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2050.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-Base_2050.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2005.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2005.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2010.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2010.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2020.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2020.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2030.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2030.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2040.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2040.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2050.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_remind_SSP2-PkBudg1300_2050.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_static 3.8 cutoff.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_endpoint_static 3.8 cutoff.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2005.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2005.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2010.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2010.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2020.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2020.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2030.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2030.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2040.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2040.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2050.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-Base_2050.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2005.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2005.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2010.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2010.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2020.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2020.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2030.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2030.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2040.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2040.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2050.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_remind_SSP2-PkBudg1300_2050.csv
diff --git a/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_static 3.8 cutoff.csv b/carculator_truck/data/IAM/B_matrix_trucks_recipe_midpoint_static 3.8 cutoff.csv
diff --git a/carculator_truck/data/dict_impact_categories.csv b/carculator_truck/data/dict_impact_categories.csv
@@ -1,3 +1,4 @@
+recipe;IPCC 2013;GWP100a;midpoint;GWP100;kg CO2-Eq.;https://www.ipcc.ch
 recipe;ReCiPe 2008 Midpoint (H) V1.13;agricultural land occupation;midpoint;ALOP;square meter-year;https://www.rivm.nl/documenten/6recipe111
 recipe;ReCiPe 2008 Midpoint (H) V1.13;ozone depletion;midpoint;ODPinf;kg CFC-11.;https://www.rivm.nl/documenten/6recipe111
 recipe;ReCiPe 2008 Midpoint (H) V1.13;climate change;midpoint;GWP100;kg CO2-Eq.;https://www.rivm.nl/documenten/6recipe111

diff --git a/carculator_truck/data/dict_inputs_A_matrix.csv b/carculator_truck/data/dict_inputs_A_matrix.csv
diff --git a/carculator_truck/data/dict_split.csv b/carculator_truck/data/dict_split.csv
@@ -14,6 +14,7 @@ components;glider;name;frame, blanks and saddle, for lorry
 components;glider;name;suspension, for lorry
 components;glider;name;cabin, for lorry
 components;glider;name;tires and wheels, for lorry
+components;glider;name;assembly operation
 components;powertrain;name;market for charger, electric passenger car
 components;powertrain;name;market for inverter, for electric passenger car
 components;powertrain;name;market for converter, for electric passenger car

diff --git a/carculator_truck/inventory.py b/carculator_truck/inventory.py
@@ -1544,7 +1544,7 @@ def get_B_matrix(self):
                     + "/*recipe_midpoint*{}*.csv".format(self.scenario)
                 )
                 list_file_names = sorted(list_file_names)
-                B = np.zeros((len(list_file_names), 22, len(self.inputs)))
+                B = np.zeros((len(list_file_names), 23, len(self.inputs)))
             elif self.method_type == "endpoint":
                 list_file_names = glob.glob(
                     str(REMIND_FILES_DIR)
@@ -1573,7 +1573,7 @@ def get_B_matrix(self):
                 )
             )
 
-            new_B[0 : np.shape(initial_B)[0], 0 : np.shape(initial_B)[1]] = initial_B
+            new_B[0: np.shape(initial_B)[0], 0: np.shape(initial_B)[1]] = initial_B
 
             B[f] = new_B
 
@@ -2914,10 +2914,10 @@ def create_fuel_dictionary(self):
             },
             "diesel": {
                 "name": (
-                    "market group for diesel, low-sulfur",
-                    "RER",
+                    "market for diesel",
+                    "Europe without Switzerland",
                     "kilogram",
-                    "diesel, low-sulfur",
+                    "diesel",
                 )
             },
             "biodiesel - algae": {
@@ -4315,7 +4315,7 @@ def set_inputs_in_A_matrix(self, array):
         self.A[:, self.index_emissions, -self.number_of_cars :] = (
             array[
                 [
-                    self.array_inputs[self.map_non_fuel_emissions[self.rev_inputs[x]]]
+                    self.array_inputs[self.map_fuel_emissions[self.rev_inputs[x]]]
                     for x in self.index_emissions
                 ]
             ]
@@ -5882,7 +5882,7 @@ def set_inputs_in_A_matrix_for_export(self, array):
         ] = (
             array[
                 [
-                    self.array_inputs[self.map_non_fuel_emissions[self.rev_inputs[x]]]
+                    self.array_inputs[self.map_fuel_emissions[self.rev_inputs[x]]]
                     for x in self.index_emissions
                 ]
             ]