hestia-earth-models 0.57.2__py3-none-any.whl → 0.59.0__py3-none-any.whl

hestia_earth/models/ipcc2006/n2OToAirExcretaDirect.py

@@ -52,7 +52,7 @@ def _should_run(cycle: dict):
                     N_total=N_total,
                     term_type_excreta_complete=term_type_complete)
 
-    should_run = all([N_total, term_type_complete])
+    should_run = all([N_total is not None, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
     return should_run, N_total
 

hestia_earth/models/ipcc2006/n2OToAirExcretaIndirect.py

@@ -1,13 +1,15 @@
-from hestia_earth.schema import EmissionMethodTier
+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 . import MODEL
 
 REQUIREMENTS = {
     "Cycle": {
+        "completeness.excreta": "True",
         "emissions": [
             {"@type": "Emission", "value": "", "term.@id": "no3ToGroundwaterExcreta"},
             {"@type": "Emission", "value": "", "term.@id": "nh3ToAirExcreta"},
@@ -41,14 +43,16 @@ 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)
+    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)
+    term_type_complete = _is_term_type_complete(cycle, TermTermType.EXCRETA)
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     no3ToGroundwaterExcreta_to_n=no3_n,
                     nh3ToAirExcreta_to_n=nh3_n,
-                    noxToAirExcreta_to_n=nox_n)
+                    noxToAirExcreta_to_n=nox_n,
+                    term_type_excreta_complete=term_type_complete)
 
-    should_run = all([no3_n, nh3_n, nox_n])
+    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
 

hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserDirect.py

@@ -28,6 +28,9 @@ RETURNS = {
         "methodTier": "tier 1"
     }]
 }
+LOOKUPS = {
+    "crop": "N2ON_FERT"
+}
 TERM_ID = 'n2OToAirInorganicFertiliserDirect'
 TIER = EmissionMethodTier.TIER_1.value
 
@@ -53,7 +56,7 @@ def _should_run(cycle: dict):
                     N_total=N_total,
                     term_type_fertiliser_complete=term_type_complete)
 
-    should_run = all([N_total, term_type_complete])
+    should_run = all([N_total is not None, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
     return should_run, N_total
 

hestia_earth/models/ipcc2006/n2OToAirInorganicFertiliserIndirect.py

@@ -69,7 +69,7 @@ def _should_run(cycle: dict):
                     N_total=N_total,
                     term_type_fertiliser_complete=term_type_complete)
 
-    should_run = all([N_total, term_type_complete])
+    should_run = all([N_total is not None, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
     return should_run, N_total
 

hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserDirect.py

@@ -55,7 +55,7 @@ def _should_run(cycle: dict):
                     N_total=N_total,
                     term_type_fertiliser_complete=term_type_complete)
 
-    should_run = all([N_total, term_type_complete])
+    should_run = all([N_total is not None, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
     return should_run, N_total
 

hestia_earth/models/ipcc2006/n2OToAirOrganicFertiliserIndirect.py

@@ -68,7 +68,7 @@ def _should_run(cycle: dict):
                     N_total=N_total,
                     term_type_fertiliser_complete=term_type_complete)
 
-    should_run = all([N_total, term_type_complete])
+    should_run = all([N_total is not None, term_type_complete])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)
     return should_run, N_total
 

hestia_earth/models/ipcc2006/utils.py

@@ -7,14 +7,17 @@ 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):
-    nh3 = find_terms_value(cycle.get('emissions', []), nh3_term_id)
-    nh3 = nh3 / get_atomic_conversion(Units.KG_NH3, Units.TO_N)
-    no3 = find_terms_value(cycle.get('emissions', []), no3_term_id)
-    no3 = no3 / get_atomic_conversion(Units.KG_NO3, Units.TO_N)
-    nox = find_terms_value(cycle.get('emissions', []), nox_term_id)
-    nox = nox / get_atomic_conversion(Units.KG_NOX, Units.TO_N)
-    return nh3, no3, nox
+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):

hestia_earth/models/ipcc2019/ch4ToAirEntericFermentation.py

@@ -14,7 +14,7 @@ from . import MODEL
 REQUIREMENTS = {
     "Cycle": {
         "completeness.animalFeed": "True",
-        "completeness.grazedForage": "True",
+        "completeness.freshForage": "True",
         "or": [
             {
                 "animals": [{
@@ -207,7 +207,7 @@ def _get_default_values(lookup, term: dict):
 
 def _should_run(cycle: dict):
     is_animalFeed_complete = cycle.get('completeness', {}).get('animalFeed', False) is True
-    is_grazedForage_complete = cycle.get('completeness', {}).get('grazedForage', False) is True
+    is_freshForage_complete = cycle.get('completeness', {}).get('freshForage', False) is True
 
     primary_product = find_primary_product(cycle) or {}
     term = primary_product.get('term', {})
@@ -252,11 +252,11 @@ def _should_run(cycle: dict):
 
     logRequirements(cycle, model=MODEL, term=TERM_ID,
                     term_type_animalFeed_complete=is_animalFeed_complete,
-                    term_type_grazedForage_complete=is_grazedForage_complete,
+                    term_type_freshForage_complete=is_freshForage_complete,
                     total_feed_in_MJ=total_feed)
 
     should_run = all([
-        is_animalFeed_complete, is_grazedForage_complete, total_feed,
+        is_animalFeed_complete, is_freshForage_complete, total_feed,
         enteric_factor or default_values[0]
     ])
     logShouldRun(cycle, MODEL, TERM_ID, should_run, methodTier=TIER)

hestia_earth/models/ipcc2019/ch4ToAirFloodedRice.py

@@ -21,17 +21,24 @@ REQUIREMENTS = {
             "products": [{"@type": "Product", "value": "", "term.@id": "aboveGroundCropResidueIncorporated"}],
             "practices": [
                 {"@type": "Practice", "value": "", "term.termType": "cropResidueManagement"},
+                {"@type": "Practice", "value": "", "term.termType": "landUseManagement"},
                 {"@type": "Practice", "value": "", "term.termType": "waterRegime"}
             ]
         }
     }
 }
 LOOKUPS = {
+    "landUseManagement": [
+        "IPCC_2019_CH4_rice_SFw", "IPCC_2019_CH4_rice_SFw-min", "IPCC_2019_CH4_rice_SFw-max",
+        "IPCC_2019_CH4_rice_SFw-sd",
+        "IPCC_2019_CH4_rice_SFp", "IPCC_2019_CH4_rice_SFp-min", "IPCC_2019_CH4_rice_SFp-max",
+        "IPCC_2019_CH4_rice_SFp-sd"
+    ],
     "waterRegime": [
-        "IPCC_2019_CH4_rice_SFw", "IPCC_2019_CH4_rice_SFw_min", "IPCC_2019_CH4_rice_SFw_max",
-        "IPCC_2019_CH4_rice_SFw_sd",
-        "IPCC_2019_CH4_rice_SFp", "IPCC_2019_CH4_rice_SFp_min", "IPCC_2019_CH4_rice_SFp_max",
-        "IPCC_2019_CH4_rice_SFp_sd"
+        "IPCC_2019_CH4_rice_SFw", "IPCC_2019_CH4_rice_SFw-min", "IPCC_2019_CH4_rice_SFw-max",
+        "IPCC_2019_CH4_rice_SFw-sd",
+        "IPCC_2019_CH4_rice_SFp", "IPCC_2019_CH4_rice_SFp-min", "IPCC_2019_CH4_rice_SFp-max",
+        "IPCC_2019_CH4_rice_SFp-sd"
     ],
     "organicFertiliser": ["IPCC_2019_CH4_rice_CFOA_kg_fresh_weight", "IPCC_2019_CH4_rice_CFOA_kg_dry_weight"],
     "region-ch4ef-IPCC2019": ["CH4_ef", "CH4_ef_min", "CH4_ef_max", "CH4_ef_sd"]
@@ -66,7 +73,7 @@ def _get_CH4_ef(country: str, suffix: str = ''):
     return safe_parse_float(get_table_value(lookup, 'termid', country, column_name('CH4_ef' + suffix)))
 
 
-def _get_waterRegime_lookup(term: dict, col: str):
+def _get_practice_lookup(term: dict, col: str):
     return safe_parse_float(get_lookup_value(term, col, model=MODEL, term=TERM_ID))
 
 
@@ -99,7 +106,7 @@ def _calculate_SFo(cycle: dict, suffix: str = ''):
 
 def _calculate_SF_average(practices: list, factor: str):
     values = [
-        (_get_waterRegime_lookup(p.get('term', {}), factor), list_sum(p.get('value', []), None)) for p in practices
+        (_get_practice_lookup(p.get('term', {}), factor), list_sum(p.get('value', []), None)) for p in practices
     ]
     # sum only values that are numbers
     return list_sum([factor * percent / 100 for factor, percent in values if percent is not None])
@@ -124,7 +131,9 @@ def _get_croppingDuration(croppingDuration: dict, key: str = 'value'):
 
 
 def _run(cycle: dict, croppingDuration: dict, country: str):
-    practices = filter_list_term_type(cycle.get('practices', []), TermTermType.WATERREGIME)
+    practices = filter_list_term_type(cycle.get('practices', []), [
+        TermTermType.WATERREGIME, TermTermType.LANDUSEMANAGEMENT
+    ])
 
     value = _calculate_factor(cycle, country, practices) * _get_croppingDuration(croppingDuration)
     min = _calculate_factor(cycle, country, practices, '_min') * _get_croppingDuration(croppingDuration, 'min')