hestia-earth-models 0.59.1__py3-none-any.whl → 0.59.2__py3-none-any.whl

hestia_earth/models/site/soilMeasurement.py

@@ -0,0 +1,197 @@
+"""
+Soil Measurement
+
+This model harmonises matching soil measurements into depth ranges of 0-30 and 0-50 and gap fills missing measurements.
+"""
+from collections import defaultdict
+from copy import deepcopy
+from hestia_earth.schema import MeasurementMethodClassification
+from hestia_earth.utils.tools import non_empty_list, flatten
+
+from hestia_earth.models.log import logRequirements, logShouldRun, logErrorRun
+from hestia_earth.models.utils.measurement import _new_measurement
+from hestia_earth.models.utils.term import get_lookup_value
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "measurements": [
+            {"@type": "Measurement", "depthUpper": "", "depthLower": ""}
+        ]
+    }
+}
+
+RETURNS = {
+    "Measurement": [{
+        "value": "",
+        "depthUpper": 0,
+        "depthLower": [30, 50],
+        "dates": "",
+        "methodClassification": "modelled using other measurements"
+    }]
+}
+
+LOOKUPS = {
+    "measurement": ["recommendAddingDepth", "depthSensitive"]
+}
+
+MODEL_KEY = 'soilMeasurement'
+STANDARD_DEPTHS = {(0, 30), (0, 50)}
+
+
+def _measurement(value: float, date: str, term_id: str, standard_fields: dict):
+    data = _new_measurement(term=term_id)
+    data["value"] = [value]
+    data["depthUpper"] = standard_fields["depthUpper"]
+    data["depthLower"] = standard_fields["depthLower"]
+    data["methodClassification"] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
+    if date and date[0]:
+        data["dates"] = [date]
+    return data
+
+
+def _get_overlap(in_lower: int, in_upper: int, out_lower: int, out_upper: int):
+    """Returns the amount of overlap between upper-lower and range_upper-range_lower."""
+    if in_lower >= in_upper or out_lower >= out_upper or in_lower >= out_upper or in_upper <= out_lower:
+        return 0
+
+    overlap_range = [max(in_lower, out_lower), min(in_upper, out_upper)]
+    return max(overlap_range) - min(overlap_range)
+
+
+def _harmonise_measurements(measurements_list: list, standard_depth_lower: int, standard_depth_upper: int) -> float:
+    """Gather measurements and calculate modelled value."""
+    total_weight_values = 0
+    total_weights = 0
+    for measurement_dict in measurements_list:
+        value = measurement_dict.get("value", [])[0]
+        depth_lower = measurement_dict.get("depthLower", 0)
+        depth_upper = measurement_dict.get("depthUpper", 0)
+        # Note that the upper/lower here is reversed as lower in the ground (greater depth),
+        # means higher numbers.
+        weight = _get_overlap(
+            in_lower=depth_upper,
+            in_upper=depth_lower,
+            out_lower=standard_depth_upper,
+            out_upper=standard_depth_lower
+        )
+        total_weights += weight
+        total_weight_values += value * weight
+    modelled_value = total_weight_values / total_weights if total_weights else 0
+    return modelled_value
+
+
+def _expand_multiple_measurements(measurements):
+    """Split/expand measurements with arrays of values and dates into distinct measurements."""
+    expanded_measurements = []
+    for measurement in measurements:
+        if "dates" in measurement and len(measurement.get("value", [])) != len(measurement.get("dates", [])):
+            logErrorRun(
+                model=MODEL,
+                term=measurement.get("term", {}),
+                error="Inconsistent field lengths between values and dates fields in measurement."
+            )
+        elif len(measurement.get("value", [])) < 2:
+            expanded_measurements.append(measurement)
+        else:
+            for v, d in zip(measurement.get("value", []), measurement.get("dates", [])):
+                new_measurement = deepcopy(measurement)
+                new_measurement.update({"value": [v], "dates": [d]})
+                expanded_measurements.append(new_measurement)
+
+    return expanded_measurements
+
+
+def _group_measurements_by_date_method_term(measurements):
+    group_by_result = defaultdict(list)
+    for measurement_dict in measurements:
+        dates = measurement_dict.get("dates", [])
+        method = measurement_dict.get("method", {}).get("@id", "")
+        term_id = measurement_dict.get("term", {}).get("@id", "")
+        if not dates:
+            dates = [measurement_dict.get('endDate', "")]
+        group_by_result[(dates[0], method, term_id)].append(measurement_dict)
+    return group_by_result
+
+
+def _run_harmonisation(measurements: list, needed_depths: list):
+    results = []
+    grouped_measurements = _group_measurements_by_date_method_term(
+        _expand_multiple_measurements(measurements)
+    )
+
+    for (date, method, term_id), measurements_list in grouped_measurements.items():
+        # For a target depth
+        for depth_upper, depth_lower in needed_depths:
+            modelled_value = _harmonise_measurements(
+                measurements_list=measurements_list,
+                standard_depth_upper=depth_upper,
+                standard_depth_lower=depth_lower
+            )
+            if modelled_value:
+                results.append(
+                    _measurement(
+                        value=modelled_value,
+                        date=date,
+                        standard_fields={
+                            "depthUpper": depth_upper,
+                            "depthLower": depth_lower
+                        },
+                        term_id=term_id
+                    )
+                )
+
+    return results
+
+
+def _run_gap_fill_depths(measurements_missing_depths: list) -> list:
+    return [dict(m, **{"depthUpper": 0, "depthLower": 30}) for m in measurements_missing_depths]
+
+
+def _get_needed_depths(site: dict) -> list:
+    needed_depths = list(STANDARD_DEPTHS)
+    for measurement in site.get("measurements", []):
+        if (measurement.get("depthUpper"), measurement.get("depthLower")) in needed_depths:
+            needed_depths.remove((int(measurement["depthUpper"]), int(measurement["depthLower"])))
+
+    return needed_depths
+
+
+def _should_run(site: dict, model_key: str):
+    # we only work with measurements with depths
+    measurements = [
+        m for m in site.get("measurements", [])
+        if get_lookup_value(m.get("term", {}), LOOKUPS["measurement"][0], model=MODEL, model_key=model_key)
+    ]
+
+    measurements_with_depths = [m for m in measurements if all([
+        "depthUpper" in m.keys(),
+        "depthLower" in m.keys(),
+        (int(m.get("depthUpper", 0)), int(m.get("depthLower", 0))) not in STANDARD_DEPTHS
+    ])]
+    has_measurements_with_depths = len(measurements_with_depths) > 0
+
+    measurements_missing_depth_recommended = [m for m in measurements if all([
+        "depthUpper" not in m.keys(),
+        "depthLower" not in m.keys(),
+        not get_lookup_value(m.get("term", {}), LOOKUPS["measurement"][1], model=MODEL, model_key=model_key)
+    ])]
+
+    logRequirements(site, model=MODEL, model_key=model_key,
+                    has_measurements_with_depths=has_measurements_with_depths,
+                    has_missing_depths=bool(measurements_missing_depth_recommended))
+
+    should_run = has_measurements_with_depths or bool(measurements_missing_depth_recommended)
+    for measurement in measurements_with_depths + measurements_missing_depth_recommended:
+        term_id = measurement.get("term", {}).get("@id", {})
+        logShouldRun(site, MODEL, term_id, should_run)
+    return should_run, measurements_with_depths, measurements_missing_depth_recommended
+
+
+def run(site: dict):
+    should_run, measurements_with_depths, measurements_missing_depth = _should_run(site=site, model_key=MODEL_KEY)
+    needed_depths = _get_needed_depths(site)
+    return non_empty_list(flatten(
+        _run_harmonisation(measurements=measurements_with_depths, needed_depths=needed_depths)
+        + _run_gap_fill_depths(measurements_missing_depths=measurements_missing_depth)
+    )) if should_run else []

hestia_earth/models/utils/cycle.py

@@ -1,6 +1,6 @@
 from hestia_earth.schema import CycleFunctionalUnit, SiteSiteType, TermTermType
 from hestia_earth.utils.model import filter_list_term_type, find_term_match, find_primary_product
-from hestia_earth.utils.tools import flatten, list_sum, safe_parse_float, safe_parse_date
+from hestia_earth.utils.tools import list_sum, safe_parse_float, safe_parse_date
 
 from ..log import logRequirements, debugValues
 from .lookup import factor_value
@@ -368,7 +368,7 @@ def is_organic(cycle: dict):
     return any([get_lookup_value(p.get('term', {}), 'isOrganic') == 'organic' for p in practices])
 
 
-def is_irrigated(cycle: dict):
+def is_irrigated(cycle: dict, **log_ars):
     """
     Check if the `Cycle` is irrigated, i.e. if it contains an irrigated `Practice` with a value above `0`.
 
@@ -376,16 +376,17 @@ def is_irrigated(cycle: dict):
     ----------
     cycle : dict
         The `Cycle`.
+    log_ars : dict[str, Any]
+        Extra loggging, e.g. model, term.
 
     Returns
     -------
     bool
         `True` if the `Cycle` is irrigated, `False` otherwise.
     """
-    irrigated_practices = [
-        p for p in cycle.get('practices', []) if p.get('term', {}).get('@id', '').startswith('irrigated')
-    ]
-    return list_sum(flatten([p.get('value', []) for p in irrigated_practices])) > 0
+    practices = filter_list_term_type(cycle.get('practices', []), TermTermType.WATERREGIME)
+    irrigated_practices = [p for p in practices if get_lookup_value(p.get('term', {}), 'irrigated', **log_ars)]
+    return any([list_sum(p.get('value', []), 0) > 0 for p in irrigated_practices])
 
 
 def cycle_end_year(cycle: dict):

hestia_earth/models/utils/emission.py

@@ -4,6 +4,8 @@ from hestia_earth.utils.model import linked_node
 from hestia_earth.utils.lookup import get_table_value, download_lookup, column_name
 
 from . import _term_id, _include_methodModel
+from .blank_node import find_terms_value
+from .constant import Units, get_atomic_conversion
 
 
 def _new_emission(term, model=None):
@@ -17,3 +19,16 @@ def is_in_system_boundary(term_id: str):
     value = get_table_value(lookup, 'termid', term_id, column_name('inHestiaDefaultSystemBoundary'))
     # handle numpy boolean
     return not (not value)
+
+
+def get_nh3_no3_nox_to_n(cycle: dict, nh3_term_id: str, no3_term_id: str, nox_term_id: str, allow_none: bool = False):
+    default_value = 0 if allow_none else None
+
+    nh3 = find_terms_value(cycle.get('emissions', []), nh3_term_id, default=default_value)
+    nh3 = None if nh3 is None else nh3 / get_atomic_conversion(Units.KG_NH3, Units.TO_N)
+    no3 = find_terms_value(cycle.get('emissions', []), no3_term_id, default=default_value)
+    no3 = None if no3 is None else no3 / get_atomic_conversion(Units.KG_NO3, Units.TO_N)
+    nox = find_terms_value(cycle.get('emissions', []), nox_term_id, default=default_value)
+    nox = None if nox is None else nox / get_atomic_conversion(Units.KG_NOX, Units.TO_N)
+
+    return (nh3, no3, nox)

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.59.1'
+VERSION = '0.59.2'

{hestia_earth_models-0.59.1.dist-info → hestia_earth_models-0.59.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.59.1
+Version: 0.59.2
 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.59.1.dist-info → hestia_earth_models-0.59.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3
 hestia_earth/models/cache_sites.py,sha256=kp_3D09P-JdAn9vt7eU-KKTwd6BAXWKQL_0UQCDsH2s,4798
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=LsmLTJIb3gRkCkowNKNONE3gjzMidoU3T3ZdHLRP_xc,19
+hestia_earth/models/version.py,sha256=58Yl5t5ON-GW8LlDihjO_US-BZGFRvSNjAnjUrGJ5wQ,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -44,7 +44,7 @@ hestia_earth/models/cycle/excretaKgMass.py,sha256=iA8Kfl3WvyxbQpx1QOGPQZ9O_Pc5rj
 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=3pJRcbZ0OQSNkFq_YC4McpiwLvWJpnL29AhhmCxr7RI,6938
-hestia_earth/models/cycle/irrigatedTypeUnspecified.py,sha256=OgKEuGmLLieS_aZ-2eA6r78UcXo1jcA0JJRZUllMHJg,2303
+hestia_earth/models/cycle/irrigatedTypeUnspecified.py,sha256=KlIa5eDvT47Twz6Q1kpw0rMlRjCK25CExaW58DEvc9w,2125
 hestia_earth/models/cycle/liveAnimal.py,sha256=orJz6ZN3bbGNzU9s5xsTk3u8K4ntPSv1_PyG0Nwslh8,3934
 hestia_earth/models/cycle/milkYield.py,sha256=RGaD5RtinMTsu6p49YUgr5z1NAVgCNFNPmwWa_Wrk3Q,5718
 hestia_earth/models/cycle/pastureGrass.py,sha256=7PrmDMJPtsbKGa8WIOh_4NXNtbH3Pxb23pmjawQuY9o,1226
@@ -176,7 +176,7 @@ hestia_earth/models/impact_assessment/__init__.py,sha256=gTR_PhWps593fPhm-V826VL
 hestia_earth/models/impact_assessment/emissions.py,sha256=zRQd17joMqij8mjRcrY9LssHgwzsYC5bkoy7iGdjj-Q,3429
 hestia_earth/models/impact_assessment/freshwaterWithdrawalsDuringCycle.py,sha256=wvNwABEh4blgm95G9y_yorMNEjyYsq4MZiFggkPRuIE,3932
 hestia_earth/models/impact_assessment/freshwaterWithdrawalsInputsProduction.py,sha256=DSLX_aEWaUFcFZRD46bG5lIQ4TtAtIqH-sMkVCJH2Dg,990
-hestia_earth/models/impact_assessment/irrigated.py,sha256=bXUQdF3SrL9Lqh6QztL5Gcbar0AfTiN5FHVco0JvMpA,704
+hestia_earth/models/impact_assessment/irrigated.py,sha256=qopAYbD91uu1Q2hJ3aB5Xl3br2Nzh7LoMTRCFOXmOv0,783
 hestia_earth/models/impact_assessment/landOccupationInputsProduction.py,sha256=SggB_4tpiKNeb6TIQWBm-X9VwG4pzLoyHdK8JroRIsE,576
 hestia_earth/models/impact_assessment/landTransformationFromCropland100YearAverageInputsProduction.py,sha256=jxeJS8r1qYIoyeEE-MGKbldEDL3x9CG8aIb4JdcUnj4,1036
 hestia_earth/models/impact_assessment/landTransformationFromCropland20YearAverageInputsProduction.py,sha256=vluuIcr1jYhs11oz7nANk2qUuUVPy5uNkvpfMv_M4LE,1034
@@ -202,15 +202,15 @@ hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py,sha256=6FDgMH5eiO1
 hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py,sha256=vD_kpvOJmjTOjDEnlqSYBSZxjuPGvzpmCr0JIC84GKE,3431
 hestia_earth/models/ipcc2006/belowGroundCropResidue.py,sha256=KzeRphJb1IWB_EPVcxa9tbCoNmEe80D9lKxgQOqfKoU,4138
 hestia_earth/models/ipcc2006/co2ToAirOrganicSoilCultivation.py,sha256=8AzFuqRprk6o-uyyI3XYsTGl2dP_ALgYJXWCseYEBQ8,3029
-hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py,sha256=WDpxmnlFsEWOPYI4uc-AIIZQNohwwKOrOIqTkRMlKZo,2333
+hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py,sha256=kf4WjdMzs6d8h433LFuUH9LJKJ_aMHTqEHDToGY5-Xk,2315
 hestia_earth/models/ipcc2006/n2OToAirExcretaDirect.py,sha256=VvQTIh58JyhrdPk5FdJQBkjBDr5-Cv7CnGkNEcco3P4,1986
-hestia_earth/models/ipcc2006/n2OToAirExcretaIndirect.py,sha256=WFWC3Hvw1-XXs_tHhZ-lwKtchanITOvEyHU4WgFSBV0,2261
+hestia_earth/models/ipcc2006/n2OToAirExcretaIndirect.py,sha256=me1MLX2WI5A_VZ11774CRxwRC6seOaxgMg_GGYCckIk,2243
 hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserDirect.py,sha256=hhFioTDxWZ2g_SjDt0k5tq6P8AJrq48i65qUpAfW_sU,2144
-hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py,sha256=FjwtDdp-TTp_KKR0w00LTVtRUptiIkJOMXWD2-EL9sY,2847
+hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py,sha256=MNFyXPCLX_RqfRQkO0UzVIYVevpEBO3R2uh3sIoIycM,2863
 hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserDirect.py,sha256=MZUmA3ajGkpi4wr020OU6m4WJdujjKkRhUVsbPgUVb8,2094
-hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserIndirect.py,sha256=qbHuht24JRtPBtRthzNSxCCaS5EzTOwCm1VIcgcUZSo,2785
+hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserIndirect.py,sha256=pgNG18EwgTA7kmVw9QFtucMn8ScVeEKJAsSPxcExbI8,2801
 hestia_earth/models/ipcc2006/n2OToAirOrganicSoilCultivationDirect.py,sha256=0J6ntZxYyLg3pUQeSQelDe36fb0nQtbMLjIBtwzHUyc,3038
-hestia_earth/models/ipcc2006/utils.py,sha256=mcfXf2gJKVShvER0LkEpTGp3tShXz25ZKNlYojlEGc4,1419
+hestia_earth/models/ipcc2006/utils.py,sha256=7-0rfkjgm8tH0dx5nfi-9sFP07L9Dli_2UCZf6eL2qU,541
 hestia_earth/models/ipcc2013ExcludingFeedbacks/__init__.py,sha256=v4Qe-X4w3tqIHGJBNnEAK81x4ZuQMwYxQYXRncugmcU,427
 hestia_earth/models/ipcc2013ExcludingFeedbacks/gwp100.py,sha256=8VRg-Vvzc86_CQmBH-iHNhaSnAFHew2swAMecT0aXW4,979
 hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZiTvu3mpZy_3j0xcd06RHHCfPrCMgU,427
@@ -227,20 +227,24 @@ hestia_earth/models/ipcc2019/co2ToAirSoilCarbonStockChangeManagementChange.py,sh
 hestia_earth/models/ipcc2019/co2ToAirUreaHydrolysis.py,sha256=ICE3r8GMoHj6WfMUxQdqdejRpOLa3cxDMyF3GvSTW0U,3700
 hestia_earth/models/ipcc2019/croppingDuration.py,sha256=_jlFrTNDOARH2_g8s4dzuaCoLHSX2BHzSQd3uuQN32Y,3173
 hestia_earth/models/ipcc2019/ligninContent.py,sha256=wp5EbCthCDAKyvPBfZULS9-uKEY58TQQ8ey1pf-juv8,7267
-hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=c4DOH5Evmxgm4x6MmUMzi4x77D8otT-sdlD-spQVIOs,4069
+hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py,sha256=Fand7NbT27unwgFTxi_9NxT024s63vQ7U6-tk9yp3d8,3990
+hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionIndirect.py,sha256=_Oj6Jw8F4rce7FmhWkzeqyB7W3ZQWpOiA10p6xrfSwc,3777
 hestia_earth/models/ipcc2019/n2OToAirExcretaDirect.py,sha256=9rpp5NvFZOGRSnkfLhBoMqArdzKSd4fH-fgQEnbTT4I,1722
+hestia_earth/models/ipcc2019/n2OToAirExcretaIndirect.py,sha256=4TfJg5OhTnj_ulW-IH8Jz1hMRB0zKMQdh0vBZKL6nqg,3650
 hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserDirect.py,sha256=NfS6EiEVSf-hpWHqO3r-1PKPuHPVb6ijTNLTbOlRCp0,4062
-hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserIndirect.py,sha256=9tCk0ZIUitj6XXfz8wvnGL6SR6L3aRhXL0FFpaXxQkE,4216
+hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserIndirect.py,sha256=iNjwTyktLqD0HpwfwAEnAHbQUDNQmT7ekONF_lJobzE,3715
 hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserDirect.py,sha256=pMyl6UtUVgPWfczgA_cdm1RUdMGi4Ln16qWrw1eesv4,4138
-hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py,sha256=g6vWbuooOU9Xg4V0Oqo8730UeeiwOwNPCVJMz9NoeTw,4110
+hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py,sha256=9YbaR8h7P-4rLHgcwtDLnQ_hT7cKzyELjCVJ9lWV2jI,3701
+hestia_earth/models/ipcc2019/nh3ToAirOrganicFertiliser.py,sha256=fsuc4pojyOfNrfnwLpVlfUWScm6SznJ5s_rbxhB6zJg,3717
 hestia_earth/models/ipcc2019/nitrogenContent.py,sha256=6fGG7diDp9zAidVH75gXz9c8uxURx0Q2COo8KrkT3I4,7191
 hestia_earth/models/ipcc2019/no3ToGroundwaterCropResidueDecomposition.py,sha256=8NOjbqJuQ-wnLz3bYmwaygSzKBdaF3N7hoELGNnO4YQ,3115
 hestia_earth/models/ipcc2019/no3ToGroundwaterExcreta.py,sha256=mJUXLGtg9EOZq9LH0KFOKvzER1ypCUucs0ZMaNYMShc,2991
 hestia_earth/models/ipcc2019/no3ToGroundwaterInorganicFertiliser.py,sha256=wTvMBthqmiKMn4nLbL4VD6_8_gGI2WGR3OYz3KK8sXs,3105
 hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=zOhp6NhYUuUNU_LMMwhZBP78YC2XRWRlGnajBUX2AN8,3095
-hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=7FXRYTrgFFdU1Fjo4HegfipiWPbY5ChcBi3qRfc7aXE,141142
+hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=VK3F0GUBG5CYJj0tLercVryj1ezj58PxaFi_zqijHvE,3717
+hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=ADn2kv6uzfJb71ti8ydI3aGiGQMj0HsIZDjgxdU2Aic,142289
 hestia_earth/models/ipcc2019/pastureGrass.py,sha256=CpDEtdnbKd_8eaDLcflJ-dGik3t879HIoEIzuaHNmC0,23168
-hestia_earth/models/ipcc2019/utils.py,sha256=1DfHJxVktu7vZMqj-yVjGb_59sHi7lu91GDnB5-qR4o,6504
+hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2021/__init__.py,sha256=VTgGFKhwMmk_nuI1RRq0in27fHYVPBonlXlPK00K8no,409
 hestia_earth/models/ipcc2021/gwp100.py,sha256=v-DYU-11XnWI1Ns1GEiKrJqL3JafxvhTsLmuBuFcxJU,1021
 hestia_earth/models/jarvisAndPain1994/__init__.py,sha256=ercUwy29sV7oPIESj8UjsGB5lqiBCss9OZcbjxeeG8E,418
@@ -447,6 +451,7 @@ hestia_earth/models/site/precipitationAnnual.py,sha256=to14BEFjUaYyCu5aIBQZtuaIr
 hestia_earth/models/site/precipitationMonthly.py,sha256=yGUbiUCu1Prp3qVHuZodGrcfrbYu170WTUGyaj-KEjY,1896
 hestia_earth/models/site/rainfallAnnual.py,sha256=Ix_B8Ny7IIRkJ_3lUvoHOjPgqCyR9I0U3_ADUUtMqsY,2003
 hestia_earth/models/site/rainfallMonthly.py,sha256=2Uo8F-YxnTK0_txlHmiAyVp1bGfWD4bneRKyg4tdQkI,1881
+hestia_earth/models/site/soilMeasurement.py,sha256=pFh7-lpcBrvpOZ071XhadpuK_5AoywIFaekRfGosY5U,7839
 hestia_earth/models/site/temperatureAnnual.py,sha256=Q3b1RH2_hpA0JWwOYA5nKgMGcXHjV8-akXT9vB0cbwc,2012
 hestia_earth/models/site/temperatureMonthly.py,sha256=yXwpFCGT2tUqvVBNedaPyBmN_KlzZqo5yv2TWem1pBk,1890
 hestia_earth/models/site/totalNitrogenPerKgSoil.py,sha256=8ERrTZpN_yCRUyFg_EYaX4abE9jLcyX3lx3MO4Bi6CE,1938
@@ -501,9 +506,9 @@ hestia_earth/models/utils/crop.py,sha256=S8UycHpkgx_TznW3Q7pchEMlCQ623T_SqU6V5fB
 hestia_earth/models/utils/cropResidue.py,sha256=_0Q35CrliJeo31xGHsPWe8A2oHxijdIsOrf3gBEqhlA,612
 hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
-hestia_earth/models/utils/cycle.py,sha256=gDCGfAb_bZ9pdqZrIhUMNUJ_qT11GyY-w1zlayvoAsA,16511
+hestia_earth/models/utils/cycle.py,sha256=F5dykDeHJfnSm6m7YCqQT3Ip3OZsAB-oipbKwbvslBE,16647
 hestia_earth/models/utils/ecoClimateZone.py,sha256=NHFt-A9EiWXC6tUNIxkgOWUZOjj4I4uwJIP9ddDZegw,1112
-hestia_earth/models/utils/emission.py,sha256=W0yCUnr_FQB5f6-SF6skoDC6MzC6zglwNrKWTPYCUdo,748
+hestia_earth/models/utils/emission.py,sha256=AVp-ngrb4VHYT8BG1QA5EEb17edT3cLonsXV3cNm04U,1576
 hestia_earth/models/utils/excretaManagement.py,sha256=NuWPQjFZxMVt9sYgBjcqhGWCFk_OKb3sA9Ovcff3fRQ,428
 hestia_earth/models/utils/feedipedia.py,sha256=fqlpAwG_jbZAFPWJ-yUI7gwn0oq--1GLTlHLsCeBbPQ,3181
 hestia_earth/models/utils/fuel.py,sha256=r1MKMMxg-PYiVlRutP83RuvY2rsdCQ1iN6ekSGGQGpA,1379
@@ -744,17 +749,21 @@ tests/models/ipcc2019/test_co2ToAirUreaHydrolysis.py,sha256=MmtEME0xjsa3KojFk_fx
 tests/models/ipcc2019/test_croppingDuration.py,sha256=gLRXeR6Tqa7ciD9KTRfsIflSeIIWT2iOpZMdcxAQla4,1871
 tests/models/ipcc2019/test_ligninContent.py,sha256=eIKEN__ab-0R52EhlhPSBiHnmTl6xOf1XbI33O-W9A4,4146
 tests/models/ipcc2019/test_n2OToAirCropResidueDecompositionDirect.py,sha256=lVfSKpVszGK42pzo2FefXNZRmXbqOt25IBcnxvhC_X0,2418
+tests/models/ipcc2019/test_n2OToAirCropResidueDecompositionIndirect.py,sha256=it2PVNYBNAvQWmWLDJ9Evjqtx7SJl-X0ZyQz3Fuvb3k,2119
 tests/models/ipcc2019/test_n2OToAirExcretaDirect.py,sha256=JYvBK4edcqfHrMPwgBFXF6km51ew9RISUcfQ_RNf2RY,1216
+tests/models/ipcc2019/test_n2OToAirExcretaIndirect.py,sha256=z46L5JMB4-W0uCyyFlLKTEyDnt2gUHRkH7dEXK6ioHk,2098
 tests/models/ipcc2019/test_n2OToAirInorganicFertiliserDirect.py,sha256=ffk-aom1BqyEmqm-JESWX5MErrAVAgVuH1gjW32U5Pk,2407
-tests/models/ipcc2019/test_n2OToAirInorganicFertiliserIndirect.py,sha256=X61AE9Eb0Lqwy4AkfKKaHKU-p4C5JZIo326t8BT6ALs,1613
+tests/models/ipcc2019/test_n2OToAirInorganicFertiliserIndirect.py,sha256=RnU8CkUCYBBO1bgJALnoVgjTHLL1L1sja2nsyeVA_cg,2113
 tests/models/ipcc2019/test_n2OToAirOrganicFertiliserDirect.py,sha256=XQpzdEFT7qSw6KKRYEZ6Cmzkc_xLyG98FHH1PSfOUo0,2403
-tests/models/ipcc2019/test_n2OToAirOrganicFertiliserIndirect.py,sha256=cPXdknWmXJig9i_AR19oX4g3GjTcEo8455DsD2w8M10,1609
+tests/models/ipcc2019/test_n2OToAirOrganicFertiliserIndirect.py,sha256=hW84sTlhB8mKRSFJX_iQS4gYo74zCtY-9zr1VHLC5GU,2111
+tests/models/ipcc2019/test_nh3ToAirOrganicFertiliser.py,sha256=Z4a20I2UnZdzm6FqHnlHRXXVCY993_SHT7nG-zAhx-c,1104
 tests/models/ipcc2019/test_nitrogenContent.py,sha256=rKl_05PCC0OSsAhG0cHJOqnt9LsCaFnRpJorkm1TShA,3704
 tests/models/ipcc2019/test_no3ToGroundwaterCropResidueDecomposition.py,sha256=4__3HDUDWt5KjQGcXEFXHBgP_jT0rxvIzpBLH_mP9WE,1729
 tests/models/ipcc2019/test_no3ToGroundwaterExcreta.py,sha256=Z-pCBQvlUf0ttmCERgezW-6e3KlX45YEVccOwthf5lU,1588
 tests/models/ipcc2019/test_no3ToGroundwaterInorganicFertiliser.py,sha256=e7REnQ9r9a8xroq5aPp0NIzmkad_6MyTuceRTYoKdkE,1613
 tests/models/ipcc2019/test_no3ToGroundwaterOrganicFertiliser.py,sha256=e1ZViD12qB3bLdH3TJw3GbBP8iqMen-UJbcFkytb3VQ,1609
-tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=UtiFAYJSqIz8_zb0H4qFRfh-6c-m422THoV3KfHHXpQ,20374
+tests/models/ipcc2019/test_noxToAirOrganicFertiliser.py,sha256=LR5pjV5vRbgSSQAw8kYRp_ij4CHInzgaDS6EggQuBiw,1104
+tests/models/ipcc2019/test_organicCarbonPerHa.py,sha256=lsg148KPupjF4ds8yUy1Cl2hcVXaGT9AIgkGycbHqXI,21643
 tests/models/ipcc2019/test_pastureGrass.py,sha256=pE4PWdR541v4xWDYihP7Dou8V1iqg5GwD5_rjGRzrds,2292
 tests/models/ipcc2021/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2021/test_gwp100.py,sha256=JRklKMSg-OXopb9ZufGgl94deuMuJSsfNXRZDBtOZrE,1119
@@ -956,6 +965,7 @@ tests/models/site/test_precipitationAnnual.py,sha256=h0tXvykZw4Zaw225RHfvw-3DvAy
 tests/models/site/test_precipitationMonthly.py,sha256=iccr-_ZrseM_OT3AKZbTNQhRFSIe-R6wXTDS-2wIVew,995
 tests/models/site/test_rainfallAnnual.py,sha256=4YYna66qjJptPJ_URvdcQuRC3dri9SB0xmWP8DFwslM,986
 tests/models/site/test_rainfallMonthly.py,sha256=A3gIe2Yxt9CLtLcAJNCQ0-8aRB49VdfKBLBy-7eDgJw,985
+tests/models/site/test_soilMeasurement.py,sha256=yXOG0EKyk57NvIqVDIohjZRubQ4aJoLw63Nwi6H54r8,4445
 tests/models/site/test_temperatureAnnual.py,sha256=nOJG9ZJ8NCMM8T47uxxBeloIYLFN6-xtvUBqJsqt8xk,992
 tests/models/site/test_temperatureMonthly.py,sha256=C2lv-lpYqH7VUGOlxNLE6d7k_dFS6NYe8BvMlrJorCw,991
 tests/models/site/test_totalNitrogenPerKgSoil.py,sha256=2ILrA0jQKGniiKwS5FF3ZLtudgUgjcMnzFtrHpJKPTc,1161
@@ -1017,8 +1027,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
 tests/models/utils/test_term.py,sha256=JJmzyHnhVGeQ7tG-T6DjE7CoIJPH0guH-y2kjGeZiJY,3756
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.59.1.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
-hestia_earth_models-0.59.1.dist-info/METADATA,sha256=OmSflUlcdw-cSbja7uMHn26Do72YujIz0dol2DND0Ek,3134
-hestia_earth_models-0.59.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.59.1.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.59.1.dist-info/RECORD,,
+hestia_earth_models-0.59.2.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
+hestia_earth_models-0.59.2.dist-info/METADATA,sha256=-qJ0J6ITtaF7C2fKg8Y38GtdFxZq0FMtcW4XO-H1pkA,3134
+hestia_earth_models-0.59.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.59.2.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.59.2.dist-info/RECORD,,

tests/models/ipcc2019/test_n2OToAirCropResidueDecompositionIndirect.py

@@ -0,0 +1,71 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_emission
+
+from hestia_earth.models.ipcc2019.n2OToAirCropResidueDecompositionIndirect import (
+    MODEL, TERM_ID, run, _should_run, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID
+)
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+def test_should_run():
+    # no emissions => no run
+    cycle = {'completeness': {'cropResidue': True}, 'emissions': []}
+    should_run, *args = _should_run(cycle)
+    assert not should_run
+
+    # with no3 emission => run
+    cycle['emissions'] = [
+        {
+            'term': {'@id': NO3_TERM_ID},
+            'value': [100]
+        },
+        {
+            'term': {'@id': NH3_TERM_ID},
+            'value': [100]
+        },
+        {
+            'term': {'@id': NOX_TERM_ID},
+            '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
+
+
+@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_n2OToAirExcretaIndirect.py

@@ -0,0 +1,71 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_emission
+
+from hestia_earth.models.ipcc2019.n2OToAirExcretaIndirect import (
+    MODEL, TERM_ID, run, _should_run, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID
+)
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+def test_should_run():
+    # no emissions => no run
+    cycle = {'completeness': {'excreta': True}, 'emissions': []}
+    should_run, *args = _should_run(cycle)
+    assert not should_run
+
+    # with no3 emission => run
+    cycle['emissions'] = [
+        {
+            'term': {'@id': NO3_TERM_ID},
+            'value': [100]
+        },
+        {
+            'term': {'@id': NH3_TERM_ID},
+            'value': [100]
+        },
+        {
+            'term': {'@id': NOX_TERM_ID},
+            '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
+
+
+@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_n2OToAirInorganicFertiliserIndirect.py

@@ -2,26 +2,49 @@ 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
+from hestia_earth.models.ipcc2019.n2OToAirInorganicFertiliserIndirect import (
+    MODEL, TERM_ID, run, _should_run, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID
+)
 
 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({})
+def test_should_run():
+    # no emissions => no run
+    cycle = {'completeness': {'fertiliser': True}, 'emissions': []}
+    should_run, *args = _should_run(cycle)
+    assert not should_run
 
-    # with N => no run
-    mock_N_total.return_value = 10
-    assert not _should_run({})
+    # with no3 emission => run
+    cycle['emissions'] = [
+        {
+            'term': {'@id': NO3_TERM_ID},
+            'value': [100]
+        },
+        {
+            'term': {'@id': NH3_TERM_ID},
+            'value': [100]
+        },
+        {
+            'term': {'@id': NOX_TERM_ID},
+            'value': [100]
+        }
+    ]
+    should_run, *args = _should_run(cycle)
+    assert should_run is True
 
-    # 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(*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
 
 
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)