hestia-earth-models 0.59.1__tar.gz → 0.59.2__tar.gz

{hestia-earth-models-0.59.1/hestia_earth_models.egg-info → hestia-earth-models-0.59.2}/PKG-INFO

@@ -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 → hestia-earth-models-0.59.2}/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-0.59.1 → hestia-earth-models-0.59.2}/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-0.59.1 → hestia-earth-models-0.59.2}/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-0.59.1 → hestia-earth-models-0.59.2}/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-0.59.1 → hestia-earth-models-0.59.2}/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-0.59.1 → hestia-earth-models-0.59.2}/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-0.59.2/hestia_earth/models/ipcc2006/utils.py

@@ -0,0 +1,14 @@
+from hestia_earth.utils.model import find_primary_product
+
+COEFF_NH3NOX_N2O = 0.01
+COEFF_NO3_N2O = 0.0075
+
+
+def get_N_N2O_excreta_coeff_from_primary_product(cycle: dict):
+    product = find_primary_product(cycle)
+    term = product.get('term', {}) if product else {}
+    # TODO: should use the coefficient from lookup table
+    # percent = get_lookup_value(lookup, term, col)
+    # return safe_parse_float(percent, 0.02)
+    has_sheep_goat_products = term.get('@id') in ['sheep', 'goat']
+    return 0.01 if has_sheep_goat_products else 0.02

{hestia-earth-models-0.59.1 → hestia-earth-models-0.59.2}/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-0.59.2/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-0.59.2/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-0.59.2/hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserIndirect.py

@@ -0,0 +1,100 @@
+from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+
+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.fertiliser": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterInorganicFertiliser"},
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirInorganicFertiliser"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirInorganicFertiliser"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirInorganicFertiliserIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+NO3_TERM_ID = 'no3ToGroundwaterInorganicFertiliser'
+NH3_TERM_ID = 'nh3ToAirInorganicFertiliser'
+NOX_TERM_ID = 'noxToAirInorganicFertiliser'
+
+
+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, 'fertiliser')
+
+    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-0.59.2/hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py

@@ -0,0 +1,100 @@
+from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+
+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.fertiliser": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterOrganicFertiliser"},
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirOrganicFertiliser"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirOrganicFertiliser"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirOrganicFertiliserIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+NO3_TERM_ID = 'no3ToGroundwaterOrganicFertiliser'
+NH3_TERM_ID = 'nh3ToAirOrganicFertiliser'
+NOX_TERM_ID = 'noxToAirOrganicFertiliser'
+
+
+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, 'fertiliser')
+
+    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 []