premise 2.1.0.dev1__tar.gz → 2.1.0.dev4__tar.gz

{premise-2.1.0.dev1 → premise-2.1.0.dev4}/MANIFEST.in

@@ -39,6 +39,10 @@ include premise/data/geomap/*.yml
 include premise/data/geomap/*.yaml
 include premise/data/renewables/*.csv
 include premise/data/direct_air_capture/*.yaml
+include premise/data/transport/car/*.csv
+include premise/data/transport/bus/*.csv
+include premise/data/transport/truck/*.csv
+include premise/data/transport/two-wheeler/*.csv
 include premise/data/utils/*.csv
 include premise/data/utils/*.yml
 include premise/data/utils/*.yaml

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

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

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

{premise-2.1.0.dev1 → premise-2.1.0.dev4}/premise/activity_maps.py

@@ -278,8 +278,27 @@ class InventorySet:
 
         database = database or self.database
 
+        names = []
+
+        for entry in filtr.values():
+            if "fltr" in entry:
+                if isinstance(entry["fltr"], dict):
+                    if "name" in entry["fltr"]:
+                        names.extend(entry["fltr"]["name"])
+                elif isinstance(entry["fltr"], list):
+                    names.extend(entry["fltr"])
+                else:
+                    names.append(entry["fltr"])
+
+        subset = list(
+            ws.get_many(
+                database,
+                ws.either(*[ws.contains("name", name) for name in names]),
+            )
+        )
+
         techs = {
-            tech: act_fltr(database, fltr.get("fltr"), fltr.get("mask"))
+            tech: act_fltr(subset, fltr.get("fltr"), fltr.get("mask"))
             for tech, fltr in filtr.items()
         }
 

{premise-2.1.0.dev1 → premise-2.1.0.dev4}/premise/biomass.py

@@ -164,31 +164,61 @@ class Biomass(BaseTransformation):
             ]
 
             for biomass_type, biomass_act in biomass_map.items():
-                total_prod_vol = np.clip(
-                    (
-                        self.iam_data.production_volumes.sel(
-                            variables=available_biomass_vars, region=region
-                        )
-                        .interp(year=self.year)
-                        .sum(dim="variables")
-                    ),
-                    1e-6,
-                    None,
-                )
-
-                if biomass_type in available_biomass_vars:
-                    share = np.clip(
+                if self.year in self.iam_data.production_volumes.coords["year"].values:
+                    total_prod_vol = np.clip(
+                        (
+                            self.iam_data.production_volumes.sel(
+                                variables=available_biomass_vars,
+                                region=region,
+                                year=self.year,
+                            ).sum(dim="variables")
+                        ),
+                        1e-6,
+                        None,
+                    )
+                else:
+                    total_prod_vol = np.clip(
                         (
                             self.iam_data.production_volumes.sel(
-                                variables=biomass_type, region=region
+                                variables=available_biomass_vars, region=region
                             )
                             .interp(year=self.year)
-                            .sum()
-                            / total_prod_vol
-                        ).values.item(0),
-                        0,
-                        1,
+                            .sum(dim="variables")
+                        ),
+                        1e-6,
+                        None,
                     )
+
+                if biomass_type in available_biomass_vars:
+                    if (
+                        self.year
+                        in self.iam_data.production_volumes.coords["year"].values
+                    ):
+                        share = np.clip(
+                            (
+                                self.iam_data.production_volumes.sel(
+                                    variables=biomass_type,
+                                    region=region,
+                                    year=self.year,
+                                ).sum()
+                                / total_prod_vol
+                            ).values.item(0),
+                            0,
+                            1,
+                        )
+                    else:
+                        share = np.clip(
+                            (
+                                self.iam_data.production_volumes.sel(
+                                    variables=biomass_type, region=region
+                                )
+                                .interp(year=self.year)
+                                .sum()
+                                / total_prod_vol
+                            ).values.item(0),
+                            0,
+                            1,
+                        )
                 elif (
                     self.system_model == "consequential"
                     and biomass_type == "biomass - residual"

{premise-2.1.0.dev1 → premise-2.1.0.dev4}/premise/cement.py

@@ -14,6 +14,7 @@ from .transformation import (
     BaseTransformation,
     Dict,
     IAMDataCollection,
+    InventorySet,
     List,
     calculate_input_energy,
     np,
@@ -106,6 +107,18 @@ class Cement(BaseTransformation):
         )
         self.version = version
 
+        mapping = InventorySet(self.database)
+        self.cement_fuels_map: dict = mapping.generate_cement_fuels_map()
+
+        # reverse the fuel map to get a mapping from ecoinvent to premise
+        self.fuel_map_reverse: dict = {}
+
+        self.fuel_map: dict = mapping.generate_fuel_map()
+
+        for key, value in self.fuel_map.items():
+            for v in list(value):
+                self.fuel_map_reverse[v] = key
+
     def fetch_current_energy_details(self, dataset):
         # Fetches the current energy consumption per ton of clinker
 
@@ -483,23 +496,30 @@ class Cement(BaseTransformation):
             self.add_to_index(new_dataset)
 
         # cement markets
-        markets = ws.get_many(
-            self.database,
-            ws.contains("name", "market for cement"),
-            ws.contains("reference product", "cement"),
-            ws.doesnt_contain_any("name", ["factory", "tile", "sulphate", "plaster"]),
-            ws.doesnt_contain_any("location", self.regions),
+        markets = list(
+            ws.get_many(
+                self.database,
+                ws.contains("name", "market for cement"),
+                ws.contains("reference product", "cement"),
+                ws.doesnt_contain_any(
+                    "name", ["factory", "tile", "sulphate", "plaster"]
+                ),
+                ws.doesnt_contain_any("location", self.regions),
+            )
         )
 
-        markets = {(m["name"], m["reference product"]) for m in markets}
+        unique_markets = list(
+            set([(m["name"], m["reference product"]) for m in markets])
+        )
 
         new_datasets = []
 
-        for dataset in markets:
+        for dataset in unique_markets:
             new_cement_markets = self.fetch_proxies(
                 name=dataset[0],
                 ref_prod=dataset[1],
                 production_variable="cement, dry feed rotary kiln",
+                subset=markets,
             )
 
             # add to log
@@ -513,24 +533,31 @@ class Cement(BaseTransformation):
         self.database.extend(new_datasets)
 
         # cement production
-        production = ws.get_many(
-            self.database,
-            ws.contains("name", "cement production"),
-            ws.contains("reference product", "cement"),
-            ws.doesnt_contain_any("name", ["factory", "tile", "sulphate", "plaster"]),
+        production = list(
+            ws.get_many(
+                self.database,
+                ws.contains("name", "cement production"),
+                ws.contains("reference product", "cement"),
+                ws.doesnt_contain_any(
+                    "name", ["factory", "tile", "sulphate", "plaster"]
+                ),
+            )
         )
 
-        production = {(p["name"], p["reference product"]) for p in production}
+        reduced_production = list(
+            set([(p["name"], p["reference product"]) for p in production])
+        )
 
         new_datasets = []
 
-        for dataset in production:
+        for dataset in reduced_production:
             # Fetch proxy datasets (one per IAM region)
             # Delete old datasets
             new_cement_production = self.fetch_proxies(
                 name=dataset[0],
                 ref_prod=dataset[1],
                 production_variable="cement, dry feed rotary kiln",
+                subset=production,
             )
 
             # add to log

{premise-2.1.0.dev1 → premise-2.1.0.dev4}/premise/clean_datasets.py

@@ -35,27 +35,16 @@ def remove_uncertainty(database):
     :param database:
     :return:
     """
-
-    keys_to_remove = [
-        "loc",
-        "scale",
-        "pedigree",
-        "minimum",
-        "maximum",
-        "shape",
-    ]
-
-    def set_defaults(exchange):
-        """Set default values for the exchange."""
-        exchange["loc"] = exchange["amount"]
-        for key in ["scale", "shape", "minimum", "maximum"]:
-            exchange[key] = np.nan
+    uncertainty_keys = ["scale", "shape", "minimum", "maximum"]
+    nan_value = np.nan
 
     for dataset in database:
         for exchange in dataset["exchanges"]:
-            if exchange.get("preserve uncertainty", False) is False:
+            if not exchange.get("preserve uncertainty", False):
                 exchange["uncertainty type"] = 0
-                set_defaults(exchange)
+                exchange["loc"] = exchange["amount"]
+                for key in uncertainty_keys:
+                    exchange[key] = nan_value
 
     return database
 

{premise-2.1.0.dev1 → premise-2.1.0.dev4}/premise/data/fuels/fuel_markets.yml

@@ -12,7 +12,7 @@ natural gas:
   name: market for natural gas, high pressure
   reference product: natural gas, high pressure
   unit: cubic meter
-  lhv: 47.5
+  lhv: 36
 hydrogen:
   name: market for hydrogen, gaseous
   reference product: hydrogen, gaseous