hestia-earth-models 0.51.0__py3-none-any.whl → 0.51.1__py3-none-any.whl

hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py

@@ -2,7 +2,7 @@ from hestia_earth.schema import ProductStatsDefinition, TermTermType
 from hestia_earth.utils.model import filter_list_term_type
 from hestia_earth.utils.tools import list_sum, safe_parse_float
 
-from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.log import logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.completeness import _is_term_type_incomplete
 from hestia_earth.models.utils.product import _new_product
 from hestia_earth.models.utils.crop import get_crop_lookup_value
@@ -41,20 +41,27 @@ def _run(product: dict):
     return [_product(value)]
 
 
-def _should_run_product(product: dict):
-    value = list_sum(product.get('value', [0]))
-    lookup_value = _get_lookup_value(product)
-    return value > 0 and lookup_value is not None
-
-
 def _should_run(cycle: dict):
     # filter crop products with matching data in the lookup
     products = filter_list_term_type(cycle.get('products', []), TermTermType.CROP)
-    products = list(filter(_should_run_product, products))
+    product_values = [
+        (product, list_sum(product.get('value', [0])), _get_lookup_value(product)) for product in products
+    ]
+    product_logs = log_as_table([
+        {
+            'id': product.get('term', {}).get('@id'),
+            'value': value,
+            'lookup': lookup_value
+        } for product, value, lookup_value in product_values
+    ])
+    products = [
+        product for product, value, lookup_value in product_values if all([value > 0, lookup_value is not None])
+    ]
     single_crop_product = len(products) == 1
     term_type_incomplete = _is_term_type_incomplete(cycle, TERM_ID)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
+                    product_details=product_logs,
                     single_crop_product=single_crop_product,
                     term_type_cropResidue_incomplete=term_type_incomplete)
 

hestia_earth/models/schmidt2007/__init__.py

@@ -0,0 +1,13 @@
+from os.path import dirname, abspath
+import sys
+from importlib import import_module
+
+from hestia_earth.models.utils.blank_node import run_if_required
+
+CURRENT_DIR = dirname(abspath(__file__)) + '/'
+sys.path.append(CURRENT_DIR)
+MODEL = 'schmidt2007'
+PKG = '.'.join(['hestia_earth', 'models', MODEL])
+
+
+def run(model: str, data): return run_if_required(MODEL, model, data, import_module(f".{model}", package=PKG))

hestia_earth/models/schmidt2007/ch4ToAirWasteTreatment.py

@@ -0,0 +1,60 @@
+from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.utils.tools import list_sum
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.emission import _new_emission
+from .utils import get_waste_values
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "or": {
+            "product": [
+                {"@type": "Product", "value": "", "term.termType": "waste"}
+            ],
+            "completeness.waste": ""
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1",
+        "statsDefinition": "modelled"
+    }]
+}
+LOOKUPS = {
+    "waste": "ch4EfSchmidt2007"
+}
+TERM_ID = 'ch4ToAirWasteTreatment'
+TIER = EmissionMethodTier.TIER_1.value
+
+
+def _emission(value: float):
+    emission = _new_emission(TERM_ID, MODEL)
+    emission['value'] = [value]
+    emission['methodTier'] = TIER
+    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
+    return emission
+
+
+def _run(waste_values: list):
+    value = list_sum(waste_values)
+    return [_emission(value)]
+
+
+def _should_run(cycle: dict):
+    waste_values = get_waste_values(TERM_ID, cycle, LOOKUPS['waste'])
+    has_waste = len(waste_values) > 0
+
+    logRequirements(cycle, model=MODEL, term=TERM_ID,
+                    has_waste=has_waste)
+
+    should_run = any([has_waste])
+    logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
+    return should_run, waste_values
+
+
+def run(cycle: dict):
+    should_run, waste_values = _should_run(cycle)
+    return _run(waste_values) if should_run else []

hestia_earth/models/schmidt2007/utils.py

@@ -0,0 +1,16 @@
+from hestia_earth.schema import NodeType, TermTermType
+from hestia_earth.utils.model import filter_list_term_type
+from hestia_earth.utils.tools import non_empty_list
+
+from hestia_earth.models.utils.completeness import _is_term_type_complete
+from hestia_earth.models.utils.lookup import factor_value
+
+
+def get_waste_values(term_id: str, cycle: dict, lookup_col: str):
+    products = filter_list_term_type(cycle.get('products', []), TermTermType.WASTE)
+    values = non_empty_list(map(factor_value(None, term_id, f"{TermTermType.WASTE.value}.csv", lookup_col), products))
+    return [0] if all([
+        len(values) == 0,
+        _is_term_type_complete(cycle, {'termType': 'waste'}),
+        cycle.get('@type', cycle.get('type')) == NodeType.CYCLE.value  # ignore adding 0 value for Transformation
+    ]) else values

hestia_earth/models/utils/term.py

@@ -23,6 +23,7 @@ def get_liquid_fuel_terms():
     """
     Find all "liquid" `fuel` terms from the Glossary:
     - https://hestia.earth/glossary?termType=fuel&query=gasoline
+    - https://hestia.earth/glossary?termType=fuel&query=petrol
     - https://hestia.earth/glossary?termType=fuel&query=diesel
 
     Returns
@@ -50,6 +51,11 @@ def get_liquid_fuel_terms():
                         "name": "gasoline*"
                     }
                 },
+                {
+                    "regexp": {
+                        "name": "petrol*"
+                    }
+                },
                 {
                     "regexp": {
                         "name": "diesel*"

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.51.0'
+VERSION = '0.51.1'

{hestia_earth_models-0.51.0.dist-info → hestia_earth_models-0.51.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.51.0
+Version: 0.51.1
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team

{hestia_earth_models-0.51.0.dist-info → hestia_earth_models-0.51.1.dist-info}/RECORD

@@ -2,10 +2,10 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 hestia_earth/models/log.py,sha256=kPLBOABkSiiAaPejXYvDJ9g6RbaXQXgtOZP2x9v_FwA,3008
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=Ezz852GGkdfxb2k3u7L1TnxGyY4y72dUXj8UZbAtwrY,19
+hestia_earth/models/version.py,sha256=fRAhsretJm4iLEtE8CfsBZQk5ipiQBc4ay4SR7y7jKc,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=ORPd1nWPgKZAF0wtQ9M4ll8bKHElLMExWOdguEYPTaw,4532
-hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=rxU6nflJ5QisQTjEGsCSbAF9fYfSOtez3cGaRJVKo14,3303
+hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=RjKJM64lHqTZ8L8K8ZftIhW2pOoWPjLIU4Xl1iqf8bw,3800
 hestia_earth/models/akagiEtAl2011AndIpcc2006/__init__.py,sha256=WK7xQwUPX48JGqZeb2S2EKdtXuxMjY7HYyUFHItUqUo,425
 hestia_earth/models/akagiEtAl2011AndIpcc2006/ch4ToAirCropResidueBurning.py,sha256=JUTkKB9EclLu7OkVQm2tTZpZF5vTTZl4HogaH_S4qrs,1779
 hestia_earth/models/akagiEtAl2011AndIpcc2006/n2OToAirCropResidueBurningDirect.py,sha256=3LbL2CgE-SQM1VYpQYh3jqJ5pHTPsvRPFq-zN9251eE,1785
@@ -92,13 +92,13 @@ hestia_earth/models/data/ecoinventV3/__init__.py,sha256=oevyurRuioXy_CsQCtG-S_FX
 hestia_earth/models/deRuijterEtAl2010/__init__.py,sha256=lbH6mB98dmZZlwdZctNYtEmVwAow957l80Dv7JSPDsI,418
 hestia_earth/models/deRuijterEtAl2010/nh3ToAirCropResidueDecomposition.py,sha256=iFxOC7busuhdO2UOto49r-LeWzzFiYQPavMiflY00bU,3448
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
-hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=fcrm4Kw3TLD802isFfZsLdKfDASI7gmbhPMKa2VCAtQ,1623
-hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=nvbZVtQIMs7TAs_OmM_f3g6298-KIFevZUtEUW-GjX4,1629
-hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=Gbt4o27yiTfVyQVvMkhCPVnW5B_nwYWV_e4hnAQOObA,3631
+hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=ULOUte7_o1vLKDQD2sq56B9MEzOL9r7Ib2j0g30DKHE,1746
+hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=DTpvSamSWaJy6uTn3iqk5rgvUw8qUJ527fsyTzDlzW8,1753
+hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=EvvNA3Qme1PHnRMT2JcokEPebu_--BZ8HqmYW3hHXoM,3879
 hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=GxIBiz1l5nyTd4_2txbQSsZPg_PJ9f9jlzCSHZwT6gI,6396
-hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=w-gZBqzKEB7Oa3TLA8hhOQfLjEGhXbL1aWW2w6csbTc,1623
-hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=-TwTtd9Po65zekAfDX8Z6QWfsH_QpGw-0IN2hDplHuw,1623
-hestia_earth/models/emepEea2019/utils.py,sha256=7YgC-dUndd8Ha25LRZCM92_SYmOQo9tn0V90_EOfzTE,816
+hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=3QFuWaRyvsIZC7Kd8L3sFNb081Zy3z1hnujNn0lPFP0,1746
+hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=Xg_z3xJkM2vfZzTXZck6F5DUvW6imDeHCksI_yJz1to,1746
+hestia_earth/models/emepEea2019/utils.py,sha256=rwjH1ezlEdZ2GpVSN0fXItQ_0rgETXxzCtacfnZRCAg,1537
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=nIuPIkQR1ghv_T_Ab4Ckq5wmGdWVmgbaOjhtKfIJ-WE,2183
 hestia_earth/models/environmentalFootprintV3/__init__.py,sha256=lzg9qccwd9tbspw0lQ58YPprnvvSLTn3QV5T2-tPcC4,425
 hestia_earth/models/environmentalFootprintV3/freshwaterEcotoxicityPotentialCtue.py,sha256=E7xplLzmYxZOSAiHPWbuDJlQxLtftw8Cojry_eS-FLE,912
@@ -116,12 +116,12 @@ hestia_earth/models/faostat2018/utils.py,sha256=Uc8KXYIwwS0YJjA16jm3_v1DHQaIQg8_
 hestia_earth/models/faostat2018/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hestia_earth/models/faostat2018/product/price.py,sha256=vE3rtICxjYqnQdYiUNuR0gyjbVjDuCGqrARUT1HILEA,8058
 hestia_earth/models/geospatialDatabase/__init__.py,sha256=2Eh6-hjX812Uuf8nxYnC50uXE6uv_8ofFK8iVMwihXA,419
-hestia_earth/models/geospatialDatabase/aware.py,sha256=LE2Pwp6urX_QV0DlAn6S4NcKwcg0Y_J8lTfr_LzKlBA,1363
+hestia_earth/models/geospatialDatabase/aware.py,sha256=eyWhTuDaXbJqsGMbHMLBf_7CaV21w2pay3c4eC5JAc0,1377
 hestia_earth/models/geospatialDatabase/clayContent.py,sha256=SAlHW1TMhOz9S4iUASlC9htuSlydINgk22hXW-v4UDU,2286
 hestia_earth/models/geospatialDatabase/croppingIntensity.py,sha256=x2uPKe44w-vgyWcx_pZiK_MEOan9WWlxSuhsysGC8rg,2011
 hestia_earth/models/geospatialDatabase/drainageClass.py,sha256=XnzamiydO3Xk1eJo8d2ddqz23AX-78kE0sOT8Gg9HnM,2117
 hestia_earth/models/geospatialDatabase/ecoClimateZone.py,sha256=Go447ubRKm5SiPeinwgMiJ7LKO5_NHV_n6LLosBS8FI,3847
-hestia_earth/models/geospatialDatabase/ecoregion.py,sha256=Tok0hfpWRL7sj39KES-JtWkmlC3GTjSS1o-jGRuD7TM,1599
+hestia_earth/models/geospatialDatabase/ecoregion.py,sha256=Ro8AXoRkGt8v6FxMdzFsSEU7rEX0oPBSicXr8PHmqvI,1613
 hestia_earth/models/geospatialDatabase/erodibility.py,sha256=kTYRrqG7G9qaGkSEewyc0Zv_JVsqs404Vz3B7zl_Kaw,2071
 hestia_earth/models/geospatialDatabase/heavyWinterPrecipitation.py,sha256=DTBYosgttThxzRvuEdoH-9qnFRak-NYAMkojhIN8_NY,2168
 hestia_earth/models/geospatialDatabase/histosol.py,sha256=99u2Dd2kgXUmgCZ-1L24CZYT8o2kXN-EgL5O3yXVnkc,2486
@@ -132,7 +132,7 @@ hestia_earth/models/geospatialDatabase/potentialEvapotranspirationAnnual.py,sha2
 hestia_earth/models/geospatialDatabase/potentialEvapotranspirationLongTermAnnualMean.py,sha256=ak6iiDS7Ww_eWeLI0msirMi0Yk6cCbyc52hX30wmOGQ,2375
 hestia_earth/models/geospatialDatabase/precipitationAnnual.py,sha256=uGtwEDDzUE4fDR9aA9OjzKWkUBXjubxFS5Nd6bGKTzg,3543
 hestia_earth/models/geospatialDatabase/precipitationLongTermAnnualMean.py,sha256=s52m8Fhm3yQbYaHYyIRqyqLSB9yqV6oVz1jD2dtAhHA,2542
-hestia_earth/models/geospatialDatabase/region.py,sha256=RIc6NN4UYJ5vm267rcna1LP_qDwvSKS1FZjNxBmUqrE,2084
+hestia_earth/models/geospatialDatabase/region.py,sha256=_ygDmdzg_6p-Q_6-3gBQGA7oXUjN_-CLC43tZZw9hNo,1820
 hestia_earth/models/geospatialDatabase/sandContent.py,sha256=6eH0WcQReUyHySf6AHVBwwgCHC3gYdTV7ZoAxBI_Zdo,2286
 hestia_earth/models/geospatialDatabase/siltContent.py,sha256=min1ig_H2tgagNUOuMf_iH3NGhtT5v1vL36SA5ppYt4,2208
 hestia_earth/models/geospatialDatabase/slope.py,sha256=eZkFFdqvwZ11nl3WzRlCOdR171OQPyHHiCCo0esIJcQ,2087
@@ -142,8 +142,8 @@ hestia_earth/models/geospatialDatabase/temperatureAnnual.py,sha256=cWFqmGLZNPdQa
 hestia_earth/models/geospatialDatabase/temperatureLongTermAnnualMean.py,sha256=lHYKGV6IasvyUbhWjaWODzHvxuP5broOY3sAv5Ry1ZY,2417
 hestia_earth/models/geospatialDatabase/totalNitrogenPerKgSoil.py,sha256=9GQT8Q1ci9n1IIpIMYETdEoJe33ax0qwgXJTsVTGvT4,2237
 hestia_earth/models/geospatialDatabase/totalPhosphorusPerKgSoil.py,sha256=4eWK4zBmHbAL1cFZlo7qLXKMF0E_K2sdF69EZa0CTDY,2226
-hestia_earth/models/geospatialDatabase/utils.py,sha256=bLwCBiF908y_Nh08in3iXqnKBMR7enNHFdgS99w_LLw,7078
-hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=1JedDiqoHvPejfoU3wq4rbjuMx9kqAa9uqFAJfq0sv4,1944
+hestia_earth/models/geospatialDatabase/utils.py,sha256=Xo-LlF1xrudiWkcE08RYRmICQLi0yW-Wdol2qujgQ-E,7240
+hestia_earth/models/geospatialDatabase/waterDepth.py,sha256=4syF-tQQAd2ygOrZmbe2lncCEpRvDU32HlueFqYE7kI,1958
 hestia_earth/models/globalCropWaterModel2008/__init__.py,sha256=vQxexzFCl2Uv2RiIJfcppkRi9RgzBsJ68yhVDK4GvAU,425
 hestia_earth/models/globalCropWaterModel2008/rootingDepth.py,sha256=k6UeqX-JyXKdB6qcEzKUl2UzSOlX8sH1nnPf9LhtKWY,4254
 hestia_earth/models/haversineFormula/__init__.py,sha256=o155nR-XI67iCSBVNYIu4sPRIF3C2Y1NnUZ6lfpi0Do,417
@@ -159,7 +159,7 @@ hestia_earth/models/hyde32/landTransformationFromOtherNaturalVegetation20YearAve
 hestia_earth/models/hyde32/landTransformationFromPermanentPasture100YearAverageDuringCycle.py,sha256=0E6UtW0DpyB6nCFioekbCBvZu10F7LtvyOxbWRPL5oY,2417
 hestia_earth/models/hyde32/landTransformationFromPermanentPasture20YearAverageDuringCycle.py,sha256=khH8zdALTeaCaIDK6L-3OexD03I7MB8vA_mBOSkwe1M,2408
 hestia_earth/models/hyde32/utils.py,sha256=j9QavyBZIQ-ZCNjdPLWjOjg2LrxcNlanQ1wPnT0IKX8,3098
-hestia_earth/models/impact_assessment/__init__.py,sha256=B6UO8z3NR6JjIycyT7adZbnNKcBC49qnF2bOhVcufy4,355
+hestia_earth/models/impact_assessment/__init__.py,sha256=gTR_PhWps593fPhm-V826VLLrZVH8CNQTqxExB7GGNI,418
 hestia_earth/models/impact_assessment/emissions.py,sha256=XcHTqyPAZeCz7qPTD8VvccmYMYROqBGrR0zJNpZtmvM,3413
 hestia_earth/models/impact_assessment/freshwaterWithdrawalsDuringCycle.py,sha256=ljh9vou6jJzNjWCtdLsvozx2S1K9cQvWVxifk6mMWso,3952
 hestia_earth/models/impact_assessment/freshwaterWithdrawalsInputsProduction.py,sha256=DSLX_aEWaUFcFZRD46bG5lIQ4TtAtIqH-sMkVCJH2Dg,990
@@ -210,25 +210,29 @@ hestia_earth/models/ipcc2019/ch4ToAirExcreta.py,sha256=nw95VfIRhfn7zH9wfZxafVLwn
 hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py,sha256=VyF9Z_xtbJXslRk2XDlhivN5f5fpDNF6JChsRcJ21uU,6481
 hestia_earth/models/ipcc2019/co2ToAirLimeHydrolysis.py,sha256=Q9CGcD1PizZJQ2qdeBQJXn3P_oIpAdbnn02re8HP0D4,2580
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=2CnBlsD10wIbG66Amv4S-1QT5MRVNQGrAG2iN-ZH8o8,3819
-hestia_earth/models/ipcc2019/croppingDuration.py,sha256=jipKhjF0MdMzU2KoWmbD6XEwOabnCi4xQwdWz5W3Nuo,2979
+hestia_earth/models/ipcc2019/croppingDuration.py,sha256=3aphCnu9jtzUJeCEcC2hY_gY66DliTDhP4zPQ-DAR6E,2983
 hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=hUGujoGptR8rVjCPucebsFZtmXQrE6m-iZjon4YJrwY,4758
 hestia_earth/models/ipcc2019/n2OToAirExcretaDirect.py,sha256=gB1NbBKkUQyIFwjy4p8YYJxEEEW35QYWBVhNLduhaJ0,1984
+hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserIndirect.py,sha256=SRGuWskW6Hn7oRYyozixtnCNtwlRWLD0rOZU7naHEHA,4118
+hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py,sha256=ufj7cBqHtJiSY4v8txOHVx9Ad7TbnLO4J49Wc5UWCEc,4117
 hestia_earth/models/ipcc2019/nitrogenContent.py,sha256=5LISfKnCtRm5JE3va3F6CU0bshnFpgSAuzmjH0zpev0,6452
 hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=3JOQANIy4rDsFTWBy6pOzJ2NRdAiAL-x--C87gBIZQw,3603
 hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=WNfaopS9canZs5zePdijfD2HzTTYfqD1hiainuVfwmk,3004
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=X2WPGOiWi_1cQ5yiyjfrBU_rAm3EDsm4WnRJi8ea6g8,3007
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=Q6XLA-yUEJFQCrk1N4Tq2DiMSACI7XnsW_Mn595V1as,3102
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=2WOHlPFprpvDsZguPAlRqJi-oPftXTMUAKkGwYXAH-c,21747
-hestia_earth/models/ipcc2019/utils.py,sha256=u-KBk8xVI0Rcn1_jwjGeSXpF83VHpAiNsjGD3DBrUfY,992
+hestia_earth/models/ipcc2019/utils.py,sha256=-7cJc0IdeqfqdAaDMtDyTEv9Ao5SzY9WzYNFNoziUfs,2880
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=HEV4Misbe5h99qCqZeCaKNTs4FkFWmv6RdCty_U2pps,947
+hestia_earth/models/jarvisAndPain1994/__init__.py,sha256=ercUwy29sV7oPIESj8UjsGB5lqiBCss9OZcbjxeeG8E,418
+hestia_earth/models/jarvisAndPain1994/n2ToAirExcreta.py,sha256=QY605kIRIOplMtb9hUP3or68p30YwhxLXIlYZG7kGyw,1588
 hestia_earth/models/koble2014/__init__.py,sha256=jRciLONEhGHtMLu2rlWXEEVwcJqA-URsfH1cCt-Qti4,410
-hestia_earth/models/koble2014/aboveGroundCropResidue.py,sha256=jV1hrzD4VeRtEk7qF1dm_kCu_zrXK3-nwehCh1yzqN0,5919
+hestia_earth/models/koble2014/aboveGroundCropResidue.py,sha256=5jjWPo6feJxJiF3PspbNT7BwuDVXPRaAbFIso_LyuGQ,6516
 hestia_earth/models/koble2014/cropResidueManagement.py,sha256=22guAEe6pyi7SS6pswz3H3lMzfygefB1Mlg3aL2k6PQ,2973
 hestia_earth/models/koble2014/residueBurnt.py,sha256=eKvzC4HOj8t7c2-50guVhqQMapTuxcHNBB-_zElHILY,2285
 hestia_earth/models/koble2014/residueLeftOnField.py,sha256=R3D6-21Za9CylMVFWePSUywL55d7n9ohlBHAJyXAwA4,421
 hestia_earth/models/koble2014/residueRemoved.py,sha256=NqYXLr5Te7m6EcGMJOEeXTB_DDMFKoJslJuiTIQ16RM,2035
-hestia_earth/models/koble2014/utils.py,sha256=Cv-SQZim7uzTC84_cmotQf1y3tqguQ9YT8g5FxK_UO0,2029
+hestia_earth/models/koble2014/utils.py,sha256=O0-6kZdUxo6pprIC1DmeS6BvlCTOHrWhkmIfepG5thk,2238
 hestia_earth/models/lcImpactAllEffects100Years/__init__.py,sha256=Z15q1K369kIkH4JC3X2mN0PdNHhUn6dscug6g4DvAxc,427
 hestia_earth/models/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsClimateChange.py,sha256=xKph9CTpqOwr0Ht5BiQouwOVek6z0Y13G5ZCgUNjo6c,1038
 hestia_earth/models/lcImpactAllEffects100Years/damageToFreshwaterEcosystemsFreshwaterEcotoxicity.py,sha256=0oZr_tW-uIwQ8VR-ac5OPmjNSJ-915m20ICkW74tcQk,953
@@ -318,9 +322,9 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=x6xsPu-Rwh-7HKsvHuKmgM1YML6fQy2z9Hsy9_BeO2Y,3565
 hestia_earth/models/mocking/__init__.py,sha256=Y39V6yj_3M1q8v9ShCHwPeJOstypOVIvb_FldMEbF7g,766
 hestia_earth/models/mocking/mock_search.py,sha256=ysPhzvMGvsHKqQXKRFi8ZqohcnyKutBlNqT_j0OH8L4,1983
-hestia_earth/models/mocking/search-results.json,sha256=krO95gw0Sk5mhdjAXBEghgSmuCyq72maSeGtO-yQKGE,32131
+hestia_earth/models/mocking/search-results.json,sha256=q72dDdhGkTMmnsh6M66k_DWAbgSsqLlpNav0dDzf6-I,32960
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
-hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=cJa-2eFuBM0pBAH6tMHUFlpBLhU92rYZzol-JkyDduM,2210
+hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=wywl3QelciXV9hITH7eJ7xqkrD7N9qOsFMkC23I7Pgs,2530
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=txjMrM6Q2g5Qsq6HhAL-IpMMLOj37wlWD2KnovyEWvw,2205
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=aFGXvqP6AM-hgkQvyRTCwdphv9UsfsRtn68YkuDODXY,6727
 hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=iDZ9Ge9VfulLvlVT44_bYAGC-xEUDucLtkrjKbGAfiQ,5622
@@ -405,6 +409,9 @@ hestia_earth/models/schererPfister2015/pToDrainageWaterSoilFlux.py,sha256=XzzyoQ
 hestia_earth/models/schererPfister2015/pToGroundwaterSoilFlux.py,sha256=Gt3YdTCu7uGz4rugpGza6H0XkCU7hs3rk1UYKDVkfPg,2109
 hestia_earth/models/schererPfister2015/pToSurfaceWaterSoilFlux.py,sha256=bzgtCAtX0D5cRqoL24Ukg2IDr00Up7Ji4m1QQ9fJ-9w,2741
 hestia_earth/models/schererPfister2015/utils.py,sha256=LEvz9guqto0kuF5rXcQjgYsD3CvEmORvJQqRA1f7uMI,3130
+hestia_earth/models/schmidt2007/__init__.py,sha256=xheSN6LOGXpWx7Hnv83onhe60Xk1_jk1PJg1nH_aZOQ,412
+hestia_earth/models/schmidt2007/ch4ToAirWasteTreatment.py,sha256=GG9rXb3a1aa3Svs80cFo16M_E4MvlfQ0UonfZMR7MQo,1611
+hestia_earth/models/schmidt2007/utils.py,sha256=NGG5iJI5F1PFSscW2u2Z4clj6UFXVfCewqRnXB5Pv48,815
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=kQWABi_TWOYKgAkBnMEc0O1VgNOSbJuNkLaeNFMzeEI,3693
 hestia_earth/models/site/flowingWater.py,sha256=ZPeXd2tNYgG24kYOGQZM9lrUzCi9nZsabvHJsaH0hy4,1796
@@ -484,7 +491,7 @@ hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTj
 hestia_earth/models/utils/property.py,sha256=6JiELxqqs9sqFPv-xQHewdtmalJHhk61t09b57UiHAY,4469
 hestia_earth/models/utils/site.py,sha256=Nxf4_ANN1_QcxQEwlaL1tFyR-lDUypOBezBJcGmztL4,2725
 hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
-hestia_earth/models/utils/term.py,sha256=Es4AMaD-sFL9-FxTDB9OSLd-xno-ZMHSorDKsUzTr2E,12095
+hestia_earth/models/utils/term.py,sha256=Qkc2UodF6Ok4i8odL9ynjtqKdu4r5dbeJn3PNEoz4eA,12291
 hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zuxzsYl3W8xOu2p0,370
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=fcqomqaWp4BNh937FdC5M-WrhBovtoH-pdUlCnkz7TU,4061
@@ -580,7 +587,7 @@ tests/models/emepEea2019/test_nh3ToAirExcreta.py,sha256=VtZFVWaHjqlxdge1Qir-OghN
 tests/models/emepEea2019/test_nh3ToAirInorganicFertiliser.py,sha256=tIaekBTAeiaXPRBaYrogKsxlDcEbcX3MlIZMjSqea4o,1674
 tests/models/emepEea2019/test_noxToAirFuelCombustion.py,sha256=drCeoaGo6Ag3fdEDDSC3D880OXxzillzHk7rPYcVwmE,1450
 tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=CNaT_z02DHDpBJ2IIkG0K7ra87WBg_iDkhx9QGAjk00,1450
-tests/models/emepEea2019/test_utils.py,sha256=UvwhQnBpxgvDRrB7eSJME65a8r6QBaDyE9luw449b6Y,1383
+tests/models/emepEea2019/test_utils.py,sha256=8izzxUtam9703-MnN6F-Wi0byRitMSidCx9aX7_ktL4,1968
 tests/models/environmentalFootprintV3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/environmentalFootprintV3/test_freshwaterEcotoxicityPotentialCtue.py,sha256=lIgsdGh_0eDi-rPcCOrSSjVYNiET2GCSRkAHdugAkDk,851
 tests/models/epa2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -612,7 +619,7 @@ tests/models/geospatialDatabase/test_potentialEvapotranspirationAnnual.py,sha256
 tests/models/geospatialDatabase/test_potentialEvapotranspirationLongTermAnnualMean.py,sha256=6jn2TsDRvLtmwMdepYOIo23UqGeh-fTDPiOsp4ZZbt0,1072
 tests/models/geospatialDatabase/test_precipitationAnnual.py,sha256=wKNON8808fSb0RZuO1h9nsflnIysaX_o7yGB_x_nkJU,832
 tests/models/geospatialDatabase/test_precipitationLongTermAnnualMean.py,sha256=9WHknL9o5lYxXHMViF_tAmdOYtRDPVrP7Z94tXE8EwY,1050
-tests/models/geospatialDatabase/test_region.py,sha256=i6ZQ_-thrOdguUsa23yDaCNHolemzeVSctMsFMonsas,959
+tests/models/geospatialDatabase/test_region.py,sha256=_VZ9aWZEpgbwLh_E739TkLoTthtcWmMpyX2ssD2b6dk,884
 tests/models/geospatialDatabase/test_sandContent.py,sha256=LZUr8t0il1naqP8U4-XlfQE9luiJgcugXDkVfgj-smI,1030
 tests/models/geospatialDatabase/test_siltContent.py,sha256=STUpMTN0iQRUyDY1EMd3WA6Rqt9rRzDG10g7z_IvXi0,1072
 tests/models/geospatialDatabase/test_slope.py,sha256=DHCbds1jPqELVLhZ0pzXOzvEzveUxIP9fQEibyqzOuU,1024
@@ -622,7 +629,7 @@ tests/models/geospatialDatabase/test_temperatureAnnual.py,sha256=tRaptqQAQthYraF
 tests/models/geospatialDatabase/test_temperatureLongTermAnnualMean.py,sha256=JhgAgCzkEImg0Tsdq6bio27xOr0ph29xhB1cQLsEVEY,1048
 tests/models/geospatialDatabase/test_totalNitrogenPerKgSoil.py,sha256=qIzj4gd6ERW87ho03Kl9X6_Rm3pE5RdGo6V1zvkyFTE,1041
 tests/models/geospatialDatabase/test_totalPhosphorusPerKgSoil.py,sha256=VmzuP_MdX8__LSlGbQ2wDswtYIcuDDNJuxfEj4BvvuI,1043
-tests/models/geospatialDatabase/test_utils.py,sha256=COKAlj_Gvy5cij4R3wrPivY81V0WD5WTxFpvw7RXlZk,307
+tests/models/geospatialDatabase/test_utils.py,sha256=z6kZu-XtxZ_9gmc_Ck3yhlglIn75WNlbjhpZY6zZaXw,558
 tests/models/geospatialDatabase/test_waterDepth.py,sha256=AoCKQBcuNURfR12bHrXALjrK3Wzo5nu4fe5KNJuDfFM,1023
 tests/models/globalCropWaterModel2008/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/globalCropWaterModel2008/test_rootingDepth.py,sha256=dyhojeVM9ge1XOuuiUVSkNeLy--A2xW81hqGELNvEWY,2468
@@ -692,6 +699,8 @@ tests/models/ipcc2019/test_co2ToAirUreaHydrolysis.py,sha256=MmtEME0xjsa3KojFk_fx
 tests/models/ipcc2019/test_croppingDuration.py,sha256=gLRXeR6Tqa7ciD9KTRfsIflSeIIWT2iOpZMdcxAQla4,1871
 tests/models/ipcc2019/test_n2OToAirCropResidueDecompositionDirect.py,sha256=PW-FvpX4KD-X2wMhR9o6c_FVaR7xAd1YSinNPsap6fY,2015
 tests/models/ipcc2019/test_n2OToAirExcretaDirect.py,sha256=JYvBK4edcqfHrMPwgBFXF6km51ew9RISUcfQ_RNf2RY,1216
+tests/models/ipcc2019/test_n2OToAirInorganicFertiliserIndirect.py,sha256=X61AE9Eb0Lqwy4AkfKKaHKU-p4C5JZIo326t8BT6ALs,1613
+tests/models/ipcc2019/test_n2OToAirOrganicFertiliserIndirect.py,sha256=cPXdknWmXJig9i_AR19oX4g3GjTcEo8455DsD2w8M10,1609
 tests/models/ipcc2019/test_nitrogenContent.py,sha256=vCAg9hgFAnXaNst92VZYMsd-gZOxzGZlCOmv1sMSRgo,3592
 tests/models/ipcc2019/test_no3ToGroundwaterCropResidueDecomposition.py,sha256=l9LRPS2ReB1c-cmClef86LWL6FmURvDxUXAzMbKFJis,1624
 tests/models/ipcc2019/test_no3ToGroundwaterExcreta.py,sha256=Z-pCBQvlUf0ttmCERgezW-6e3KlX45YEVccOwthf5lU,1588
@@ -700,8 +709,10 @@ tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12q
 tests/models/ipcc2019/test_pastureGrass.py,sha256=fs_og0NM_XiJuFgL8UXegjOvKj7bL2koxXeOionbebs,1912
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2021/test_gwp100.py,sha256=r3pDw_TUcOrNlNRWtFAN3CBWfG5FCkHExypVqg0sZVk,857
+tests/models/jarvisAndPain1994/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/jarvisAndPain1994/test_n2ToAirExcreta.py,sha256=aMCuR9fmGDmum7VqLb1oBOsTCjBz5O9XQn2DWtP8HVM,1057
 tests/models/koble2014/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/koble2014/test_aboveGroundCropResidue.py,sha256=kzGKf4ZthaPocbU44s79iGwGRaBqx5MiNsVM4eASylU,1188
+tests/models/koble2014/test_aboveGroundCropResidue.py,sha256=ZqBQK3_Z5PA0__Dgz_chPi7TtrWND8-9LjL0Px-zHEw,1635
 tests/models/koble2014/test_cropResidueManagement.py,sha256=QwmMcVpOoW7Pedowldd0GFdnvE6lesGEfWGGMO2TQbQ,621
 tests/models/koble2014/test_residueBurnt.py,sha256=4XJBiqQcxRlbUYjP6uSvBviqJq5UhIjTexKhQArGRgA,811
 tests/models/koble2014/test_residueLeftOnField.py,sha256=9pFFYldqBrzr45Ia_1bu-6uv-_rBl3h1rZjb_NGwt-U,858
@@ -876,6 +887,9 @@ tests/models/schererPfister2015/test_pErosionSoilFlux.py,sha256=YbQEZGQjdppamcUm
 tests/models/schererPfister2015/test_pToDrainageWaterSoilFlux.py,sha256=57MVRyiEU0g8pp6uRQiVo6l2w3OgBPyfv6oqdSIyrZ0,1060
 tests/models/schererPfister2015/test_pToGroundwaterSoilFlux.py,sha256=lOTL-ue6hEbQsKIss6VsN7bJME5UCB3pTbqbLtMp9rk,1064
 tests/models/schererPfister2015/test_pToSurfaceWaterSoilFlux.py,sha256=1VJo9q-Kb2OboK2RMp3-bkP6lXfkFbqMz1ACJC75FWw,1441
+tests/models/schmidt2007/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/schmidt2007/test_ch4ToAirWasteTreatment.py,sha256=5VSxT6sEbNp6c4Y07WzJGFDwVnjJbziG9HmbJNF6r6A,1454
+tests/models/schmidt2007/test_utils.py,sha256=rmtOV3xiFynjgx8lQNGsJqquG8HDxz3LDmh1efN8AkI,1278
 tests/models/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=ZbIt-mQohYE-8xd4zoqDTVj3VC-Dg9wnOTY4ppULsCY,1023
 tests/models/site/test_flowingWater.py,sha256=q7ktHV7sffIUBf0SgIhbkL_U_c7RTHYv6oWhXY4A6io,1274
@@ -944,8 +958,8 @@ tests/models/utils/test_site.py,sha256=cSKrkLeerymMLZAwCnbQce38NwgxXojQHAVm9DPUT
 tests/models/utils/test_term.py,sha256=-Wn2C1jyOLfkvhcKmKWT-Jms7yqLwx5ok91gYJNcGWc,2028
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.51.0.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.51.0.dist-info/METADATA,sha256=rC2wapJDyfDGxiaJeFZkJZc7No-1kNZRGaMEN_Al0IA,3178
-hestia_earth_models-0.51.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-hestia_earth_models-0.51.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.51.0.dist-info/RECORD,,
+hestia_earth_models-0.51.1.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.51.1.dist-info/METADATA,sha256=pau-UYw6oKiDHVlx76p2Mq0pDvBvEL5DboUI74Pin0g,3178
+hestia_earth_models-0.51.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+hestia_earth_models-0.51.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.51.1.dist-info/RECORD,,

tests/models/emepEea2019/test_utils.py

@@ -5,7 +5,7 @@ from hestia_earth.models.emepEea2019.utils import get_fuel_values
 class_path = 'hestia_earth.models.emepEea2019.utils'
 TERMS = [
     'diesel',
-    'gasoline'
+    'petrol'
 ]
 
 
@@ -36,9 +36,23 @@ def test_get_fuel_values(*args):
                 'value': [100]
             },
             {
-                'term': {'@id': 'gasoline', 'termType': 'fuel'},
+
+                'term': {'@id': 'diesel', 'termType': 'fuel'},
+                'operation': {'@id': 'crushingWoodMachineUnspecified', 'termType': 'operation'},
+                'value': [200]
+            },
+            {
+
+                'term': {'@id': 'diesel', 'termType': 'fuel'},
+                'operation': {'@id': 'helicopterUseOperationUnspecified', 'termType': 'operation'},
+                'value': [150]
+            },
+            {
+                'term': {'@id': 'marineGasOil', 'termType': 'fuel'},
+                'operation': {'@id': 'crushingWoodMachineUnspecified', 'termType': 'operation'},
                 'value': [50]
             }
         ]
     }
-    assert get_fuel_values('co2ToAirFuelCombustion', cycle, 'co2ToAirFuelCombustionEmepEea2019') == [317.0]
+    result = get_fuel_values('co2ToAirFuelCombustion', cycle, 'co2ToAirFuelCombustionEmepEea2019')
+    assert result == [317.0, 632.0, 475.5, 158.5]

tests/models/geospatialDatabase/test_region.py

@@ -8,13 +8,12 @@ class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
 
 
-@patch(f"{class_path}.should_download", return_value=True)
-@patch(f"{class_path}.has_geospatial_data")
-def test_should_run(mock_has_geospatial_data, *args):
-    mock_has_geospatial_data.return_value = True
+@patch(f"{class_path}.has_coordinates")
+def test_should_run(mock_has_coordinates, *args):
+    mock_has_coordinates.return_value = True
     assert _should_run({}) is True
 
-    mock_has_geospatial_data.return_value = False
+    mock_has_coordinates.return_value = False
     assert not _should_run({})
 
 

tests/models/geospatialDatabase/test_utils.py

@@ -1,8 +1,17 @@
 from hestia_earth.schema import TermTermType
 
-from hestia_earth.models.geospatialDatabase.utils import get_region_factor
+from hestia_earth.models.geospatialDatabase.utils import get_region_factor, _get_area_size
 
 
 def test_get_region_factor():
     site = {'country': {'@id': 'GADM-ALB'}}
     assert get_region_factor('croppingIntensity', site, TermTermType.LANDUSEMANAGEMENT) == 0.9999775685587958
+
+
+def test_get_area_size():
+    site = {'country': {'@id': 'GADM-ALB'}}
+    assert _get_area_size(site) == 28735.42144
+
+    site['boundary'] = {'type': 'Polygon'}
+    site['boundaryArea'] = 1000
+    assert _get_area_size(site) == 1000

tests/models/ipcc2019/test_n2OToAirInorganicFertiliserIndirect.py

@@ -0,0 +1,48 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_emission
+
+from hestia_earth.models.ipcc2019.n2OToAirInorganicFertiliserIndirect import MODEL, TERM_ID, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}.get_ecoClimateZone", return_value=2)
+@patch(f"{class_path}._is_term_type_complete", return_value=False)
+@patch(f"{class_path}.get_inorganic_fertiliser_N_total", return_value=0)
+def test_should_run(mock_N_total, mock_complete, *args):
+    # no N => no run
+    assert not _should_run({})
+
+    # with N => no run
+    mock_N_total.return_value = 10
+    assert not _should_run({})
+
+    # is complete => run
+    mock_complete.return_value = True
+    assert _should_run({}) is True
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run_wet(*args):
+    with open(f"{fixtures_folder}/ecoClimateZone-wet/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/ecoClimateZone-wet/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run_dry(*args):
+    with open(f"{fixtures_folder}/ecoClimateZone-dry/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/ecoClimateZone-dry/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/ipcc2019/test_n2OToAirOrganicFertiliserIndirect.py

@@ -0,0 +1,48 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_emission
+
+from hestia_earth.models.ipcc2019.n2OToAirOrganicFertiliserIndirect import MODEL, TERM_ID, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}.get_ecoClimateZone", return_value=2)
+@patch(f"{class_path}._is_term_type_complete", return_value=False)
+@patch(f"{class_path}.get_organic_fertiliser_N_total", return_value=0)
+def test_should_run(mock_N_total, mock_complete, *args):
+    # no N => no run
+    assert not _should_run({})
+
+    # with N => no run
+    mock_N_total.return_value = 10
+    assert not _should_run({})
+
+    # is complete => run
+    mock_complete.return_value = True
+    assert _should_run({}) is True
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run_wet(*args):
+    with open(f"{fixtures_folder}/ecoClimateZone-wet/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/ecoClimateZone-wet/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run_dry(*args):
+    with open(f"{fixtures_folder}/ecoClimateZone-dry/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/ecoClimateZone-dry/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/jarvisAndPain1994/test_n2ToAirExcreta.py

@@ -0,0 +1,37 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_emission
+
+from hestia_earth.models.jarvisAndPain1994.n2ToAirExcreta import MODEL, TERM_ID, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+def test_should_run(*args):
+    # no emissions => no run
+    cycle = {'emissions': []}
+    should_run, *args = _should_run(cycle)
+    assert not should_run
+
+    # with n2o emission => run
+    cycle['emissions'] = [{
+        'term': {
+            '@id': 'n2OToAirExcretaDirect'
+        },
+        'value': [100]
+    }]
+    should_run, *args = _should_run(cycle)
+    assert should_run is True
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/koble2014/test_aboveGroundCropResidue.py

@@ -34,3 +34,16 @@ def test_run(*args):
 
     value = run(cycle)
     assert value == expected
+
+
+@patch(f"{class_path}._is_term_type_incomplete", return_value=True)
+@patch(f"{class_path}._new_product", side_effect=fake_new_product)
+def test_run_no_total(*args):
+    with open(f"{fixtures_folder}/no-total/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/no-total/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected