threedi-modelchecker 2.14.0.dev0__tar.gz → 2.14.0.dev1__tar.gz

{threedi_modelchecker-2.14.0.dev0/threedi_modelchecker.egg-info → threedi_modelchecker-2.14.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.14.0.dev0
+Version: 2.14.0.dev1
 Summary: Checks validity of a 3Di schematisation
 Author-email: Nelen & Schuurmans <info@nelen-schuurmans.nl>
 License: MIT
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: Click
 Requires-Dist: GeoAlchemy2!=0.11.*,>=0.9
 Requires-Dist: SQLAlchemy>=1.4
-Requires-Dist: threedi-schema==0.228.0.dev1
+Requires-Dist: threedi-schema==0.228.0.dev2
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.14.0.dev0 → threedi_modelchecker-2.14.0.dev1}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "Click",
     "GeoAlchemy2>=0.9,!=0.11.*",
     "SQLAlchemy>=1.4",
-    "threedi-schema==0.228.0.dev1"
+    "threedi-schema==0.228.0.dev2"
 #    "threedi-schema @ git+https://github.com/nens/threedi-schema.git@margriet_89_schema_300_1D"
 
 ]

{threedi_modelchecker-2.14.0.dev0 → threedi_modelchecker-2.14.0.dev1}/threedi_modelchecker/__init__.py

@@ -1,5 +1,5 @@
 from .model_checks import *  # NOQA
 
 # fmt: off
-__version__ = '2.14.0.dev0'
+__version__ = '2.14.0.dev1'
 # fmt: on

{threedi_modelchecker-2.14.0.dev0 → threedi_modelchecker-2.14.0.dev1}/threedi_modelchecker/checks/cross_section_definitions.py

@@ -2,6 +2,7 @@ from abc import ABC, abstractmethod
 from enum import IntEnum
 from typing import Union
 
+from sqlalchemy import func
 from threedi_schema import constants, models
 
 from .base import BaseCheck
@@ -487,12 +488,13 @@ class OpenIncreasingCrossSectionConveyanceFrictionCheck(
             super()
             .to_check(session)
             .where(
+                self.table.c.cross_section_shape.isnot(None),
                 self.table.c.friction_type.in_(
                     [
                         constants.FrictionType.CHEZY_CONVEYANCE,
                         constants.FrictionType.MANNING_CONVEYANCE,
                     ]
-                )
+                ),
             )
         )
 
@@ -544,6 +546,37 @@ class CrossSectionVariableCorrectLengthCheck(CrossSectionBaseCheck, ABC):
         return f"{self.column_name} should contain 1 value for each element; len({self.column_name}) = len(width)-1"
 
 
+class OpenIncreasingCrossSectionConveyanceFrictionCheckWithMaterial(
+    OpenIncreasingCrossSectionCheck
+):
+    """
+    Check if cross sections used with friction with conveyance
+    are open and monotonically increasing in width
+    """
+
+    def to_check(self, session):
+        return (
+            super()
+            .to_check(session)
+            .outerjoin(models.Material, self.table.c.material_id == models.Material.id)
+            .where(
+                self.table.c.cross_section_shape.isnot(None),
+                # take value from table if present, otherwise value from Material
+                func.coalesce(
+                    self.table.c.friction_type, models.Material.friction_type
+                ).in_(
+                    [
+                        constants.FrictionType.CHEZY_CONVEYANCE,
+                        constants.FrictionType.MANNING_CONVEYANCE,
+                    ]
+                ),
+            )
+        )
+
+    def description(self):
+        return f"{self.column_name} should contain 1 value for each element; len({self.column_name}) = len(width)-1"
+
+
 class CrossSectionFrictionCorrectLengthCheck(CrossSectionVariableCorrectLengthCheck):
     def parse_str_value(self, str_value):
         return [float(item) for item in str_value.split(",")]

{threedi_modelchecker-2.14.0.dev0 → threedi_modelchecker-2.14.0.dev1}/threedi_modelchecker/config.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from sqlalchemy import func, or_, select, true
+from sqlalchemy import and_, func, or_, true
 from sqlalchemy.orm import Query
 from threedi_schema import constants, models
 from threedi_schema.beta_features import BETA_COLUMNS, BETA_VALUES
@@ -35,6 +35,7 @@ from .checks.cross_section_definitions import (
     CrossSectionYZHeightCheck,
     CrossSectionYZIncreasingWidthIfOpenCheck,
     OpenIncreasingCrossSectionConveyanceFrictionCheck,
+    OpenIncreasingCrossSectionConveyanceFrictionCheckWithMaterial,
     OpenIncreasingCrossSectionVariableCheck,
 )
 from .checks.factories import (
@@ -149,7 +150,6 @@ cross_section_tables = [
 CHECKS: List[BaseCheck] = []
 
 ## 002x: FRICTION
-## Use same error code as other null checks
 CHECKS += [
     QueryCheck(
         error_code=20,
@@ -225,31 +225,69 @@ CHECKS += [
     NotNullCheck(
         error_code=24,
         column=table.friction_value,
-        filters=table.crest_type == constants.CrestType.BROAD_CRESTED.value,
+        filters=(
+            (table.crest_type == constants.CrestType.BROAD_CRESTED.value)
+            & ((table.material_id.is_(None)) | (table.friction_type.isnot(None)))
+        ),
     )
     for table in [models.Orifice, models.Weir]
 ]
+CHECKS += [
+    NotNullCheck(
+        error_code=24,
+        column=table.friction_value,
+        filters=((table.material_id.is_(None)) | (table.friction_type.isnot(None))),
+    )
+    for table in [models.Culvert, models.Pipe]
+]
 CHECKS += [
     NotNullCheck(
         error_code=25,
         column=table.friction_type,
-        filters=table.crest_type == constants.CrestType.BROAD_CRESTED.value,
+        filters=(
+            (table.crest_type == constants.CrestType.BROAD_CRESTED.value)
+            & ((table.material_id.is_(None)) | (table.friction_value.isnot(None)))
+        ),
     )
     for table in [models.Orifice, models.Weir]
 ]
+CHECKS += [
+    NotNullCheck(
+        error_code=25,
+        column=table.friction_type,
+        filters=((table.material_id.is_(None)) | (table.friction_value.isnot(None))),
+    )
+    for table in [models.Culvert, models.Pipe]
+]
+
+
 # Friction with conveyance should raise an error when used
 # on a column other than models.CrossSectionLocation
+
 CHECKS += [
     QueryCheck(
         error_code=26,
         column=table.friction_type,
-        invalid=Query(table).filter(
-            table.friction_type.in_(
-                [
-                    constants.FrictionType.CHEZY_CONVEYANCE,
-                    constants.FrictionType.MANNING_CONVEYANCE,
-                ]
-            ),
+        invalid=Query(table)
+        .outerjoin(models.Material, table.material_id == models.Material.id)
+        .filter(
+            or_(
+                table.friction_type.in_(
+                    [
+                        constants.FrictionType.CHEZY_CONVEYANCE,
+                        constants.FrictionType.MANNING_CONVEYANCE,
+                    ]
+                ),
+                and_(
+                    table.friction_type == None,
+                    models.Material.friction_type.in_(
+                        [
+                            constants.FrictionType.CHEZY_CONVEYANCE,
+                            constants.FrictionType.MANNING_CONVEYANCE,
+                        ]
+                    ),
+                ),
+            )
         ),
         message=(
             "Friction with conveyance, such as chezy_conveyance and "
@@ -258,6 +296,8 @@ CHECKS += [
     )
     for table in [models.Pipe, models.Culvert, models.Weir, models.Orifice]
 ]
+
+
 # Friction with conveyance should only be used on
 # tabulated rectangle, tabulated trapezium, or tabulated yz shapes
 CHECKS += [
@@ -293,10 +333,17 @@ CHECKS += [
     )
 ]
 CHECKS += [
-    OpenIncreasingCrossSectionConveyanceFrictionCheck(error_code=28, column=table.id)
-    for table in cross_section_tables
+    OpenIncreasingCrossSectionConveyanceFrictionCheckWithMaterial(
+        error_code=28, column=table.id
+    )
+    for table in [models.Pipe, models.Weir, models.Orifice, models.Culvert]
+] + [
+    OpenIncreasingCrossSectionConveyanceFrictionCheck(
+        error_code=28, column=models.CrossSectionLocation.id
+    )
 ]
 
+
 ## 003x: CALCULATION TYPE
 
 CHECKS += [
@@ -861,7 +908,7 @@ for table in cross_section_tables:
         CrossSectionExpectEmptyCheck(
             error_code=94,
             level=CheckLevel.WARNING,
-            column=models.CrossSectionLocation.cross_section_height,
+            column=table.cross_section_height,
             shapes=(
                 constants.CrossSectionShape.CIRCLE,
                 constants.CrossSectionShape.EGG,
@@ -870,23 +917,24 @@ for table in cross_section_tables:
         ),
         CrossSectionYZHeightCheck(
             error_code=95,
-            column=models.CrossSectionLocation.cross_section_table,
+            column=table.cross_section_table,
             shapes=(constants.CrossSectionShape.TABULATED_YZ,),
         ),
         CrossSectionYZCoordinateCountCheck(
-            column=models.CrossSectionLocation.cross_section_table,
+            column=table.cross_section_table,
             error_code=96,
             shapes=(constants.CrossSectionShape.TABULATED_YZ,),
         ),
         CrossSectionYZIncreasingWidthIfOpenCheck(
-            column=models.CrossSectionLocation.cross_section_table,
+            column=table.cross_section_table,
             error_code=97,
             shapes=(constants.CrossSectionShape.TABULATED_YZ,),
         ),
         CrossSectionMinimumDiameterCheck(
-            column=models.CrossSectionLocation.id,
+            column=table.id,
             error_code=98,
             level=CheckLevel.WARNING,
+            filters=table.cross_section_shape.isnot(None),
         ),
     ]
 
@@ -3044,6 +3092,7 @@ CHECKS += [
     OpenIncreasingCrossSectionVariableCheck(
         error_code=186,
         column=table.id,
+        filters=table.cross_section_shape.isnot(None),
     )
     for table in cross_section_tables
 ]
@@ -3230,7 +3279,12 @@ CHECKS += [
 ]
 
 conditions = [
-    models.Material.id.in_(select(table.material_id)) for table in material_ref_tables
+    and_(
+        table.material_id == models.Material.id,
+        table.friction_value.is_(None),
+        table.friction_type.is_(None),
+    )
+    for table in material_ref_tables
 ]
 CHECKS += [
     NotNullCheck(
@@ -3339,8 +3393,6 @@ not_null_columns = [
     models.CrossSectionLocation.reference_level,
     models.Culvert.connection_node_id_start,
     models.Culvert.connection_node_id_end,
-    models.Culvert.friction_type,
-    models.Culvert.friction_value,
     models.Culvert.invert_level_start,
     models.Culvert.invert_level_end,
     models.Orifice.connection_node_id_start,
@@ -3350,8 +3402,6 @@ not_null_columns = [
     models.Pipe.connection_node_id_start,
     models.Pipe.connection_node_id_end,
     models.Pipe.exchange_type,
-    models.Pipe.friction_type,
-    models.Pipe.friction_value,
     models.Pipe.invert_level_end,
     models.Pipe.invert_level_start,
     models.Pump.connection_node_id,
@@ -3366,6 +3416,7 @@ not_null_columns = [
     models.Weir.crest_level,
     models.Weir.crest_type,
     models.Windshielding.channel_id,
+    models.ModelSettings.node_open_water_detection,
 ]
 
 

{threedi_modelchecker-2.14.0.dev0 → threedi_modelchecker-2.14.0.dev1/threedi_modelchecker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threedi-modelchecker
-Version: 2.14.0.dev0
+Version: 2.14.0.dev1
 Summary: Checks validity of a 3Di schematisation
 Author-email: Nelen & Schuurmans <info@nelen-schuurmans.nl>
 License: MIT
@@ -15,7 +15,7 @@ License-File: LICENSE
 Requires-Dist: Click
 Requires-Dist: GeoAlchemy2!=0.11.*,>=0.9
 Requires-Dist: SQLAlchemy>=1.4
-Requires-Dist: threedi-schema==0.228.0.dev1
+Requires-Dist: threedi-schema==0.228.0.dev2
 Provides-Extra: rasterio
 Requires-Dist: rasterio>=1.3.10; extra == "rasterio"
 Provides-Extra: test

{threedi_modelchecker-2.14.0.dev0 → threedi_modelchecker-2.14.0.dev1}/threedi_modelchecker.egg-info/requires.txt

@@ -1,7 +1,7 @@
 Click
 GeoAlchemy2!=0.11.*,>=0.9
 SQLAlchemy>=1.4
-threedi-schema==0.228.0.dev1
+threedi-schema==0.228.0.dev2
 
 [rasterio]
 rasterio>=1.3.10