hestia-earth-models 0.60.0__py3-none-any.whl → 0.61.0__py3-none-any.whl

hestia_earth/models/{impact_assessment → pooreNemecek2018}/freshwaterWithdrawalsDuringCycle.py

@@ -46,7 +46,7 @@ TERM_ID = 'freshwaterWithdrawalsDuringCycle'
 
 
 def _indicator(term_id: str, value: float):
-    indicator = _new_indicator(term_id)
+    indicator = _new_indicator(term_id, MODEL)
     indicator['value'] = value
     return indicator
 

hestia_earth/models/site/brackishWater.py

@@ -0,0 +1,43 @@
+from hestia_earth.schema import MeasurementMethodClassification
+from hestia_earth.utils.model import find_term_match
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.measurement import _new_measurement, measurement_value
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "measurements": [
+            {"@type": "Measurement", "term.@id": "waterSalinity", "value": ">= 500 and <= 18000"}
+        ]
+    }
+}
+RETURNS = {
+    "Measurement": [{
+        "value": "100",
+        "methodClassification": "modelled using other measurements"
+    }]
+}
+TERM_ID = 'brackishWater'
+
+
+def _measurement():
+    data = _new_measurement(TERM_ID)
+    data['value'] = [100]
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
+    return data
+
+
+def _should_run(site: dict):
+    waterSalinity = measurement_value(find_term_match(site.get('measurements', []), 'waterSalinity'))
+
+    logRequirements(site, model=MODEL, term=TERM_ID,
+                    waterSalinity=waterSalinity)
+
+    should_run = all([500 <= waterSalinity <= 18000])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+    return should_run
+
+
+def run(site: dict):
+    return _measurement() if _should_run(site) else None

hestia_earth/models/site/freshWater.py

@@ -0,0 +1,43 @@
+from hestia_earth.schema import MeasurementMethodClassification
+from hestia_earth.utils.model import find_term_match
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.measurement import _new_measurement, measurement_value
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "measurements": [
+            {"@type": "Measurement", "term.@id": "waterSalinity", "value": "< 500"}
+        ]
+    }
+}
+RETURNS = {
+    "Measurement": [{
+        "value": "100",
+        "methodClassification": "modelled using other measurements"
+    }]
+}
+TERM_ID = 'freshWater'
+
+
+def _measurement():
+    data = _new_measurement(TERM_ID)
+    data['value'] = [100]
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
+    return data
+
+
+def _should_run(site: dict):
+    waterSalinity = measurement_value(find_term_match(site.get('measurements', []), 'waterSalinity'))
+
+    logRequirements(site, model=MODEL, term=TERM_ID,
+                    waterSalinity=waterSalinity)
+
+    should_run = all([0 < waterSalinity < 500])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+    return should_run
+
+
+def run(site: dict):
+    return _measurement() if _should_run(site) else None

hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py

@@ -125,11 +125,11 @@ def _cache_results(site: dict, area_size: float):
     return cache_site_results(raster_results + vector_results, rasters + vectors, area_size)
 
 
-def _should_run(site: dict, area_size: float = None):
+def _should_run(site: dict, area_size: float = None, check_has_cache: bool = True):
     area_size = area_size or get_area_size(site)
     contains_geospatial_data = has_geospatial_data(site)
     contains_coordinates = has_coordinates(site)
-    has_cache = cached_value(site, CACHE_VALUE) is not None
+    has_cache = check_has_cache and cached_value(site, CACHE_VALUE) is not None
 
     debugValues(site,
                 area_size=area_size,

hestia_earth/models/site/salineWater.py

@@ -0,0 +1,43 @@
+from hestia_earth.schema import MeasurementMethodClassification
+from hestia_earth.utils.model import find_term_match
+
+from hestia_earth.models.log import logRequirements, logShouldRun
+from hestia_earth.models.utils.measurement import _new_measurement, measurement_value
+from . import MODEL
+
+REQUIREMENTS = {
+    "Site": {
+        "measurements": [
+            {"@type": "Measurement", "term.@id": "waterSalinity", "value": "> 18000"}
+        ]
+    }
+}
+RETURNS = {
+    "Measurement": [{
+        "value": "100",
+        "methodClassification": "modelled using other measurements"
+    }]
+}
+TERM_ID = 'salineWater'
+
+
+def _measurement():
+    data = _new_measurement(TERM_ID)
+    data['value'] = [100]
+    data['methodClassification'] = MeasurementMethodClassification.MODELLED_USING_OTHER_MEASUREMENTS.value
+    return data
+
+
+def _should_run(site: dict):
+    waterSalinity = measurement_value(find_term_match(site.get('measurements', []), 'waterSalinity'))
+
+    logRequirements(site, model=MODEL, term=TERM_ID,
+                    waterSalinity=waterSalinity)
+
+    should_run = all([waterSalinity > 18000])
+    logShouldRun(site, MODEL, TERM_ID, should_run)
+    return should_run
+
+
+def run(site: dict):
+    return _measurement() if _should_run(site) else None

hestia_earth/models/utils/__init__.py

@@ -3,7 +3,7 @@ import sys
 import datetime
 from functools import reduce
 import operator
-from typing import Any
+from typing import Any, Union
 from hestia_earth.schema import SchemaType
 from hestia_earth.utils.api import download_hestia
 from hestia_earth.utils.model import linked_node
@@ -31,8 +31,8 @@ def _include_model(node: dict, term_id: str):
     return {**node, **({} if term.get('@id') is None else {'model': linked_node(term)})}
 
 
-def _include_method(node: dict, term_id: str):
-    term = download_hestia(term_id) or {}
+def _include_method(node: dict, term_id: Union[str, dict]):
+    term = (download_hestia(term_id) or {}) if isinstance(term_id, str) else term_id
     return {**node, **({} if term.get('@id') is None else {'method': linked_node(term)})}
 
 

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.60.0'
+VERSION = '0.61.0'

{hestia_earth_models-0.60.0.dist-info → hestia_earth_models-0.61.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.60.0
+Version: 0.61.0
 Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: Hestia Team
@@ -11,7 +11,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: hestia-earth.schema ==27.*
+Requires-Dist: hestia-earth.schema ==28.*
 Requires-Dist: hestia-earth.utils >=0.12.2
 Requires-Dist: python-dateutil >=2.8.1
 Requires-Dist: CurrencyConverter ==0.16.8

{hestia_earth_models-0.60.0.dist-info → hestia_earth_models-0.61.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
 hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
-hestia_earth/models/cache_sites.py,sha256=wsRjO7B14dd0XQtCqkjK0_W8P-45t_VhxWfaAFYYzKg,4916
+hestia_earth/models/cache_sites.py,sha256=KQp9cUKE-aIcYJoMWEtKFYS8gBFfsx5LKQhqoWpUSoM,6065
 hestia_earth/models/log.py,sha256=b63I3qyTtQs17xxbq8RI0Fv2lvZ1oDZ9k0njhxqiFFk,3459
 hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
-hestia_earth/models/version.py,sha256=HxmxadwsbabLEgeV2_2efW6fNlYUuCRBJVCOpiPm7qg,19
+hestia_earth/models/version.py,sha256=FT08Vhb7Lb3VBMJTpz6SG6r9-iYbaTSa6dMvziz62nw,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=mrh8seYSYdTgcMDCETLiknuPeJehg071YoG4UiyW0yU,4404
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=_Rbngu0DzHKa62JwBl58ZC_ui1zLF2que_nB7ukhOQc,3392
@@ -38,8 +38,7 @@ hestia_earth/models/cycle/coldCarcassWeightPerHead.py,sha256=SaTHq8AC3o8HylfN0LE
 hestia_earth/models/cycle/coldDressedCarcassWeightPerHead.py,sha256=9i52CQHiqZjFYcW1IwKUAgJvFkUvp0BZT_z3Ik-HiSM,3041
 hestia_earth/models/cycle/concentrateFeed.py,sha256=TBhBuh98WYrzMEajXyuFRTdVq_pnp0fokCCqL67nfmk,5594
 hestia_earth/models/cycle/cropResidueManagement.py,sha256=QTRCCFu9VvD_a3_8aAj216vsuhAJEhlAwTJH7ifMkDo,2237
-hestia_earth/models/cycle/cycleDuration.py,sha256=ZgK6lQ8wmRv5uhM30OiV8ctqE4v8ldkBzzo23JlNwWY,1576
-hestia_earth/models/cycle/endDate.py,sha256=YwXvYDO2dz5TxspsqRGIWOYFHj5PYtAL-DtCqEkxIvE,1396
+hestia_earth/models/cycle/cycleDuration.py,sha256=9EvmdBdyjgKqiMi643PMVPvlrzRInP00WKiB2hv96NQ,3016
 hestia_earth/models/cycle/energyContentLowerHeatingValue.py,sha256=AyVKCQbb3Pto3Ca__F0KJ_wlwTxbPd7mUyehZW7AJPM,2212
 hestia_earth/models/cycle/excretaKgMass.py,sha256=iA8Kfl3WvyxbQpx1QOGPQZ9O_Pc5rj7xhucYx3rB8Co,3949
 hestia_earth/models/cycle/excretaKgN.py,sha256=mgJTneQIYJ9Su-rTK5ppb_k3YhICFNWsfPZtGR98RI0,2968
@@ -56,7 +55,8 @@ hestia_earth/models/cycle/residueIncorporated.py,sha256=9_s2RMOy5D20eq9ziDBEA_Y7
 hestia_earth/models/cycle/residueLeftOnField.py,sha256=qYxKGAdUORN7Vjqj7AZC2VGV_rM3MN0-padDGhgjiNU,2175
 hestia_earth/models/cycle/residueRemoved.py,sha256=jxDu_Jfcyd-rm-qo8ZuRIf-GGxtFBMpmGy1zHOavwy0,2135
 hestia_earth/models/cycle/siteDuration.py,sha256=XAxCA_51kQaWh4_0L_Y08cGn-qsMRUcyaPrn84rfafI,1058
-hestia_earth/models/cycle/startDate.py,sha256=RTpA7NX5afktdQH0Z6c2SB7LCSi5R28aPcqq7Xn5lkw,1181
+hestia_earth/models/cycle/startDate.py,sha256=OnuMf4TkDb0WwCntjXNy3ipLS-b4drMWSkXWeXU142Q,1507
+hestia_earth/models/cycle/startDateDefinition.py,sha256=4C7Gh3x7nBtAK7q1LbNUInwPpS5Vv7ivnkxP5QFhHBs,2273
 hestia_earth/models/cycle/transformation.py,sha256=06KTfVubh2I47dfnG9Iv6AbuUBbURM8BAVOkRu7XmHw,1255
 hestia_earth/models/cycle/utils.py,sha256=ZcVwvRwVNK48jZfnhrHl2ai4a96YzcmRgO-eQXwQNjo,1408
 hestia_earth/models/cycle/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -178,21 +178,9 @@ hestia_earth/models/hyde32/landTransformationFromPermanentPasture100YearAverageD
 hestia_earth/models/hyde32/landTransformationFromPermanentPasture20YearAverageDuringCycle.py,sha256=khH8zdALTeaCaIDK6L-3OexD03I7MB8vA_mBOSkwe1M,2408
 hestia_earth/models/hyde32/utils.py,sha256=j9QavyBZIQ-ZCNjdPLWjOjg2LrxcNlanQ1wPnT0IKX8,3098
 hestia_earth/models/impact_assessment/__init__.py,sha256=gTR_PhWps593fPhm-V826VLLrZVH8CNQTqxExB7GGNI,418
-hestia_earth/models/impact_assessment/emissions.py,sha256=zRQd17joMqij8mjRcrY9LssHgwzsYC5bkoy7iGdjj-Q,3429
-hestia_earth/models/impact_assessment/freshwaterWithdrawalsDuringCycle.py,sha256=wvNwABEh4blgm95G9y_yorMNEjyYsq4MZiFggkPRuIE,3932
-hestia_earth/models/impact_assessment/freshwaterWithdrawalsInputsProduction.py,sha256=DSLX_aEWaUFcFZRD46bG5lIQ4TtAtIqH-sMkVCJH2Dg,990
+hestia_earth/models/impact_assessment/emissions.py,sha256=6eq88G_U-JxXvysOnGDSXOB2dhJOjlqmJCq-CHQ7ZIM,3357
 hestia_earth/models/impact_assessment/irrigated.py,sha256=qopAYbD91uu1Q2hJ3aB5Xl3br2Nzh7LoMTRCFOXmOv0,783
-hestia_earth/models/impact_assessment/landOccupationInputsProduction.py,sha256=SggB_4tpiKNeb6TIQWBm-X9VwG4pzLoyHdK8JroRIsE,576
-hestia_earth/models/impact_assessment/landTransformationFromCropland100YearAverageInputsProduction.py,sha256=jxeJS8r1qYIoyeEE-MGKbldEDL3x9CG8aIb4JdcUnj4,1036
-hestia_earth/models/impact_assessment/landTransformationFromCropland20YearAverageInputsProduction.py,sha256=vluuIcr1jYhs11oz7nANk2qUuUVPy5uNkvpfMv_M4LE,1034
-hestia_earth/models/impact_assessment/landTransformationFromForest100YearAverageInputsProduction.py,sha256=pDPLaJh6eWD_ENuWIuAhHHcgzWK44emt9A6Ckc0ob0c,1032
-hestia_earth/models/impact_assessment/landTransformationFromForest20YearAverageInputsProduction.py,sha256=h-ZxPjc4Wdl4fJThcbVkktHL2btO48cfmYA3pZLeKiY,1030
-hestia_earth/models/impact_assessment/landTransformationFromOtherNaturalVegetation100YearAverageInputsProduction.py,sha256=Bb-qMHTjazCSZi0MGT9nYXDBb14jnpTbMzlz-X_5lMM,1064
-hestia_earth/models/impact_assessment/landTransformationFromOtherNaturalVegetation20YearAverageInputsProduction.py,sha256=wQdJ4NqEfjI3N3tD8X5bCEmz-2XVoYVLriKcLRLhPmU,1062
-hestia_earth/models/impact_assessment/landTransformationFromPermanentPasture100YearAverageInputsProduction.py,sha256=7btlXl5PL47qIjfs-w_xLZY_nsRnJAwTREtt8LpY6UI,1052
-hestia_earth/models/impact_assessment/landTransformationFromPermanentPasture20YearAverageInputsProduction.py,sha256=pdluhfRQuJK0EHq-L0s0TOf37tvOQYB-M-wZiuSbarw,1050
 hestia_earth/models/impact_assessment/organic.py,sha256=vgY-Wwt_gE6t2EQSFDY6XvDjI0TXb7YeMxH7gty-u6Q,759
-hestia_earth/models/impact_assessment/utils.py,sha256=qMEIcXYBgVgEFnY_KFhZ8Y_07trNkLOIQGnbXWjczCE,1869
 hestia_earth/models/impact_assessment/post_checks/__init__.py,sha256=rkHO4Z3Zz8LCT1OoDgHmUuGURvXsdzh2nQqgU2M4tjU,304
 hestia_earth/models/impact_assessment/post_checks/cycle.py,sha256=FxfDEswd9uPYL-ZRqgr_IrrtOJyD9BnqA8-l1ZOxwiY,838
 hestia_earth/models/impact_assessment/post_checks/site.py,sha256=KyQmQ8dizBPZ6R31Th5S99EMw6LAfeqc1sX4_PX73MY,828
@@ -251,7 +239,7 @@ hestia_earth/models/ipcc2019/no3ToGroundwaterOrganicFertiliser.py,sha256=zOhp6Nh
 hestia_earth/models/ipcc2019/noxToAirInorganicFertiliser.py,sha256=D-UyzY55mOiIcXRzEtvPY-r1bDFgb9YqA08SmHsQeNA,4226
 hestia_earth/models/ipcc2019/noxToAirOrganicFertiliser.py,sha256=SVgVNp76bIv9oUjrZZuI6xYLo4Gw2DRU5tbp14gydOE,3911
 hestia_earth/models/ipcc2019/organicCarbonPerHa.py,sha256=omxrtnAZ58qHQYIhi38R7VFn7SRzf8Kk89KgP0VELFQ,141507
-hestia_earth/models/ipcc2019/pastureGrass.py,sha256=TNKK3P0s0euV1jnZTFVxomed5G74R2dAHjKnoGZSS0g,8708
+hestia_earth/models/ipcc2019/pastureGrass.py,sha256=Q3uX7IcTk0PmzxqEhU3JAcHb5LnUymZbmdRFP9xXsfo,8713
 hestia_earth/models/ipcc2019/pastureGrass_utils.py,sha256=nUJYYkovzF7QD4LeUqhV5mBYFKdrhxeG4gyPRv0Xpuk,16002
 hestia_earth/models/ipcc2019/utils.py,sha256=MSDMu15D9DnilFUgi4_6jYXC0FaKso3OODauGTMB6hs,6229
 hestia_earth/models/ipcc2019/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -353,16 +341,29 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
 hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py,sha256=t8DTybm_3DIlvtpSJP-KBWsgp0SKe4d_pw2Y0BKGxMg,1175
 hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialAcidification.py,sha256=U74max756dWZLVbLNUAHcHeUiHADLxuvRbvpJc4eSLc,1182
 hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py,sha256=-8e8-lt0yByEcVbk7bTF4-z3t51w5iQKVdZ5bgYsyJg,1063
-hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=d19wzr4GnWXpMWRhchqwp3S8txrUkpIWrGPwnWdXhjI,6236
+hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=SPP09DMS4zUThyQfcgLpivFwsey4WSt77CDMYHJPKWE,423
+hestia_earth/models/linkedImpactAssessment/emissions.py,sha256=od49hQAJCnjxG3mI2W7ZoOfiNPoUAWMWtklB5_2syoY,6274
+hestia_earth/models/linkedImpactAssessment/freshwaterWithdrawalsInputsProduction.py,sha256=DSLX_aEWaUFcFZRD46bG5lIQ4TtAtIqH-sMkVCJH2Dg,990
+hestia_earth/models/linkedImpactAssessment/landOccupationInputsProduction.py,sha256=SggB_4tpiKNeb6TIQWBm-X9VwG4pzLoyHdK8JroRIsE,576
+hestia_earth/models/linkedImpactAssessment/landTransformationFromCropland100YearAverageInputsProduction.py,sha256=jxeJS8r1qYIoyeEE-MGKbldEDL3x9CG8aIb4JdcUnj4,1036
+hestia_earth/models/linkedImpactAssessment/landTransformationFromCropland20YearAverageInputsProduction.py,sha256=vluuIcr1jYhs11oz7nANk2qUuUVPy5uNkvpfMv_M4LE,1034
+hestia_earth/models/linkedImpactAssessment/landTransformationFromForest100YearAverageInputsProduction.py,sha256=pDPLaJh6eWD_ENuWIuAhHHcgzWK44emt9A6Ckc0ob0c,1032
+hestia_earth/models/linkedImpactAssessment/landTransformationFromForest20YearAverageInputsProduction.py,sha256=h-ZxPjc4Wdl4fJThcbVkktHL2btO48cfmYA3pZLeKiY,1030
+hestia_earth/models/linkedImpactAssessment/landTransformationFromOtherNaturalVegetation100YearAverageInputsProduction.py,sha256=Bb-qMHTjazCSZi0MGT9nYXDBb14jnpTbMzlz-X_5lMM,1064
+hestia_earth/models/linkedImpactAssessment/landTransformationFromOtherNaturalVegetation20YearAverageInputsProduction.py,sha256=wQdJ4NqEfjI3N3tD8X5bCEmz-2XVoYVLriKcLRLhPmU,1062
+hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPasture100YearAverageInputsProduction.py,sha256=7btlXl5PL47qIjfs-w_xLZY_nsRnJAwTREtt8LpY6UI,1052
+hestia_earth/models/linkedImpactAssessment/landTransformationFromPermanentPasture20YearAverageInputsProduction.py,sha256=pdluhfRQuJK0EHq-L0s0TOf37tvOQYB-M-wZiuSbarw,1050
+hestia_earth/models/linkedImpactAssessment/utils.py,sha256=dGwGc2d-8_WQElTpfyPmz5vQtL-LHQRmiZnCTuPXMDs,1876
 hestia_earth/models/mocking/__init__.py,sha256=kmSeOTSvurMUxw7Ajhf3G-SVPQ1NgmirMTk4TSOEicY,765
 hestia_earth/models/mocking/mock_search.py,sha256=V-ycVBTkJu7PP37Ivy_16hpKBV4aEtJb5S9DfChPNSU,2038
-hestia_earth/models/mocking/search-results.json,sha256=XZzKZ_aXsJJ2XgzlDbIYwmLozqdNHitUnDMDKNKWOG8,39547
+hestia_earth/models/mocking/search-results.json,sha256=YBVHukDRbVuDQc17wZ-Jax2KbKLCEP9pa-wBr-q2P7Q,40203
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=Qt-mel4dkhK6N5uUOutNOinCTFjbjtGzITaaI0LvYc4,2396
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=JT0RybbvWVlo01FO8K0Yj41HrEaJT3Kj1xfayr2X-xw,2315
 hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=CxjhFinScTebBGNVheEdbdw36DdHwoPszAnbxtd6_9s,6590
 hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=kLWtv49c1sD3YrporqRcmwr36Q_fJc-hIrvi8LS-864,6418
 hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=nlnZSDx-bIvtukL79Syhon0cSQ8o4OC1YKtAG6haGhI,8500
+hestia_earth/models/pooreNemecek2018/freshwaterWithdrawalsDuringCycle.py,sha256=HB_9q5eE6al2Te3v29hC5wqxsYe4P46ZAPwdWNzx3v0,3939
 hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=jE110XgPMgfnBMUXyKIL5SL9yZWYhdGr5NrfHcqn2h0,2785
 hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=8Z--QMhRItR77RsZFr6v1EPVZdv7pBxyl685t3Iit5M,1561
 hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=HJ7IstImGyasIKosK2lQZ-v6Lqt3_aEfZhoiC4CY0rM,2586
@@ -450,8 +451,10 @@ hestia_earth/models/schmidt2007/n2OToAirWasteTreatmentDirect.py,sha256=3i7tgar2D
 hestia_earth/models/schmidt2007/nh3ToAirWasteTreatment.py,sha256=yGrw7LHTrgRU_LyUsdl96TO6omEZju7JaBbW_A8ufX4,1474
 hestia_earth/models/schmidt2007/utils.py,sha256=pQ76IBWMwi10Wa5PjsehtdnOMw-GVgDtB4nLGYKT-Ic,812
 hestia_earth/models/site/__init__.py,sha256=aVuLLhq0OQVm-_MZoq4JAKMidqexUWJBg_7mmojmDzc,405
+hestia_earth/models/site/brackishWater.py,sha256=dl-R_vwFlXwAkir3grhCYZTLf05FYrfUJS9ZdnprzY0,1277
 hestia_earth/models/site/cationExchangeCapacityPerKgSoil.py,sha256=0eH4A-tXJ0hvIkiYXWxlx8TfrdbIKUGYUDk97-yQJgg,3653
 hestia_earth/models/site/flowingWater.py,sha256=0ZuSXMr3EUTY3wsy8hdfuXeZcNX-n3D45MfX3dwyaeA,1728
+hestia_earth/models/site/freshWater.py,sha256=z-C_Il0U6UhZUQUPwh72Z0vixmSrUNEmBN5Lz-nl9_w,1254
 hestia_earth/models/site/management.py,sha256=gYmFaWIYtki112b3A3qf_1hLl9bb98T6oYMG4KbaXzQ,8628
 hestia_earth/models/site/netPrimaryProduction.py,sha256=UIIQkYd911qVzrWjxBLrC37e-RARIVgDwLdARY9BuLw,1849
 hestia_earth/models/site/organicCarbonPerHa.py,sha256=gcmhZavc2EWvkroKkpFM5xXowPTgyXGh1XL6lgs3CX4,14303
@@ -465,6 +468,7 @@ hestia_earth/models/site/precipitationAnnual.py,sha256=to14BEFjUaYyCu5aIBQZtuaIr
 hestia_earth/models/site/precipitationMonthly.py,sha256=yGUbiUCu1Prp3qVHuZodGrcfrbYu170WTUGyaj-KEjY,1896
 hestia_earth/models/site/rainfallAnnual.py,sha256=Ix_B8Ny7IIRkJ_3lUvoHOjPgqCyR9I0U3_ADUUtMqsY,2003
 hestia_earth/models/site/rainfallMonthly.py,sha256=2Uo8F-YxnTK0_txlHmiAyVp1bGfWD4bneRKyg4tdQkI,1881
+hestia_earth/models/site/salineWater.py,sha256=HO31JcUBw5WQYGu9zHNqbARasBubNFgJ7OxSVrK3D2o,1255
 hestia_earth/models/site/soilMeasurement.py,sha256=q5CJ4caCqH8pSbQxen0IqTjrFyMRLrrCU2M2BMUgzTE,7851
 hestia_earth/models/site/temperatureAnnual.py,sha256=Q3b1RH2_hpA0JWwOYA5nKgMGcXHjV8-akXT9vB0cbwc,2012
 hestia_earth/models/site/temperatureMonthly.py,sha256=yXwpFCGT2tUqvVBNedaPyBmN_KlzZqo5yv2TWem1pBk,1890
@@ -476,7 +480,7 @@ hestia_earth/models/site/measurement/value.py,sha256=7IhUbIj7n5vB7yXoNxXsWbliEJj
 hestia_earth/models/site/post_checks/__init__.py,sha256=CkExxesk1GuG8NjrbKfix1iDuVUgU-9i1ccM_X7MZn4,284
 hestia_earth/models/site/post_checks/cache.py,sha256=_MZsNsclecUdHDT2MsYx4cEsVUXydIasddgZNA6SU4k,284
 hestia_earth/models/site/pre_checks/__init__.py,sha256=fjv6nU5fiL-CLyaa-cBpiLB-xujgPzeK7i7ZJuTOjCI,394
-hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py,sha256=89ZbSyJjP9adH09JhVlaFfLeXq3ND3w8Nxmd4HVB-5k,5240
+hestia_earth/models/site/pre_checks/cache_geospatialDatabase.py,sha256=MoQ76e0S63uvoFhqBbhG0GuoJ9bZgX_vrXz2_Id44Jw,5290
 hestia_earth/models/site/pre_checks/cache_sources.py,sha256=RzvSgHJTpVkAB3mEvRju_irDQmdJRK7GUdU6PhS2Gaw,904
 hestia_earth/models/site/pre_checks/cache_years.py,sha256=qGwTaHlWxnVT7iVxXVcpJ-oG6M-VH4ZpCDTdTixUHR4,883
 hestia_earth/models/stehfestBouwman2006/__init__.py,sha256=EhvD4NK6oEPevusLb1WdYV3GT_fCtQx4gvdMhK_dEIQ,420
@@ -509,7 +513,7 @@ hestia_earth/models/transformation/product/__init__.py,sha256=47DEQpj8HBSa-_TImW
 hestia_earth/models/transformation/product/excreta.py,sha256=Yj9wMF5if-zivb6qbN3vy1X51ZNYxvoyG9f4KPp3Y18,5700
 hestia_earth/models/usetoxV2/__init__.py,sha256=pK37V3H-KvYcvRKw4Mv8CWrB2N0LFLzmv0jKLdhGGqs,409
 hestia_earth/models/usetoxV2/freshwaterEcotoxicityPotentialCtue.py,sha256=oYNwThnMXjZymif5buyHiczFiOq_61jOdDMOAyy8vwQ,1018
-hestia_earth/models/utils/__init__.py,sha256=XBoIFLfdddas7ser6X1TxFL8bHipnmYn83KjY33sTXc,4379
+hestia_earth/models/utils/__init__.py,sha256=OrqV4x67N7bzHldAPGQyrvV1GobzBWfrCVzQrnxFdyQ,4442
 hestia_earth/models/utils/aggregated.py,sha256=sz6usleZmo_tC_hIvmGgYsX8-H0dulXmmhHK4EkA5Kg,4946
 hestia_earth/models/utils/animalProduct.py,sha256=M5IunAKGY6oZv3j1Ascl34ywyeLWApqOIlBzbtlA2FE,721
 hestia_earth/models/utils/aquacultureManagement.py,sha256=3uSTSMDNNPa26NTJGZCYwByv3QZVyxj6bh2aFCoBzHk,126
@@ -546,10 +550,9 @@ hestia_earth/models/utils/transformation.py,sha256=nyT5Mz4_VgFwhkL8JoNX9kxxow0zu
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
 hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=G2eq00XGdr1ZEZ5Ru1nBIR-sD7iM9hGYhvk8r5wL3dA,3910
 tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/test_cache_sites.py,sha256=6Dp5SpshEFRavtDixA7ymxPv9j-ei_bqdbowYVMPYMQ,2465
+tests/models/test_cache_sites.py,sha256=AsZSGb4ruFqag74wRaQxpoZxbMxexPY8q8sMb2ergzg,1986
 tests/models/test_ecoinventV3.py,sha256=zyIWeeS7VndjXAHcROhDi3E0I52U8uQu8u-t1EXwqW8,1492
 tests/models/test_emissionNotRelevant.py,sha256=YXTdRfcdR_JepHuj2P3Y3r0aFMKNOmsXQHY48tmLTQo,1316
-tests/models/test_linkedImpactAssessment.py,sha256=RiBNTF34GMA5YsuJ0MAsEPhMuHNC2W0Qq9YnWYDpXM4,1172
 tests/models/agribalyse2016/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/agribalyse2016/test_fuelElectricity.py,sha256=u_wNlqngJc8NELPr16kYsYQ-_2PcL8BnrfJucY7dccU,1353
 tests/models/agribalyse2016/test_machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=75yJ0yuPbIizpSsHr7CpZnUv01LZbuYsm5s9hE0VL_o,1090
@@ -584,8 +587,7 @@ tests/models/cycle/test_coldDressedCarcassWeightPerHead.py,sha256=DrdI1TUmggeeQv
 tests/models/cycle/test_completeness.py,sha256=Ku1ZSApGaACkXe3ae14yP01C4GssHMwlPG_UPrSytPo,1625
 tests/models/cycle/test_concentrateFeed.py,sha256=tgkThL4g293CexLvb89ftO9UqUbHhNOxiP6QMmsqCCo,2013
 tests/models/cycle/test_cropResidueManagement.py,sha256=vQWl7rDYLJjiKyBQlCiOA76LpzM4dI2t7JJ30uF8H9M,2020
-tests/models/cycle/test_cycleDuration.py,sha256=jD9L6eGwi0woUMpqcGm6MxP_Wvh_H6FCSmiHME5eOZc,1296
-tests/models/cycle/test_endDate.py,sha256=SY04-jtp9dAaCJpFv8Ef09jhUmsB0IWRphWrilR_wv4,649
+tests/models/cycle/test_cycleDuration.py,sha256=5anGBbvxFP7YKO9za80bNFL_DoZdtqhMYwJKkvNSi34,856
 tests/models/cycle/test_energyContentLowerHeatingValue.py,sha256=ZvHigQrtneKrRc8qr7rN8aj6tuA0ds0V6Brh0UzN_T8,1204
 tests/models/cycle/test_excretaKgMass.py,sha256=xpuq0k5HKvnGmWdJy0GmIv6A4xYk2VDFB4BMb8J2Z0g,2925
 tests/models/cycle/test_excretaKgN.py,sha256=xoe0PF-DwhVkihN-1BonUa7u_QNM9lr7CmGXsOozQ0Y,1090
@@ -605,7 +607,8 @@ tests/models/cycle/test_residueIncorporated.py,sha256=esB_wnpf6W0PB24HW0YUgtfD9m
 tests/models/cycle/test_residueLeftOnField.py,sha256=_8CoSp-7z3BBLGN5Hv067FRYz8yDFw5fi_Cu5n6Rl3g,1290
 tests/models/cycle/test_residueRemoved.py,sha256=R5v8lwGyz_4a9_X_LnugBEmgVgcisS5LTM5GFCtKIco,1278
 tests/models/cycle/test_siteDuration.py,sha256=3VS9oyEey_dkaIaKtXfnxfARkfSmZbbM-Px0_lvqxQM,881
-tests/models/cycle/test_startDate.py,sha256=on3OdP7HtR005cQUTiFbiz_iQ7pX53WZ368wYYBHbks,556
+tests/models/cycle/test_startDate.py,sha256=cGhqeZWkJdp6PNxmT0rJ5ZVsTAKm_8CyZKivAzRwSeI,592
+tests/models/cycle/test_startDateDefinition.py,sha256=42BmsT1I7Jq_YMVN-VNU7a0fIZ2w3i5jgwy4H_r4dNM,920
 tests/models/cycle/test_transformations.py,sha256=Ws_8KhNqeHogGFXTQ4qZXQ5Ph2I3ZUaY0yO1itFUHLk,464
 tests/models/cycle/animal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/cycle/animal/test_milkYield.py,sha256=e3FX8ikrS7nNeOuy8K7rNLs577odN5xrFohUWQw-tag,1323
@@ -714,18 +717,7 @@ tests/models/hyde32/test_landTransformationFromPermanentPasture100YearAverageDur
 tests/models/hyde32/test_landTransformationFromPermanentPasture20YearAverageDuringCycle.py,sha256=Bnoy946OwVhgn_jtZBiYXMebyJMT0LX7ATOVa0ivXrs,713
 tests/models/impact_assessment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/impact_assessment/test_emissions.py,sha256=nygoe5JeuQ1rbMQSqAr8oBSm6jC4ygZb2XNHyEx85lo,990
-tests/models/impact_assessment/test_freshwaterWithdrawalsDuringCycle.py,sha256=cIVhNaE3L7XldfEI2SNr4EaMFLSc-fZhOkzBhdwmtlk,1624
-tests/models/impact_assessment/test_freshwaterWithdrawalsInputsProduction.py,sha256=JYrGPA-w3ghkM56FOa3zug9IMuXz-9vJe8XPq_TaEOw,839
 tests/models/impact_assessment/test_irrigated.py,sha256=3elSWEN1NE05JO1OMfJ7uf0JmU-fqLpazCvS6FVxMQE,377
-tests/models/impact_assessment/test_landOccupationInputsProduction.py,sha256=g_sfSvN2rbDyqRsJUPFkZgB2EVVv5Okre1PVVWFRJ4Y,832
-tests/models/impact_assessment/test_landTransformationFromCropland100YearAverageInputsProduction.py,sha256=AhJRlwxLfsboA2-to3haNHFggIJXLZQAd0vWiT-re5Y,870
-tests/models/impact_assessment/test_landTransformationFromCropland20YearAverageInputsProduction.py,sha256=ED81hhRRZMIIKwEX8atmMMVN9dVoXP-lZa20QYCr0ws,869
-tests/models/impact_assessment/test_landTransformationFromForest100YearAverageInputsProduction.py,sha256=3sZNCkxr7g1gRBwWDxQAL_AcsAc7I-yvcLrVyM4Wy_w,868
-tests/models/impact_assessment/test_landTransformationFromForest20YearAverageInputsProduction.py,sha256=ZwirLlYpClbDxMmnLCGNyudOobwjslr00JqLCZc03vY,867
-tests/models/impact_assessment/test_landTransformationFromOtherNaturalVegetation100YearAverageInputsProduction.py,sha256=UJ47_paA5V3x7gnQu13MuqmfsfEo8p2qlCE4f7SCyHs,898
-tests/models/impact_assessment/test_landTransformationFromOtherNaturalVegetation20YearAverageInputsProduction.py,sha256=ljyVAoY89OYIxSG7v1xr3bLOn9uUIgoGZo6kknX3RF8,897
-tests/models/impact_assessment/test_landTransformationFromPermanentPasture100YearAverageInputsProduction.py,sha256=7ZcnHUYedq46fYEVqZ6N1JzP1P5MGuoCYyRSitQxp0c,878
-tests/models/impact_assessment/test_landTransformationFromPermanentPasture20YearAverageInputsProduction.py,sha256=97jyVVOeqL5ogKrdlAsRvKO7Ce9KUQALT-IMaPC1_tY,877
 tests/models/impact_assessment/test_oganic.py,sha256=Ei73bkB2MzKlr3jZmg8Cimxw_ImJSBdB3xKBn6ZCRx8,375
 tests/models/impact_assessment/test_post_checks.py,sha256=B-KVdkWaG8v-9aT1fNDQ9sml3q9I5XPo38NKxear1nY,310
 tests/models/impact_assessment/test_pre_checks.py,sha256=1oXCdhldG7O7fntwbUqbCheVhuHgf5N3BionfEGC7Nc,308
@@ -886,12 +878,25 @@ tests/models/lcImpactCertainEffectsInfinite/test_damageToTerrestrialEcosystemsPd
 tests/models/lcImpactCertainEffectsInfinite/test_damageToTerrestrialEcosystemsPhotochemicalOzoneFormation.py,sha256=d_rysPRtlmb_sjX-e857qNxL9sQK0m8RP3zRwTjM6Ko,951
 tests/models/lcImpactCertainEffectsInfinite/test_damageToTerrestrialEcosystemsTerrestrialAcidification.py,sha256=rdiAapP73gXosOBZ2loTEbeBBASFUtdifbZwYYB8SLA,934
 tests/models/lcImpactCertainEffectsInfinite/test_damageToTerrestrialEcosystemsTerrestrialEcotoxicity.py,sha256=UJJ0raY5leOqtBpBlIGRZSUYqA5mNt-xmq5Eos_nysg,882
+tests/models/linkedImpactAssessment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/linkedImpactAssessment/test_emissions.py,sha256=07z9LW5Ir3uL8odeU6puaeb9ZsgGclfWX3_h13cxeio,752
+tests/models/linkedImpactAssessment/test_freshwaterWithdrawalsInputsProduction.py,sha256=uGiKffgLCzWqeSrofmiZTBv6WNItar-ArC7jCofSNw0,859
+tests/models/linkedImpactAssessment/test_landOccupationInputsProduction.py,sha256=epP6d1bRI6YNJZt_dkQhBKpMzFg9D8nxahIYQiLyUnE,852
+tests/models/linkedImpactAssessment/test_landTransformationFromCropland100YearAverageInputsProduction.py,sha256=l15bLWmKG71Pr0WhAQSxRDuqc1SyVl7R4H9iQIZWY_g,890
+tests/models/linkedImpactAssessment/test_landTransformationFromCropland20YearAverageInputsProduction.py,sha256=cfG3sKQQ3B_NODSHHTcA6-vtI4d3lcqm1QYk8CmwukQ,889
+tests/models/linkedImpactAssessment/test_landTransformationFromForest100YearAverageInputsProduction.py,sha256=JWJNssUohSvj9Vrv_hpBHayIBoZ5iLDWPFkabRhzfbI,888
+tests/models/linkedImpactAssessment/test_landTransformationFromForest20YearAverageInputsProduction.py,sha256=SbSkYLqMq5UapyZpFYIjmAIvVFfsh-og8PG2fVYRoZs,887
+tests/models/linkedImpactAssessment/test_landTransformationFromOtherNaturalVegetation100YearAverageInputsProduction.py,sha256=cCNqfR4c8teYaqz3YDWBd8vrqlcJm4eD8p09XUMQsp0,918
+tests/models/linkedImpactAssessment/test_landTransformationFromOtherNaturalVegetation20YearAverageInputsProduction.py,sha256=GYR71LUEHr8EPnXkCothX23viB2df_NbZ5g6fBhl75Q,917
+tests/models/linkedImpactAssessment/test_landTransformationFromPermanentPasture100YearAverageInputsProduction.py,sha256=KB2zZ07QHk9IuPCRGIVdNBcx6CQqBEqdLjUGNZR8hDk,1041
+tests/models/linkedImpactAssessment/test_landTransformationFromPermanentPasture20YearAverageInputsProduction.py,sha256=9nxdXerjwr3hMshI3hyhHrIscPuqzbj54ekpJ9HKlyY,1038
 tests/models/pooreNemecek2018/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/pooreNemecek2018/test_aboveGroundCropResidueTotal.py,sha256=m-cpFULarm0Ee4MV-OvhYPRg7W2_mvbrqHkjDZgcQsw,1660
 tests/models/pooreNemecek2018/test_belowGroundCropResidue.py,sha256=A6EOD2B6frN0UtuUTP3GwZ7bNEtEudQfztHXjdiDwdQ,1655
 tests/models/pooreNemecek2018/test_ch4ToAirAquacultureSystems.py,sha256=rUxD57yl82Ht8IyhbiQhi0xl8L9iLdnLpbI-T5C0Mck,2722
 tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=lKM-Q7TjQoxjvjY9tCcmJxoWvHuxglNCVsPXh6JBgCY,4063
 tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=LIoLevR0tHrZwazuGprt6SCFtmDrj4NBq1s1SJEhQCA,3252
+tests/models/pooreNemecek2018/test_freshwaterWithdrawalsDuringCycle.py,sha256=5QxDU6VzcwWup3Nuhn32kJoIlAkqcSggGr4CmoRqrFA,1623
 tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=XbsApbRIuzq4GeaN7PrzlMA7grU7y6j_HPesgQIf_Uw,1650
 tests/models/pooreNemecek2018/test_longFallowPeriod.py,sha256=zAa-zmCbHOjCUsOQdEvZRBw_r8gdmxYZXYurRGVLxfM,923
 tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py,sha256=4YAoUhIwfEmRe2B5BvNg247VeB7UXHNeZqr2mRtJA7Y,2207
@@ -977,8 +982,10 @@ tests/models/schmidt2007/test_n2OToAirWasteTreatmentDirect.py,sha256=xgikZTGcDqi
 tests/models/schmidt2007/test_nh3ToAirWasteTreatment.py,sha256=22x5Hc0keF41LYMKvARrJvmPtOjIKJ6vCrF2d8AOyAc,1454
 tests/models/schmidt2007/test_utils.py,sha256=rmtOV3xiFynjgx8lQNGsJqquG8HDxz3LDmh1efN8AkI,1278
 tests/models/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/site/test_brackishWater.py,sha256=YGCp4glaWudKklYBSp-50KbfvIRtp3F4Qrj5T81ECTk,986
 tests/models/site/test_cationExchangeCapacityPerKgSoil.py,sha256=tNMhN998vcjQ15I-5mNnFh2d7mHzEBIBO6o1VSfQNUE,1075
 tests/models/site/test_flowingWater.py,sha256=t_rxvdlmUVDsFBoDF20_zDM-0iiLKkNCV7knO9l1T7o,1370
+tests/models/site/test_freshWater.py,sha256=GOeAxHhPW_2E1wQdQRX4W-r7mnb_LgmiAVLImitoApw,982
 tests/models/site/test_management.py,sha256=CO9wghyFmnG5ynU6iuKcJ3LkZCoV9pY35hQedrY6-kk,4470
 tests/models/site/test_netPrimaryProduction.py,sha256=JCxG0MODbKVvl3hOqmKzh4FjHYn3Xs9KsVod6LvKQII,1108
 tests/models/site/test_organicCarbonPerHa.py,sha256=6Qtc0Xmveir7MmNF4Ekv5YkV92TNp8GfDnURPVg05-4,3471
@@ -992,6 +999,7 @@ tests/models/site/test_precipitationAnnual.py,sha256=h0tXvykZw4Zaw225RHfvw-3DvAy
 tests/models/site/test_precipitationMonthly.py,sha256=iccr-_ZrseM_OT3AKZbTNQhRFSIe-R6wXTDS-2wIVew,995
 tests/models/site/test_rainfallAnnual.py,sha256=4YYna66qjJptPJ_URvdcQuRC3dri9SB0xmWP8DFwslM,986
 tests/models/site/test_rainfallMonthly.py,sha256=A3gIe2Yxt9CLtLcAJNCQ0-8aRB49VdfKBLBy-7eDgJw,985
+tests/models/site/test_salineWater.py,sha256=by_goKU4q5Dr-ctqosfrjFPZsG9KeG26Y_xMWEHBhpA,985
 tests/models/site/test_soilMeasurement.py,sha256=IMSnjbyBYAqWicXGgpdNPpJ_OQw6QEJEmfHJxyF4iec,4887
 tests/models/site/test_temperatureAnnual.py,sha256=nOJG9ZJ8NCMM8T47uxxBeloIYLFN6-xtvUBqJsqt8xk,992
 tests/models/site/test_temperatureMonthly.py,sha256=C2lv-lpYqH7VUGOlxNLE6d7k_dFS6NYe8BvMlrJorCw,991
@@ -1054,8 +1062,8 @@ tests/models/utils/test_source.py,sha256=mv3vHZV5cjpoLA2I1109-YUkuzAiuhbRSnv_76_
 tests/models/utils/test_term.py,sha256=M5Sa26v2gzQYbZ4H_fo7DspnaCx__-WtL-MULGapCWk,3509
 tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
-hestia_earth_models-0.60.0.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
-hestia_earth_models-0.60.0.dist-info/METADATA,sha256=9LXKP4GRx3ee43zO2ew5DLQYvFL8XkDUlAXWfeFr6yQ,3134
-hestia_earth_models-0.60.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hestia_earth_models-0.60.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.60.0.dist-info/RECORD,,
+hestia_earth_models-0.61.0.dist-info/LICENSE,sha256=AC7h7GAgCZGJK_Tzh6LUCrML9gQEfowWwecEw2w54QM,1154
+hestia_earth_models-0.61.0.dist-info/METADATA,sha256=e46k2VJnTo3hg8p6ZeFBkWgRDzQFjk-xnnLMER1Cj2c,3134
+hestia_earth_models-0.61.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hestia_earth_models-0.61.0.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.61.0.dist-info/RECORD,,

tests/models/cycle/test_cycleDuration.py

@@ -1,43 +1,31 @@
-from unittest.mock import patch
 import json
 from tests.utils import fixtures_path
 
-from hestia_earth.models.cycle.cycleDuration import MODEL, MODEL_KEY, _should_run, run
+from hestia_earth.models.cycle.cycleDuration import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
 
 
-@patch(f"{class_path}.valid_site_type", return_value=True)
-@patch(f"{class_path}.find_term_match", return_value={})
-def test_should_run(mock_practice, *args):
-    # no cycleDuration => no run
-    cycle = {}
-    should_run, *args = _should_run(cycle)
-    assert not should_run
+def test_run_with_dates():
+    with open(f"{fixtures_folder}/with-dates/cycle.jsonld", encoding='utf-8') as f:
+        data = json.load(f)
+
+    result = run(data)
+    assert result == 335
 
-    # with cycleDuration = 100 => no run
-    cycle['cycleDuration'] = 100
-    should_run, *args = _should_run(cycle)
-    assert not should_run
 
-    # with practice => no run
-    mock_practice.return_value = {'value': [100]}
-    should_run, *args = _should_run(cycle)
-    assert not should_run
+def test_run_with_permanent_crop():
+    with open(f"{fixtures_folder}/permanent-crop/cycle.jsonld", encoding='utf-8') as f:
+        data = json.load(f)
 
-    # with cycleDuration = 365 => run
-    cycle['cycleDuration'] = 365
-    should_run, *args = _should_run(cycle)
-    assert should_run is True
+    result = run(data)
+    assert result == 365
 
 
-def test_run():
-    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+def test_run_with_temporary_crop():
+    with open(f"{fixtures_folder}/temporary-crop/cycle.jsonld", encoding='utf-8') as f:
         data = json.load(f)
 
-    with open(f"{fixtures_folder}/result.txt", encoding='utf-8') as f:
-        expected = f.read().strip()
-
     result = run(data)
-    assert float(result) == float(expected)
+    assert float(result) == 264.7807110234042

tests/models/cycle/test_startDate.py

@@ -2,21 +2,21 @@ from hestia_earth.models.cycle.startDate import _should_run, run
 
 
 def test_should_run():
-    # no startDate => no run
-    cycle = {}
+    # no endDate => no run
+    cycle = {'cycleDuration': 365}
     should_run = _should_run(cycle)
     assert not should_run
 
-    # with startDate full date => no run
-    cycle['startDate'] = '2020-01-01'
+    # with startDate missing days => not run
+    cycle['endDate'] = '2020-01'
     should_run = _should_run(cycle)
     assert not should_run
 
-    # with startDate missing days => run
-    cycle['startDate'] = '2020-01'
+    # with endDate full date => run
+    cycle['endDate'] = '2020-01-01'
     should_run = _should_run(cycle)
     assert should_run is True
 
 
 def test_run():
-    assert run({'startDate': '2020-01'}) == '2020-01-01'
+    assert run({'endDate': '2020-01-01', 'cycleDuration': 365}) == '2019-01-01'

tests/models/cycle/test_startDateDefinition.py

@@ -0,0 +1,31 @@
+import json
+from tests.utils import fixtures_path
+
+from hestia_earth.models.cycle.startDateDefinition import MODEL, MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+
+def test_run_with_permanent_crop():
+    with open(f"{fixtures_folder}/permanent-crop/cycle.jsonld", encoding='utf-8') as f:
+        data = json.load(f)
+
+    result = run(data)
+    assert result == 'one year prior'
+
+
+def test_run_with_permanent_crop_last_day():
+    with open(f"{fixtures_folder}/permanent-crop-last-day/cycle.jsonld", encoding='utf-8') as f:
+        data = json.load(f)
+
+    result = run(data)
+    assert result == 'start of year'
+
+
+def test_run_with_temporary_crop():
+    with open(f"{fixtures_folder}/temporary-crop/cycle.jsonld", encoding='utf-8') as f:
+        data = json.load(f)
+
+    result = run(data)
+    assert result == 'harvest of previous crop'

tests/models/linkedImpactAssessment/test_emissions.py

@@ -0,0 +1,22 @@
+import os
+import json
+from unittest.mock import patch
+from tests.utils import fixtures_path, fake_new_emission, fake_load_impacts
+
+from hestia_earth.models.linkedImpactAssessment.emissions import MODEL, run
+
+class_path = f"hestia_earth.models.{MODEL}.emissions"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'emissions')
+
+
+@patch(F"{class_path}.load_impacts", side_effect=fake_load_impacts)
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected

tests/models/{impact_assessment → linkedImpactAssessment}/test_freshwaterWithdrawalsInputsProduction.py

@@ -2,14 +2,14 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
 
-from hestia_earth.models.impact_assessment.freshwaterWithdrawalsInputsProduction import TERM_ID, run
+from hestia_earth.models.linkedImpactAssessment.freshwaterWithdrawalsInputsProduction import TERM_ID, run
 
-class_path = f"hestia_earth.models.impact_assessment.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/impact_assessment/{TERM_ID}"
+class_path = f"hestia_earth.models.linkedImpactAssessment.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/linkedImpactAssessment/{TERM_ID}"
 
 
 @patch('hestia_earth.models.utils.input.load_impacts', side_effect=fake_load_impacts)
-@patch('hestia_earth.models.impact_assessment.utils._new_indicator', side_effect=fake_new_indicator)
+@patch('hestia_earth.models.linkedImpactAssessment.utils._new_indicator', side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
         impact = json.load(f)