flood-adapt 1.0.5__tar.gz → 1.0.6__tar.gz

{flood_adapt-1.0.5 → flood_adapt-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.0.5
+Version: 1.0.6
 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: ====================================================
@@ -712,14 +712,12 @@ Requires-Dist: cht-cyclones==1.0.3
 Requires-Dist: cht-meteo==0.3.1
 Requires-Dist: cht-observations==0.2.1
 Requires-Dist: cht-tide==0.1.1
-Requires-Dist: dask==2024.11.2
-Requires-Dist: numba_celltree==0.2.2
 Requires-Dist: fiat-toolbox==0.1.20
 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.5
-Requires-Dist: hydromt-sfincs==1.2.0
+Requires-Dist: hydromt-fiat<1.0,>=0.5.5
+Requires-Dist: hydromt-sfincs[quadtree]<2.0,>=1.2.2
 Requires-Dist: numpy<2.0,>=1.0
 Requires-Dist: numpy-financial<2.0,>=1.0
 Requires-Dist: pandas<3.0,>=2.0

{flood_adapt-1.0.5 → flood_adapt-1.0.6}/flood_adapt/__init__.py

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

{flood_adapt-1.0.5 → flood_adapt-1.0.6}/flood_adapt/adapter/sfincs_adapter.py

@@ -1304,10 +1304,14 @@ class SfincsAdapter(IHazardAdapter):
             )
             return
 
+        model_rivers = self._read_river_locations()
+        if model_rivers.empty:
+            logger.warning(
+                "Cannot add discharge forcing: No rivers defined in the sfincs model."
+            )
+            return
         logger.info(f"Setting discharge forcing for river: {discharge.river.name}")
-
         time_frame = self.get_model_time()
-        model_rivers = self._read_river_locations()
 
         # Check that the river is defined in the model and that the coordinates match
         river_loc = shapely.Point(
@@ -1705,17 +1709,22 @@ class SfincsAdapter(IHazardAdapter):
 
     def _read_river_locations(self) -> gpd.GeoDataFrame:
         path = self.get_model_root() / "sfincs.src"
-
-        with open(path) as f:
-            lines = f.readlines()
+        lines = []
+        if path.exists():
+            with open(path) as f:
+                lines = f.readlines()
         coords = [(float(line.split()[0]), float(line.split()[1])) for line in lines]
         points = [shapely.Point(coord) for coord in coords]
 
         return gpd.GeoDataFrame({"geometry": points}, crs=self._model.crs)
 
     def _read_waterlevel_boundary_locations(self) -> gpd.GeoDataFrame:
-        with open(self.get_model_root() / "sfincs.bnd") as f:
-            lines = f.readlines()
+        path = self.get_model_root() / "sfincs.bnd"
+        lines = []
+        if path.exists():
+            with open(path) as f:
+                lines = f.readlines()
+
         coords = [(float(line.split()[0]), float(line.split()[1])) for line in lines]
         points = [shapely.Point(coord) for coord in coords]
 

{flood_adapt-1.0.5 → flood_adapt-1.0.6}/flood_adapt/dbs_classes/database.py

@@ -233,7 +233,7 @@ class Database(IDatabase):
             if _type == FloodmapType.water_level:
                 paths = [base_dir / "max_water_level_map.nc"]
             elif _type == FloodmapType.water_depth:
-                paths = [base_dir / f"FloodMap_{self.name}.tif"]
+                paths = [base_dir / f"FloodMap_{scenario_name}.tif"]
         elif mode == Mode.risk:
             if _type == FloodmapType.water_level:
                 paths = list(base_dir.glob("RP_*_maps.nc"))

{flood_adapt-1.0.5 → flood_adapt-1.0.6}/flood_adapt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: flood-adapt
-Version: 1.0.5
+Version: 1.0.6
 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: ====================================================
@@ -712,14 +712,12 @@ Requires-Dist: cht-cyclones==1.0.3
 Requires-Dist: cht-meteo==0.3.1
 Requires-Dist: cht-observations==0.2.1
 Requires-Dist: cht-tide==0.1.1
-Requires-Dist: dask==2024.11.2
-Requires-Dist: numba_celltree==0.2.2
 Requires-Dist: fiat-toolbox==0.1.20
 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.5
-Requires-Dist: hydromt-sfincs==1.2.0
+Requires-Dist: hydromt-fiat<1.0,>=0.5.5
+Requires-Dist: hydromt-sfincs[quadtree]<2.0,>=1.2.2
 Requires-Dist: numpy<2.0,>=1.0
 Requires-Dist: numpy-financial<2.0,>=1.0
 Requires-Dist: pandas<3.0,>=2.0

{flood_adapt-1.0.5 → flood_adapt-1.0.6}/flood_adapt.egg-info/requires.txt

@@ -2,14 +2,12 @@ cht-cyclones==1.0.3
 cht-meteo==0.3.1
 cht-observations==0.2.1
 cht-tide==0.1.1
-dask==2024.11.2
-numba_celltree==0.2.2
 fiat-toolbox==0.1.20
 fiona<2.0,>=1.0
 geojson<4.0,>=3.0
 geopandas<2.0,>=1.0
-hydromt-fiat==0.5.5
-hydromt-sfincs==1.2.0
+hydromt-fiat<1.0,>=0.5.5
+hydromt-sfincs[quadtree]<2.0,>=1.2.2
 numpy<2.0,>=1.0
 numpy-financial<2.0,>=1.0
 pandas<3.0,>=2.0

{flood_adapt-1.0.5 → flood_adapt-1.0.6}/pyproject.toml

@@ -30,14 +30,12 @@ dependencies = [
     "cht-meteo          ==0.3.1",
     "cht-observations   ==0.2.1",
     "cht-tide           ==0.1.1",
-    "dask               ==2024.11.2",   # not a dependency, but a we need to use this version
-    "numba_celltree     ==0.2.2",       # not a dependency, but a we need to use this version
     "fiat-toolbox       ==0.1.20",
     "fiona              >=1.0,<2.0",
     "geojson            >=3.0,<4.0",
     "geopandas          >=1.0,<2.0",
-    "hydromt-fiat       ==0.5.5",
-    "hydromt-sfincs     ==1.2.0",
+    "hydromt-fiat       >=0.5.5,<1.0",
+    "hydromt-sfincs[quadtree]>=1.2.2,<2.0",
     "numpy              >=1.0,<2.0",
     "numpy-financial    >=1.0,<2.0",
     "pandas             >=2.0,<3.0",
@@ -119,7 +117,7 @@ python = "3.11.*"
 [tool.pixi.feature.py310.dependencies]
 python = "3.10.*"
 
-[tool.pixi.project]
+[tool.pixi.workspace]
 name = "flood-adapt"
 channels = ["conda-forge"]
 platforms = ["win-64", "linux-64"]