premise 1.8.2.dev3__tar.gz → 1.8.2.dev4__tar.gz

{premise-1.8.2.dev3/premise.egg-info → premise-1.8.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: premise
-Version: 1.8.2.dev3
+Version: 1.8.2.dev4
 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-1.8.2.dev3 → premise-1.8.2.dev4}/premise/__init__.py

@@ -1,5 +1,5 @@
 __all__ = ("NewDatabase", "clear_cache", "get_regions_definition")
-__version__ = (1, 8, 2, "dev3")
+__version__ = (1, 8, 2, "dev4")
 
 
 from .ecoinvent_modification import NewDatabase

{premise-1.8.2.dev3 → premise-1.8.2.dev4}/premise/ecoinvent_modification.py

@@ -515,6 +515,9 @@ def _export_to_matrices(obj):
 def _export_to_simapro(obj):
     obj.export_db_to_simapro()
 
+def _export_to_olca(obj):
+    obj.export_db_to_simapro(olca_compartments=True)
+
 
 class NewDatabase:
     """
@@ -1537,8 +1540,7 @@ class NewDatabase:
                 results = pool.starmap(_prepare_database, args)
 
             for s, scenario in enumerate(self.scenarios):
-                self.scenarios[s] = results[s][0]
-                cache.update(results[s][1])
+                self.scenarios[s] = results[s]
 
             with ProcessPool(processes=multiprocessing.cpu_count()) as pool:
                 args = [
@@ -1597,6 +1599,40 @@ class NewDatabase:
         # generate change report from logs
         self.generate_change_report()
 
+    def write_db_to_olca(self, filepath: str = None):
+        """
+        Exports database as a Simapro CSV file to be imported in OpenLCA
+
+        :param filepath: path provided by the user to store the exported import file
+        :type filepath: str
+
+        """
+
+        filepath = filepath or Path(Path.cwd() / "export" / "olca")
+
+        if not os.path.exists(filepath):
+            os.makedirs(filepath)
+
+        print("Write Simapro import file(s) for OpenLCA.")
+
+        # use multiprocessing to speed up the process
+
+        for scenario in self.scenarios:
+            _prepare_database(
+                scenario=scenario,
+                db_name="database",
+                original_database=self.database,
+                keep_uncertainty_data=self.keep_uncertainty_data,
+            )
+
+        for scen, scenario in enumerate(self.scenarios):
+            Export(scenario, filepath, self.version).export_db_to_simapro(olca_compartments=True)
+
+        # generate scenario report
+        self.generate_scenario_report()
+        # generate change report from logs
+        self.generate_change_report()
+
     def write_datapackage(self, name: str = f"datapackage_{date.today()}"):
         if not isinstance(name, str):
             raise TypeError("`name` should be a string.")

{premise-1.8.2.dev3 → premise-1.8.2.dev4}/premise/export.py

@@ -1197,7 +1197,7 @@ class Export:
 
         return dict_categories
 
-    def export_db_to_simapro(self):
+    def export_db_to_simapro(self, olca_compartments=False):
         if not os.path.exists(self.filepath):
             os.makedirs(self.filepath)
 
@@ -1251,7 +1251,6 @@ class Export:
             "Emissions to air",
             "Emissions to water",
             "Emissions to soil",
-            "Final waste flows",
             "Non material emission",
             "Social issues",
             "Economic issues",
@@ -1263,7 +1262,10 @@ class Export:
         simapro_units = get_simapro_units()
 
         # mapping between BW2 and Simapro sub-compartments
-        simapro_subs = get_simapro_compartments()
+        if olca_compartments:
+            simapro_subs = {}
+        else:
+            simapro_subs = get_simapro_compartments()
 
         filename = f"simapro_export_{self.model}_{self.scenario}_{self.year}.csv"
 
@@ -1493,7 +1495,7 @@ class Export:
                             if e["type"] == "biosphere" and e["categories"][0] == "air":
                                 if len(e["categories"]) > 1:
                                     sub_compartment = simapro_subs.get(
-                                        e["categories"][1], ""
+                                        e["categories"][1], e["categories"][1]
                                     )
                                 else:
                                     sub_compartment = ""
@@ -1527,7 +1529,7 @@ class Export:
                             ):
                                 if len(e["categories"]) > 1:
                                     sub_compartment = simapro_subs.get(
-                                        e["categories"][1], ""
+                                        e["categories"][1], e["categories"][1]
                                     )
                                 else:
                                     sub_compartment = ""
@@ -1561,7 +1563,7 @@ class Export:
                             ):
                                 if len(e["categories"]) > 1:
                                     sub_compartment = simapro_subs.get(
-                                        e["categories"][1], ""
+                                        e["categories"][1], e["categories"][1]
                                     )
                                 else:
                                     sub_compartment = ""

{premise-1.8.2.dev3 → premise-1.8.2.dev4}/premise/transformation.py

@@ -1849,12 +1849,6 @@ class BaseTransformation:
             f"\n{dataset['name']}|{dataset['location']}"
         )
 
-        for key in exchanges_before.keys():
-            assert np.allclose(exchanges_before[key], exchanges_after[key]), (
-                f"Exchanges before and after relinking are not the same: {exchanges_before[key]} != {exchanges_after[key]}"
-                f"\n{dataset['name']}|{dataset['location']}"
-            )
-
         return dataset
 
     def get_gis_match(

{premise-1.8.2.dev3 → premise-1.8.2.dev4/premise.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: premise
-Version: 1.8.2.dev3
+Version: 1.8.2.dev4
 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-1.8.2.dev3 → premise-1.8.2.dev4}/premise.egg-info/SOURCES.txt

@@ -118,6 +118,7 @@ premise/data/additional_inventories/lci-vanadium-redox-flow-battery.xlsx
 premise/data/additional_inventories/lci-vanadium.xlsx
 premise/data/additional_inventories/lci-wave_energy.xlsx
 premise/data/additional_inventories/migration_map.csv
+premise/data/additional_inventories/~$lci-hydrogen-smr-atr-natgas.xlsx
 premise/data/consequential/blacklist.yaml
 premise/data/consequential/leadtimes.yaml
 premise/data/consequential/lifetimes.yaml