TTim Well: slug default False

Add StrictlyPositive schema
Deltares · Oct 27, 2023 · 2e3e807 · 2e3e807
1 parent 32f1606
commit 2e3e807
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 21 deletions.
diff --git a/plugin/qgistim/core/elements/aquifer.py b/plugin/qgistim/core/elements/aquifer.py
@@ -13,6 +13,7 @@
     Required,
     SemiConfined,
     StrictlyDecreasing,
+    StrictlyPositive,
 )
 
 
@@ -21,8 +22,8 @@ class AquiferSchema(TableSchema):
         "layer": AllRequired(Range()),
         "aquifer_top": AllRequired(StrictlyDecreasing()),
         "aquifer_bottom": AllRequired(StrictlyDecreasing()),
-        "aquitard_c": OffsetAllRequired(Positive()),
-        "aquifer_k": AllRequired(Positive()),
+        "aquitard_c": OffsetAllRequired(StrictlyPositive()),
+        "aquifer_k": AllRequired(StrictlyPositive()),
         "semiconf_top": OptionalFirstOnly(),
         "semiconf_head": OptionalFirstOnly(),
     }
@@ -38,8 +39,8 @@ class AquiferSchema(TableSchema):
 
 class TemporalSettingsSchema(SingleRowSchema):
     ttim_schemata = {
-        "time_min": Required(Positive()),
-        "laplace_inversion_M": Required(Positive()),
+        "time_min": Required(StrictlyPositive()),
+        "laplace_inversion_M": Required(StrictlyPositive()),
         "reference_date": Required(),
     }
 

diff --git a/plugin/qgistim/core/elements/building_pit.py b/plugin/qgistim/core/elements/building_pit.py
@@ -17,6 +17,7 @@
     Required,
     SemiConfined,
     StrictlyDecreasing,
+    StrictlyPositive
 )
 
 
@@ -35,8 +36,8 @@ class AssociatedBuildingPitSchema(TableSchema):
         "layer": AllRequired(Range()),
         "aquifer_top": AllRequired(StrictlyDecreasing()),
         "aquifer_bottom": AllRequired(StrictlyDecreasing()),
-        "aquitard_c": OffsetAllRequired(Positive()),
-        "aquifer_k": AllRequired(Positive()),
+        "aquitard_c": OffsetAllRequired(StrictlyPositive()),
+        "aquifer_k": AllRequired(StrictlyPositive()),
         "semiconf_top": OptionalFirstOnly(),
         "semiconf_head": OptionalFirstOnly(),
         "wall_in_layer": AllRequired(AtleastOneTrue()),

diff --git a/plugin/qgistim/core/elements/head_line_sink.py b/plugin/qgistim/core/elements/head_line_sink.py
@@ -11,6 +11,7 @@
     Optional,
     Positive,
     Required,
+    StrictlyPositive,
 )
 
 
@@ -19,7 +20,7 @@ class HeadLineSinkSchema(RowWiseSchema):
         "geometry": Required(),
         "head": Required(),
         "resistance": Required(Positive()),
-        "width": Required(Positive()),
+        "width": Required(StrictlyPositive()),
         "order": Required(Positive()),
         "layer": Required(Membership("aquifer layers")),
     }

diff --git a/plugin/qgistim/core/elements/headwell.py b/plugin/qgistim/core/elements/headwell.py
@@ -20,14 +20,15 @@
     Optional,
     Positive,
     Required,
+    StrictlyPositive,
 )
 
 
 class HeadWellSchema(RowWiseSchema):
     timml_schemata = {
         "geometry": Required(),
         "head": Required(),
-        "radius": Required(Positive()),
+        "radius": Required(StrictlyPositive()),
         "resistance": Required(Positive()),
         "layer": Required(Membership("aquifer layers")),
     }

diff --git a/plugin/qgistim/core/elements/leaky_building_pit.py b/plugin/qgistim/core/elements/leaky_building_pit.py
@@ -18,6 +18,7 @@
     RequiredFirstOnly,
     SemiConfined,
     StrictlyDecreasing,
+    StrictlyPositive,
 )
 
 
@@ -36,11 +37,11 @@ class AssociatedLeakyBuildingPitchema(TableSchema):
         "layer": AllRequired(Range()),
         "aquifer_top": AllRequired(StrictlyDecreasing()),
         "aquifer_bottom": AllRequired(StrictlyDecreasing()),
-        "aquitard_c": OffsetAllRequired(Positive()),
-        "aquifer_k": AllRequired(Positive()),
+        "aquitard_c": OffsetAllRequired(StrictlyPositive()),
+        "aquifer_k": AllRequired(StrictlyPositive()),
         "semiconf_top": OptionalFirstOnly(),
         "semiconf_head": OptionalFirstOnly(),
-        "resistance": RequiredFirstOnly(),
+        "resistance": RequiredFirstOnly(StrictlyPositive()),
         "wall_in_layer": AllRequired(AtleastOneTrue()),
     }
     timml_consistency_schemata = (

diff --git a/plugin/qgistim/core/elements/leaky_line_doublet.py b/plugin/qgistim/core/elements/leaky_line_doublet.py
@@ -3,13 +3,13 @@
 from qgistim.core.elements.colors import RED
 from qgistim.core.elements.element import Element
 from qgistim.core.elements.schemata import RowWiseSchema
-from qgistim.core.schemata import Membership, Positive, Required
+from qgistim.core.schemata import Membership, Positive, Required, StrictlyPositive
 
 
 class LeakyLineDoubletSchema(RowWiseSchema):
     timml_schemata = {
         "geometry": Required(),
-        "resistance": Required(Positive()),
+        "resistance": Required(StrictlyPositive()),
         "order": Required(Positive()),
         "layer": Required(Membership("aquifer layers")),
     }

diff --git a/plugin/qgistim/core/elements/line_sink_ditch.py b/plugin/qgistim/core/elements/line_sink_ditch.py
@@ -11,6 +11,7 @@
     Optional,
     Positive,
     Required,
+    StrictlyPositive,
 )
 
 
@@ -19,7 +20,7 @@ class LineSinkDitchSchema(RowWiseSchema):
         "geometry": Required(),
         "discharge": Required(),
         "resistance": Required(Positive()),
-        "width": Required(Positive()),
+        "width": Required(StrictlyPositive()),
         "order": Required(Positive()),
         "layer": Required(Membership("aquifer layers")),
     }

diff --git a/plugin/qgistim/core/elements/polygon_semi_confined_top.py b/plugin/qgistim/core/elements/polygon_semi_confined_top.py
@@ -5,13 +5,13 @@
 from qgistim.core.elements.colors import BLUE, TRANSPARENT_BLUE
 from qgistim.core.elements.element import Element
 from qgistim.core.elements.schemata import RowWiseSchema
-from qgistim.core.schemata import Positive, Required
+from qgistim.core.schemata import Positive, Required, StrictlyPositive
 
 
 class PolygonSemiConfinedTopSchema(RowWiseSchema):
     timml_schemata = {
         "geometry": Required(),
-        "aquitard_c": Required(Positive()),
+        "aquitard_c": Required(StrictlyPositive()),
         "semiconf_top": Required(),
         "semiconf_head": Required(),
         "order": Required(Positive()),

diff --git a/plugin/qgistim/core/elements/well.py b/plugin/qgistim/core/elements/well.py
@@ -13,19 +13,20 @@
     Optional,
     Positive,
     Required,
+    StrictlyPositive,
 )
 
 
 class WellSchema(RowWiseSchema):
     timml_schemata = {
         "geometry": Required(),
         "discharge": Required(),
-        "radius": Required(Positive()),
+        "radius": Required(StrictlyPositive()),
         "resistance": Required(Positive()),
         "layer": Required(Membership("aquifer layers")),
     }
     ttim_schemata = {
-        "caisson_radius": Required(Positive),
+        "caisson_radius": Required(StrictlyPositive),
         "slug": Required(),
         "time_start": Optional(Positive()),
         "time_end": Optional(Positive()),
@@ -66,8 +67,8 @@ class Well(TransientElement):
     timml_defaults = {
         "radius": QgsDefaultValue("0.1"),
         "resistance": QgsDefaultValue("0.0"),
-        "caisson_radius": QgsDefaultValue("0.0"),
-        "slug": QgsDefaultValue("True"),
+        "caisson_radius": QgsDefaultValue("0.1"),
+        "slug": QgsDefaultValue("False"),
     }
     transient_columns = (
         "time_start",

diff --git a/plugin/qgistim/core/schemata.py b/plugin/qgistim/core/schemata.py
@@ -172,7 +172,14 @@ def validate(self, data, other=None) -> ErrorList:
 class Positive(BaseSchema):
     def validate(self, data, _=None) -> MaybeError:
         if data < 0:
-            return f"Non-positive value: {data}"
+            return f"Number is not positive (>=0): {data}"
+        return None
+
+
+class StrictlyPositive(BaseSchema):
+    def validate(self, data, _=None) -> MaybeError:
+        if data <= 0:
+            return f"Number is not strictly positive (>0): {data}"
         return None