hestia-earth-models 0.59.5__py3-none-any.whl → 0.59.6__py3-none-any.whl

hestia_earth/models/ipcc2019/organicCarbonPerHa.py

@@ -2,7 +2,13 @@
 The IPCC model for estimating soil organic carbon stock changes in the 0 - 30cm depth interval due to management
 changes. This model combines the Tier 1 & Tier 2 methodologies. It first tries to run Tier 2 (only on croplands
 remaining croplands). If Tier 2 cannot run, it will try to run Tier 1 (for croplands remaining croplands and for
-grasslands remaining grasslands). Source:
+grasslands remaining grasslands).
+
+More information on this model, including data requirements **and** recommendations, tier methodologies, and examples,
+can be found in the
+[Hestia SOC wiki](https://gitlab.com/hestia-earth/hestia-engine-models/-/wikis/Soil-organic-carbon-modelling).
+
+Source:
 [IPCC 2019, Vol. 4, Chapter 10](https://www.ipcc-nggip.iges.or.jp/public/2019rf/pdf/4_Volume4/19R_V4_Ch05_Cropland.pdf).
 """
 from enum import Enum
@@ -846,7 +852,7 @@ def _calc_water_factor(
     float
         The water effect on decomposition for a given month, dimensionless, between `0.2129` and `1.5`.
     """
-    mappet = min(1.25, precipitation / pet)
+    mappet = min(1.25, precipitation / pet) if pet else 1.25
     return 0.775 if is_irrigated else 0.2129 + (water_factor_slope * (mappet)) - (0.2413 * pow(mappet, 2))
 
 
@@ -937,7 +943,8 @@ def _calc_average_nitrogen_content_of_organic_carbon_sources(
     weighted_values = [
         c.mass * (c.nitrogen_content if c.nitrogen_content else default_nitrogen_content) for c in carbon_sources
     ]
-    return sum(weighted_values) / total_weight if total_weight > 0 else default_nitrogen_content
+    should_run = total_weight > 0
+    return sum(weighted_values) / total_weight if should_run else 0
 
 
 def _calc_average_lignin_content_of_organic_carbon_sources(
@@ -963,7 +970,8 @@ def _calc_average_lignin_content_of_organic_carbon_sources(
     weighted_values = [
         c.mass * (c.lignin_content if c.lignin_content else default_lignin_content) for c in carbon_sources
     ]
-    return sum(weighted_values) / total_weight if total_weight > 0 else default_lignin_content
+    should_run = total_weight > 0
+    return sum(weighted_values) / total_weight if should_run else 0
 
 
 # --- TIER 2 FUNCTIONS: ACTIVE SUB-POOL SOC STOCK ---
@@ -3724,9 +3732,16 @@ def _should_run_inventory_year_tier_2(group: dict) -> bool:
         }
     )
 
+    carbon_input_data_complete = all([
+        group.get(_InventoryKey.CARBON_INPUT, 0) > 0,
+        group.get(_InventoryKey.N_CONTENT, 0) > 0,
+        group.get(_InventoryKey.LIGNIN_CONTENT, 0) > 0,
+    ])
+
     return all([
         not group.get(_InventoryKey.IS_PADDY_RICE),
         monthly_data_complete,
+        carbon_input_data_complete,
         all(key in group.keys() for key in REQUIRED_KEYS_TIER_2),
     ])
 

hestia_earth/models/ipcc2019/pastureGrass.py

@@ -497,7 +497,8 @@ def _sum_values(values): return sum([value for term_id, value in values])
 def _calculate_GE(cycle: dict, meanDE: float, system: dict):
     animals = [
         a for a in cycle.get('animals', []) if all([
-            a.get('value') and a.get('referencePeriod') == AnimalReferencePeriod.AVERAGE.value
+            a.get('value'),
+            a.get('referencePeriod') == AnimalReferencePeriod.AVERAGE.value
         ])
     ]
 

hestia_earth/models/linkedImpactAssessment/__init__.py

@@ -75,7 +75,7 @@ def _run_emission(cycle: dict, term_id: str, data: dict):
 
         details = values.get('details', {})
         logRequirements(cycle, model=model, term=term_id,
-                        values=log_as_table([{'impact_assessment_id': key} | value for key, value in details.items()]))
+                        values=log_as_table([{'impact-assessment-id': key} | value for key, value in details.items()]))
 
         logShouldRun(cycle, model, term_id, True, methodTier=TIER,
                      input=term.get('@id'),
@@ -138,8 +138,8 @@ def _group_inputs(group: dict, values: tuple):
             grouped_inputs['value'] = grouped_inputs['value'] + (emission_value * input_value)
             # for logging
             grouped_inputs['details'][input.get('impactAssessment', {}).get('@id')] = {
-                'emission_value': emission_value,
-                'input_value': input_value
+                'emission-value': emission_value,
+                'input-value': input_value
             }
             group[emission_term_id][input_group_key] = grouped_inputs
     return group