hestia-earth-models 0.70.2__py3-none-any.whl → 0.70.4__py3-none-any.whl

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py

@@ -1346,7 +1346,7 @@ def _assign_ipcc_management_category(
         ipcc_land_use_category, IpccManagementCategory.NOT_RELEVANT
     )
 
-    land_cover_nodes = filter_list_term_type(management_nodes, [TermTermType.LANDCOVER])
+    land_cover_nodes = filter_list_term_type(management_nodes, [TermTermType.PASTUREMANAGEMENT])
     tillage_nodes = filter_list_term_type(management_nodes, [TermTermType.TILLAGE])
 
     should_run_ = any([
@@ -1461,7 +1461,7 @@ Value: Corresponding decision tree for IPCC management categories based on land
 """
 
 _IPCC_LAND_USE_CATEGORY_TO_DEFAULT_IPCC_MANAGEMENT_CATEGORY = {
-    IpccLandUseCategory.GRASSLAND: IpccManagementCategory.UNKNOWN,
+    IpccLandUseCategory.GRASSLAND: IpccManagementCategory.NOMINALLY_MANAGED,
     IpccLandUseCategory.ANNUAL_CROPS_WET: IpccManagementCategory.UNKNOWN,
     IpccLandUseCategory.ANNUAL_CROPS: IpccManagementCategory.UNKNOWN
 }

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py

@@ -204,11 +204,19 @@ _CARBON_INPUT_PROPERTY_TERM_IDS = [
     _DRY_MATTER_TERM_ID
 ]
 
-_CARBON_SOURCE_TERM_TYPES = [
+_INPUT_CARBON_SOURCE_TERM_TYPES = [
     TermTermType.ORGANICFERTILISER.value,
     TermTermType.SOILAMENDMENT.value
 ]
 
+_PRACTICE_CARBON_SOURCE_TERM_TYPES = [
+    TermTermType.LANDCOVER
+]
+
+_PRODUCT_CARBON_SOURCE_TERM_TYPES = [
+    TermTermType.CROPRESIDUE
+]
+
 _VALID_SITE_TYPES = [
     SiteSiteType.CROPLAND.value
 ]
@@ -1447,7 +1455,10 @@ def _get_carbon_sources(cycle: dict) -> list[CarbonSource]:
     list[CarbonSource]
         A formatted list of `CarbonSource`s.
     """
-    inputs_and_products = cycle.get("inputs", []) + cycle.get("products", [])
+    carbon_source_nodes = filter_list_term_type(
+        cycle.get("inputs", []) + cycle.get("practices", []) + cycle.get("products", []),
+        _INPUT_CARBON_SOURCE_TERM_TYPES + _PRACTICE_CARBON_SOURCE_TERM_TYPES + _PRODUCT_CARBON_SOURCE_TERM_TYPES
+    )
 
     group_fac = cycle.get('fraction_of_group_duration')
     node_fac = cycle.get('fraction_of_node_duration')
@@ -1466,7 +1477,7 @@ def _get_carbon_sources(cycle: dict) -> list[CarbonSource]:
                 if validator(node)
             ),
             None
-        ) for node in inputs_and_products
+        ) for node in carbon_source_nodes
     ])
 
 
@@ -1603,7 +1614,7 @@ def _should_run_carbon_source(node: dict) -> bool:
     """
     return any([
         node.get("term", {}).get("@id") in _CARBON_SOURCE_TERM_IDS,
-        node.get("term", {}).get("termType") in _CARBON_SOURCE_TERM_TYPES
+        node.get("term", {}).get("termType") in _INPUT_CARBON_SOURCE_TERM_TYPES
     ])
 
 

hestia_earth/models/ipcc2019/organicSoilCultivation_utils.py

@@ -1,5 +1,6 @@
 from enum import Enum
 from typing import Literal
+import numpy as np
 
 from hestia_earth.schema import SiteSiteType
 from hestia_earth.utils.model import find_primary_product
@@ -22,8 +23,7 @@ _NETHERLANDS_TERM_ID = "GADM-NLD"
 
 _CONVERSION_FACTORS = {
     "co2ToAirOrganicSoilCultivation": 1000 * get_atomic_conversion(Units.KG_CO2, Units.TO_C),
-    "ch4ToAirOrganicSoilCultivation": 1000,
-    "n2OToAirOrganicSoilCultivationDirect": 1000 * get_atomic_conversion(Units.KG_N2O, Units.TO_N)
+    "n2OToAirOrganicSoilCultivationDirect": get_atomic_conversion(Units.KG_N2O, Units.TO_N)
 }
 _DEFAULT_FACTOR = {"value": 0}
 _EXCLUDED_ECO_CLIMATE_ZONES = [EcoClimateZone.POLAR_MOIST, EcoClimateZone.POLAR_DRY]
@@ -136,7 +136,7 @@ def calc_emission(
     """
     Calculate the emission and convert it to kg/ha-1.
     """
-    return emission_factor * land_occupation * histosol * _CONVERSION_FACTORS[emission_id] / 100
+    return emission_factor * land_occupation * histosol * _CONVERSION_FACTORS.get(emission_id, 1) / 100
 
 
 def remap_categories(
@@ -157,3 +157,11 @@ def valid_eco_climate_zone(
     Validate that the model should run for a specific eco-climate zone.
     """
     return isinstance(eco_climate_zone, EcoClimateZone) and eco_climate_zone not in _EXCLUDED_ECO_CLIMATE_ZONES
+
+
+def format_number(value) -> str:
+    return f"{value:.3g}" if isinstance(value, (float, int)) else "None"
+
+
+def format_nd_array(value) -> str:
+    return f"{np.mean(value):.3g} ± {np.std(value):.3g}" if isinstance(value, np.ndarray) else "None"