flood-adapt 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

flood_adapt/__init__.py

@@ -1,5 +1,5 @@
 # has to be here at the start to avoid circular imports
-__version__ = "1.0.2"
+__version__ = "1.0.4"
 
 from flood_adapt import adapter, database_builder, dbs_classes, objects
 from flood_adapt.config.config import Settings

flood_adapt/adapter/sfincs_adapter.py

@@ -168,24 +168,7 @@ class SfincsAdapter(IHazardAdapter):
 
     def has_run(self, scenario: Scenario) -> bool:
         """Check if the model has been run."""
-        event = self.database.events.get(scenario.event)
-        if event.mode == Mode.risk:
-            sim_paths = [
-                self._get_simulation_path(scenario, sub_event=sub_event)
-                for sub_event in event.sub_events
-            ]
-            if not all(sim_path.exists() for sim_path in sim_paths):
-                # simpaths dont exist, so check if the output files are still there
-                return self.run_completed(scenario)
-            else:
-                return all(self.sfincs_completed(sim_path) for sim_path in sim_paths)
-        else:
-            if not self._get_simulation_path(scenario).exists():
-                # simpath doesnt exist, so check if the output files are still there
-                return self.run_completed(scenario)
-            else:
-                # Check if the simulation folder exists
-                return self.sfincs_completed(self._get_simulation_path(scenario))
+        return self.run_completed(scenario)
 
     def execute(self, path: Path, strict: bool = True) -> bool:
         """
@@ -513,10 +496,9 @@ class SfincsAdapter(IHazardAdapter):
         bool : True if all flood maps exist, False otherwise.
 
         """
-        any_floodmap = len(self._get_flood_map_paths(scenario)) > 0
-        all_exist = all(
-            floodmap.exists() for floodmap in self._get_flood_map_paths(scenario)
-        )
+        paths = self._get_flood_map_paths(scenario)
+        any_floodmap = len(paths) > 0
+        all_exist = all(floodmap.exists() for floodmap in paths)
         return any_floodmap and all_exist
 
     def sfincs_completed(self, sim_path: Path) -> bool:
@@ -1796,7 +1778,7 @@ class SfincsAdapter(IHazardAdapter):
             units=us.UnitTypesLength(units),
         )
 
-        if df_gauge is None:
+        if df_gauge is None or df_gauge.empty:
             logger.warning(
                 "No water level data available for the tide gauge. Could not add it to the plot."
             )

flood_adapt/database_builder/database_builder.py

@@ -5,10 +5,8 @@ import math
 import os
 import re
 import shutil
-import time
 import warnings
 from enum import Enum
-from functools import wraps
 from pathlib import Path
 from typing import Optional, Union
 from urllib.request import urlretrieve
@@ -74,6 +72,7 @@ from flood_adapt.config.site import (
     StandardObjectModel,
 )
 from flood_adapt.dbs_classes.database import Database
+from flood_adapt.misc.debug_timer import debug_timer
 from flood_adapt.misc.log import FloodAdaptLogging
 from flood_adapt.misc.utils import modified_environ
 from flood_adapt.objects.events.event_set import EventSet
@@ -92,27 +91,6 @@ from flood_adapt.objects.strategies.strategies import Strategy
 logger = FloodAdaptLogging.getLogger("DatabaseBuilder")
 
 
-def debug_timer(func):
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        logger = FloodAdaptLogging.getLogger("DatabaseBuilder")  # No forced log level
-        if logger.isEnabledFor(logging.DEBUG):
-            logger.debug(f"Started '{func.__name__}'")
-            start_time = time.perf_counter()
-
-            result = func(*args, **kwargs)
-
-            end_time = time.perf_counter()
-            elapsed = end_time - start_time
-            logger.debug(f"Finished '{func.__name__}' in {elapsed:.4f} seconds")
-        else:
-            result = func(*args, **kwargs)
-
-        return result
-
-    return wrapper
-
-
 def path_check(str_path: str, config_path: Optional[Path] = None) -> str:
     """Check if the given path is absolute and return the absolute path.
 

flood_adapt/flood_adapt.py

@@ -883,7 +883,7 @@ class FloodAdapt:
         scenario = self.database.scenarios.get(name)
 
         # Check if the scenario has run
-        if not ScenarioRunner(self.database, scenario=scenario).hazard_run_check():
+        if not ScenarioRunner(self.database, scenario=scenario).has_run_check():
             logger.info(
                 f"Cannot retrieve observation point timeseries as the scenario {name} has not been run yet."
             )

flood_adapt/misc/debug_timer.py

@@ -0,0 +1,26 @@
+import logging
+import time
+from functools import wraps
+
+from flood_adapt.misc.log import FloodAdaptLogging
+
+
+def debug_timer(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        _logger = FloodAdaptLogging.getLogger()  # No forced log level
+        if _logger.isEnabledFor(logging.DEBUG):
+            _logger.debug(f"Started '{func.__name__}'")
+            start_time = time.perf_counter()
+
+            result = func(*args, **kwargs)
+
+            end_time = time.perf_counter()
+            elapsed = end_time - start_time
+            _logger.debug(f"Finished '{func.__name__}' in {elapsed:.4f} seconds")
+        else:
+            result = func(*args, **kwargs)
+
+        return result
+
+    return wrapper

flood_adapt/workflows/scenario_runner.py

@@ -17,15 +17,28 @@ class ScenarioRunner:
         self.site_info = self._database.site
         self.results_path = self._database.scenarios.output_path / self._scenario.name
 
+        self._event = None
+        self._projection = None
+        self._strategy = None
+
+        self._hazard_models = None
+        self._impact_models = None
+
     @property
     def impact_models(self):
         """Return the list of impact models."""
-        return self._database.static.get_impact_models()
+        if self._impact_models is not None:
+            return self._impact_models
+        self._impact_models = self._database.static.get_impact_models()
+        return self._impact_models
 
     @property
     def hazard_models(self):
         """Return the list of hazard models."""
-        return self._database.static.get_hazard_models()
+        if self._hazard_models is not None:
+            return self._hazard_models
+        self._hazard_models = self._database.static.get_hazard_models()
+        return self._hazard_models
 
     def _load_objects(self, scenario: Scenario) -> None:
         """Load objects from the database."""

{flood_adapt-1.0.2.dist-info → flood_adapt-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.0.2
+Version: 1.0.4
 Summary: A software package support system which can be used to assess the benefits and costs of flood resilience measures
 Author-email: Gundula Winter <Gundula.Winter@deltares.nl>, Panos Athanasiou <Panos.Athanasiou@deltares.nl>, Frederique de Groen <Frederique.deGroen@deltares.nl>, Tim de Wilde <Tim.deWilde@deltares.nl>, Julian Hofer <Julian.Hofer@deltares.nl>, Daley Adrichem <Daley.Adrichem@deltares.nl>, Luuk Blom <Luuk.Blom@deltares.nl>
 License: ====================================================

{flood_adapt-1.0.2.dist-info → flood_adapt-1.0.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-flood_adapt/__init__.py,sha256=nM2dOWhbuJMqz6B1Z_TD3ymLj7p4NZt4VME5qSRiuQ0,818
-flood_adapt/flood_adapt.py,sha256=0oUk83neusSBa2ibBvqHMoTSz97ABICGZgQ47VXoaOk,38701
+flood_adapt/__init__.py,sha256=ckRctoVnY8-iqM2cbEkPXTPdOKjZJNDKeBolOYFa81s,818
+flood_adapt/flood_adapt.py,sha256=g-OpS0spvi-puwQFhvsfu_vvduozTPXk9DU2ay9ypgs,38698
 flood_adapt/adapter/__init__.py,sha256=vnF8NCkEVX-N-gtGS-J_A1H1YYAjihWjJZFyYGwcp8Q,180
 flood_adapt/adapter/fiat_adapter.py,sha256=kqZsAEo4YToLtaKTwATAGgmp5-FWQffZLbAItuLx104,60010
-flood_adapt/adapter/sfincs_adapter.py,sha256=rDniEAWo1JIdDTy0mb5kJZ_lDNMWYnGub738Bg-gLkY,79422
+flood_adapt/adapter/sfincs_adapter.py,sha256=mvW1cW8NNr2fnhZW0Ffzg9gDuheSrhTvYI0Y0AkLCNA,78499
 flood_adapt/adapter/sfincs_offshore.py,sha256=MjSPTrFPuOI2VqHeaBobS_OCozgnJST05nR49lq7cPs,7639
 flood_adapt/adapter/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/adapter/interface/hazard_adapter.py,sha256=S2NIUAMSRgxC_E-tZRJ2qIP06U1zEVdn-MnvMTrn86s,2828
@@ -18,7 +18,7 @@ flood_adapt/config/impacts.py,sha256=O7vE7jB3GSXnkqAvv7TqJiJ_j1uJ3mck_KQ-ScsB3bo
 flood_adapt/config/sfincs.py,sha256=y8C3PzFwwgMB_sb8rBzgteaQ8fCxep6DnZxuk0q__bc,4825
 flood_adapt/config/site.py,sha256=VR90jCHWcxgoQJptNyXy7LseGjXUDRtdOjNGCddFVzI,4328
 flood_adapt/database_builder/__init__.py,sha256=YsI5bGcAKYmsmb5W-spp91hzsKSTRtkXBLNRxLOWml4,474
-flood_adapt/database_builder/database_builder.py,sha256=OD702Ge83_-qsQvYBYnYBUwP5JWSMQCJb_HM4OoPANo,100285
+flood_adapt/database_builder/database_builder.py,sha256=yJH1OIrPIJiT18Ab97fSZu-30uVT5u0oQYidx-gSGsc,99653
 flood_adapt/database_builder/templates/default_units/imperial.toml,sha256=zIjPlxIa2kWLUjSYisd8UolXGo5iKdFoDDz_JkKBXTM,295
 flood_adapt/database_builder/templates/default_units/metric.toml,sha256=tc0XMKs7xGL9noB9lAb0gyQfjYxzokgHa3NqpccxWl0,302
 flood_adapt/database_builder/templates/green_infra_table/green_infra_lookup_table.csv,sha256=ooQzNGQwAMSAphy5W2ZyR5boQlcwvPv9ToJx1MlZhVE,466
@@ -90,6 +90,7 @@ flood_adapt/dbs_classes/interface/element.py,sha256=XN3SjfEiAa4oZ61XJNnHkfKQu5Da
 flood_adapt/dbs_classes/interface/static.py,sha256=amChHlParELA4vFMUn_kL1fx6z7fCFW-hJXBo7PGtbY,1588
 flood_adapt/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/misc/database_user.py,sha256=4PnXMNA0poQWWGc9FbmYAfJh5PhTMI3xzlCaIuP5wn4,546
+flood_adapt/misc/debug_timer.py,sha256=TUXsJSX62P66AQrf7rqpmd95EZECJVWGT7pHpuxNG0I,743
 flood_adapt/misc/exceptions.py,sha256=xLT1QnbjClftzYaxX5XdvVAkoI0q1CAsWJX901GB9JM,513
 flood_adapt/misc/log.py,sha256=aK5uJch8p3a4Js4f79tO5AM9yZvNlGPjHYPsY5EuWbc,6898
 flood_adapt/misc/path_builder.py,sha256=sLhvk3tq-QzI3fFjdzckpBYYZeuGyHBbuI0R98Tqud8,1396
@@ -132,9 +133,9 @@ flood_adapt/objects/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 flood_adapt/objects/strategies/strategies.py,sha256=Jw-WJDCamL9p_7VEir3AdmYPMVAiCVRU9n_whG6WcgE,2981
 flood_adapt/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flood_adapt/workflows/benefit_runner.py,sha256=VtYt0sHFymNyErpzOtuN55cKJGVm5hT2a_Qzprg6T88,21786
-flood_adapt/workflows/scenario_runner.py,sha256=RGTtYt7kRqjL2kJJq1hTJ-i9vKndRfazGkyVkJym0so,3679
-flood_adapt-1.0.2.dist-info/LICENSE,sha256=Ui5E03pQ0EVKxvKA54lTPA1xrtgA2HMGLQai95eOzoE,36321
-flood_adapt-1.0.2.dist-info/METADATA,sha256=ZHACDKexWru7O0XSGLnhdhIKogl3C-0H4erWALYgI7I,53259
-flood_adapt-1.0.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-flood_adapt-1.0.2.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
-flood_adapt-1.0.2.dist-info/RECORD,,
+flood_adapt/workflows/scenario_runner.py,sha256=9_Y6GmMYhYoTRkBUIlju0eBy6DosGf4Zl2tgu1QEubI,4119
+flood_adapt-1.0.4.dist-info/LICENSE,sha256=Ui5E03pQ0EVKxvKA54lTPA1xrtgA2HMGLQai95eOzoE,36321
+flood_adapt-1.0.4.dist-info/METADATA,sha256=Eb02xNPlDolOPVGRx6g8RvqI8CTiH2YS2KCbUK3_qvg,53259
+flood_adapt-1.0.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+flood_adapt-1.0.4.dist-info/top_level.txt,sha256=JvzMi6cTcQPEThCfpgMEeVny3ghI1urSH0CCgVIqSzw,12
+flood_adapt-1.0.4.dist-info/RECORD,,