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

hestia_earth/models/cycle/irrigatedTypeUnspecified.py

@@ -1,7 +1,7 @@
 from hestia_earth.schema import TermTermType, CycleFunctionalUnit
-from hestia_earth.utils.model import filter_list_term_type
 
 from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.cycle import is_irrigated
 from hestia_earth.models.utils.practice import _new_practice
 from hestia_earth.models.utils.input import get_total_irrigation_m3
 from hestia_earth.models.utils.completeness import _is_term_type_complete
@@ -12,7 +12,7 @@ REQUIREMENTS = {
         "completeness.water": "",
         "functionalUnit": "1 ha",
         "none": {
-            "practices": [{"@type": "Practice", "units": ["%", "% area"], "term.termType": "waterRegime"}]
+            "practices": [{"@type": "Practice", "value": "> 0", "term.termType": "waterRegime"}]
         },
         "optional": {
             "inputs": [{"@type": "Input", "term.termType": "water", "value": ""}]
@@ -24,6 +24,9 @@ RETURNS = {
         "value": ""
     }]
 }
+LOOKUPS = {
+    "waterRegime": "irrigated"
+}
 TERM_ID = 'irrigatedTypeUnspecified'
 MIN_IRRIGATION_M3 = 250
 
@@ -34,9 +37,6 @@ def _practice(value: float):
     return practice
 
 
-def _is_irrigation_practice(practice: dict): return practice.get('term', {}).get('units', '') in ['%', '% area']
-
-
 def _run(irrigation_m3: float):
     value = 100 if irrigation_m3 > MIN_IRRIGATION_M3 else 0
     return [_practice(value)]
@@ -47,8 +47,7 @@ def _should_run(cycle: dict):
     water_complete = _is_term_type_complete(cycle, TermTermType.WATER)
     irrigation_value_m3 = get_total_irrigation_m3(cycle)
 
-    water_regime = filter_list_term_type(cycle.get('practices', []), TermTermType.WATERREGIME)
-    no_irrigation_practice = not any(map(_is_irrigation_practice, water_regime))
+    no_irrigation_practice = not is_irrigated(cycle, model=MODEL, term=TERM_ID)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     no_irrigation_practice=no_irrigation_practice,

hestia_earth/models/impact_assessment/irrigated.py

@@ -18,10 +18,13 @@ REQUIREMENTS = {
 RETURNS = {
     "`true` if the `Cycle` was irrigated, `false` otherwise": ""
 }
+LOOKUPS = {
+    "waterRegime": "irrigated"
+}
 MODEL_KEY = 'irrigated'
 
 
 def run(impact: dict):
-    value = is_irrigated(impact.get('cycle', {}))
+    value = is_irrigated(impact.get('cycle', {}), model=MODEL, model_key=MODEL_KEY)
     logger.debug('model=%s, key=%s, value=%s', MODEL, MODEL_KEY, value)
     return value

hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py

@@ -3,8 +3,8 @@ from hestia_earth.schema import EmissionMethodTier, TermTermType
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
 from hestia_earth.models.utils.completeness import _is_term_type_complete
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_nh3_no3_nox_to_n, COEFF_NH3NOX_N2O, COEFF_NO3_N2O
+from hestia_earth.models.utils.emission import _new_emission, get_nh3_no3_nox_to_n
+from .utils import COEFF_NH3NOX_N2O, COEFF_NO3_N2O
 from . import MODEL
 
 REQUIREMENTS = {
@@ -43,7 +43,7 @@ def _run(no3: float, nh3: float, nox: float):
 
 
 def _should_run(cycle: dict):
-    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID, allow_none=False)
+    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID)
     term_type_complete = _is_term_type_complete(cycle, TermTermType.CROPRESIDUE)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,

hestia_earth/models/ipcc2006/n2OToAirExcretaIndirect.py

@@ -3,8 +3,8 @@ from hestia_earth.schema import EmissionMethodTier, TermTermType
 from hestia_earth.models.log import logRequirements, logShouldRun
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
 from hestia_earth.models.utils.completeness import _is_term_type_complete
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_nh3_no3_nox_to_n, COEFF_NH3NOX_N2O, COEFF_NO3_N2O
+from hestia_earth.models.utils.emission import _new_emission, get_nh3_no3_nox_to_n
+from .utils import COEFF_NH3NOX_N2O, COEFF_NO3_N2O
 from . import MODEL
 
 REQUIREMENTS = {
@@ -43,7 +43,7 @@ def _run(no3_n: float, nh3_n: float, nox_n: float):
 
 
 def _should_run(cycle: dict):
-    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID, allow_none=False)
+    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID)
     term_type_complete = _is_term_type_complete(cycle, TermTermType.EXCRETA)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,

hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py

@@ -1,11 +1,12 @@
 from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
+from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
 from hestia_earth.models.utils.completeness import _is_term_type_complete
 from hestia_earth.models.utils.cycle import get_inorganic_fertiliser_N_total
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_nh3_no3_nox_to_n, COEFF_NH3NOX_N2O, COEFF_NO3_N2O
+from hestia_earth.models.utils.emission import _new_emission, get_nh3_no3_nox_to_n
+from .utils import COEFF_NH3NOX_N2O, COEFF_NO3_N2O
 from . import MODEL
 
 REQUIREMENTS = {
@@ -54,9 +55,9 @@ def _run(cycle: dict, N_total: float):
                 nh3_n=nh3_n,
                 nox_n=nox_n)
     value = COEFF_NH3NOX_N2O * (
-        N_total * 0.1 if nox_n == 0 or nh3_n == 0 else nh3_n + nox_n
+        sum_values([nh3_n, nox_n]) or N_total * 0.2
     ) + COEFF_NO3_N2O * (
-        N_total * 0.3 if no3_n == 0 else no3_n
+        no3_n or N_total * 0.3
     )
     return [_emission(value * get_atomic_conversion(Units.KG_N2O, Units.TO_N))]
 

hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserIndirect.py

@@ -1,11 +1,12 @@
 from hestia_earth.schema import EmissionMethodTier
 
 from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
+from hestia_earth.models.utils import sum_values
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
 from hestia_earth.models.utils.completeness import _is_term_type_complete
 from hestia_earth.models.utils.cycle import get_organic_fertiliser_N_total
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_nh3_no3_nox_to_n, COEFF_NH3NOX_N2O, COEFF_NO3_N2O
+from hestia_earth.models.utils.emission import _new_emission, get_nh3_no3_nox_to_n
+from .utils import COEFF_NH3NOX_N2O, COEFF_NO3_N2O
 from . import MODEL
 
 REQUIREMENTS = {
@@ -53,9 +54,9 @@ def _run(cycle: dict, N_total: float):
                 nh3_n=nh3_n,
                 nox_n=nox_n)
     value = COEFF_NH3NOX_N2O * (
-        N_total * 0.2 if nox_n == 0 or nh3_n == 0 else nh3_n + nox_n
+        sum_values([nh3_n, nox_n]) or N_total * 0.2
     ) + COEFF_NO3_N2O * (
-        N_total * 0.3 if no3_n == 0 else no3_n
+        no3_n or N_total * 0.3
     )
     return [_emission(value * get_atomic_conversion(Units.KG_N2O, Units.TO_N))]
 

hestia_earth/models/ipcc2006/utils.py

@@ -1,25 +1,9 @@
 from hestia_earth.utils.model import find_primary_product
 
-from hestia_earth.models.utils.constant import Units, get_atomic_conversion
-from hestia_earth.models.utils.blank_node import find_terms_value
-
 COEFF_NH3NOX_N2O = 0.01
 COEFF_NO3_N2O = 0.0075
 
 
-def get_nh3_no3_nox_to_n(cycle: dict, nh3_term_id: str, no3_term_id: str, nox_term_id: str, allow_none: bool = True):
-    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)
-
-
 def get_N_N2O_excreta_coeff_from_primary_product(cycle: dict):
     product = find_primary_product(cycle)
     term = product.get('term', {}) if product else {}

hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionDirect.py

@@ -62,13 +62,16 @@ def _emission(value: float, min: float, max: float, sd: float, aggregated: bool
     return emission
 
 
-def _run(cycle: dict, N_total: float, ecoClimateZone: str = None, flooded_rice: bool = False):
+def _run(cycle: dict, N_total: float, flooded_rice: bool = False):
+    ecoClimateZone = get_ecoClimateZone(cycle)
+
     converted_N_total = N_total * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
     factors, aggregated = get_N2O_factors(
         TERM_ID, cycle, TermTermType.CROPRESIDUE, ecoClimateZone=ecoClimateZone, flooded_rice=flooded_rice
     )
 
     debugValues(cycle, model=MODEL, term=TERM_ID,
+                ecoClimateZone=ecoClimateZone,
                 factors_used=log_as_table(factors),
                 aggregated=aggregated)
 
@@ -82,21 +85,19 @@ def _run(cycle: dict, N_total: float, ecoClimateZone: str = None, flooded_rice:
 def _should_run(cycle: dict):
     term_type_complete = _is_term_type_complete(cycle, TermTermType.CROPRESIDUE)
     N_crop_residue = get_crop_residue_decomposition_N_total(cycle)
-    ecoClimateZone = get_ecoClimateZone(cycle)
 
     flooded_rice = has_flooded_rice(cycle.get('products', []))
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     term_type_cropResidue_complete=term_type_complete,
                     N_crop_residue=N_crop_residue,
-                    has_flooded_rice=flooded_rice,
-                    ecoClimateZone=ecoClimateZone)
+                    has_flooded_rice=flooded_rice)
 
     should_run = all([N_crop_residue is not None, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
-    return should_run, N_crop_residue, ecoClimateZone, flooded_rice
+    return should_run, N_crop_residue, flooded_rice
 
 
 def run(cycle: dict):
-    should_run, N_total, ecoClimateZone, flooded_rice = _should_run(cycle)
-    return _run(cycle, N_total, ecoClimateZone, flooded_rice) if should_run else []
+    should_run, N_total, flooded_rice = _should_run(cycle)
+    return _run(cycle, N_total, flooded_rice) if should_run else []

hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionIndirect.py

@@ -0,0 +1,100 @@
+from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+
+from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils.constant import Units, get_atomic_conversion
+from hestia_earth.models.utils.completeness import _is_term_type_complete
+from hestia_earth.models.utils.emission import _new_emission, get_nh3_no3_nox_to_n
+from hestia_earth.models.utils.cycle import get_ecoClimateZone
+from .utils import ecoClimate_factors, EF4_FACTORS, EF5_FACTORS
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.cropResidue": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterCropResidueDecomposition"},
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirCropResidueDecomposition"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirCropResidueDecomposition"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirCropResidueDecompositionIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+NO3_TERM_ID = 'no3ToGroundwaterCropResidueDecomposition'
+NH3_TERM_ID = 'nh3ToAirCropResidueDecomposition'
+NOX_TERM_ID = 'noxToAirCropResidueDecomposition'
+
+
+def _emission(value: float, min: float, max: float, aggregated: bool = False):
+    emission = _new_emission(TERM_ID, MODEL)
+    emission['value'] = [value]
+    emission['min'] = [min]
+    emission['max'] = [max]
+    emission['methodTier'] = TIER
+    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
+    emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
+    return emission
+
+
+def _run(cycle: dict, no3: float, nh3: float, nox: float):
+    ecoClimateZone = get_ecoClimateZone(cycle)
+
+    ef4, aggregated = ecoClimate_factors(EF4_FACTORS, ecoClimateZone=ecoClimateZone)
+    ef5 = EF5_FACTORS.get('default')
+
+    debugValues(cycle, model=MODEL, term=TERM_ID,
+                ecoClimateZone=ecoClimateZone,
+                ef4_factors_used=log_as_table(ef4),
+                ef5_factors_used=log_as_table(ef5),
+                aggregated=aggregated)
+
+    value = sum([
+        no3 * ef5['value'],
+        nh3 * ef4['value'],
+        nox * ef4['value']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    min = sum([
+        no3 * ef5['min'],
+        nh3 * ef4['min'],
+        nox * ef4['min']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    max = sum([
+        no3 * ef5['max'],
+        nh3 * ef4['max'],
+        nox * ef4['max']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    return [_emission(value, min, max, aggregated=aggregated)]
+
+
+def _should_run(cycle: dict):
+    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID)
+    term_type_complete = _is_term_type_complete(cycle, TermTermType.CROPRESIDUE)
+
+    logRequirements(cycle, model=MODEL, term=TERM_ID,
+                    no3_n=no3_n,
+                    nh3_n=nh3_n,
+                    nox_n=nox_n,
+                    term_type_cropResidue_complete=term_type_complete)
+
+    should_run = all([no3_n is not None, nh3_n is not None, nox_n is not None, term_type_complete])
+    logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
+    return should_run, no3_n, nh3_n, nox_n
+
+
+def run(cycle: dict):
+    should_run, no3, nh3, nox = _should_run(cycle)
+    return _run(cycle, no3, nh3, nox) if should_run else []

hestia_earth/models/ipcc2019/n2OToAirExcretaIndirect.py

@@ -0,0 +1,100 @@
+from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+
+from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
+from hestia_earth.models.utils.constant import Units, get_atomic_conversion
+from hestia_earth.models.utils.completeness import _is_term_type_complete
+from hestia_earth.models.utils.emission import _new_emission, get_nh3_no3_nox_to_n
+from hestia_earth.models.utils.cycle import get_ecoClimateZone
+from .utils import ecoClimate_factors, EF4_FACTORS, EF5_FACTORS
+from . import MODEL
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.excreta": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterExcreta"},
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirExcreta"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirExcreta"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirExcretaIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+NO3_TERM_ID = 'no3ToGroundwaterExcreta'
+NH3_TERM_ID = 'nh3ToAirExcreta'
+NOX_TERM_ID = 'noxToAirExcreta'
+
+
+def _emission(value: float, min: float, max: float, aggregated: bool = False):
+    emission = _new_emission(TERM_ID, MODEL)
+    emission['value'] = [value]
+    emission['min'] = [min]
+    emission['max'] = [max]
+    emission['methodTier'] = TIER
+    emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
+    emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
+    return emission
+
+
+def _run(cycle: dict, no3: float, nh3: float, nox: float):
+    ecoClimateZone = get_ecoClimateZone(cycle)
+
+    ef4, aggregated = ecoClimate_factors(EF4_FACTORS, ecoClimateZone=ecoClimateZone)
+    ef5 = EF5_FACTORS.get('default')
+
+    debugValues(cycle, model=MODEL, term=TERM_ID,
+                ecoClimateZone=ecoClimateZone,
+                ef4_factors_used=log_as_table(ef4),
+                ef5_factors_used=log_as_table(ef5),
+                aggregated=aggregated)
+
+    value = sum([
+        no3 * ef5['value'],
+        nh3 * ef4['value'],
+        nox * ef4['value']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    min = sum([
+        no3 * ef5['min'],
+        nh3 * ef4['min'],
+        nox * ef4['min']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    max = sum([
+        no3 * ef5['max'],
+        nh3 * ef4['max'],
+        nox * ef4['max']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    return [_emission(value, min, max, aggregated=aggregated)]
+
+
+def _should_run(cycle: dict):
+    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID)
+    term_type_complete = _is_term_type_complete(cycle, TermTermType.EXCRETA)
+
+    logRequirements(cycle, model=MODEL, term=TERM_ID,
+                    no3_n=no3_n,
+                    nh3_n=nh3_n,
+                    nox_n=nox_n,
+                    term_type_cropResidue_complete=term_type_complete)
+
+    should_run = all([no3_n is not None, nh3_n is not None, nox_n is not None, term_type_complete])
+    logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
+    return should_run, no3_n, nh3_n, nox_n
+
+
+def run(cycle: dict):
+    should_run, no3, nh3, nox = _should_run(cycle)
+    return _run(cycle, no3, nh3, nox) if should_run else []

hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserIndirect.py

@@ -1,107 +1,100 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
 
-from hestia_earth.models.log import debugValues, logRequirements, logShouldRun
+from hestia_earth.models.log import debugValues, logRequirements, logShouldRun, log_as_table
 from hestia_earth.models.utils.constant import Units, get_atomic_conversion
 from hestia_earth.models.utils.completeness import _is_term_type_complete
-from hestia_earth.models.utils.cycle import get_inorganic_fertiliser_N_total, get_ecoClimateZone
-from hestia_earth.models.utils.emission import _new_emission
-from .utils import get_nh3_no3_nox_to_n, COEFF_NO3_N2O, COEFF_N_NH3NOX_inorganic, get_FracNH3NOx_N2O, get_FracLEACH_H
+from hestia_earth.models.utils.emission import _new_emission, get_nh3_no3_nox_to_n
+from hestia_earth.models.utils.cycle import get_ecoClimateZone
+from .utils import ecoClimate_factors, EF4_FACTORS, EF5_FACTORS
 from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
         "completeness.fertiliser": "True",
-        "completeness.water": "True",
-        "inputs": [{
-            "@type": "Input",
-            "value": "",
-            "term.units": ["kg", "kg N"],
-            "term.termType": "inorganicFertiliser",
-            "optional": {
-                "properties": [{"@type": "Property", "value": "", "term.@id": "nitrogenContent"}]
-            }
-        }],
         "emissions": [
             {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterInorganicFertiliser"},
             {"@type": "Emission", "value": "", "term.@id": "nh3ToAirInorganicFertiliser"},
             {"@type": "Emission", "value": "", "term.@id": "noxToAirInorganicFertiliser"}
         ],
-        "site": {
-            "@type": "Site",
-            "measurements": [{"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}]
-        },
         "optional": {
-            "practices": [{"@type": "Practice", "value": "", "term.termType": "waterRegime"}]
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
         }
     }
 }
 RETURNS = {
     "Emission": [{
         "value": "",
-        "sd": "",
-        "min": "",
-        "max": "",
-        "methodTier": "tier 1",
-        "statsDefinition": "modelled"
+        "methodTier": "tier 1"
     }]
 }
-
 TERM_ID = 'n2OToAirInorganicFertiliserIndirect'
+TIER = EmissionMethodTier.TIER_1.value
 NO3_TERM_ID = 'no3ToGroundwaterInorganicFertiliser'
 NH3_TERM_ID = 'nh3ToAirInorganicFertiliser'
 NOX_TERM_ID = 'noxToAirInorganicFertiliser'
-TIER = EmissionMethodTier.TIER_1.value
 
 
-def _emission(value: float, sd: float, min: float, max: float):
+def _emission(value: float, min: float, max: float, aggregated: bool = False):
     emission = _new_emission(TERM_ID, MODEL)
     emission['value'] = [value]
-    emission['sd'] = [sd]
     emission['min'] = [min]
     emission['max'] = [max]
     emission['methodTier'] = TIER
     emission['statsDefinition'] = EmissionStatsDefinition.MODELLED.value
+    emission['methodModelDescription'] = 'Aggregated version' if aggregated else 'Disaggregated version'
     return emission
 
 
-def _run(cycle: dict):
-    N_total = get_inorganic_fertiliser_N_total(cycle)
-    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID)
+def _run(cycle: dict, no3: float, nh3: float, nox: float):
+    ecoClimateZone = get_ecoClimateZone(cycle)
+
+    ef4, aggregated = ecoClimate_factors(EF4_FACTORS, ecoClimateZone=ecoClimateZone)
+    ef5 = EF5_FACTORS.get('default')
+
     debugValues(cycle, model=MODEL, term=TERM_ID,
-                no3_n=no3_n,
-                nh3_n=nh3_n,
-                nox_n=nox_n)
-    value, min_val, max_val, std = [
-        get_FracNH3NOx_N2O(cycle, TERM_ID)[x] * (
-            N_total * COEFF_N_NH3NOX_inorganic[x] if nox_n == 0 or nh3_n == 0 else nh3_n + nox_n
-        ) +
-        COEFF_NO3_N2O[x] * (
-            N_total * get_FracLEACH_H(cycle, TERM_ID)[x] if no3_n == 0 else no3_n
-        ) for x in range(4)
-    ]
-    return [_emission(
-        value * get_atomic_conversion(Units.KG_N2O, Units.TO_N),
-        std * get_atomic_conversion(Units.KG_N2O, Units.TO_N),
-        min_val * get_atomic_conversion(Units.KG_N2O, Units.TO_N),
-        max_val * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
-    )]
+                ecoClimateZone=ecoClimateZone,
+                ef4_factors_used=log_as_table(ef4),
+                ef5_factors_used=log_as_table(ef5),
+                aggregated=aggregated)
+
+    value = sum([
+        no3 * ef5['value'],
+        nh3 * ef4['value'],
+        nox * ef4['value']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    min = sum([
+        no3 * ef5['min'],
+        nh3 * ef4['min'],
+        nox * ef4['min']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    max = sum([
+        no3 * ef5['max'],
+        nh3 * ef4['max'],
+        nox * ef4['max']
+    ]) * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    return [_emission(value, min, max, aggregated=aggregated)]
 
 
 def _should_run(cycle: dict):
-    N_inorganic_fertiliser = get_inorganic_fertiliser_N_total(cycle)
-    ecoClimateZone = get_ecoClimateZone(cycle)
-    fertiliser_complete = _is_term_type_complete(cycle, 'fertiliser')
-    water_complete = _is_term_type_complete(cycle, TermTermType.WATER)
+    nh3_n, no3_n, nox_n = get_nh3_no3_nox_to_n(cycle, NH3_TERM_ID, NO3_TERM_ID, NOX_TERM_ID)
+    term_type_complete = _is_term_type_complete(cycle, 'fertiliser')
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    N_inorganic_fertiliser=N_inorganic_fertiliser,
-                    ecoClimateZone=ecoClimateZone,
-                    term_type_fertiliser_complete=fertiliser_complete,
-                    term_type_water_complete=water_complete)
+                    no3_n=no3_n,
+                    nh3_n=nh3_n,
+                    nox_n=nox_n,
+                    term_type_cropResidue_complete=term_type_complete)
 
-    should_run = all([N_inorganic_fertiliser is not None, ecoClimateZone, fertiliser_complete, water_complete])
-    logShouldRun(cycle, MODEL, TERM_ID, should_run)
-    return should_run
+    should_run = all([no3_n is not None, nh3_n is not None, nox_n is not None, term_type_complete])
+    logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
+    return should_run, no3_n, nh3_n, nox_n
 
 
-def run(cycle: dict): return _run(cycle) if _should_run(cycle) else []
+def run(cycle: dict):
+    should_run, no3, nh3, nox = _should_run(cycle)
+    return _run(cycle, no3, nh3, nox) if should_run else []