Align wrt master

polca · Aug 5, 2024 · 5d9288e · 5d9288e
1 parent 0e715cc
commit 5d9288e
Show file tree

Hide file tree

Showing 18 changed files with 1,108 additions and 1,195 deletions.
diff --git a/docs/extract.rst b/docs/extract.rst
diff --git a/docs/transform.rst b/docs/transform.rst
diff --git a/premise/data/additional_inventories/lci-PV-GaAs.xlsx b/premise/data/additional_inventories/lci-PV-GaAs.xlsx
diff --git a/premise/data/additional_inventories/lci-PV-perovskite.xlsx b/premise/data/additional_inventories/lci-PV-perovskite.xlsx
diff --git a/premise/data/additional_inventories/lci-battery-capacity.xlsx b/premise/data/additional_inventories/lci-battery-capacity.xlsx
diff --git a/premise/data/additional_inventories/lci-buses.xlsx b/premise/data/additional_inventories/lci-buses.xlsx
diff --git a/premise/data/additional_inventories/lci-pass_cars.xlsx b/premise/data/additional_inventories/lci-pass_cars.xlsx
diff --git a/premise/data/additional_inventories/lci-trucks.xlsx b/premise/data/additional_inventories/lci-trucks.xlsx
diff --git a/premise/data/additional_inventories/lci-two_wheelers.xlsx b/premise/data/additional_inventories/lci-two_wheelers.xlsx
diff --git a/premise/data/consequential/leadtimes.yaml b/premise/data/consequential/leadtimes.yaml
@@ -38,7 +38,7 @@ Wind Onshore: 2
 Wind Offshore: 3
 Wave: 3
 Storage, Hydrogen: 3
-Storage, Flow Battery: 3
+Storage, Battery: 3
 diesel: 3
 gasoline: 3
 diesel, synthetic, from wood: 3

diff --git a/premise/data/consequential/lifetimes.yaml b/premise/data/consequential/lifetimes.yaml
@@ -80,4 +80,4 @@ daccs_sorbent: 20
 biomass - residual: 35
 biomass crops - purpose grown: 35
 Storage, Hydrogen: 20
-Storage, Flow Battery: 20
+Storage, Battery: 20
diff --git a/premise/data/utils/logging/reporting.yaml b/premise/data/utils/logging/reporting.yaml
@@ -547,6 +547,14 @@ premise_battery:
         name: SIB market share
         description: Market share of SIB
         unit: 0-1
+      VRFB market share:
+        name: VRFB market share
+        description: Market share of VRFB
+        unit: 0-1
+      LEAD-ACID market share:
+        name: LEAD-ACID market share
+        description: Market share of LEAD-ACID
+        unit: 0-1
     tab: Battery
 
 premise_wind_turbine:

diff --git a/premise/electricity.py b/premise/electricity.py
@@ -1515,7 +1515,7 @@ def create_region_specific_power_plants(self):
             # "Oil CC",
             "Coal CF 80-20",
             "Coal CF 50-50",
-            "Storage, Flow Battery",
+            "Storage, Battery",
             "Storage, Hydrogen",
         ]
 
@@ -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/export.py b/premise/export.py
@@ -1527,7 +1527,7 @@ def export_db_to_simapro(self, olca_compartments=False):
                     if item == "System description":
                         writer.writerow(["Ecoinvent v3"])
                     if item == "Infrastructure":
-                        writer.writerow(["Yes"])
+                        writer.writerow(["No"])
                     if item == "External documents":
                         writer.writerow(
                             [
@@ -1802,7 +1802,13 @@ def export_db_to_simapro(self, olca_compartments=False):
             print(x)
 
         if len(self.unmatched_category_flows) > 0:
-            print(f"{len(self.unmatched_category_flows)} unmatched flow categories.")
+            print(
+                f"{len(self.unmatched_category_flows)} unmatched flow categories. Check unlinked.log."
+            )
+            # save the list of unmatched flow to unlinked.log
+            with open("unlinked.log", "a") as f:
+                for item in self.unmatched_category_flows:
+                    f.write(f"{item}\n")
 
         print(f"Simapro CSV file saved in {self.filepath}.")
 

diff --git a/premise/iam_variables_mapping/constants.yaml b/premise/iam_variables_mapping/constants.yaml
@@ -37,21 +37,6 @@ SUPPORTED_PATHWAYS:
   - SSP5-PkBudg500
   - static
 
-LIST_TRANSF_FUNC:
-  - update_biomass
-  - update_electricity
-  - update_dac
-  - update_cement
-  - update_steel
-  - update_two_wheelers
-  - update_cars
-  - update_trucks
-  - update_buses
-  - update_fuels
-  - update_heat
-  - update_external_scenario
-  - update_emissions
-
 LIST_MESSAGE_REGIONS:
   - AFR
   - CHN

diff --git a/premise/iam_variables_mapping/electricity_variables.yaml b/premise/iam_variables_mapping/electricity_variables.yaml
@@ -899,10 +899,10 @@ Solar PV Residential:
     gcam: Secondary Energy|Electricity|rooftop_pv
     image: Secondary Energy|Electricity|Solar|PV|2
     tiam-ucl: Secondary Energy|Electricity|Concentrated Solar PV decentralised
-Storage, Flow Battery:
+Storage, Battery:
   ecoinvent_aliases:
     fltr:
-    - market for battery capacity, stationary (TC scenario)
+      - market for battery capacity, stationary (CONT scenario)
   iam_aliases:
     image: Secondary Energy|Electricity|Storage
     message: Secondary Energy|Electricity|Storage

diff --git a/premise/iam_variables_mapping/missing_geography_equivalences.yaml b/premise/iam_variables_mapping/missing_geography_equivalences.yaml
@@ -2,13 +2,13 @@
 # for which constructive_geometries
 # cannot find an IAM equivalent
 ---
-Europe without Austria:
+Europe without Switzerland and Austria:
   remind: EUR
   image: WEU
   message: WEU
   tiam-ucl: WEU
   gcam: EU-15
-Europe without Switzerland and Austria:
+Europe without Austria:
   remind: EUR
   image: WEU
   message: WEU

diff --git a/premise/iam_variables_mapping/topologies/message-topology.json b/premise/iam_variables_mapping/topologies/message-topology.json
@@ -0,0 +1,188 @@
+{
+    "R12_SAS": ["AF", "BD", "BT", "IN", "MV", "NP", "PK", "LK"],
+    "R12_EEU": [
+        "AL",
+        "BA",
+        "BG",
+        "HR",
+        "CZ",
+        "EE",
+        "HU",
+        "LV",
+        "LT",
+        "PL",
+        "RO",
+        "SK",
+        "SI",
+        "MK"
+    ],
+    "R12_MEA": [
+        "DZ",
+        "BH",
+        "EG",
+        "IR",
+        "IQ",
+        "IL",
+        "JO",
+        "KW",
+        "LB",
+        "LY",
+        "MA",
+        "OM",
+        "QA",
+        "SA",
+        "SD",
+        "SY",
+        "TN",
+        "AE",
+        "YE"
+    ],
+    "R12_PAS": [
+        "AS",
+        "BN",
+        "FJ",
+        "PF",
+        "KI",
+        "ID",
+        "MY",
+        "MM",
+        "NC",
+        "PG",
+        "PH",
+        "KR",
+        "SG",
+        "SB",
+        "TW",
+        "TH",
+        "TO",
+        "VU",
+        "WS"
+    ],
+    "R12_WEU": [
+        "AD",
+        "AT",
+        "BE",
+        "CY",
+        "DK",
+        "FO",
+        "FI",
+        "FR",
+        "DE",
+        "GI",
+        "GR",
+        "GL",
+        "IS",
+        "IE",
+        "IM",
+        "IT",
+        "LI",
+        "LU",
+        "MT",
+        "MC",
+        "NL",
+        "NO",
+        "PT",
+        "ES",
+        "SE",
+        "CH",
+        "TR",
+        "GB"
+    ],
+    "R12_AFR": [
+        "AO",
+        "BJ",
+        "BW",
+        "IO",
+        "BF",
+        "BI",
+        "CM",
+        "CV",
+        "CF",
+        "TD",
+        "KM",
+        "CG",
+        "CI",
+        "DJ",
+        "GQ",
+        "ER",
+        "ET",
+        "GA",
+        "GM",
+        "GH",
+        "GN",
+        "GW",
+        "KE",
+        "LS",
+        "LR",
+        "MG",
+        "MW",
+        "ML",
+        "MR",
+        "MU",
+        "MZ",
+        "NA",
+        "NE",
+        "NG",
+        "RE",
+        "RW",
+        "SH",
+        "ST",
+        "SN",
+        "SC",
+        "SL",
+        "SO",
+        "ZA",
+        "SZ",
+        "TZ",
+        "TG",
+        "UG",
+        "ZR",
+        "ZM",
+        "ZW"
+    ],
+    "R12_LAM": [
+        "AG",
+        "AR",
+        "BS",
+        "BB",
+        "BZ",
+        "BM",
+        "BO",
+        "BR",
+        "CL",
+        "CO",
+        "CR",
+        "CU",
+        "DM",
+        "DO",
+        "EC",
+        "SV",
+        "GF",
+        "GD",
+        "GP",
+        "GT",
+        "GY",
+        "HT",
+        "HN",
+        "JM",
+        "MQ",
+        "MX",
+        "ANT",
+        "NI",
+        "PA",
+        "PY",
+        "PE",
+        "KN",
+        "VC",
+        "LC",
+        "SR",
+        "TT",
+        "UY",
+        "VE"
+    ],
+    "R12_FSU": ["AM", "AZ", "BY", "GE", "KZ", "KG", "MD", "RU", "TJ", "TM", "UA", "UZ"],
+    "R12_PAO": ["AU", "JP", "NZ"],
+    "R12_RCPA": ["KH", "KP", "LA", "MN", "VN"],
+    "R12_NAM": ["CA", "GU", "PR", "US", "VI"],
+    "R12_CHN": ["CN", "HK", "MO"]
+}