Merge remote-tracking branch 'origin/main'

Author: alvarojhahn

pathways/data/classifications.csv

@@ -1463,9 +1463,9 @@ market for ruthenium,ruthenium,0729:Mining of other non-ferrous metal ores,14290
 "market for rutile, 95% titanium dioxide","rutile, 95% titanium dioxide",0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
 market for samarium oxide,samarium oxide,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
 market for sand,sand,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
-"market for sawlog and veneer log, hardwood, measured as solid wood under bark","sawlog and veneer log, hardwood, measured as solid wood under bark",0220:Logging',"3110: Wood, sawn or chipped lengthwise, sliced or peeled, of a thickness exceeding 6 mm; railway or tramway sleepers […]"
-"market for sawlog and veneer log, softwood, debarked, measured as solid wood","sawlog and veneer log, softwood, debarked, measured as solid wood",0220:Logging',"3110: Wood, sawn or chipped lengthwise, sliced or peeled, of a thickness exceeding 6 mm; railway or tramway sleepers […]"
-"market for sawlog and veneer log, softwood, measured as solid wood under bark","sawlog and veneer log, softwood, measured as solid wood under bark",0220:Logging',"3110: Wood, sawn or chipped lengthwise, sliced or peeled, of a thickness exceeding 6 mm; railway or tramway sleepers […]"
+"market for sawlog and veneer log, hardwood, measured as solid wood under bark","sawlog and veneer log, hardwood, measured as solid wood under bark",0220:Logging,"3110: Wood, sawn or chipped lengthwise, sliced or peeled, of a thickness exceeding 6 mm; railway or tramway sleepers […]"
+"market for sawlog and veneer log, softwood, debarked, measured as solid wood","sawlog and veneer log, softwood, debarked, measured as solid wood",0220:Logging,"3110: Wood, sawn or chipped lengthwise, sliced or peeled, of a thickness exceeding 6 mm; railway or tramway sleepers […]"
+"market for sawlog and veneer log, softwood, measured as solid wood under bark","sawlog and veneer log, softwood, measured as solid wood under bark",0220:Logging,"3110: Wood, sawn or chipped lengthwise, sliced or peeled, of a thickness exceeding 6 mm; railway or tramway sleepers […]"
 market for scandium oxide,scandium oxide,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
 market for selenium,selenium,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
 market for silica sand,silica sand,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
@@ -3148,7 +3148,7 @@ wet etching,gaAs wafer with gold particles,0161:Support activities for crop prod
 "wood chips production, hardwood, at sawmill","wood chips, wet, measured as dry mass",1610:Sawmilling and planing of wood,31230: Wood in chips or particles
 "wood chips production, softwood, at sawmill","wood chips, wet, measured as dry mass",1610:Sawmilling and planing of wood,31230: Wood in chips or particles
 wood combustion power plant 20 MW,wood combustion power plant 20 MW,4220:Construction of utility projects,53262: Power plants
-"wood logs, burned in wood stove 6kW",heat,1622:Manufacture of builders' carpentry and joinery,17300: Steam and hot water
+"wood logs, burned in wood stove 6kW",heat,"1622:Manufacture of builders"" carpentry and joinery",17300: Steam and hot water
 "wood pellet, burned in residential stove 9kW",heat,"3510:Electric power generation, transmission and distribution",17300: Steam and hot water
 xanthate production,xanthate,2011:Manufacture of basic chemicals,35499: Other chemical products n.e.c.
 "zinc chloride (ZnCl2) production, electroactive RFBs","zinc chloride (ZnCl2), electroactive RFBs",2011:Manufacture of basic chemicals,34220: Zinc oxide; zinc peroxide; chromium oxides and hydroxides; manganese oxides; iron oxides and hydroxides; earth[…]
@@ -3159,4 +3159,63 @@ zinc mine operation,"germanium, concentrate",0729:Mining of other non-ferrous me
 zinc mine operation,lead concentrate,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
 zinc mine operation,sand,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
 zinc mine operation,zinc concentrate,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
-"zirconium and hafnium tetrachloride production, from zircon",hafnium tetrachloride,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
+"zirconium and hafnium tetrachloride production, from zircon",hafnium tetrachloride,0729:Mining of other non-ferrous metal ores,14290: Other non-ferrous metal ores and concentrates (other than uranium or thorium ores and concentrates)
+"hydrogen production, gaseous, petroleum refinery operation_chemical_hydrogen_refinery","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_ammonia_hydrogen_refinery","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity, domestic, FE2050_electrolysis_hydrogen_ammonia","hydrogen, gaseous, 30 bar",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_oil_refining_hydrogen_ammonia","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"chlor-alkali electrolysis, diaphragm cell_chlore_hydrogen_ammonia","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_chemical_hydrogen_ammonia","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_methane_reforming_hydrogen_ammonia","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_ammonia_hydrogen_ammonia","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity, domestic, FE2050_electrolysis_hydrogen_chemicals","hydrogen, gaseous, 30 bar",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen, recovered from coke oven gas, FE2050_coking_hydrogen_chemicals","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_oil_refining_hydrogen_chemicals","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"chlor-alkali electrolysis, diaphragm cell_chlore_hydrogen_chemicals","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_chemical_hydrogen_chemicals","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_methane_reforming_hydrogen_chemicals","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_ammonia_hydrogen_chemicals","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity, domestic, FE2050_electrolysis_hydrogen_steel","hydrogen, gaseous, 30 bar",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen, recovered from coke oven gas, FE2050_coking_hydrogen_steel","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_oil_refining_hydrogen_steel","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"chlor-alkali electrolysis, diaphragm cell_chlore_hydrogen_steel","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_chemical_hydrogen_steel","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_methane_reforming_hydrogen_steel","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_ammonia_hydrogen_steel","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity, domestic, FE2050_electrolysis_hydrogen_others","hydrogen, gaseous, 30 bar",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen, recovered from coke oven gas, FE2050_coking_hydrogen_others","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_oil_refining_hydrogen_others","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"chlor-alkali electrolysis, diaphragm cell_chlore_hydrogen_others","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, petroleum refinery operation_chemical_hydrogen_others","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_methane_reforming_hydrogen_others","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, steam methane reforming_ammonia_hydrogen_others","hydrogen, gaseous, low pressure",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"high voltage grid, per kWh, FE2050","transmitted electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"electricity production, from vehicle-to-grid, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"electricity production, hydro, pumped storage, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"electricity production, from hydrogen, with gas turbine, for grid-balancing, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"hydrogen storage, for grid-balancing, FE2050","hydrogen, gaseous, 80 bar",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity, domestic, FE2050","hydrogen, gaseous, 30 bar",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"electricity supply, high voltage, from vanadium-redox flow battery system, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"electricity production, from stationary battery, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"hydrogen, recovered from coke oven gas, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"hydrogen, recovered from coke oven gas, with carbon capture and storage, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"market for compressed gas, high pressure, FE2050",compressed gas,1920:Manufacture of refined petroleum products,33360: Gas oil
+"market for compressed gas, low pressure, FE2050",compressed gas,1920:Manufacture of refined petroleum products,33360: Gas oil
+"market for diesel, FE2050",diesel,1920:Manufacture of refined petroleum products,33360: Gas oil
+"market for petrol, FE2050",petrol,1920:Manufacture of refined petroleum products,33360: Gas oil
+"market for electricity production, direct production, high voltage, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity, high voltage, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity, from direct French production, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity, from storage, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity, from import, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity, from direct production and import, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity production, storage production, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity production, import, FE2050","electricity, high voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity, medium voltage, FE2050","electricity, medium voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for electricity, low voltage, FE2050","electricity, low voltage","3510:Electric power generation, transmission and distribution",17100: Electrical energy
+"market for hydrogen, gaseous, for refinery use, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"market for hydrogen, gaseous, for ammonia use, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"market for hydrogen, gaseous, for chemicals use, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"market for hydrogen, gaseous, for steel use, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"market for hydrogen, gaseous, for various use, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."
+"market for hydrogen, FE2050","hydrogen, gaseous",2011:Manufacture of basic chemicals,"34210: Hydrogen, nitrogen, oxygen, carbon dioxide and rare gases; inorganic oxygen compounds of non-metals n.e.c."

pathways/data/units_conversion.yaml

@@ -41,4 +41,8 @@ GW/yr:
   unit: 1
 
 million veh:
-  unit: 1e6
+  unit: 1e6
+
+TWh/year:
+  kilowatt hour: 1e+9
+  megajoule: 3.6e+9

pathways/lcia.py

@@ -65,7 +65,7 @@ def get_lcia_methods(methods: list = None, ei_version="3.11"):
     :rtype: dict[str, dict[tuple[str, str, str], float]]
     """
 
-    if ei_version != "3.11":
+    if ei_version == "3.11":
         filepath = LCIA_METHODS_EI311
     else:
         filepath = LCIA_METHODS_EI310

pathways/pathways.py

@@ -406,6 +406,9 @@ def _get_scenarios(self, scenario_data: pd.DataFrame) -> xr.DataArray:
             .to_xarray()
         )
 
+        # fill missing values with zeros
+        data = data.fillna(0)
+
         # convert values under "model" column to lower case
         data.coords["model"] = [x.lower() for x in data.coords["model"].values]