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

hestia_earth/models/ipcc2019/n2OToAirCropResidueBurningDirect.py

@@ -38,24 +38,25 @@ def _emission(value: float):
     return emission
 
 
-def _run(product_value: list):
+def _run(product_value: list, factor: float):
     value = sum(product_value)
-    factor = get_lookup_value({'termType': 'emission', '@id': TERM_ID}, LOOKUPS['emission'][0])
     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)
+                    has_crop_residue_burnt=has_crop_residue_burnt,
+                    burning_factor=factor)
 
-    should_run = all([has_crop_residue_burnt])
+    should_run = all([has_crop_residue_burnt, 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
 
 
 def run(cycle: dict):
-    should_run, crop_residue_burnt_value = _should_run(cycle)
-    return _run(crop_residue_burnt_value) if should_run else []
+    should_run, crop_residue_burnt_value, factor = _should_run(cycle)
+    return _run(crop_residue_burnt_value, factor) if should_run else []

hestia_earth/models/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -4,15 +4,14 @@ from itertools import product
 import numpy as np
 import numpy.typing as npt
 from typing import Any, Callable, Literal, Optional, TypedDict, Union
-
 from hestia_earth.schema import EmissionMethodTier, EmissionStatsDefinition, SiteSiteType
 from hestia_earth.utils.lookup import download_lookup, get_table_value, column_name
 from hestia_earth.utils.tools import safe_parse_float
+from hestia_earth.utils.stats import gen_seed, repeat_single, truncated_normal_1d
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.log import debugMissingLookup, log_as_table, logRequirements, logShouldRun
-from hestia_earth.models.utils.array_builders import gen_seed, repeat_single, truncated_normal_1d
 from hestia_earth.models.utils.blank_node import group_nodes_by_year
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
 from hestia_earth.models.utils.emission import _new_emission
 from hestia_earth.models.utils.lookup import get_region_lookup_value

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_1.py

@@ -4,20 +4,19 @@ from numpy import empty_like, random, vstack
 from numpy.typing import NDArray
 from pydash.objects import merge
 from typing import Callable, Literal, Optional, Union
-
 from hestia_earth.schema import MeasurementMethodClassification, SiteSiteType, TermTermType
 from hestia_earth.utils.blank_node import get_node_value
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import non_empty_list
+from hestia_earth.utils.stats import gen_seed
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
 
 from hestia_earth.models.utils import split_on_condition
-from hestia_earth.models.utils.array_builders import gen_seed
 from hestia_earth.models.utils.blank_node import (
     cumulative_nodes_match, cumulative_nodes_lookup_match, cumulative_nodes_term_match, group_by_term,
     node_lookup_match, node_term_match, group_nodes_by_year, validate_start_date_end_date
 )
 from hestia_earth.models.utils.ecoClimateZone import EcoClimateZone, get_eco_climate_zone_value
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.property import get_node_property
 from hestia_earth.models.utils.term import get_residue_removed_or_burnt_terms, get_upland_rice_land_cover_terms

hestia_earth/models/ipcc2019/organicCarbonPerHa_tier_2.py

@@ -3,23 +3,22 @@ from numpy import array, empty, exp, minimum, random, where, vstack
 from numpy.typing import NDArray
 from pydash.objects import merge
 from typing import Any, Callable, Union
-
 from hestia_earth.schema import (
     CycleFunctionalUnit, MeasurementMethodClassification, SiteSiteType, TermTermType
 )
 from hestia_earth.utils.model import find_term_match, filter_list_term_type
 from hestia_earth.utils.tools import flatten, list_sum, non_empty_list
 from hestia_earth.utils.blank_node import get_node_value
-
-from hestia_earth.models.utils.array_builders import (
+from hestia_earth.utils.stats import (
     avg_run_in_columnwise, gen_seed, grouped_avg, repeat_1d_array_as_columns
 )
+from hestia_earth.utils.descriptive_stats import calc_descriptive_stats
+
 from hestia_earth.models.utils.blank_node import (
     cumulative_nodes_lookup_match, cumulative_nodes_term_match, group_nodes_by_year, group_nodes_by_year_and_month,
     GroupNodesByYearMode, node_lookup_match, node_term_match
 )
 from hestia_earth.models.utils.cycle import check_cycle_site_ids_identical
-from hestia_earth.models.utils.descriptive_stats import calc_descriptive_stats
 from hestia_earth.models.utils.measurement import _new_measurement
 from hestia_earth.models.utils.property import get_node_property
 from hestia_earth.models.utils.site import related_cycles

hestia_earth/models/ipcc2019/organicCarbonPerHa_utils.py

@@ -2,14 +2,13 @@ from enum import Enum
 from numpy import inf
 from numpy.typing import NDArray
 from typing import NamedTuple, Optional
-
 from hestia_earth.schema import MeasurementStatsDefinition, SiteSiteType
+from hestia_earth.utils.stats import calc_z_critical
 
-from hestia_earth.models.utils.array_builders import (
+from hestia_earth.utils.stats import (
     repeat_single, truncated_normal_1d
 )
 from hestia_earth.models.utils.blank_node import cumulative_nodes_term_match, node_term_match
-from hestia_earth.models.utils.stats import calc_z_critical
 from hestia_earth.models.utils.term import get_cover_crop_property_terms, get_irrigated_terms
 
 STATS_DEFINITION = MeasurementStatsDefinition.SIMULATED.value