premise 2.1.1.dev2__tar.gz → 2.1.1.dev4__tar.gz

{premise-2.1.1.dev2/premise.egg-info → premise-2.1.1.dev4}/PKG-INFO

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

@@ -4,7 +4,7 @@ __all__ = (
     "clear_inventory_cache",
     "get_regions_definition",
 )
-__version__ = (2, 1, 1, "dev2")
+__version__ = (2, 1, 1, "dev4")
 
 
 from premise.new_database import NewDatabase

{premise-2.1.1.dev2 → premise-2.1.1.dev4}/premise/external.py

@@ -1079,6 +1079,10 @@ class ExternalScenario(BaseTransformation):
                             r for r in regions if r not in market_vars["except regions"]
                         ]
 
+                    # remove World region from regions
+                    if "World" in regions and len(regions) > 1:
+                        regions.remove("World")
+
                     # Loop through regions
                     for region in regions:
                         # Create market dictionary
@@ -1273,14 +1277,12 @@ class ExternalScenario(BaseTransformation):
                     # if there's more than one region,
                     # we create a World region
                     create_world_region = True
-                    if (
-                        "World" in regions
-                        or "World" in market_vars.get("except regions", [])
-                        or len(regions) == 1
+                    if len(regions) <= 1 or "World" in market_vars.get(
+                        "except regions", []
                     ):
                         create_world_region = False
 
-                    if create_world_region:
+                    if create_world_region is True:
                         world_market = self.fill_in_world_market(
                             market=market_vars,
                             regions=regions,

{premise-2.1.1.dev2 → premise-2.1.1.dev4}/premise/external_data_validation.py

@@ -69,7 +69,19 @@ def flag_activities_to_adjust(
     :return: dataset with additional info on variables to adjust
     """
 
-    regions = scenario_data["production volume"].region.values.tolist()
+    if "production volume variable" not in dataset_vars:
+        regions = scenario_data["production volume"].region.values.tolist()
+    else:
+        data = scenario_data["production volume"].sel(
+            variables=dataset_vars["production volume variable"]
+        )
+        # fetch regions which do not contain nan data
+        regions = [
+            r
+            for r in data.region.values.tolist()
+            if not np.isnan(data.sel(region=r).values).all()
+        ]
+
     if "except regions" in dataset_vars:
         regions = [r for r in regions if r not in dataset_vars["except regions"]]
 
@@ -279,7 +291,7 @@ def check_inventories(
             "except regions": val.get(
                 "except regions",
                 [
-                    "World",
+                    # "World",
                 ],
             ),
             "efficiency": val.get("efficiency", []),
@@ -464,17 +476,22 @@ def check_inventories(
 
         # Perform checks in order of preference
         for region in short_listed:
-            while short_listed[region] is None:
-                for location in sorted_candidate_locations:
-                    for check_func in check_functions:
-                        if check_func(region, location):
-                            # check the dataset was not previously emptied
-                            if (
-                                candidates_by_location[location].get("emptied", False)
-                                is False
-                            ):
-                                assign_candidate_if_empty(region, location)
-                                break
+            for location in sorted_candidate_locations:
+                for check_func in check_functions:
+                    if check_func(region, location):
+                        # check the dataset was not previously emptied
+                        if (
+                            candidates_by_location[location].get("emptied", False)
+                            is False
+                        ):
+                            assign_candidate_if_empty(region, location)
+                            break
+
+            if short_listed[region] is None:
+                if "RoW" in sorted_candidate_locations:
+                    assign_candidate_if_empty(region, "RoW")
+                else:
+                    assign_candidate_if_empty(region, location)
 
         return short_listed
 

{premise-2.1.1.dev2 → premise-2.1.1.dev4}/premise/fuels.py

@@ -2248,11 +2248,12 @@ class Fuels(BaseTransformation):
         string = ""
 
         # if the sum is zero, we need to select a provider
-        if (
+        if np.isclose(
             self.iam_fuel_markets.sel(region=region, variables=prod_vars)
             .interp(year=self.year)
-            .sum(dim=["variables"])
-            == 0
+            .sum(dim=["variables"]),
+            0,
+            atol=1e-3,
         ):
             if "hydrogen" in dataset["name"].lower():
                 prod_vars = [
@@ -2266,7 +2267,6 @@ class Fuels(BaseTransformation):
                     prod_var, tuple(vars_map[fuel_category]), region, period
                 )
                 sum_share += share
-
             else:
                 share = 1.0
                 sum_share = 1.0

{premise-2.1.1.dev2 → premise-2.1.1.dev4}/premise/iam_variables_mapping/fuels_variables.yaml

@@ -627,6 +627,10 @@ hydrogen, from natural gas:
     remind: Tech|Hydrogen|Gas|w/o CC|Efficiency
   ecoinvent_aliases:
     fltr: hydrogen production, steam methane reforming
+    mask:
+      name:
+        - biomethane
+        - CCS
 
 hydrogen, from natural gas, with CCS:
   lhv: 120
@@ -647,8 +651,10 @@ hydrogen, from biogas:
   co2: 0
   biogenic_share: 1
   ecoinvent_aliases:
-    fltr:
-      - hydrogen production, steam methane reforming, from biomethane
+    fltr: hydrogen production, steam methane reforming, from biomethane
+    mask:
+      name:
+        - CCS
 
 hydrogen, from biogas, with CCS:
   lhv: 120

{premise-2.1.1.dev2 → premise-2.1.1.dev4}/premise/iam_variables_mapping/transport_roadfreight_variables.yaml

@@ -120,7 +120,7 @@ truck, fuel cell electric, 18t:
       - Energy Service|Transportation|Freight|Med Truck|Fuel Cell Vehicle|Hydrogen
   energy_use_aliases:
     remind: FE|Transport|Freight|Road|Truck (18t)|Hydrogen
-  eff_fuel_aliases:
+  eff_aliases:
     image:
       - Efficiency|Transportation|Freight|Med Truck|Fuel Cell Vehicle|Biofuels
       - Efficiency|Transportation|Freight|Med Truck|Fuel Cell Vehicle|Gasoline
@@ -143,7 +143,7 @@ truck, diesel, 18t:
       - Energy Service|Transportation|Freight|Med Truck|Internal Combustion Engine|Hydrogen
   energy_use_aliases:
     remind: FE|Transport|Freight|Road|Truck (18t)|Liquids
-  eff_fuel_aliases:
+  eff_aliases:
       image:
           - Efficiency|Transportation|Freight|Med Truck|Internal combustion engine efficienct|Gasoline
           - Efficiency|Transportation|Freight|Med Truck|Internal Combustion Engine|Biofuel
@@ -164,7 +164,7 @@ truck, diesel hybrid, 18t:
           - Energy Service|Transportation|Freight|Med Truck|Hybrid engine|Diesel
           - Energy Service|Transportation|Freight|Med Truck|Hybrid engine|Gasoline
           - Energy Service|Transportation|Freight|Med Truck|Hybrid engine|Hydrogen
-    eff_fuel_aliases:
+    eff_aliases:
         image:
           - Efficiency|Transportation|Freight|Med Truck|Hybrid engine|Biofuel
           - Efficiency|Transportation|Freight|Med Truck|Hybrid engine|Diesel
@@ -183,7 +183,7 @@ truck, compressed gas, 18t:
     image: Energy Service|Transportation|Freight|Med Truck|Hybrid engine|LNG
   energy_use_aliases:
     remind: FE|Transport|Freight|Road|Truck (18t)|Gases
-  eff_fuel_aliases:
+  eff_aliases:
     image: Efficiency|Transportation|Freight|Med Truck|Hybrid engine|LNG
   ecoinvent_aliases:
     fltr:
@@ -201,7 +201,7 @@ truck, diesel plugin hybrid, 18t:
           - Energy Service|Transportation|Freight|Med Truck|Plug-in electric vehicle 30km|Oil
           - Energy Service|Transportation|Freight|Med Truck|Plug-in electric vehicle 60km|Biofuel
           - Energy Service|Transportation|Freight|Med Truck|Plug-in electric vehicle 60km|Oil
-    eff_fuel_aliases:
+    eff_aliases:
         image:
           - Efficiency|Transportation|Freight|Med Truck|Plug-in electric vehicle 10km|Biofuel
           - Efficiency|Transportation|Freight|Med Truck|Plug-in electric vehicle 10km|Electricity
@@ -289,7 +289,7 @@ truck, fuel cell electric, 40t:
   energy_use_aliases:
     remind: FE|Transport|Freight|Road|Truck (40t)|Hydrogen
     image: Final Energy|Transportation|Freight|Heavy Truck|H2
-  eff_fuel_aliases:
+  eff_aliases:
     image:
       - Efficiency|Transportation|Freight|Heavy Truck|Fuel Cell Vehicle|Biofuels
       - Efficiency|Transportation|Freight|Heavy Truck|Fuel Cell Vehicle|Gasoline
@@ -308,7 +308,7 @@ truck, diesel hybrid, 40t:
           - Energy Service|Transportation|Freight|Heavy Truck|Hybrid engine|Diesel
           - Energy Service|Transportation|Freight|Heavy Truck|Hybrid engine|Gasoline
           - Energy Service|Transportation|Freight|Heavy Truck|Hybrid engine|Hydrogen
-    eff_fuel_aliases:
+    eff_aliases:
         image:
           - Efficiency|Transportation|Freight|Heavy Truck|Hybrid engine|Biofuel
           - Efficiency|Transportation|Freight|Heavy Truck|Hybrid engine|Diesel
@@ -332,7 +332,7 @@ truck, diesel, 40t:
       - Energy Service|Transportation|Freight|Heavy Truck|Internal Combustion Engine|Hydrogen
   energy_use_aliases:
     remind: FE|Transport|Freight|Road|Truck (40t)|Liquids
-  eff_fuel_aliases:
+  eff_aliases:
     image:
       - Efficiency|Transportation|Freight|Heavy Truck|Internal combustion engine efficienct|Gasoline
       - Efficiency|Transportation|Freight|Heavy Truck|Internal Combustion Engine|Biofuel
@@ -352,7 +352,7 @@ truck, compressed gas, 40t:
     image: Energy Service|Transportation|Freight|Heavy Truck|Hybrid engine|LNG
   energy_use_aliases:
     remind: FE|Transport|Freight|Road|Truck (40t)|Gases
-  eff_fuel_aliases:
+  eff_aliases:
     image: Efficiency|Transportation|Freight|Heavy Truck|Hybrid engine|LNG
   ecoinvent_aliases:
     fltr:
@@ -370,7 +370,7 @@ truck, diesel plugin hybrid, 40t:
           - Energy Service|Transportation|Freight|Heavy Truck|Plug-in electric vehicle 30km|Oil
           - Energy Service|Transportation|Freight|Heavy Truck|Plug-in electric vehicle 60km|Biofuel
           - Energy Service|Transportation|Freight|Heavy Truck|Plug-in electric vehicle 60km|Oil
-    eff_fuel_aliases:
+    eff_aliases:
         image:
           - Efficiency|Transportation|Freight|Heavy Truck|Plug-in electric vehicle 10km|Biofuel
           - Efficiency|Transportation|Freight|Heavy Truck|Plug-in electric vehicle 10km|Electricity

{premise-2.1.1.dev2 → premise-2.1.1.dev4}/premise/transformation.py

@@ -492,9 +492,7 @@ class BaseTransformation:
                 suppliers = list(
                     ws.get_many(
                         subset or self.database,
-                        ws.either(
-                            *[ws.contains("name", sup) for sup in possible_names]
-                        ),
+                        ws.either(*[ws.equals("name", sup) for sup in possible_names]),
                         (
                             ws.either(
                                 *[

{premise-2.1.1.dev2 → premise-2.1.1.dev4/premise.egg-info}/PKG-INFO

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

@@ -215,8 +215,6 @@ premise/iam_variables_mapping/gains_regions_mapping.yaml
 premise/iam_variables_mapping/heat_variables.yaml
 premise/iam_variables_mapping/iam_region_to_climate.yaml
 premise/iam_variables_mapping/mapping_overview.xlsx
-premise/iam_variables_mapping/mapping_overview_new.xlsx
-premise/iam_variables_mapping/mapping_overview_refined_pivot.xlsx
 premise/iam_variables_mapping/missing_geography_equivalences.yaml
 premise/iam_variables_mapping/other_variables.yaml
 premise/iam_variables_mapping/steel_variables.yaml