flood-adapt 0.3.5__tar.gz → 0.3.7__tar.gz

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 0.3.5
+Version: 0.3.7
 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:                     GNU GENERAL PUBLIC LICENSE
@@ -695,7 +695,7 @@ Requires-Dist: fiat-toolbox==0.1.17
 Requires-Dist: fiona<2.0,>=1.0
 Requires-Dist: geojson<4.0,>=3.0
 Requires-Dist: geopandas<2.0,>=1.0
-Requires-Dist: hydromt-fiat==0.5.4
+Requires-Dist: hydromt-fiat==0.5.5
 Requires-Dist: hydromt-sfincs==1.2.0
 Requires-Dist: numpy<2.0,>=1.0
 Requires-Dist: numpy-financial<2.0,>=1.0

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/__init__.py

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

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/adapter/sfincs_adapter.py

@@ -1309,15 +1309,11 @@ class SfincsAdapter(IHazardAdapter):
         # Make sure no multipolygons are there
         gdf_green_infra = gdf_green_infra.explode()
 
-        # Volume is always already calculated and is converted to m3 for SFINCS
-        height = None
-        volume = green_infrastructure.volume.convert(
-            us.UnitTypesVolume(us.UnitTypesVolume.m3)
-        )
-
         # HydroMT function: create storage volume
         self._model.setup_storage_volume(
-            storage_locs=gdf_green_infra, volume=volume, height=height, merge=True
+            storage_locs=gdf_green_infra,
+            volume=green_infrastructure.volume.convert(us.UnitTypesVolume.m3),
+            merge=True,
         )
 
     def _add_measure_pump(self, pump: Pump):
@@ -1681,10 +1677,6 @@ class SfincsAdapter(IHazardAdapter):
             else:
                 return spw_file
 
-        self.logger.info(
-            f"Creating spiderweb file for hurricane event `{name}`. This may take a while."
-        )
-
         # Initialize the tropical cyclone
         tc = TropicalCyclone()
         tc.read_track(filename=str(track_forcing.path), fmt="ddb_cyc")
@@ -1699,6 +1691,10 @@ class SfincsAdapter(IHazardAdapter):
         self.logger.info(f"{start} rainfall in the spiderweb file")
         tc.include_rainfall = include_rainfall
 
+        self.logger.info(
+            f"Creating spiderweb file for hurricane event `{name}`. This may take a while."
+        )
+
         # Create spiderweb file from the track
         tc.to_spiderweb(spw_file)
 

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/config/site.py

@@ -66,6 +66,11 @@ class Site(BaseModel):
             "description": self.description,
             "lat": self.lat,
             "lon": self.lon,
+            "standard_objects": {
+                "events": self.standard_objects.events,
+                "projections": self.standard_objects.projections,
+                "strategies": self.standard_objects.strategies,
+            },
             "components": {},
         }
 

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/dbs_classes/database.py

@@ -123,11 +123,17 @@ class Database(IDatabase):
 
         # Initialize the different database objects
         self._static = DbsStatic(self)
-        self._events = DbsEvent(self)
+        self._events = DbsEvent(
+            self, standard_objects=self.site.standard_objects.events
+        )
         self._scenarios = DbsScenario(self)
-        self._strategies = DbsStrategy(self)
+        self._strategies = DbsStrategy(
+            self, standard_objects=self.site.standard_objects.strategies
+        )
         self._measures = DbsMeasure(self)
-        self._projections = DbsProjection(self)
+        self._projections = DbsProjection(
+            self, standard_objects=self.site.standard_objects.projections
+        )
         self._benefits = DbsBenefit(self)
 
         # Delete any unfinished/crashed scenario output

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/dbs_classes/dbs_event.py

@@ -33,26 +33,6 @@ class DbsEvent(DbsTemplate[Event]):
         # Load event
         return EventFactory.load_file(event_path)
 
-    def _check_standard_objects(self, name: str) -> bool:
-        """Check if an event is a standard event.
-
-        Parameters
-        ----------
-        name : str
-            name of the event to be checked
-
-        Returns
-        -------
-        bool
-            True if the event is a standard event, False otherwise
-        """
-        # Check if event is a standard event
-        if self._database.site.standard_objects:
-            if self._database.site.standard_objects.events:
-                if name in self._database.site.standard_objects.events:
-                    return True
-        return False
-
     def check_higher_level_usage(self, name: str) -> list[str]:
         """Check if an event is used in a scenario.
 

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/dbs_classes/dbs_projection.py

@@ -7,27 +7,6 @@ class DbsProjection(DbsTemplate[Projection]):
     display_name = "Projection"
     _object_class = Projection
 
-    def _check_standard_objects(self, name: str) -> bool:
-        """Check if a projection is a standard projection.
-
-        Parameters
-        ----------
-        name : str
-            name of the projection to be checked
-
-        Raises
-        ------
-        ValueError
-            Raise error if projection is a standard projection.
-        """
-        # Check if projection is a standard projection
-        if self._database.site.standard_objects:
-            if self._database.site.standard_objects.projections:
-                if name in self._database.site.standard_objects.projections:
-                    return True
-
-        return False
-
     def check_higher_level_usage(self, name: str) -> list[str]:
         """Check if a projection is used in a scenario.
 

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/dbs_classes/dbs_static.py

@@ -39,6 +39,19 @@ class DbsStatic(IDbsStatic):
         """Initialize any necessary attributes."""
         self._database = database
 
+    def load_static_data(self):
+        """Read data into the cache.
+
+        This is used to read data from the database and store it in the cache.
+        """
+        self.get_aggregation_areas()
+        self.get_model_boundary()
+        self.get_model_grid()
+        self.get_obs_points()
+        self.get_slr_scn_names()
+        self.get_buildings()
+        self.get_property_types()
+
     @cache_method_wrapper
     def get_aggregation_areas(self) -> dict[str, gpd.GeoDataFrame]:
         """Get a list of the aggregation areas that are provided in the site configuration.

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/dbs_classes/dbs_strategy.py

@@ -104,26 +104,6 @@ class DbsStrategy(DbsTemplate[Strategy]):
                     counter += 1
             raise ValueError(msg)
 
-    def _check_standard_objects(self, name: str) -> bool:
-        """Check if a strategy is a standard strategy.
-
-        Parameters
-        ----------
-        name : str
-            name of the strategy to be checked
-
-        Raises
-        ------
-        ValueError
-            Raise error if strategy is a standard strategy.
-        """
-        # Check if strategy is a standard strategy
-        if self._database.site.standard_objects:
-            if self._database.site.standard_objects.strategies:
-                if name in self._database.site.standard_objects.strategies:
-                    return True
-        return False
-
     def check_higher_level_usage(self, name: str) -> list[str]:
         """Check if a strategy is used in a scenario.
 

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/dbs_classes/dbs_template.py

@@ -1,7 +1,7 @@
 import shutil
 from datetime import datetime
 from pathlib import Path
-from typing import Any, TypeVar
+from typing import Any, Optional, TypeVar
 
 import tomli
 import tomli_w
@@ -18,12 +18,14 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
     dir_name: str
     _object_class: type[T_OBJECTMODEL]
 
-    def __init__(self, database: IDatabase):
+    def __init__(
+        self, database: IDatabase, standard_objects: Optional[list[str]] = None
+    ):
         """Initialize any necessary attributes."""
         self._database = database
         self.input_path = database.input_path / self.dir_name
         self.output_path = database.output_path / self.dir_name
-        self.standard_objects = []
+        self.standard_objects = standard_objects
 
     def get(self, name: str) -> T_OBJECTMODEL:
         """Return an object of the type of the database with the given name.
@@ -188,8 +190,8 @@ class DbsTemplate(AbstractDatabaseElement[T_OBJECTMODEL]):
         bool
             True if the object is a standard object, False otherwise
         """
-        # If this function is not implemented for the object type, it cannot be a standard object.
-        # By default, it is not a standard object.
+        if self.standard_objects:
+            return name in self.standard_objects
         return False
 
     def check_higher_level_usage(self, name: str) -> list[str]:

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt/flood_adapt.py

@@ -923,6 +923,13 @@ class FloodAdapt:
         )
 
     # Static
+    def load_static_data(self):
+        """Read the static data into the cache.
+
+        This is used to speed up the loading of the static data.
+        """
+        self.database.static.load_static_data()
+
     def get_aggregation_areas(
         self,
     ) -> dict[str, gpd.GeoDataFrame]:

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 0.3.5
+Version: 0.3.7
 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:                     GNU GENERAL PUBLIC LICENSE
@@ -695,7 +695,7 @@ Requires-Dist: fiat-toolbox==0.1.17
 Requires-Dist: fiona<2.0,>=1.0
 Requires-Dist: geojson<4.0,>=3.0
 Requires-Dist: geopandas<2.0,>=1.0
-Requires-Dist: hydromt-fiat==0.5.4
+Requires-Dist: hydromt-fiat==0.5.5
 Requires-Dist: hydromt-sfincs==1.2.0
 Requires-Dist: numpy<2.0,>=1.0
 Requires-Dist: numpy-financial<2.0,>=1.0

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/flood_adapt.egg-info/requires.txt

@@ -8,7 +8,7 @@ fiat-toolbox==0.1.17
 fiona<2.0,>=1.0
 geojson<4.0,>=3.0
 geopandas<2.0,>=1.0
-hydromt-fiat==0.5.4
+hydromt-fiat==0.5.5
 hydromt-sfincs==1.2.0
 numpy<2.0,>=1.0
 numpy-financial<2.0,>=1.0

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "fiona              >=1.0,<2.0",
     "geojson            >=3.0,<4.0",
     "geopandas          >=1.0,<2.0",
-    "hydromt-fiat       ==0.5.4",
+    "hydromt-fiat       ==0.5.5",
     "hydromt-sfincs     ==1.2.0",
     "numpy              >=1.0,<2.0",
     "numpy-financial    >=1.0,<2.0",

{flood_adapt-0.3.5 → flood_adapt-0.3.7}/tests/test_flood_adapt.py

@@ -1,3 +1,5 @@
+import platform
+
 import geopandas as gpd
 import numpy as np
 import pandas as pd
@@ -272,6 +274,10 @@ class TestStrategies:
             test_fa.get_strategy(strategy.name)
 
 
+@pytest.mark.skipif(
+    platform.system() == "Linux",
+    reason="Skipped on Linux due to broken sfincs binary",
+)
 class TestScenarios:
     @pytest.fixture()
     def setup_nearshore_scenario(self, test_fa: FloodAdapt, setup_nearshore_event):
@@ -430,6 +436,10 @@ class TestScenarios:
         test_fa.database.scenarios.summarize_objects()
 
 
+@pytest.mark.skipif(
+    platform.system() == "Linux",
+    reason="Skipped on Linux due to broken sfincs binary",
+)
 class TestOutput:
     @pytest.fixture(scope="class")
     def completed_scenario(self, test_fa_class: FloodAdapt):