Merge remote-tracking branch 'origin/mc' into mc

dev/timing.py

@@ -17,9 +17,9 @@
     scenarios=p.scenarios.pathway.values.tolist(),
     years=[
         2020,
-        #2030,
-        #2040,
-        #2050
+        # 2030,
+        # 2040,
+        # 2050
     ],
     variables=vars,
     use_distributions=20,

pathways/lca.py

@@ -21,7 +21,6 @@
 
 from .filesystem_constants import DIR_CACHED_DB, USER_LOGS_DIR
 from .lcia import fill_characterization_factors_matrices
-
 from .subshares import (
     adjust_matrix_based_on_shares,
     find_technology_indices,
@@ -570,7 +569,10 @@ def _calculate_year(args: tuple):
     )
 
     # reorder keys of acts_category_idx_dict based on lca_results.coords["act_category"].values
-    acts_category_idx_dict = {k: acts_category_idx_dict[k] for k in lca_results.coords["act_category"].values.tolist()}
+    acts_category_idx_dict = {
+        k: acts_category_idx_dict[k]
+        for k in lca_results.coords["act_category"].values.tolist()
+    }
 
     acts_location_idx_dict = _group_technosphere_indices(
         technosphere_indices=technosphere_indices,
@@ -580,7 +582,10 @@ def _calculate_year(args: tuple):
     )
 
     # reorder keys of acts_location_idx_dict based on lca_results.coords["location"].values
-    acts_location_idx_dict = {k: acts_location_idx_dict[k] for k in lca_results.coords["location"].values.tolist()}
+    acts_location_idx_dict = {
+        k: acts_location_idx_dict[k]
+        for k in lca_results.coords["location"].values.tolist()
+    }
 
     bar = pyprind.ProgBar(len(regions))
     for region in regions:

pathways/pathways.py

@@ -150,8 +150,6 @@ def __init__(
                 yaml.full_load(self.data.get_resource("classifications").raw_read())
             )
 
-
-
         self.lca_results = None
         self.lcia_methods = get_lcia_method_names()
         self.units = load_units_conversion()