premise 2.1.0.dev4__tar.gz → 2.1.0.dev6__tar.gz

{premise-2.1.0.dev4/premise.egg-info → premise-2.1.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: premise
-Version: 2.1.0.dev4
+Version: 2.1.0.dev6
 Summary: Coupling IAM output to ecoinvent LCA database ecoinvent for prospective LCA
 Author-email: Romain Sacchi <romain.sacchi@psi.ch>, Alois Dirnaichner <dirnaichner@pik-potsdam.de>,  Chris Mutel <cmutel@gmail.com>
 Maintainer-email: Romain Sacchi <romain.sacchi@psi.ch>

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/__init__.py

@@ -1,5 +1,5 @@
 __all__ = ("NewDatabase", "clear_cache", "get_regions_definition")
-__version__ = (2, 1, 0, "dev4")
+__version__ = (2, 1, 0, "dev6")
 
 
 from premise.new_database import NewDatabase

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/logger.py

@@ -3,12 +3,9 @@ Module to create a logger with the given handler.
 """
 
 import logging.config
-from logging.handlers import QueueHandler
 from multiprocessing import Queue
 from pathlib import Path
 
-import yaml
-
 from .filesystem_constants import DATA_DIR
 
 LOG_CONFIG = DATA_DIR / "utils" / "logging" / "logconfig.yaml"
@@ -58,4 +55,12 @@ def empty_log_files():
     for file in DIR_LOG_REPORT.iterdir():
         # if suffix is ".log"
         if file.suffix == ".log":
-            file.unlink()
+            try:
+                file.unlink()
+            except PermissionError:
+                try:
+                    # instead, let's empty the file
+                    with open(file, "w") as f:
+                        f.write("")
+                except PermissionError:
+                    pass

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/new_database.py

@@ -4,14 +4,10 @@ as well as export it back.
 
 """
 
-import copy
 import logging
-import multiprocessing
 import os
 import pickle
 from datetime import datetime
-from multiprocessing import Pool as ProcessPool
-from multiprocessing.pool import ThreadPool as Pool
 from pathlib import Path
 from typing import List, Union
 
@@ -490,7 +486,6 @@ class NewDatabase:
         keep_uncertainty_data=False,
         gains_scenario="CLE",
         use_absolute_efficiency=False,
-        use_multiprocessing=True,
     ) -> None:
         self.source = source_db
         self.version = check_db_version(source_version)
@@ -498,7 +493,6 @@ class NewDatabase:
         self.system_model = check_system_model(system_model)
         self.system_model_args = system_args
         self.use_absolute_efficiency = use_absolute_efficiency
-        self.multiprocessing = use_multiprocessing
         self.keep_uncertainty_data = keep_uncertainty_data
 
         # if version is anything other than 3.8 or 3.9
@@ -583,13 +577,8 @@ class NewDatabase:
             self.database.extend(data)
 
         print("- Fetching IAM data")
-        # use multiprocessing to speed up the process
-        if self.multiprocessing:
-            with Pool(processes=multiprocessing.cpu_count()) as pool:
-                pool.map(_fetch_iam_data, self.scenarios)
-        else:
-            for scenario in self.scenarios:
-                _fetch_iam_data(scenario)
+        for scenario in self.scenarios:
+            _fetch_iam_data(scenario)
 
         print("Done!")
 
@@ -904,11 +893,21 @@ class NewDatabase:
                 # add database to scenarios
                 scenario["database"] = pickle.loads(pickle.dumps(self.database, -1))
                 for sector in sectors:
+                    if sector in scenario.get("applied functions", []):
+                        print(
+                            f"Function to update {sector} already applied to scenario."
+                        )
+                        continue
+
                     # Prepare the function and arguments
                     update_func = sector_update_methods[sector]["func"]
                     fixed_args = sector_update_methods[sector]["args"]
                     scenario = update_func(scenario, *fixed_args)
 
+                    if "applied functions" not in scenario:
+                        scenario["applied functions"] = []
+                    scenario["applied functions"].append(sector)
+
                 # dump database
                 dump_database(scenario)
                 # Manually update the outer progress bar after each sector is completed
@@ -1042,10 +1041,18 @@ class NewDatabase:
 
         """
 
+        def scenario_name(scenario):
+            name = scenario["pathway"]
+
+            if "external scenarios" in scenario:
+                for external in scenario["external scenarios"]:
+                    name += f"-{external['scenario']}"
+            return name
+
         if filepath is not None:
             if isinstance(filepath, str):
                 filepath = [
-                    (Path(filepath) / s["model"] / s["pathway"] / str(s["year"]))
+                    (Path(filepath) / s["model"] / scenario_name(s) / str(s["year"]))
                     for s in self.scenarios
                 ]
             elif isinstance(filepath, list):
@@ -1072,7 +1079,6 @@ class NewDatabase:
                 keep_uncertainty_data=self.keep_uncertainty_data,
             )
             Export(scenario, filepath[s], self.version).export_db_to_matrices()
-            del scenario["database"]
 
         # generate scenario report
         self.generate_scenario_report()
@@ -1095,8 +1101,6 @@ class NewDatabase:
 
         print("Write Simapro import file(s).")
 
-        # use multiprocessing to speed up the process
-
         for scenario in self.scenarios:
             scenario = load_database(scenario)
             _prepare_database(
@@ -1129,8 +1133,6 @@ class NewDatabase:
 
         print("Write Simapro import file(s) for OpenLCA.")
 
-        # use multiprocessing to speed up the process
-
         for scenario in self.scenarios:
             scenario = load_database(scenario)
             _prepare_database(
@@ -1162,7 +1164,6 @@ class NewDatabase:
             cache_fp = DIR_CACHED_DB / f"cached_{self.source}_inventories.pickle"
             raise ValueError(f"No cached inventories found at {cache_fp}.")
 
-        # use multiprocessing to speed up the process
         for scenario in self.scenarios:
             scenario = load_database(scenario)
             _prepare_database(

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/steel.py

@@ -562,7 +562,6 @@ class Steel(BaseTransformation):
                         ws.either(*[ws.contains("name", x) for x in list_fuels])
                     ],
                     biosphere_filters=[ws.contains("name", "Carbon dioxide, fossil")],
-                    remove_uncertainty=False,
                 )
 
                 # Update the comments

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/transformation.py

@@ -310,23 +310,6 @@ def find_fuel_efficiency(
             print(
                 f"Warning: {dataset['name'], dataset['location']} has no energy input"
             )
-            for exc in dataset["exchanges"]:
-                print(
-                    exc["type"],
-                    exc["name"],
-                    exc["amount"],
-                    exc.get("product"),
-                    exc["unit"],
-                )
-            from pprint import pprint
-
-            print()
-            pprint(fuel_filters)
-            print()
-            pprint(fuel_specs)
-            print()
-            pprint(fuel_map_reverse)
-            print()
 
     if energy_input != 0 and float(energy_out) != 0:
         current_efficiency = float(energy_out) / energy_input

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/transport.py

@@ -517,26 +517,6 @@ class Transport(BaseTransformation):
         Create vehicle market (fleet average) datasets.
         """
 
-        # # create and regionalize vehicle datasets
-        # vehicle_datasets = list(ws.get_many(
-        #     self.database,
-        #     ws.either(*[
-        #         ws.contains("name", size)
-        #         for size in self.mapping[self.vehicle_type]["sizes"]
-        #     ]),
-        #     ws.contains("name", self.vehicle_type),
-        #     ws.equals("unit", "unit")
-        # ))
-        #
-        # for ds in vehicle_datasets:
-        #     new_vehicle_datasets = self.fetch_proxies(
-        #         subset = vehicle_datasets,
-        #         name=ds["name"],
-        #         ref_prod=ds["reference product"],
-        #     )
-        #
-        #     self.database.extend(new_vehicle_datasets.values())
-
         # create and regionalize transport datasets
         filters = [
             ws.either(

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/utils.py

@@ -107,9 +107,7 @@ def eidb_label(
             name += f"_{ext_scenario['scenario']}"
 
     # add date and time
-    name += (
-        f"_{datetime.now().strftime('%Y-%m-%d %H-%M')} v.{'.'.join(str(__version__))}"
-    )
+    name += f"_{datetime.now().strftime('%Y-%m-%d %H-%M')}"
 
     return name
 
@@ -357,6 +355,9 @@ def dump_database(scenario):
     :param scenario: scenario dictionary
     """
 
+    if "database filepath" in scenario:
+        return scenario
+
     # generate random name
     name = f"{uuid.uuid4().hex}.pickle"
     # dump as pickle
@@ -374,6 +375,9 @@ def load_database(scenario):
     :param scenario: scenario dictionary
     """
 
+    if "database" in scenario:
+        return scenario
+
     filepath = scenario["database filepath"]
 
     # load pickle

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/premise/validation.py

@@ -12,6 +12,7 @@ import yaml
 from .filesystem_constants import DATA_DIR
 from .geomap import Geomap
 from .logger import create_logger
+from .utils import rescale_exchanges
 
 logger = create_logger("validation")
 
@@ -770,9 +771,9 @@ class HeatValidation(BaseDatasetValidator):
                     message = f"Heat conversion efficiency is {efficiency:.2f}, expected to be less than 3.0. Corrected to 3.0."
                     self.log_issue(ds, "heat conversion efficiency", message)
 
-                    # scale it back to 3
-                    for exc in ds["exchanges"]:
-                        exc["amount"] *= efficiency / 3.0
+                    scaling_factor = efficiency / 3.0
+                    rescale_exchanges(ds, scaling_factor)
+                    expected_co2 *= scaling_factor
 
                 co2 = sum(
                     [
@@ -1184,11 +1185,17 @@ class ElectricityValidation(BaseDatasetValidator):
     def check_electricity_mix(self):
         # check that the electricity mix in teh market datasets
         # corresponds to the IAM scenario projection
+        vars = [
+            x
+            for x in self.iam_data.electricity_markets.coords["variables"].values
+            if x.lower().startswith("hydro")
+        ]
 
         if self.year in self.iam_data.electricity_markets.coords["year"].values:
+
             hydro_share = self.iam_data.electricity_markets.sel(
-                variables="Hydro", year=self.year
-            ) / self.iam_data.electricity_markets.sel(
+                variables=vars, year=self.year
+            ).sum(dim="variables") / self.iam_data.electricity_markets.sel(
                 variables=[
                     v
                     for v in self.iam_data.electricity_markets.variables.values
@@ -1199,9 +1206,9 @@ class ElectricityValidation(BaseDatasetValidator):
                 dim="variables"
             )
         else:
-            hydro_share = self.iam_data.electricity_markets.sel(
-                variables="Hydro"
-            ).interp(year=self.year) / self.iam_data.electricity_markets.sel(
+            hydro_share = self.iam_data.electricity_markets.sel(variables=vars).interp(
+                year=self.year
+            ).sum(dim="variables") / self.iam_data.electricity_markets.sel(
                 variables=[
                     v
                     for v in self.iam_data.electricity_markets.variables.values

{premise-2.1.0.dev4 → premise-2.1.0.dev6/premise.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: premise
-Version: 2.1.0.dev4
+Version: 2.1.0.dev6
 Summary: Coupling IAM output to ecoinvent LCA database ecoinvent for prospective LCA
 Author-email: Romain Sacchi <romain.sacchi@psi.ch>, Alois Dirnaichner <dirnaichner@pik-potsdam.de>,  Chris Mutel <cmutel@gmail.com>
 Maintainer-email: Romain Sacchi <romain.sacchi@psi.ch>

{premise-2.1.0.dev4 → premise-2.1.0.dev6}/tests/test_utils.py

@@ -18,7 +18,7 @@ def test_ei_db_label():
     }
     assert (
         eidb_label(scenario, version, system_model)
-        == f"ecoinvent_{system_model}_{version}_{model}_{pathway}_{year}_test_{datetime.now().strftime('%Y-%m-%d %H-%M')} v.{'.'.join(str(__version__))}"
+        == f"ecoinvent_{system_model}_{version}_{model}_{pathway}_{year}_test_{datetime.now().strftime('%Y-%m-%d %H-%M')}"
     )