Some fixes

romainsacchi · Apr 12, 2021 · ff8597e · ff8597e
1 parent ff82c65
commit ff8597e
Show file tree

Hide file tree

Showing 95 changed files with 27,172 additions and 24,821 deletions.
diff --git a/carculator_bus/data/A_matrix.csv b/carculator_bus/data/A_matrix.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2005.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2010.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2020.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2030.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2040.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2050.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-Base_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2005.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2010.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2020.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2030.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2040.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2050.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_remind_SSP2-PkBudg1100_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_static_ 3.7 cutoff.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_buses_static_ 3.7 cutoff.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2005.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2010.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2020.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2030.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2040.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2050.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-Base_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2005.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2010.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2020.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2030.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2040.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2050.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_remind_SSP2-PkBudg1100_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_static_ 3.7 cutoff.csv b/carculator_bus/data/IAM/B_matrix_ilcd_midpoint_trucks_static_ 3.7 cutoff.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-Base_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_remind_SSP2-PkBudg1100_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_static_ 3.7 cutoff.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_buses_static_ 3.7 cutoff.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-Base_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_remind_SSP2-PkBudg1100_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_static_ 3.7 cutoff.csv b/carculator_bus/data/IAM/B_matrix_recipe_endpoint_trucks_static_ 3.7 cutoff.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-Base_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_remind_SSP2-PkBudg1100_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_static_ 3.7 cutoff.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_buses_static_ 3.7 cutoff.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-Base_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2005.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2005.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2010.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2010.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2020.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2020.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2030.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2030.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2040.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2040.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2050.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_remind_SSP2-PkBudg1100_2050.csv
diff --git a/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_static_ 3.7 cutoff.csv b/carculator_bus/data/IAM/B_matrix_recipe_midpoint_trucks_static_ 3.7 cutoff.csv
diff --git a/carculator_bus/data/default_parameters.json b/carculator_bus/data/default_parameters.json
diff --git a/carculator_bus/data/dict_inputs_A_matrix.csv b/carculator_bus/data/dict_inputs_A_matrix.csv
diff --git a/carculator_bus/data/dict_split.csv b/carculator_bus/data/dict_split.csv
@@ -33,5 +33,7 @@ components;energy storage;name;electricity market for energy storage production
 components;energy storage;name;lead acid
 components;energy storage;name;fuel tank, for diesel vehicle
 components;road;name;market for road
+components;road;name;ev charger
+components;road;name;overhead
 components;EoL;name;treatment of used bus
 components;EoL;name;market for used li-ion battery