hestia-earth-models 0.73.3__py3-none-any.whl → 0.73.4__py3-none-any.whl

hestia_earth/models/akagiEtAl2011/utils.py

@@ -21,27 +21,26 @@ def _emission(term_id: str, value: float, sd: float = None):
     return emission
 
 
-def _run(term_id: str, product_value: list):
-    value = sum(product_value)
-    term = {'termType': TermTermType.EMISSION.value, '@id': term_id}
-    factor = get_lookup_value(term, LOOKUP_NAME)
-    factor_sd = get_lookup_value(term, LOOKUP_NAME + '-sd')
-    emission_value = multiply_values([value, factor])
-    return [] if emission_value is None else [_emission(term_id, emission_value, multiply_values([value, factor_sd]))]
+def _run(term_id: str, value: float, factor: float, factor_sd: float = None):
+    return [_emission(term_id, value * factor, multiply_values([value, factor_sd]))]
 
 
 def _should_run(term_id: str, cycle: dict):
     crop_residue_burnt_value = get_crop_residue_burnt_value(cycle)
-    has_crop_residue_burnt = len(crop_residue_burnt_value) > 0
+    term = {'termType': TermTermType.EMISSION.value, '@id': term_id}
+    factor = get_lookup_value(term, LOOKUP_NAME)
+    factor_sd = get_lookup_value(term, LOOKUP_NAME + '-sd')
 
     logRequirements(cycle, model=MODEL, term=term_id,
-                    has_crop_residue_burnt=has_crop_residue_burnt)
+                    crop_residue_burnt_value=crop_residue_burnt_value,
+                    burning_factor=factor,
+                    burning_factor_sd=factor_sd)
 
-    should_run = all([has_crop_residue_burnt])
+    should_run = all([crop_residue_burnt_value is not None, factor is not None])
     logShouldRun(cycle, MODEL, term_id, should_run, methodTier=TIER)
-    return should_run, crop_residue_burnt_value
+    return should_run, crop_residue_burnt_value, factor, factor_sd
 
 
 def run_emission(term_id: str, cycle: dict):
-    should_run, crop_residue_burnt_value = _should_run(term_id, cycle)
-    return _run(term_id, crop_residue_burnt_value) if should_run else []
+    should_run, value, factor, factor_sd = _should_run(term_id, cycle)
+    return _run(term_id, value, factor, factor_sd) if should_run else []

hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py

@@ -38,25 +38,19 @@ def _emission(value: float):
     return emission
 
 
-def _run(product_value: list, factor: float):
-    value = sum(product_value)
-    return [_emission(value * factor)]
-
-
 def _should_run(cycle: dict):
     crop_residue_burnt_value = get_crop_residue_burnt_value(cycle)
-    has_crop_residue_burnt = len(crop_residue_burnt_value) > 0
     factor = get_lookup_value({'termType': 'emission', '@id': TERM_ID}, LOOKUPS['emission'][0])
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
-                    has_crop_residue_burnt=has_crop_residue_burnt,
+                    crop_residue_burnt_value=crop_residue_burnt_value,
                     burning_factor=factor)
 
-    should_run = all([has_crop_residue_burnt, factor is not None])
+    should_run = all([crop_residue_burnt_value is not None, factor is not None])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
     return should_run, crop_residue_burnt_value, factor
 
 
 def run(cycle: dict):
-    should_run, crop_residue_burnt_value, factor = _should_run(cycle)
-    return _run(crop_residue_burnt_value, factor) if should_run else []
+    should_run, value, factor = _should_run(cycle)
+    return [_emission(value * factor)] if should_run else []