hestia-earth-models 0.75.1__py3-none-any.whl → 0.75.3__py3-none-any.whl

hestia_earth/models/ipcc2019/ch4ToAirExcreta.py

@@ -12,13 +12,20 @@ from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.measurement import most_relevant_measurement_value
 from hestia_earth.models.utils.input import total_excreta
 from hestia_earth.models.utils.lookup import get_region_lookup_value
+from hestia_earth.models.utils.property import get_node_property
 from . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
         "cycleDuration": "",
         "endDate": "",
-        "practices": [{"@type": "Practice", "value": "", "term.termType": "excretaManagement"}],
+        "practices": [{
+            "@type": "Practice",
+            "term.termType": "excretaManagement",
+            "optional": {
+                "properties": [{"@type": "Property", "term.id": "methaneConversionFactor"}]
+            }
+        }],
         "site": {
             "@type": "Site",
             "country": {"@type": "Term", "termType": "region"},
@@ -39,6 +46,7 @@ RETURNS = {
 }
 TERM_ID = 'ch4ToAirExcreta'
 TIER = EmissionMethodTier.TIER_2.value
+_CONV_FACTOR_PROP_ID = REQUIREMENTS['Cycle']['practices'][0]['optional']['properties'][0]['term.id']
 
 
 class DURATION(Enum):
@@ -110,17 +118,27 @@ def _get_ch4_conv_factor(cycle: dict):
     measurements = cycle.get('site', {}).get('measurements', [])
     ecoClimateZone = most_relevant_measurement_value(measurements, 'ecoClimateZone', end_date)
     practices = filter_list_term_type(cycle.get('practices', []), TermTermType.EXCRETAMANAGEMENT)
-    practice_id = practices[0].get('term', {}).get('@id') if len(practices) > 0 else None
+    primary_practice = practices[0] if len(practices) > 0 else {}
+    practice_id = primary_practice.get('term', {}).get('@id')
 
     debugValues(cycle, model=MODEL, term=TERM_ID,
                 duration=duration_key.value,
                 ecoClimateZone=ecoClimateZone,
-                practice_id=practice_id)
-
-    return _get_excretaManagement_MCF_from_lookup(practice_id, ecoClimateZone, duration_key) if all([
-        practice_id,
-        ecoClimateZone is not None
-    ]) else None
+                excreta_management_practice_id=practice_id)
+
+    practive_ch4_conv_factor = get_node_property(
+        node=primary_practice,
+        property=_CONV_FACTOR_PROP_ID,
+        find_default_property=False,
+        download_from_hestia=False
+    ).get('value')
+
+    return practive_ch4_conv_factor or (
+        _get_excretaManagement_MCF_from_lookup(practice_id, ecoClimateZone, duration_key) if all([
+            practice_id,
+            ecoClimateZone is not None
+        ]) else None
+    )
 
 
 def _should_run(cycle: dict):

hestia_earth/models/ipcc2019/ch4ToAirOrganicSoilCultivation.py

@@ -42,7 +42,7 @@ REQUIREMENTS = {
         "site": {
             "@type": "Site",
             "measurements": [
-                {"@type": "Measurement", "value": "", "term.@id": "histosol"},
+                {"@type": "Measurement", "value": "", "term.@id": "organicSoils"},
                 {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
             ]
         },
@@ -195,10 +195,7 @@ def _should_run(cycle: dict):
     seed = gen_seed(cycle, MODEL, TERM_ID)
     rng = np.random.default_rng(seed)
 
-    def _get_measurement_content(term_id: str):
-        return most_relevant_measurement_value(measurements, term_id, end_date)
-
-    histosol = _get_measurement_content('histosol')
+    organic_soils = most_relevant_measurement_value(measurements, "organicSoils", end_date)
     eco_climate_zone = get_eco_climate_zone_value(cycle, as_enum=True)
     organic_soil_category = assign_organic_soil_category(cycle, log_id=TERM_ID)
     ditch_category = assign_ditch_category(cycle)
@@ -227,7 +224,7 @@ def _should_run(cycle: dict):
         ditch_factor=format_nd_array(ditch_factor),
         ditch_frac=format_nd_array(ditch_frac),
         land_occupation=format_float(land_occupation),
-        histosol=format_float(histosol)
+        organic_soils=format_float(organic_soils)
     )
 
     should_run = all([
@@ -239,25 +236,25 @@ def _should_run(cycle: dict):
                 ditch_factor,
                 ditch_frac,
                 land_occupation,
-                histosol
+                organic_soils
             ]
         )
     ])
 
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
 
-    return should_run, emission_factor, ditch_factor, ditch_frac, histosol, land_occupation
+    return should_run, emission_factor, ditch_factor, ditch_frac, organic_soils, land_occupation
 
 
 def _run(
     emission_factor: npt.NDArray,
     ditch_factor: npt.NDArray,
     ditch_frac: npt.NDArray,
-    histosol: float,
+    organic_soils: float,
     land_occupation: float
 ):
-    land_emission = calc_emission(TERM_ID, emission_factor, histosol, land_occupation)
-    ditch_emission = calc_emission(TERM_ID, ditch_factor, histosol, land_occupation)
+    land_emission = calc_emission(TERM_ID, emission_factor, organic_soils, land_occupation)
+    ditch_emission = calc_emission(TERM_ID, ditch_factor, organic_soils, land_occupation)
 
     result = (ditch_emission * ditch_frac) + (land_emission * (1 - ditch_frac))
     descriptive_stats = calc_descriptive_stats(result, _STATS_DEFINITION)

hestia_earth/models/ipcc2019/co2ToAirOrganicSoilCultivation.py

@@ -39,7 +39,7 @@ REQUIREMENTS = {
         "site": {
             "@type": "Site",
             "measurements": [
-                {"@type": "Measurement", "value": "", "term.@id": "histosol"},
+                {"@type": "Measurement", "value": "", "term.@id": "organicSoils"},
                 {"@type": "Measurement", "value": "", "term.@id": "ecoClimateZone"}
             ]
         },
@@ -164,10 +164,7 @@ def _should_run(cycle: dict):
     seed = gen_seed(cycle, MODEL, TERM_ID)
     rng = np.random.default_rng(seed)
 
-    def _get_measurement_content(term_id: str):
-        return most_relevant_measurement_value(measurements, term_id, end_date)
-
-    histosol = _get_measurement_content('histosol')
+    organic_soils = most_relevant_measurement_value(measurements, "organicSoils", end_date)
     eco_climate_zone = get_eco_climate_zone_value(cycle, as_enum=True)
     organic_soil_category = assign_organic_soil_category(cycle, log_id=TERM_ID)
 
@@ -183,7 +180,7 @@ def _should_run(cycle: dict):
         organic_soil_category=organic_soil_category,
         emission_factor=format_nd_array(emission_factor),
         land_occupation=format_float(land_occupation),
-        histosol=format_float(histosol)
+        organic_soils=format_float(organic_soils)
     )
 
     should_run = all([
@@ -193,22 +190,22 @@ def _should_run(cycle: dict):
             var is not None for var in [
                 emission_factor,
                 land_occupation,
-                histosol
+                organic_soils
             ]
         )
     ])
 
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
 
-    return should_run, emission_factor, histosol, land_occupation
+    return should_run, emission_factor, organic_soils, land_occupation
 
 
-def _run(emission_factor: npt.NDArray, histosol: float, land_occupation: float):
-    result = calc_emission(TERM_ID, emission_factor, histosol, land_occupation)
+def _run(emission_factor: npt.NDArray, organic_soils: float, land_occupation: float):
+    result = calc_emission(TERM_ID, emission_factor, organic_soils, land_occupation)
     descriptive_stats = calc_descriptive_stats(result, _STATS_DEFINITION)
     return [_emission(descriptive_stats)]
 
 
 def run(cycle: dict):
-    should_run, emission_factor, histosol, land_occupation = _should_run(cycle)
-    return _run(emission_factor, histosol, land_occupation) if should_run else []
+    should_run, emission_factor, organic_soils, land_occupation = _should_run(cycle)
+    return _run(emission_factor, organic_soils, land_occupation) if should_run else []