hestia-earth-models 0.73.6__py3-none-any.whl → 0.73.8__py3-none-any.whl

hestia_earth/models/ipcc2019/co2ToAirCarbonStockChange_utils.py

@@ -2,7 +2,7 @@
 Utilities for calculating CO2 emissions based on changes in carbon stocks (e.g., `organicCarbonPerHa`,
 `aboveGroundBiomass` and `belowGroundBiomass`).
 """
-from datetime import datetime, timedelta
+from datetime import datetime
 from enum import Enum
 from functools import reduce
 from itertools import product
@@ -1506,8 +1506,6 @@ def create_run_function(
             new_emission_func(
                 term_id=emission_term_id,
                 method_tier=_get_emission_method(total_emission),
-                start_date=_get_emission_start_date(total_emission, cycle_start_date),
-                end_date=_get_emission_end_date(total_emission, cycle_end_date),
                 **calc_descriptive_stats(
                     total_emission.value,
                     EmissionStatsDefinition.SIMULATED,
@@ -1532,33 +1530,3 @@ def get_zero_emission(year):
 def _get_emission_method(emission: CarbonStockChangeEmission):
     method = emission.method
     return method if isinstance(method, EmissionMethodTier) else EmissionMethodTier.TIER_1
-
-
-def _get_emission_start_date(emission: CarbonStockChangeEmission, cycle_start_date: str) -> str:
-    cycle_datetime = safe_parse_date(_gapfill_datestr(cycle_start_date))
-    emission_datetime = safe_parse_date(emission.start_date)
-
-    should_run = (
-        cycle_datetime and emission_datetime
-        and cycle_datetime < emission_datetime  # If the cycle starts before the emission, add a `startDate`
-    )
-
-    return (
-        (emission_datetime + timedelta(seconds=1)).strftime(DatestrFormat.YEAR_MONTH_DAY.value) if should_run
-        else None
-    )
-
-
-def _get_emission_end_date(emission: CarbonStockChangeEmission, cycle_end_date: str) -> str:
-    cycle_datetime = safe_parse_date(_gapfill_datestr(cycle_end_date, DatestrGapfillMode.END))
-    emission_datetime = safe_parse_date(emission.end_date)
-
-    should_run = (
-        cycle_datetime and emission_datetime
-        and cycle_datetime > emission_datetime  # If the cycle ends after the emission, add an `endDate`
-    )
-
-    return (
-        emission_datetime.strftime(DatestrFormat.YEAR_MONTH_DAY.value) if should_run
-        else None
-    )

hestia_earth/models/ipcc2019/co2ToAirSoilOrganicCarbonStockChange.py

@@ -69,9 +69,7 @@ def _emission(
     min: list[float] = None,
     max: list[float] = None,
     statsDefinition: str = None,
-    observations: list[int] = None,
-    start_date: str,
-    end_date: str
+    observations: list[int] = None
 ) -> dict:
     """
     Create an emission node based on the provided value and method tier.
@@ -99,8 +97,6 @@ def _emission(
         "max": max,
         "statsDefinition": statsDefinition,
         "observations": observations,
-        "startDate": start_date,
-        "endDate": end_date,
         "methodTier": method_tier.value,
         "depth": _DEPTH_LOWER
     }

hestia_earth/models/ipcc2019/n2OToAirAquacultureSystemsIndirect.py

@@ -0,0 +1,44 @@
+from hestia_earth.schema import EmissionMethodTier
+
+from .n2OToAir_indirect_emissions_utils import run as run_emission
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.cropResidue": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToSurfaceWaterAquacultureSystems"},
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirAquacultureSystems"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirAquacultureSystems"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirAquacultureSystemsIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+_NO3_TERM_ID = 'nh3ToSurfaceWaterAquacultureSystems'
+_NH3_TERM_ID = 'nh3ToAirAquacultureSystems'
+_NOX_TERM_ID = 'noxToAirAquacultureSystems'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
+
+
+def run(cycle: dict):
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)

hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningIndirect.py

@@ -0,0 +1,43 @@
+from hestia_earth.schema import EmissionMethodTier
+
+from .n2OToAir_indirect_emissions_utils import run as run_emission
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.cropResidue": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirCropResidueBurning"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirCropResidueBurning"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirCropResidueBurningIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+_NO3_TERM_ID = None
+_NH3_TERM_ID = 'nh3ToAirCropResidueBurning'
+_NOX_TERM_ID = 'noxToAirCropResidueBurning'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
+
+
+def run(cycle: dict):
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)

hestia_earth/models/ipcc2019/n2OToAirCropResidueDecompositionIndirect.py

@@ -1,16 +1,9 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier
 
-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
+from .n2OToAir_indirect_emissions_utils import run as run_emission
 
 REQUIREMENTS = {
     "Cycle": {
-        "completeness.cropResidue": "True",
         "emissions": [
             {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterCropResidueDecomposition"},
             {"@type": "Emission", "value": "", "term.@id": "nh3ToAirCropResidueDecomposition"},
@@ -26,6 +19,12 @@ REQUIREMENTS = {
         }
     }
 }
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
 RETURNS = {
     "Emission": [{
         "value": "",
@@ -34,67 +33,11 @@ RETURNS = {
 }
 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
+_NO3_TERM_ID = 'no3ToGroundwaterCropResidueDecomposition'
+_NH3_TERM_ID = 'nh3ToAirCropResidueDecomposition'
+_NOX_TERM_ID = 'noxToAirCropResidueDecomposition'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
 
 
 def run(cycle: dict):
-    should_run, no3, nh3, nox = _should_run(cycle)
-    return _run(cycle, no3, nh3, nox) if should_run else []
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)

hestia_earth/models/ipcc2019/n2OToAirExcretaIndirect.py

@@ -1,16 +1,9 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, TermTermType
+from hestia_earth.schema import EmissionMethodTier
 
-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
+from .n2OToAir_indirect_emissions_utils import run as run_emission
 
 REQUIREMENTS = {
     "Cycle": {
-        "completeness.excreta": "True",
         "emissions": [
             {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterExcreta"},
             {"@type": "Emission", "value": "", "term.@id": "nh3ToAirExcreta"},
@@ -26,6 +19,12 @@ REQUIREMENTS = {
         }
     }
 }
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
 RETURNS = {
     "Emission": [{
         "value": "",
@@ -34,67 +33,11 @@ RETURNS = {
 }
 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_excreta_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
+_NO3_TERM_ID = 'no3ToGroundwaterExcreta'
+_NH3_TERM_ID = 'nh3ToAirExcreta'
+_NOX_TERM_ID = 'noxToAirExcreta'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
 
 
 def run(cycle: dict):
-    should_run, no3, nh3, nox = _should_run(cycle)
-    return _run(cycle, no3, nh3, nox) if should_run else []
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)

hestia_earth/models/ipcc2019/n2OToAirFuelCombustionIndirect.py

@@ -0,0 +1,43 @@
+from hestia_earth.schema import EmissionMethodTier
+
+from .n2OToAir_indirect_emissions_utils import run as run_emission
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.electricityFuel": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirFuelCombustion"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirFuelCombustion"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirFuelCombustionIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+_NO3_TERM_ID = None
+_NH3_TERM_ID = 'nh3ToAirFuelCombustion'
+_NOX_TERM_ID = 'noxToAirFuelCombustion'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
+
+
+def run(cycle: dict):
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)

hestia_earth/models/ipcc2019/n2OToAirInorganicFertiliserIndirect.py

@@ -1,16 +1,9 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.schema import EmissionMethodTier
 
-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
+from .n2OToAir_indirect_emissions_utils import run as run_emission
 
 REQUIREMENTS = {
     "Cycle": {
-        "completeness.fertiliser": "True",
         "emissions": [
             {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterInorganicFertiliser"},
             {"@type": "Emission", "value": "", "term.@id": "nh3ToAirInorganicFertiliser"},
@@ -26,6 +19,12 @@ REQUIREMENTS = {
         }
     }
 }
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
 RETURNS = {
     "Emission": [{
         "value": "",
@@ -34,67 +33,11 @@ RETURNS = {
 }
 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_fertiliser_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
+_NO3_TERM_ID = 'no3ToGroundwaterInorganicFertiliser'
+_NH3_TERM_ID = 'nh3ToAirInorganicFertiliser'
+_NOX_TERM_ID = 'noxToAirInorganicFertiliser'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
 
 
 def run(cycle: dict):
-    should_run, no3, nh3, nox = _should_run(cycle)
-    return _run(cycle, no3, nh3, nox) if should_run else []
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)

hestia_earth/models/ipcc2019/n2OToAirNaturalVegetationBurningIndirect.py

@@ -0,0 +1,43 @@
+from hestia_earth.schema import EmissionMethodTier
+
+from .n2OToAir_indirect_emissions_utils import run as run_emission
+
+REQUIREMENTS = {
+    "Cycle": {
+        "completeness.cropResidue": "True",
+        "emissions": [
+            {"@type": "Emission", "value": "", "term.@id": "nh3ToAirNaturalVegetationBurning"},
+            {"@type": "Emission", "value": "", "term.@id": "noxToAirNaturalVegetationBurning"}
+        ],
+        "optional": {
+            "site": {
+                "@type": "Site",
+                "measurements": [
+                    {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
+                ]
+            }
+        }
+    }
+}
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
+RETURNS = {
+    "Emission": [{
+        "value": "",
+        "methodTier": "tier 1"
+    }]
+}
+TERM_ID = 'n2OToAirNaturalVegetationBurningIndirect'
+TIER = EmissionMethodTier.TIER_1.value
+_NO3_TERM_ID = None
+_NH3_TERM_ID = 'nh3ToAirNaturalVegetationBurning'
+_NOX_TERM_ID = 'noxToAirNaturalVegetationBurning'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
+
+
+def run(cycle: dict):
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)

hestia_earth/models/ipcc2019/n2OToAirOrganicFertiliserIndirect.py

@@ -1,16 +1,9 @@
-from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition
+from hestia_earth.schema import EmissionMethodTier
 
-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
+from .n2OToAir_indirect_emissions_utils import run as run_emission
 
 REQUIREMENTS = {
     "Cycle": {
-        "completeness.fertiliser": "True",
         "emissions": [
             {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterOrganicFertiliser"},
             {"@type": "Emission", "value": "", "term.@id": "nh3ToAirOrganicFertiliser"},
@@ -26,6 +19,12 @@ REQUIREMENTS = {
         }
     }
 }
+LOOKUPS = {
+    "emission": [
+        "IPCC_2019_EF4_FACTORS", "IPCC_2019_EF4_FACTORS-max", "IPCC_2019_EF4_FACTORS-min",
+        "IPCC_2019_EF5_FACTORS", "IPCC_2019_EF5_FACTORS-max", "IPCC_2019_EF5_FACTORS-min"
+    ]
+}
 RETURNS = {
     "Emission": [{
         "value": "",
@@ -34,67 +33,11 @@ RETURNS = {
 }
 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_fertiliser_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
+_NO3_TERM_ID = 'no3ToGroundwaterOrganicFertiliser'
+_NH3_TERM_ID = 'nh3ToAirOrganicFertiliser'
+_NOX_TERM_ID = 'noxToAirOrganicFertiliser'
+_EMISSION_IDS = [_NH3_TERM_ID, _NO3_TERM_ID, _NOX_TERM_ID]
 
 
 def run(cycle: dict):
-    should_run, no3, nh3, nox = _should_run(cycle)
-    return _run(cycle, no3, nh3, nox) if should_run else []
+    return run_emission(TERM_ID, _EMISSION_IDS, cycle)