diff --git a/premise/data/additional_inventories/lci-battery-capacity.xlsx b/premise/data/additional_inventories/lci-battery-capacity.xlsx index bee3e5be..52b7d047 100644 Binary files a/premise/data/additional_inventories/lci-battery-capacity.xlsx and b/premise/data/additional_inventories/lci-battery-capacity.xlsx differ diff --git a/premise/data/additional_inventories/lci-buses.xlsx b/premise/data/additional_inventories/lci-buses.xlsx index 1784e9dc..89935dbf 100644 Binary files a/premise/data/additional_inventories/lci-buses.xlsx and b/premise/data/additional_inventories/lci-buses.xlsx differ diff --git a/premise/data/additional_inventories/lci-carbon-capture.xlsx b/premise/data/additional_inventories/lci-carbon-capture.xlsx index 764cc376..478169f0 100644 Binary files a/premise/data/additional_inventories/lci-carbon-capture.xlsx and b/premise/data/additional_inventories/lci-carbon-capture.xlsx differ diff --git a/premise/data/additional_inventories/lci-pass_cars.xlsx b/premise/data/additional_inventories/lci-pass_cars.xlsx index 065890c9..fbe885ed 100644 Binary files a/premise/data/additional_inventories/lci-pass_cars.xlsx and b/premise/data/additional_inventories/lci-pass_cars.xlsx differ diff --git a/premise/data/additional_inventories/lci-trucks.xlsx b/premise/data/additional_inventories/lci-trucks.xlsx index 57e2cafe..3a6a3a56 100644 Binary files a/premise/data/additional_inventories/lci-trucks.xlsx and b/premise/data/additional_inventories/lci-trucks.xlsx differ diff --git a/premise/data/additional_inventories/lci-two_wheelers.xlsx b/premise/data/additional_inventories/lci-two_wheelers.xlsx index 2e4ae50c..52991c4e 100644 Binary files a/premise/data/additional_inventories/lci-two_wheelers.xlsx and b/premise/data/additional_inventories/lci-two_wheelers.xlsx differ diff --git a/premise/electricity.py b/premise/electricity.py index 703b8bb2..134be54c 100644 --- a/premise/electricity.py +++ b/premise/electricity.py @@ -1550,7 +1550,7 @@ def create_region_specific_power_plants(self): ws.either( *[ws.contains("name", name) for name in list_datasets_to_duplicate] ), - # ws.exclude(ws.contains("name", "market")), + ws.exclude(ws.contains("name", "market")), ws.exclude(ws.contains("name", ", oxy, ")), ws.exclude(ws.contains("name", ", pre, ")), ): diff --git a/premise/iam_variables_mapping/electricity_variables.yaml b/premise/iam_variables_mapping/electricity_variables.yaml index 32c0b15a..71189267 100644 --- a/premise/iam_variables_mapping/electricity_variables.yaml +++ b/premise/iam_variables_mapping/electricity_variables.yaml @@ -902,7 +902,7 @@ Solar PV Residential: Storage, Battery: ecoinvent_aliases: fltr: - - market for battery capacity, stationary (CONT scenario) + - electricity supply, from stationary battery (CONT scenario) iam_aliases: image: Secondary Energy|Electricity|Storage message: Secondary Energy|Electricity|Storage diff --git a/premise/inventory_imports.py b/premise/inventory_imports.py index 5258c81a..11c94a74 100644 --- a/premise/inventory_imports.py +++ b/premise/inventory_imports.py @@ -262,22 +262,20 @@ def check_uncertainty_data(data, filename): exc["uncertainty type"] = 0 if exc["uncertainty type"] not in {0, 1}: - if not all( - f in exc - for f in MANDATORY_UNCERTAINTY_FIELDS[exc["uncertainty type"]] - ): + missing_parameters = [ + f + for f in MANDATORY_UNCERTAINTY_FIELDS[ + exc["uncertainty type"] + ] + if exc.get(f) is None + ] + if missing_parameters: rows.append( [ dataset["name"][:30], exc["name"][:30], exc["uncertainty type"], - [ - f - for f in MANDATORY_UNCERTAINTY_FIELDS[ - exc["uncertainty type"] - ] - if f not in exc - ], + missing_parameters ] ) @@ -294,7 +292,7 @@ def check_uncertainty_data(data, filename): ] ) - if not exc["minimum"] <= exc["loc"] <= exc["maximum"]: + if not exc.get("minimum", 0) <= exc.get("loc", 0) <= exc.get("maximum", 0): rows.append( [ dataset["name"][:30],