Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/materials' into materials
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Aug 4, 2023
2 parents baf59a6 + a2f0fc5 commit c6db468
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion premise/activity_maps.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ def generate_activities_using_metals_map(self) -> dict:
"""
return self.generate_sets_from_filters(self.activity_metals_filters)


@staticmethod
def act_fltr(
database: List[dict],
Expand Down
6 changes: 3 additions & 3 deletions premise/metals.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from functools import lru_cache

from .export import biosphere_flows_dictionary
from .logger import create_logger
from .transformation import (
BaseTransformation,
Dict,
Expand All @@ -29,7 +30,6 @@
ws,
)
from .utils import DATA_DIR
from .logger import create_logger

logger = create_logger("metal")

Expand Down Expand Up @@ -159,8 +159,8 @@ def __init__(
self.rev_activities_metals_map: Dict[str, str] = rev_metals_map(
self.activities_metals_map
)
#self.metals_map: Dict[str, Set] = mapping.generate_metals_map()
#self.rev_metals_map: Dict[str, str] = rev_metals_map(self.metals_map)
# self.metals_map: Dict[str, Set] = mapping.generate_metals_map()
# self.rev_metals_map: Dict[str, str] = rev_metals_map(self.metals_map)
self.conversion_factors = load_conversion_factors()
self.current_metal_use = get_ecoinvent_metal_factors()

Expand Down

0 comments on commit c6db468

Please sign in to comment.