From 6aeee375f98e285b93240695fd6006f678dc7f67 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Tue, 6 Aug 2024 18:49:04 +0200 Subject: [PATCH] version bump --- premise/heat.py | 13 +++++++++++-- premise/iam_variables_mapping/heat_variables.yaml | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/premise/heat.py b/premise/heat.py index e82a0f95..1562c551 100644 --- a/premise/heat.py +++ b/premise/heat.py @@ -139,11 +139,11 @@ def regionalize_heat_production(self): created_datasets = [] - for heat_datasets in self.heat_techs.values(): + for heat_tech, heat_datasets in self.heat_techs.items(): datasets = list( ws.get_many( self.database, - ws.either(*[ws.contains("name", n) for n in heat_datasets]), + ws.either(*[ws.equals("name", n) for n in heat_datasets]), ws.equals("unit", "megajoule"), ws.doesnt_contain_any("location", self.regions), ) @@ -155,12 +155,21 @@ def regionalize_heat_production(self): created_datasets.append(dataset["name"]) + print(heat_tech, dataset["name"]) + geo_mapping = None + if heat_tech == "heat, from natural gas (market)": + geo_mapping = { + r: "Europe without Switzerland" + for r in self.regions + } + new_ds = self.fetch_proxies( name=dataset["name"], ref_prod=dataset["reference product"], exact_name_match=True, exact_product_match=True, subset=datasets, + geo_mapping=geo_mapping, ) if len(new_ds) == 0: diff --git a/premise/iam_variables_mapping/heat_variables.yaml b/premise/iam_variables_mapping/heat_variables.yaml index e050bd20..0d0c1e2f 100644 --- a/premise/iam_variables_mapping/heat_variables.yaml +++ b/premise/iam_variables_mapping/heat_variables.yaml @@ -28,6 +28,7 @@ heat, from natural gas (market): fltr: - market for heat, central or small-scale, natural gas - market for heat, district or industrial, natural gas + mask: Jakobsberg heat, from light fuel oil: ecoinvent_aliases: