hestia-earth-models 0.66.0__py3-none-any.whl → 0.67.1__py3-none-any.whl

{hestia_earth_models-0.66.0.dist-info → hestia_earth_models-0.67.1.dist-info}/RECORD

@@ -4,7 +4,7 @@ hestia_earth/models/cache_sites.py,sha256=tApCGZ55bRG3rl7a-jjwZokgF3dxGbg8WlKfwo
 hestia_earth/models/log.py,sha256=3NzkAEgxMGCMolQbC6nDuAJEb7ZpQNXLekhbRNjedSo,3561
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=BvGgKIxig5TeeXiVMjrtK52tJU8MKBp9mZri02j09mQ,19
+hestia_earth/models/version.py,sha256=rFzSUNBZgH06WHZggrqjYhfDC7R4tScObDyCGmEYcOs,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=rm5ZaRAzJ08m2y4BxkGh-RjudkDWgozmg3XumoRm-fQ,4511
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=BPjnWmg73i_OxM2ouCdMTWZtPIqyoUAXrvutntyteE0,3390
@@ -27,15 +27,19 @@ hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsLandTransfo
 hestia_earth/models/chaudharyBrooks2018/damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=11H8j9i2h2zChea92CdzPodWZfdegkAnQx6qYC6Ym9A,2623
 hestia_earth/models/chaudharyBrooks2018/utils.py,sha256=Z0IrvVv-dKsRt09LmT7sc6e1bWnhjZ-WBrO-namIngo,1539
 hestia_earth/models/cml2001Baseline/__init__.py,sha256=0uGrCKDNUH-MUkpvts9MyPMnZKao-M03gU8uKquUozQ,416
-hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=K3IfNziLDGvfmHsWBUXCwAl1k2Z6p-02Vi7HG3jZRhI,7708
+hestia_earth/models/cml2001Baseline/abioticResourceDepletionFossilFuels.py,sha256=6CvHcrSANH4UAWY58y2Ow00DzqitJVAteCzjsmi5cwA,6070
 hestia_earth/models/cml2001Baseline/abioticResourceDepletionMineralsAndMetals.py,sha256=yXie6UW0_I4VQcADn7Uvk4n1RmrFAauJ7ZVh7OgBUyA,5952
 hestia_earth/models/cml2001Baseline/eutrophicationPotentialExcludingFate.py,sha256=nUWKsn3COqAOrYNmiBKnA2rUs88pj4o3k4fHKA0TVbU,1068
+hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionDuringCycle.py,sha256=UUzdnKE4J9KHvFdJVRgVfVkTuMfSxK_nW-aMkTuNoCk,5546
+hestia_earth/models/cml2001Baseline/resourceUseEnergyDepletionInputsProduction.py,sha256=hXGdx1IA5yeVLHrRrSZWCP0s7ucSRWelYNr6aQ9YTyU,1205
+hestia_earth/models/cml2001Baseline/resourceUseMineralsAndMetalsDuringCycle.py,sha256=WUIA2tDBoAdTQ6Aa5GgEpvOGyR-O6KuJeeIffUpTh2U,2708
+hestia_earth/models/cml2001Baseline/resourceUseMineralsAndMetalsInputsProduction.py,sha256=WfFL9n_KyR2XXPwliHu6gpgixFrOWB4XAO1VsJWgIio,1200
 hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=N8neIISqeTAS7VGTNWbbbozOtfCb816qwwHCnv7Nnpw,1113
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
 hestia_earth/models/config/Cycle.json,sha256=pl90Wepb0ocERsRm2ZTeXYXJvBrAwfIjjLQQQQheNmM,56452
-hestia_earth/models/config/ImpactAssessment.json,sha256=AAa3VMREvIDUwrqmRq67VQcB-wxEQTlZWiewBoVuow4,57936
+hestia_earth/models/config/ImpactAssessment.json,sha256=vASduDfQQaYjRR1GRG_gXCqP7j5j5InkNBdXK04VF5g,55628
 hestia_earth/models/config/Site.json,sha256=i25vGzBYcaGnU6BvNE2cdmpo6DJolXKKogyCfXaMTuQ,13146
 hestia_earth/models/config/__init__.py,sha256=l1WqL7ezlank86ABP4zUia_hIvM9ba-sOE3z6wNrea8,2333
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
@@ -53,7 +57,7 @@ hestia_earth/models/cycle/energyContentLowerHeatingValue.py,sha256=AyVKCQbb3Pto3
 hestia_earth/models/cycle/excretaKgMass.py,sha256=iA8Kfl3WvyxbQpx1QOGPQZ9O_Pc5rj7xhucYx3rB8Co,3949
 hestia_earth/models/cycle/excretaKgN.py,sha256=mgJTneQIYJ9Su-rTK5ppb_k3YhICFNWsfPZtGR98RI0,2968
 hestia_earth/models/cycle/excretaKgVs.py,sha256=ed-DcQoQXZgWF8UZDs2N-G6EBIOPmpXu3BD6jdmh0V0,2973
-hestia_earth/models/cycle/inorganicFertiliser.py,sha256=Yt5NcP9FQEzWwlritrPGbhh2W9wR378OM3lDPBzDiL4,6967
+hestia_earth/models/cycle/inorganicFertiliser.py,sha256=pH4jHB6wEQnr5YQ9AhVsuROfEFb07SNcBMPlHvf1Fjo,9127
 hestia_earth/models/cycle/irrigatedTypeUnspecified.py,sha256=KlIa5eDvT47Twz6Q1kpw0rMlRjCK25CExaW58DEvc9w,2125
 hestia_earth/models/cycle/liveAnimal.py,sha256=5dlvuVAu24hLLOVXsozcVzWyDVzddzoungUBwrBDS-g,3986
 hestia_earth/models/cycle/longFallowRatio.py,sha256=_h0kub99sACO87IfjMeiu8IgdK2jaeBlgGA9A9-ViZA,1683
@@ -88,7 +92,7 @@ hestia_earth/models/cycle/completeness/animalFeed.py,sha256=8Fo1TqwSuiPudvd2vJ-L
 hestia_earth/models/cycle/completeness/cropResidue.py,sha256=Jpmm5SAiyUkaFp8EsBIQ55jiCyn3C20a3au_zaPRnEk,2837
 hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=uEXMyfMCvvZKD3jcQGAIZOv1cZLrhpXZiyCn_56kxig,2125
 hestia_earth/models/cycle/completeness/excreta.py,sha256=2yVxcuWjAh4hoEukaMJ90VZpkCL7SfpwIgzigbjVaF4,996
-hestia_earth/models/cycle/completeness/freshForage.py,sha256=bfPoOvhQU6nztSTGYlonv5ungk5TmtV0x89gk3aT_Dw,2256
+hestia_earth/models/cycle/completeness/freshForage.py,sha256=qxo2MoVCgrMtcj-h_uHfbVZpOn-THx8DkyyRXCXixLk,2412
 hestia_earth/models/cycle/completeness/material.py,sha256=UQH2oRnUY-Q-_MVuOlTAYqQxc7wWDM5mi_iFmp9PlIQ,1362
 hestia_earth/models/cycle/completeness/seed.py,sha256=rLNar7q39YqdtyFLBiyXeRbsVSWFRd8H7Bhjx7ATISU,1932
 hestia_earth/models/cycle/completeness/soilAmendment.py,sha256=AXGtO1d8oLWgvmVLoNBqknsH2lmr5y15E2xkgZpkCSU,1392
@@ -99,7 +103,7 @@ hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioEnergy.py,sha25
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioFedWeight.py,sha256=7Dss1AIbG7GimQ3-Ecv2wsx1PrblZhHFYhMHWoyvPc4,2140
 hestia_earth/models/cycle/feedConversionRatio/feedConversionRatioNitrogen.py,sha256=RV7lLd4PiFRCkH83-DvuZKnOCA9bXbYOcDHea8Wz4LY,2603
 hestia_earth/models/cycle/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=_YYV49HtJqGB8cnjTG5DRCrHyUT2DP3gzcw8He3FqWI,6031
+hestia_earth/models/cycle/input/hestiaAggregatedData.py,sha256=LQ53JfQqM4IHSChxxYKyjJNyCqny28PU4xMWMbRWqFs,6286
 hestia_earth/models/cycle/input/properties.py,sha256=xJojLiaMSqFVunJi8aOiTtn8wzkizduinMSxsGGhKN4,3187
 hestia_earth/models/cycle/input/value.py,sha256=kolH9Fc5GIn9OVH2DgHEaW8ksS4xisy0LerS3WkKK9E,1550
 hestia_earth/models/cycle/post_checks/__init__.py,sha256=5ThdvGKp7ilFOzn8Tq23c4XXqhA345PYIe63yOtGJTY,336
@@ -145,13 +149,15 @@ hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=8B1GVsn5gEXVW3i
 hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=hHHhu_EZWhxAKhGJgrHY3vNI7Kuy6h8-JyOuas7KRXk,1524
 hestia_earth/models/emepEea2019/utils.py,sha256=oTHjbRRwJZv_tpO9MOlfpyQRmN0a1kvEZsVHUPliZpQ,4014
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=NkP635TDNs7bQBv2n9tUTLwScZHfUkSC4XzLVwjxWtg,2240
-hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0lQ58YPprnvvSLTn3QV5T2-tPcC4,425
-hestia_earth/models/environmentalFootprintV3/environmentalFootprintSingleOverallScore.py,sha256=Jlenb5nh0DKCoh8Pdd6-3Bxvyg9fB3bw1ww3_y7nE9w,5796
-hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandOccupation.py,sha256=r3GV2pspKWAlKU46TMh_6D_rrXtY_onhk3RnukzJjD8,5095
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexLandTransformation.py,sha256=D_le-V9J0JFcCT5YBXYWv_Z1IQ67EjvwDiaoDuVeJ6w,7072
-hestia_earth/models/environmentalFootprintV3/soilQualityIndexTotalLandUseEffects.py,sha256=SIjFYPv4n3mziohW2nlycaMssHQ3ws79hqHa4i3sCVI,2997
-hestia_earth/models/environmentalFootprintV3/utils.py,sha256=fZ99_G0Kh4OUW5wH-LglzCrKp8l2plKuCs4yvUH_3hs,699
+hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
+hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=pNiL6WNAuRqTQ9lwEasxAAiAm7vhZUs5bxLIQTCSb70,5733
+hestia_earth/models/environmentalFootprintV3_1/freshwaterEcotoxicityPotentialCtue.py,sha256=N_gw2aNoCMW5Z1XM-uAyCF1kfpZUI07giv_bo3Lmr5Q,918
+hestia_earth/models/environmentalFootprintV3_1/marineEutrophicationPotential.py,sha256=UM9pezQeETfk9i0FtOBRdreaaJ9OqL6G4gYljrKOz-0,1063
+hestia_earth/models/environmentalFootprintV3_1/scarcityWeightedWaterUse.py,sha256=2m_vX-Ziy8rrVqf1fBpKzLc1FFXs48XQRygvCKS7i-0,1263
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandOccupation.py,sha256=r3GV2pspKWAlKU46TMh_6D_rrXtY_onhk3RnukzJjD8,5095
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexLandTransformation.py,sha256=KJfcFqVYDLLkymWUAf7NI_7JSwcEPgjw9PKVwyhXShQ,7318
+hestia_earth/models/environmentalFootprintV3_1/soilQualityIndexTotalLandUseEffects.py,sha256=OS746_21QBMN7D-B04HU-rWwXFuaVD6qy-TTd_Ea5zU,3318
+hestia_earth/models/environmentalFootprintV3_1/utils.py,sha256=fZ99_G0Kh4OUW5wH-LglzCrKp8l2plKuCs4yvUH_3hs,699
 hestia_earth/models/epa2014/__init__.py,sha256=ckGf_6X7CCzI_18OqchEkuJAXKXM1x7V53u480ckknM,408
 hestia_earth/models/epa2014/no3ToGroundwaterExcreta.py,sha256=fN4fOOcjBg3tl0lzNeJ8mzg6mrvQRxilx-R5Gc4l4Nw,1724
 hestia_earth/models/fantkeEtAl2016/__init__.py,sha256=NtOlRmjTA4e8i0nW8erwdm-DDtfYlbLiARqqv82bkU4,415
@@ -208,8 +214,8 @@ hestia_earth/models/haversineFormula/transport/__init__.py,sha256=47DEQpj8HBSa-_
 hestia_earth/models/haversineFormula/transport/distance.py,sha256=163KrmKzlEQuKYT1ZvpPgmKlv_-mmvxp0A1_uKya99w,4203
 hestia_earth/models/hestia/__init__.py,sha256=o5vAmPzSaK9XPgL8GCne3-lugfCOgZhHELYolNgqyyY,407
 hestia_earth/models/hestia/landCover.py,sha256=L0TsEzDAF4tczU_TSa-UrtUbJiBjuUYxDY64-oOeT-o,30224
-hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=-7ToRvCVPD6AAcjxorPS5jSWio7JAglHrdSS9PPyPqQ,1551
-hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=TCskVLhYXBMxdeZM-gN4Tdixk5ua7eVn-o5dfIT_H7o,1543
+hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=JdiCiy8nEH7i59vcDOi2F4-3jANqtlfHanMhR4rBFNQ,1539
+hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=WxSZZ3wDJefZ3MFOulXtbcLW-YtGehpjdhvAzNL6gJ8,1531
 hestia_earth/models/hestia/residueRemoved.py,sha256=VdB00ZdwQMIj7qsZ7549DQmbqWtCQtFZpsUlc_11yt8,2857
 hestia_earth/models/hestia/resourceUse_utils.py,sha256=7DJE4yGUl0BCiNdtr8u_41Uz8m9yY7tdlC9ggkGwh7c,8639
 hestia_earth/models/hestia/seed_emissions.py,sha256=58hmHAgemOuGVIsij-FWF7EsGmEbCSfzFAEfXkXSyEE,11566
@@ -227,7 +233,7 @@ hestia_earth/models/impact_assessment/pre_checks/cycle.py,sha256=2kg2_X1PRNxevAr
 hestia_earth/models/impact_assessment/pre_checks/site.py,sha256=GMse3nBIXBFMJqMUq6C_Sqw8uWm7ykh46enMtmHPYbU,911
 hestia_earth/models/impact_assessment/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/impact_assessment/product/economicValueShare.py,sha256=EFVAQ6ZDC_jPRMA3K3lVVLR6Ow3nzMeG6zhNlwICef8,1470
-hestia_earth/models/impact_assessment/product/value.py,sha256=opBfdXZ8GfTxdMkr_XeOFb3gZ4slGpUNE9RXHH1QUHw,1332
+hestia_earth/models/impact_assessment/product/value.py,sha256=K88uLQ7m_vvoVuTXjolV9fdzds6DO6VHRB-1f3CA7eY,1331
 hestia_earth/models/ipcc2006/__init__.py,sha256=ReUFPLqIyp16QEOGaiHmz41QbuwYBQYDKVtw6KuRDIA,409
 hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py,sha256=6FDgMH5eiO1mEn20oerYpWty6t9058JS3MCdfVmeY_o,2714
 hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py,sha256=vD_kpvOJmjTOjDEnlqSYBSZxjuPGvzpmCr0JIC84GKE,3431
@@ -248,9 +254,9 @@ hestia_earth/models/ipcc2013ExcludingFeedbacks/gwp100.py,sha256=2fFEHTXxel_XPiMX
 hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZiTvu3mpZy_3j0xcd06RHHCfPrCMgU,427
 hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=HR2vnOc64mg_fxe9m5NmqxBZ8-aFuKb44gmItyuRL1s,1041
 hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
-hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=rOPA-pdNXq6Cg1AlloDqYl7QMKQc2OzJtUiGcqRQ1Rw,19940
+hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=hfiDkbsiSkx-CrravYwF8C0McK4w9-PZL5sQWIdHrLM,19944
 hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=lT2QVV5c2LvQqZRfPEvFT_bMTayMXgIsFLnx8I6iYzw,3089
-hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=dBvu1--OfIr2GwoF4eznG8MY7MBajWyMLX2VSoLztvM,18945
+hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=QclpcQh58qlUIFn1wXH3pktfQ-x5lw0YpEFUdMSr68I,18949
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=7AFU2Q0qPAvv6uEKWByS38jl77FvjTPbGm2GQ53waGg,3499
 hestia_earth/models/ipcc2019/biomass_utils.py,sha256=R7t-YWq5K-AMHihlWh8hWHfhaoGZMmDf8SNFM6-wGdU,15895
 hestia_earth/models/ipcc2019/carbonContent.py,sha256=tlQvu4Auhpjmaz7XrZz86xwxVrJhsYYf8DFA_aQeev4,7255
@@ -260,7 +266,7 @@ hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=WnKmSQSqr1Jv7_95DLgtufPYG
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=TJ4J7VA5n4RPrJYZQeR3lc3ZoCw7T1E5Cb1XJewr834,7331
 hestia_earth/models/ipcc2019/co2ToAirAboveGroundBiomassStockChange.py,sha256=s0zViR8Ab_b_sMDwMzopN4SAWdm6wpzGs-Hf_TtWaiw,6641
 hestia_earth/models/ipcc2019/co2ToAirBelowGroundBiomassStockChange.py,sha256=trinj_A8H6H_zMaQMjYXcBePvjDKXhbqmIpeet0lW6g,6691
-hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=SjE2QtBBV6DMM5sp5RGBoKcShojZFmSZwMGUSXXHtAY,57884
+hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py,sha256=SeBGZr3qucktpRMfvIRMqFnW0C2QQxQnRfHYNoHshZ4,57933
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=7z0zdqiiWQwkyJCgSNMoK2mft3cJkTRlqwKrMuSKdWI,2454
 hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py,sha256=UQjmccUsKxsycG_htbD1-T2xw6AklKqIR3u8KIMGBOY,6709
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=Ofld5SuRKndcKB3FFFoUdzSgNq-gc4kmiNyyrPKQ3Io,3580
@@ -284,8 +290,8 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=px2SN-u
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=fmmFgjtvOD2TrrLY03jYly_KvDnCsAXqhL_tmZQQt-A,4480
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=9dx_MRTwJGxJRq6mj2EJQMdQ2w6j7lw0fQk0If_cIGc,4152
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=C9ef41fd-gYixEV3sTs9VMHHdnSZJ14kbEEmMG116hY,8653
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=hgMh3p7tflTo06LJjAkoz8btrl8Rc6lYYvZp1ooJIaI,76214
-hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=ICeEoCR334zzV3CfvvMf_d00jtREkRO1t_gNlB83Avw,64003
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1_utils.py,sha256=XynerdHDnIx1BOeu_dc-R3F4fOACxdBAUm0don3OINY,76203
+hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2_utils.py,sha256=HgvM6PpfSvSBae4idOHkunD7zffT3z6hTX6YVIocGSs,64028
 hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py,sha256=FFcjdkYq5NJwAu4bWZJUao4MoDHvgbXmXCnUNKD-a3w,9842
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=HWRkpYpGqvMfol2dPb9pFkNzoGj7n6sRpyIjGSVM9lQ,10306
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=KvjIQ3xwbq1rk3thHlkGgQaWKgh0hCkNnzC53JW9634,14178
@@ -408,7 +414,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=S1zlux02gU2Lajrtoq-zQ
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=u-tcKGaNFryejlnVJTsBNXbfDmzoS3ncapYQiS55-nk,102053
+hestia_earth/models/mocking/search-results.json,sha256=ZEwud-KZeXQ0-UYWoP9METNQ_llbCJhbmUXTqITgk6k,105086
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
@@ -512,7 +518,7 @@ hestia_earth/models/site/defaultMethodClassification.py,sha256=dd8d8agEGZxnDhZWb
 hestia_earth/models/site/defaultMethodClassificationDescription.py,sha256=PfViyDtpMfBZTea4XkuG5SK1Ac3x3RkK9lA_ogiNJNg,1474
 hestia_earth/models/site/flowingWater.py,sha256=v3g5722GIA4zQAUQI9yGFiZvFvI1QAVZqlQrY-6_B3A,1731
 hestia_earth/models/site/freshWater.py,sha256=FXs3Vt8V4e-wn325_dwSTOKlZtn5ksNUpvYGDeLJShY,1255
-hestia_earth/models/site/management.py,sha256=6MY67jam6JFnPnXnua2DJ6Mxpu8tffELaLr9q8uYw4A,15722
+hestia_earth/models/site/management.py,sha256=MJgbfphil6asmbXR7K2Y0kIokxSd1fLQCfLGAFYZ-Uk,15730
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=F2ShinHf0m9qKa1nCYBspsDkRY6jzOl0wM8mSDre22I,14916
 hestia_earth/models/site/organicCarbonPerKgSoil.py,sha256=t--wAshiAKS-JvEKhLFRadGvgSBv5NFZ68jdyms_wh4,1945
@@ -570,12 +576,12 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=pPX8u-Aq6Pg5Y9xw0CS0S2WkAHQpOMl0lL2tLQwwOuU,918
-hestia_earth/models/utils/__init__.py,sha256=ADtNs74scoLRPsBF8J9K-QE6WcNB2qFhBmR8abJAYh8,7302
-hestia_earth/models/utils/aggregated.py,sha256=01V5RDvO9EZAEiApY7M2dUoR4GcGxvAH5lvtIK_qjyI,4946
+hestia_earth/models/utils/__init__.py,sha256=nFFkL46giQRAakpUmhlWq57f_M3UI36NMLYKJbC8nWg,7436
+hestia_earth/models/utils/aggregated.py,sha256=cTUzS60t44_viF1wMnTTVpFq8-6cKJTQuQXPHGq6RgY,5102
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=dxrbC1Xf140cohxTbSw6TxLAnAASWTdNZwBBam4yQnw,171
-hestia_earth/models/utils/array_builders.py,sha256=QEkM7e75Y9aq5yEPEk3R8md36IuvCDkpekdGm3uA0uk,19397
-hestia_earth/models/utils/blank_node.py,sha256=M7ioDaUQn2_JjYamseIzTGpTcP8uU8Ii2DKqUDWVDjA,52180
+hestia_earth/models/utils/array_builders.py,sha256=ko1pDZKaUudZqxOZ99vJamKAdoR6ND4ZmxVrYH6YjPc,19498
+hestia_earth/models/utils/blank_node.py,sha256=dvVv9JXrexEAzACs-CIObZlFZ4NrwxIND5MhQgbIlIc,53935
 hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAerXRDrMHpjasAZ0,377
 hestia_earth/models/utils/completeness.py,sha256=2-GusD9UycobDZq8y5jar0ZcOjyqnSbzPRT_5XMc4YA,1259
 hestia_earth/models/utils/constant.py,sha256=6wLx8xb2R8HtpEpVy5e-PbioOo7QCu2n-W72fs6OvgE,3411
@@ -585,19 +591,19 @@ hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDy
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
 hestia_earth/models/utils/cycle.py,sha256=PmloVCSU4TtXnEe0ltP--bTIZBXVB-rEFJrV6IYsdeo,16209
 hestia_earth/models/utils/descriptive_stats.py,sha256=EMVwFvg2OnZgKRAfireAoWY2EbrSvqR0V0bK9B53p28,1583
-hestia_earth/models/utils/ecoClimateZone.py,sha256=kD5DGActHAfMCJykKQGkwEEicWt7PQlEIX9_PkqXfP0,4265
+hestia_earth/models/utils/ecoClimateZone.py,sha256=etsWsAQeYHCnDJJi-ezTrzjoaFILC1e3SMfSNsdRnPs,4241
 hestia_earth/models/utils/emission.py,sha256=H_apu-Og9SJTLVU2lU56IsvSU22-9J7OrqXk1b2qnSE,3638
 hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk_OKb3sA9Ovcff3fRQ,428
 hestia_earth/models/utils/feedipedia.py,sha256=wzzrMbYlda1XCpWiObLz4bFLXbAZejHcxsXJFr4U_AM,3953
 hestia_earth/models/utils/fertiliser.py,sha256=DBO4OBNgnQJ0fCQMDkIk_ZGZX-uKGaTFZCEXfAnJciY,690
 hestia_earth/models/utils/fuel.py,sha256=XzOELV3dn506PkMKjFQ_ZKVZInd2lL2x6PKdsa6Po4M,1429
-hestia_earth/models/utils/impact_assessment.py,sha256=VoJVgSVJkXFvlIukCBm054KGMCBeot17k3DRwo_3_QI,8137
+hestia_earth/models/utils/impact_assessment.py,sha256=fA2hK7xpHKYBZTiz3xvMgO8yTrUtDptoKQRAXdPsahU,8231
 hestia_earth/models/utils/indicator.py,sha256=UuuraMUdKLqjcm_zEoF8BaMb76qW23djIA_2DeaoiEw,700
 hestia_earth/models/utils/inorganicFertiliser.py,sha256=_dLBY-otGkLr8PobR5dQ89bF2uwc2PB4JPrHFSksMEQ,1900
 hestia_earth/models/utils/input.py,sha256=gsVFKTC9WF8dO6YAg_-H_GAOQTnvAr49Ox5-eTH8zf8,5145
 hestia_earth/models/utils/landCover.py,sha256=8-nfynzCx9gf9YfhpuoH6Cn4kQwWFpYA5RmoGW-0ETE,300
 hestia_earth/models/utils/liveAnimal.py,sha256=GnajBPZw5d94raf80KtLloaOqlfqGAPwUtP9bRlGWeE,1754
-hestia_earth/models/utils/lookup.py,sha256=VMdoPiNDuN90JNDDgYuv3iAQFk_cXu3p1ZonPi9QBFw,8726
+hestia_earth/models/utils/lookup.py,sha256=HR0uvZ1--KviBaUbYYyzlZDs7YioTI1NtyoQqFweMbc,8700
 hestia_earth/models/utils/management.py,sha256=W5M9k0arraVUGh4ZccVqgb8rSSLxHM6rkmi4MSzV6Dw,413
 hestia_earth/models/utils/measurement.py,sha256=izEiPszUcPA22zaIc0OuF7Yk82JWu5cxi0Sbz_9YgBo,11142
 hestia_earth/models/utils/organicFertiliser.py,sha256=2HY-a0EBzUw4DkEAXClLMXVCEZTKYf0BwFHBo7lQ5Tg,363
@@ -605,7 +611,7 @@ hestia_earth/models/utils/pesticideAI.py,sha256=_mlhKnA1TxF-x39CPNnOGXk6754SoSQq
 hestia_earth/models/utils/practice.py,sha256=tNadOzsrNlCEt801B815XaruJXzZ5yPASam7B3sWpXE,1091
 hestia_earth/models/utils/product.py,sha256=DhDgiReR8k9n9aaRM2xk3PIY3nfoE1ISKg9pKsBVzVQ,10143
 hestia_earth/models/utils/productivity.py,sha256=rTJX_nemxHpOcPN7jiM2hFHknoLUIW8y-hFxVxIkg70,593
-hestia_earth/models/utils/property.py,sha256=qtn1BLh3V8wlUE0KR9AZQ4qFD-ztFmvyG9kiUhUUzQk,5402
+hestia_earth/models/utils/property.py,sha256=-qQTdGLmH3v_5IS2pOkZV9RIaYbJ97oWPUni3uTiHz4,5585
 hestia_earth/models/utils/site.py,sha256=MyWh_jhY1XbN2EZRdJsHzNJW0PGQqEC1wAmiie4nQy0,3905
 hestia_earth/models/utils/source.py,sha256=Y-CcO5Y3q5Hz4A4RdX35C1EUjL9w1NKnOrzVfOWQ7nU,1748
 hestia_earth/models/utils/stats.py,sha256=-0vvhSDAhp4ZYXD1l6sO2hdok8_HgUM6OjCSYGSTHqU,15291
@@ -616,9 +622,9 @@ hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zu
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=TGXyusrRd9shT842iqbrI6MkQhICgw7uYdrl4jsDrg8,4193
 hestia_earth/orchestrator/__init__.py,sha256=ntPWzdomHMdKejrnUlVPCUrLw0P2C9UIt3jRJD_Gwn4,1402
-hestia_earth/orchestrator/log.py,sha256=rvuc221TZCXB1s_Qxme_lTPAI9cZWkmTvnZHGqSDtWY,2214
+hestia_earth/orchestrator/log.py,sha256=ZVqekPDbXw9zIzxaiGZ86PdMhVK7w99eu-Rvs28VCeo,2580
 hestia_earth/orchestrator/utils.py,sha256=LAMUTyIQ-90TR6CUljWPbCNBsAMeukOhW4zoPy7LzuU,4111
-hestia_earth/orchestrator/models/__init__.py,sha256=LdoDX-_wv6ZUCNomEuUMPZrr2jmfsiU_LIcUF8V1Px8,4010
+hestia_earth/orchestrator/models/__init__.py,sha256=0YtIyaNyhavK8Vq_y5a3smynLNXaGnuaZte5HROlNFc,4237
 hestia_earth/orchestrator/models/transformations.py,sha256=zJwfVXabudLXhdyz0Hsk4IV_2OjgMtaYEZbD9kuZtLk,4128
 hestia_earth/orchestrator/models/emissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/orchestrator/models/emissions/deleted.py,sha256=KC6J1bdMJC1rBFlWW5SD1NhbN8kyBPFdncbtY9OfYBU,575
@@ -634,8 +640,8 @@ hestia_earth/orchestrator/strategies/run/add_key_if_missing.py,sha256=t3U-v87Xpb
 hestia_earth/orchestrator/strategies/run/always.py,sha256=D0In6_kr28s-fgqspawgvj5cgFClxGvepZYqtYsjWVE,217
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/test_cache_sites.py,sha256=eZkbgAhfA-67GhPgE4lk8byHnYvX2Ate1KPsE6jH1-c,2954
-tests/models/test_config.py,sha256=JhO7T3bNh2Dl61pKAyM4iEPKybfue02qdneHcJTO2Ck,3368
-tests/models/test_ecoinventV3.py,sha256=_BqfWiYFaw-Y7A-EeabHEnja3d7yb4Ed7gGGvu3Srpw,1936
+tests/models/test_config.py,sha256=w27OA_pk9NuDbxzMD--l72Ea97SL1HS6bos6mOUCy8k,3386
+tests/models/test_ecoinventV3.py,sha256=ojL19T8kFNCiM5i-EgvXniLWBxU4RCsBOgIQ-sbGaMM,1894
 tests/models/test_ecoinventV3AndEmberClimate.py,sha256=_EOxdrdavXP6L5_LtvaVbXb_-56UJXSaiPhpGntmwVc,801
 tests/models/test_emissionNotRelevant.py,sha256=YXTdRfcdR_JepHuj2P3Y3r0aFMKNOmsXQHY48tmLTQo,1316
 tests/models/agribalyse2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -659,9 +665,13 @@ tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandOccupatio
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsLandTransformation.py,sha256=lcyMTaNMbIjzZrbPxejujfYyAEj2XOH5Ei9pmAQAi7k,1912
 tests/models/chaudharyBrooks2018/test_damageToTerrestrialEcosystemsTotalLandUseEffects.py,sha256=NTc3PZZRc9ZqGpaARdbuzLWR5bB0HCPw5AMdGmwVsRg,704
 tests/models/cml2001Baseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=lR2PX0mmppnSMWj9-vAD1XUBXQab5w-xS5CbWbNl1Uk,8369
+tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py,sha256=XseqzU8JE3MOeIM_3cBIlNhTInucG_VNfgyUIpKAdrU,5663
 tests/models/cml2001Baseline/test_abioticResourceDepletionMineralsAndMetals.py,sha256=y-E5t5x2VcgPsy3cPFBWyULd6vieaGjDY_J2GVJMtUo,4081
 tests/models/cml2001Baseline/test_eutrophicationPotentialExcludingFate.py,sha256=ZIIx_EiYbUxUoAS7NuQrxqwTFS3rXQm9_1AsqF_bhB8,894
+tests/models/cml2001Baseline/test_resourceUseEnergyDepletionDuringCycle.py,sha256=QzQg_AdpZ_5jUprevm8F_FOTHbDnxEkxnjSpKCNxyKY,4719
+tests/models/cml2001Baseline/test_resourceUseEnergyDepletionInputsProduction.py,sha256=KPEC2CXgO78Kkcbi_Iu0AzKRZMYJSfkeEV-kspSyLYA,910
+tests/models/cml2001Baseline/test_resourceUseMineralsAndMetalsDuringCycle.py,sha256=kko6cV3YRmcxfYdJ8xQuTeo9Bro9BuBbgGBO2gklxWM,2085
+tests/models/cml2001Baseline/test_resourceUseMineralsAndMetalsInputsProduction.py,sha256=_UqFak1-DX6b-brX2xt3zpfYUhjFPRoUMhgF9l3cw3I,912
 tests/models/cml2001Baseline/test_terrestrialAcidificationPotentialIncludingFateAverageEurope.py,sha256=t3WBdg_aTYSLfaqeXUDyvQJ8ZqbvKwv9RKaZyRzj61k,925
 tests/models/cml2001NonBaseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/cml2001NonBaseline/test_eutrophicationPotentialIncludingFateAverageEurope.py,sha256=Snt0zwI1fF2_ome79rTRZjl5Oc8dZfbcqX8lXwxabVs,910
@@ -759,12 +769,14 @@ tests/models/emepEea2019/test_pm25ToAirAnimalHousing.py,sha256=cs3UaJ7ucCryOaQy0
 tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=zRTyeeQM1fRdRVFWbtCNndaddDbKHU1xLzmp_psDceE,1518
 tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwEZslxgoPNyQN9OQFDNY3uGNX6E,714
 tests/models/emepEea2019/test_utils.py,sha256=G6z8tEfWM0OPnUBaFCQgQyEi5-kRF_DqsqdYaPnzR_I,8761
-tests/models/environmentalFootprintV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/environmentalFootprintV3/test_environmentalFootprintSingleOverallScore.py,sha256=BMmUURDMn6z3gd3bchwwwrNyft0hYemieJe-855GOyc,3349
-tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=ZPDKM23qlLMe_ZzeA-QIutSkFlod3BsmjloA9WA8nug,845
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandOccupation.py,sha256=pgauGmFl52lQJVPaDHryrUU3LSmjWC-Al_XBqQj33u4,6116
-tests/models/environmentalFootprintV3/test_soilQualityIndexLandTransformation.py,sha256=pZPeduNitr0VCfsNtg0M84EhiCpjTwUZ1qnj_7tWSeQ,5797
-tests/models/environmentalFootprintV3/test_soilQualityIndexTotalLandUseEffects.py,sha256=j6V2AE1I98hi-Cv_-L5Rc2zzL0au9SWW4XnMkSuV7yo,2314
+tests/models/environmentalFootprintV3_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverallScore.py,sha256=F4oz4UadhpBlyh4JvLPOWAxGSIKnJVTTDaSzOT3Ihgk,4909
+tests/models/environmentalFootprintV3_1/test_freshwaterEcotoxicityPotentialCtue.py,sha256=WE-DcerljCjXMYE4f3Sv5ZCVHP0oTjbWkOGuvaa4p10,926
+tests/models/environmentalFootprintV3_1/test_marineEutrophicationPotential.py,sha256=kY_pu_7SjSZl_l41mttMn4BpKl13TTV9jQYSHFMNXhI,968
+tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py,sha256=zEdWXjtlZv5Nyv0EZxvLxe4BQ-4_ME38bMfNvFZXjl8,1169
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandOccupation.py,sha256=-E8Q5JxIdfF11oqGwRJqcqGO0Ao_Bva164ELMR7sRsI,6197
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandTransformation.py,sha256=xRTBMfQ1Qxs_NIoEFtshM_uzAAcFb80k1qGuFLJa2Dw,7650
+tests/models/environmentalFootprintV3_1/test_soilQualityIndexTotalLandUseEffects.py,sha256=oeLb8kQ2yabnlCaBw7MYF_fMfVNea4ogr9lWJ-u3SXM,2389
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/epa2014/test_no3ToGroundwaterExcreta.py,sha256=ESVz4UURvQfhjGBTxjuAV_bymMBcvGNfLAkYMvNup9U,1217
 tests/models/fantkeEtAl2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -828,7 +840,7 @@ tests/models/hestia/test_residueRemoved.py,sha256=WkyWaW_Ym-KBXFYJHcMR-mliiQX4vw
 tests/models/hestia/test_seed_emissions.py,sha256=dCUuJBkhwNFBhhcypQN7eMqrWZ9iGCnypoidO5DfQYw,921
 tests/models/impact_assessment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/impact_assessment/test_allocationMethod.py,sha256=HkUt6oWdEyFSdxMpx8y_Oxk0nO2Fi9B_kUZcVte9tzg,1223
-tests/models/impact_assessment/test_emissions.py,sha256=K6Mi800irxajDfsmG7RHV-Y89U2KoCT_k3VR-RqCV24,1019
+tests/models/impact_assessment/test_emissions.py,sha256=nygoe5JeuQ1rbMQSqAr8oBSm6jC4ygZb2XNHyEx85lo,990
 tests/models/impact_assessment/test_irrigated.py,sha256=3elSWEN1NE05JO1OMfJ7uf0JmU-fqLpazCvS6FVxMQE,377
 tests/models/impact_assessment/test_oganic.py,sha256=Ei73bkB2MzKlr3jZmg8Cimxw_ImJSBdB3xKBn6ZCRx8,375
 tests/models/impact_assessment/test_post_checks.py,sha256=B-KVdkWaG8v-9aT1fNDQ9sml3q9I5XPo38NKxear1nY,310
@@ -1115,7 +1127,7 @@ tests/models/site/test_defaultMethodClassification.py,sha256=MoG9inlu5GrNL2QJpO0
 tests/models/site/test_defaultMethodClassificationDescription.py,sha256=7Dg40MLSZnW1X3ZXg2dXMzc1hUqIUIuiga5KX9cVscU,767
 tests/models/site/test_flowingWater.py,sha256=t_rxvdlmUVDsFBoDF20_zDM-0iiLKkNCV7knO9l1T7o,1370
 tests/models/site/test_freshWater.py,sha256=GOeAxHhPW_2E1wQdQRX4W-r7mnb_LgmiAVLImitoApw,982
-tests/models/site/test_management.py,sha256=Z6wwL-UcOktgE026ePskAo78FTwBU6RqZtCg4VO_PYM,1746
+tests/models/site/test_management.py,sha256=iMA9SpP7yOhHpsvCyizCsSbvw0ZSayvJ5koEZ-Kjbs0,1736
 tests/models/site/test_netPrimaryProduction.py,sha256=JCxG0MODbKVvl3hOqmKzh4FjHYn3Xs9KsVod6LvKQII,1108
 tests/models/site/test_organicCarbonPerHa.py,sha256=XtGrE7ZqthTF0x8lDxJ1slNd_GvYHEyEydcRgA46jEc,3207
 tests/models/site/test_organicCarbonPerKgSoil.py,sha256=0M-NMg_T3UXzGT_VlKOKhSxg4cZ0_zhd3FRgY5Hpj6o,1087
@@ -1168,8 +1180,8 @@ tests/models/transformation/product/test_excreta.py,sha256=Q9OQpk8qVPv3alIz2i5XQ
 tests/models/usetoxV2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/usetoxV2/test_freshwaterEcotoxicityPotentialCtue.py,sha256=eq7Gcmfya9g0eOKKkuBhz8vq7xi_CmZ_LTSxueBwZt4,835
 tests/models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/utils/test_array_builders.py,sha256=uHxO4beJhdJD-1lI5aPEAsYziQP8SN7AJ9PEY67DpaI,8417
-tests/models/utils/test_blank_node.py,sha256=G_hH-Gk3__1ZtHQcsdYMbUMwVNSTmYcVBs5jcReIYGM,39945
+tests/models/utils/test_array_builders.py,sha256=4giHf3bTNd2ReAgcKinKjLpQOOcmfF0qSInngW7UdYc,8434
+tests/models/utils/test_blank_node.py,sha256=gWdKjXEDkfHGkYjkZwyCOfkESsE5X23OTqgm0OxkzPA,32974
 tests/models/utils/test_cache_sources.py,sha256=xcGMVbYoV23YC4HLBTL_4qZP1ME2cp3DFebgJMxI2TE,721
 tests/models/utils/test_crop.py,sha256=d508vQdtB_Q_6hEahNueXed5PaEiLeN7ScbwZIKCiDI,862
 tests/models/utils/test_cropResidueManagement.py,sha256=RQt8lexeJzCyxZceIutgDpw7BpcqmjsUB0C0yZC2QpY,930
@@ -1200,7 +1212,7 @@ tests/orchestrator/test_models.py,sha256=v5VnyELmrSEcTOtw4lyk2U0r016z8Xx34EFs0FJ
 tests/orchestrator/test_orchestrator.py,sha256=dlO4CKn04m__SZhDtvy1npvQUavVNhdcRe4Unj7wg6g,742
 tests/orchestrator/test_utils.py,sha256=Sqysl2ocifLUeSbgGUdeRn0Sof0xVEeH4dgoXfe18yw,3050
 tests/orchestrator/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/orchestrator/models/test_transformations.py,sha256=cQdk8rEtSJJr27th8SmacsOpC7BP_YVXDrmFDDY4Iks,1080
+tests/orchestrator/models/test_transformations.py,sha256=5s6Ts6_DzNvvxpgtqoA2YTnsTJFr_6xbwTNUkQmWr14,1441
 tests/orchestrator/models/emissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/orchestrator/models/emissions/test_deleted.py,sha256=55WOjXR2oeKxdRgXmJg4DgIY3f0asPMvez8b5fkT7LI,767
 tests/orchestrator/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1213,8 +1225,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=lGqeebvgAwGathB8NLZ14Js5JV_-KyHueaD6I8IH8mU,3615
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.66.0.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.66.0.dist-info/METADATA,sha256=BmZGBMAEEnQGVkzLqh-_iHelje1yM0FHCXo_Ji4a010,4046
-hestia_earth_models-0.66.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.66.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.66.0.dist-info/RECORD,,
+hestia_earth_models-0.67.1.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.67.1.dist-info/METADATA,sha256=0rZS_1PvrGQF1RreEZE_EjDXwvIQgjDSyknNAhRL2HI,4046
+hestia_earth_models-0.67.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.67.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.67.1.dist-info/RECORD,,

tests/models/cml2001Baseline/test_abioticResourceDepletionFossilFuels.py

@@ -4,7 +4,7 @@ from unittest.mock import patch
 from pytest import mark
 
 from hestia_earth.models.cml2001Baseline.abioticResourceDepletionFossilFuels import MODEL, TERM_ID, run, _should_run, \
-    download_all_non_renewable_terms
+    get_all_non_renewable_terms
 from tests.utils import fixtures_path, fake_new_indicator
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
@@ -17,7 +17,7 @@ def fake_rounded_indicator(value: float):
     return indicator
 
 
-def fake_download_hestia(filename):
+def fake_download_hestia(filename, column_name):
     data = {
         'fuel.csv': ["lignite", "conventionalCrudeOil", "naturalGas", "coalTar"],
         'electricity.csv': ['electricityGridMarketMix', 'electricityGridHardCoal', 'electricityProducedOnSiteHardCoal',
@@ -27,94 +27,56 @@ def fake_download_hestia(filename):
 
 
 input_lignite_mj = {"@id": "lignite", "name": "lignite (Brown coal)", "termType": "fuel", "units": "MJ"}
-input_coal_tar_kg = {"@id": "coalTar", "name": "Coal tar unknown energy Content", "termType": "fuel", "units": "kg"}
-input_crude_oil_kg_property = {
-    "@id": "conventionalCrudeOil", "name": "Conventional Crude Oil", "termType": "fuel", "units": "kg",
-    "properties": [{"@type": "Property", "value": 45.8,
-                    "term": {"@type": "Term", "@id": "energyContentHigherHeatingValue", "units": "MJ / kg"}, }]}
-input_crude_oil_kg_no_property = {
-    "@id": "conventionalCrudeOil", "name": "Conventional Crude Oil", "termType": "fuel", "units": "kg"}
-input_natural_gas_m3 = {"@id": "naturalGas", "name": "Natural Gas", "termType": "fuel", "units": "m3"}
+
 input_nuclear_fuel_mj = {"@id": "electricityGridNuclear", "name": "Any depleted nuclear fuel",
                          "termType": "electricity", "units": "MJ"}
-input_nuclear_fuel_kwh = {"@id": "electricityGridNuclear", "termType": "electricity", "units": "kWh"}
+
 input_excessIndustrialHeat_mj = {"@id": "excessIndustrialHeat", "name": "Excess industrial heat", "termType": "fuel",
                                  "units": "MJ"}
 
-wrong_indicator = {"term": {"@id": "BAD_INDICATOR_ID", "termType": "resourceUse"},
+wrong_indicator = {"term": {"@id": "BAD_INDICATOR_ID", "termType": "resourceUse", "units": "MJ"},
                    "value": 5,
                    "inputs": [input_lignite_mj]}
 
-indicator_no_inputs = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
-                       "value": 5,
-                       "inputs": []}
+indicator_no_inputs = {
+    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse", "units": "MJ"},
+    "value": 5,
+    "inputs": []}
 
-indicator_2_inputs = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
-                      "value": 5,
-                      "inputs": [input_lignite_mj, input_lignite_mj]}
+indicator_2_inputs = {
+    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse", "units": "MJ"},
+    "value": 5,
+    "inputs": [input_lignite_mj, input_lignite_mj]}
 
 indicator_no_unit = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
                      "value": 5,
-                     "inputs": [{
-                         "@id": "lignite",
-                         "@type": "Term",
-                         "name": "lignite (Brown coal)",
-                         "termType": "fuel",
-                     }]}
-
-indicator_wrong_unit = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
+                     "inputs": [input_lignite_mj]}
+
+indicator_wrong_unit = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse",
+                                 "units": "ha"},
                         "value": 5,
-                        "inputs": [
-                            {
-                                "@id": "lignite",
-                                "@type": "Term",
-                                "name": "lignite (Brown coal)",
-                                "termType": "fuel",
-                                "units": "ha"
-                            }
-                        ]}
-
-indicator_bad_input_id = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
-                          "value": 5,
-                          "inputs": [input_excessIndustrialHeat_mj]}
+                        "inputs": [input_lignite_mj]}
 
-good_indicator_inputs_production_mj = {
-    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
+indicator_bad_input_id = {
+    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse", "units": "MJ"},
     "value": 5,
-    "inputs": [input_lignite_mj]
-}
+    "inputs": [input_excessIndustrialHeat_mj]}
 
-good_indicator_during_cycle_mj = {"term": {"@id": "resourceUseEnergyDepletionDuringCycle", "termType": "resourceUse"},
-                                  "value": 5,
-                                  "inputs": [input_lignite_mj]}
-
-good_indicator_inputs_production_with_property = {
-    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
+good_indicator_inputs_production_mj = {
+    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse", "units": "MJ"},
     "value": 5,
-    "inputs": [input_crude_oil_kg_property]
+    "inputs": [input_lignite_mj]
 }
 
-good_indicator_inputs_production_with_no_property = {
-    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
+good_indicator_during_cycle_mj = {
+    "term": {"@id": "resourceUseEnergyDepletionDuringCycle", "termType": "resourceUse", "units": "MJ"},
     "value": 5,
-    "inputs": [input_crude_oil_kg_no_property]
-}
-
-good_indicator_m3 = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
-                     "value": 5,
-                     "inputs": [input_natural_gas_m3]}
-
-good_nuclear_indicator_mj = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
-                             "value": 5,
-                             "inputs": [input_nuclear_fuel_mj]}
-good_nuclear_indicator_kwh = {"term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
-                              "value": 1.3889,
-                              "inputs": [input_nuclear_fuel_kwh]}
+    "inputs": [input_lignite_mj]}
 
-bad_fuel_indicator_no_property_lookup = {
-    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse"},
+good_nuclear_indicator_mj = {
+    "term": {"@id": "resourceUseEnergyDepletionInputsProduction", "termType": "resourceUse", "units": "MJ"},
     "value": 5,
-    "inputs": [input_coal_tar_kg]}
+    "inputs": [input_nuclear_fuel_mj]}
 
 
 @mark.parametrize(
@@ -124,26 +86,27 @@ bad_fuel_indicator_no_property_lookup = {
         ([wrong_indicator], False, 0),
         ([indicator_no_inputs], False, 0),
         ([indicator_2_inputs], False, 2),
-        ([indicator_no_unit], False, 0),
-        ([indicator_wrong_unit], False, 0),
+        ([indicator_no_unit], False, 1),
+        ([indicator_wrong_unit], False, 1),
         ([indicator_bad_input_id], False, 0),
         ([good_indicator_inputs_production_mj], True, 1),
         ([good_indicator_during_cycle_mj], True, 1),
-        ([good_indicator_inputs_production_with_property], True, 1),
-        ([good_indicator_inputs_production_with_no_property], True, 1),
-        ([good_indicator_m3], True, 1),
         ([good_nuclear_indicator_mj], True, 1),
-        ([good_nuclear_indicator_kwh], True, 1),
-        ([bad_fuel_indicator_no_property_lookup], False, 0),
     ],
-    ids=["No indicators", "wrong indicator", "indicator no inputs", "indicator 2 inputs", "missing unit", "wrong unit",
-         "input id not in requirements", "good input production mj", "good during cycle mj",
-         "good input with input property", "good input with no input property", "good indicator in m^3",
-         "good nuclear fuel use indicator in mj", "good nuclear fuel use indicator in kWh",
-         "bad indicator input in kg no property to convert to mj"]
+    ids=["No indicators",
+         "wrong indicator",
+         "indicator no inputs",
+         "indicator 2 inputs",
+         "missing unit",
+         "wrong unit",
+         "input id not in requirements",
+         "good input production mj",
+         "good during cycle mj",
+         "good nuclear fuel use indicator in mj",
+         ]
 )
-@patch(f"{class_path}.download_all_non_renewable_terms", side_effect=fake_download_hestia)
-def test_should_run(mock_download_all_non_renewable_terms, resources, expected, num_inputs):
+@patch(f"{class_path}.get_all_non_renewable_terms", side_effect=fake_download_hestia)
+def test_should_run(mock_get_all_non_renewable_terms, resources, expected, num_inputs):
     with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
         impactassessment = json.load(f)
 
@@ -154,7 +117,7 @@ def test_should_run(mock_download_all_non_renewable_terms, resources, expected,
     assert len(resources) == num_inputs
 
 
-@patch(f"{class_path}.download_all_non_renewable_terms", side_effect=fake_download_hestia)
+@patch(f"{class_path}.get_all_non_renewable_terms", side_effect=fake_download_hestia)
 @patch(f"{class_path}._indicator", side_effect=fake_rounded_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impactassessment.jsonld", encoding='utf-8') as f:
@@ -167,16 +130,17 @@ def test_run(*args):
     assert value == expected
 
 
-def test_download_all_non_renewable_terms(*args):
+def test_get_all_non_renewable_terms(*args):
     """
-    make sure download_all_non_renewable_terms() only returns terms we want
+    make sure get_all_non_renewable_terms() only returns terms we want
     """
-    electricity_terms = download_all_non_renewable_terms("electricity.csv")
+    electricity_terms = get_all_non_renewable_terms("electricity.csv", "consideredFossilFuelUnderCml2001Baseline")
 
     assert "electricityGridHardCoal" in electricity_terms
     assert "electricityGridWind" not in electricity_terms
 
-    fuel_terms = download_all_non_renewable_terms("fuel.csv")
+    fuel_terms = get_all_non_renewable_terms("fuel.csv", "consideredFossilFuelUnderCml2001Baseline")
 
     assert "coalTar" in fuel_terms
     assert "sodPeat" in fuel_terms
+    assert "bioJetKerosene" not in fuel_terms