Issue #1176 assign wells with point filters

.teamcity/Templates/ExamplesTemplate.kt

@@ -4,7 +4,9 @@ import jetbrains.buildServer.configs.kotlin.AbsoluteId
 import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.Template
 import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport
+import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerSupport
 import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport
+import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
 
 object ExamplesTemplate : Template({
@@ -25,21 +27,26 @@ object ExamplesTemplate : Template({
             id = "Run_examples"
             workingDir = "imod-python"
             scriptContent = """
-                set Path=%system.teamcity.build.checkoutDir%\modflow6;"d:\ProgramData\pixi"
+                SET PATH=%%PATH%%;%system.teamcity.build.checkoutDir%\modflow6
                 pixi run --environment default --frozen examples
             """.trimIndent()
             formatStderrAsError = true
+            dockerImage = "containers.deltares.nl/hydrology_product_line_imod/windows-pixi:v0.26.1"
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Windows
+            dockerRunParameters = """--cpus="4""""
+            dockerPull = true
         }
     }
 
     features {
+        dockerSupport {
+            loginToRegistry = on {
+                dockerRegistryId = "PROJECT_EXT_134"
+            }
+        }
         xmlReport {
             reportType = XmlReport.XmlReportType.JUNIT
             rules = "imod-python/imod/tests/*report.xml"
         }
     }
-
-    requirements {
-        equals("env.OS", "Windows_NT")
-    }
 })

.teamcity/Templates/LintTemplate.kt

@@ -2,6 +2,8 @@ package Templates
 
 import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.Template
+import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerSupport
+import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
 
 object LintTemplate : Template({
@@ -24,10 +26,17 @@ object LintTemplate : Template({
                     pixi run --environment default --frozen lint 
                 """.trimIndent()
             formatStderrAsError = true
+            dockerImage = "containers.deltares.nl/hydrology_product_line_imod/windows-pixi:v0.26.1"
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Windows
+            dockerPull = true
         }
     }
 
-    requirements {
-        equals("env.OS", "Windows_NT")
+    features {
+        dockerSupport {
+            loginToRegistry = on {
+                dockerRegistryId = "PROJECT_EXT_134"
+            }
+        }
     }
 })

.teamcity/Templates/MyPyTemplate.kt

@@ -3,7 +3,9 @@ package Templates
 import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.Template
 import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport
+import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerSupport
 import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport
+import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
 import jetbrains.buildServer.configs.kotlin.failureConditions.BuildFailureOnMetric
 import jetbrains.buildServer.configs.kotlin.failureConditions.failOnMetricChange
@@ -29,6 +31,9 @@ object MyPyTemplate : Template({
                     pixi run --environment default --frozen mypy
                 """.trimIndent()
             formatStderrAsError = true
+            dockerImage = "containers.deltares.nl/hydrology_product_line_imod/windows-pixi:v0.26.1"
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Windows
+            dockerPull = true
         }
     }
 
@@ -45,13 +50,14 @@ object MyPyTemplate : Template({
     }
 
     features {
+        dockerSupport {
+            loginToRegistry = on {
+                dockerRegistryId = "PROJECT_EXT_134"
+            }
+        }
         xmlReport {
             reportType = XmlReport.XmlReportType.JUNIT
             rules = "imod-python/*.xml"
         }
     }
-
-    requirements {
-        equals("env.OS", "Windows_NT")
-    }
 })

.teamcity/Templates/PipPythonTemplate.kt

@@ -2,6 +2,8 @@ package Templates
 
 import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.Template
+import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerSupport
+import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
 import jetbrains.buildServer.configs.kotlin.matrix
 
@@ -25,14 +27,18 @@ object PipPythonTemplate : Template({
                     pixi run --environment %python_env% --frozen test_import
                 """.trimIndent()
             formatStderrAsError = true
+            dockerImage = "containers.deltares.nl/hydrology_product_line_imod/windows-pixi:v0.26.1"
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Windows
+            dockerPull = true
         }
     }
 
-    requirements {
-        equals("env.OS", "Windows_NT")
-    }
-
     features {
+        dockerSupport {
+            loginToRegistry = on {
+                dockerRegistryId = "PROJECT_EXT_134"
+            }
+        }
         matrix {
             param(
                 "python_env", listOf(

.teamcity/Templates/UnitTestsTemplate.kt

@@ -3,7 +3,9 @@ package Templates
 import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.Template
 import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport
+import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerSupport
 import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport
+import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.powerShell
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
 
@@ -28,10 +30,14 @@ object UnitTestsTemplate : Template({
             id = "Run_unittests"
             workingDir = "imod-python"
             scriptContent = """
-                set Path=%system.teamcity.build.checkoutDir%\modflow6;"d:\ProgramData\pixi"
+                SET PATH=%%PATH%%;%system.teamcity.build.checkoutDir%\modflow6
                 pixi run --environment default --frozen unittests
             """.trimIndent()
             formatStderrAsError = true
+            dockerImage = "containers.deltares.nl/hydrology_product_line_imod/windows-pixi:v0.26.1"
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Windows
+            dockerRunParameters = """--cpus="4""""
+            dockerPull = true
         }
         powerShell {
             name = "Extract coverage statistics"
@@ -51,17 +57,21 @@ object UnitTestsTemplate : Template({
                     Write-Host "##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='${'$'}TOTALLINES']"
                 """.trimIndent()
             }
+            param("plugin.docker.imagePlatform", "windows")
+            param("plugin.docker.imageId", "containers.deltares.nl/hydrology_product_line_imod/windows-pixi:v0.26.1")
+            param("plugin.docker.pull.enabled", "true")
         }
     }
 
     features {
+        dockerSupport {
+            loginToRegistry = on {
+                dockerRegistryId = "PROJECT_EXT_134"
+            }
+        }
         xmlReport {
             reportType = XmlReport.XmlReportType.JUNIT
             rules = "imod-python/imod/tests/*report.xml"
         }
     }
-
-    requirements {
-        equals("env.OS", "Windows_NT")
-    }
 })

.teamcity/_Self/MainProject.kt

@@ -10,6 +10,7 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests
 import jetbrains.buildServer.configs.kotlin.failureConditions.BuildFailureOnMetric
 import jetbrains.buildServer.configs.kotlin.failureConditions.failOnMetricChange
 import jetbrains.buildServer.configs.kotlin.projectFeatures.ProjectReportTab
+import jetbrains.buildServer.configs.kotlin.projectFeatures.dockerRegistry
 import jetbrains.buildServer.configs.kotlin.projectFeatures.projectReportTab
 import jetbrains.buildServer.configs.kotlin.triggers.vcs
 
@@ -29,6 +30,13 @@ object MainProject : Project({
     template(PipPythonTemplate)
 
     features {
+        dockerRegistry {
+            id = "PROJECT_EXT_134"
+            name = "Hydrology"
+            url = "https://containers.deltares.nl/"
+            userName = "robot${'$'}hydrology_product_line_imod+teamcity"
+            password = "credentialsJSON:7cfeee0c-bc26-4c80-b488-a5d8e00233c3"
+        }
         buildTypeCustomChart {
             id = "PROJECT_EXT_41"
             title = "Build Duration (all stages)"

docs/api/changelog.rst

@@ -36,6 +36,10 @@ Changed
   polygons.
 - :func:`open_projectfile_data` now returns well data grouped by ipf name,
   instead of generic, separate number per entry.
+- :class:`imod.mf6.Well` now supports wells which have a filter with zero
+  length, where ``"screen_top"`` equals ``"screen_bottom"``.
+- :class:`imod.mf6.Well` shares the same default ``minimum_thickness`` as
+  :func:`imod.prepare.assign_wells`, which is 0.05, before this was 1.0.
 
 Added
 ~~~~~

imod/mf6/wel.py

@@ -18,6 +18,7 @@
 from imod.logging import init_log_decorator, logger
 from imod.logging.logging_decorators import standard_log_decorator
 from imod.logging.loglevel import LogLevel
+from imod.mf6 import StructuredDiscretization, VerticesDiscretization
 from imod.mf6.boundary_condition import (
     BoundaryCondition,
     DisStructuredBoundaryCondition,
@@ -339,7 +340,7 @@ def _derive_cellid_from_points(
             "x": ("ncellid", x),
             "y": ("ncellid", y),
         }
-        cellid = cellid.assign_coords(**coords)
+        cellid = cellid.assign_coords(coords=coords)
 
         return cellid
 
@@ -505,7 +506,7 @@ def from_imod5_data(
         imod5_data: dict[str, dict[str, GridDataArray]],
         times: list[datetime],
         minimum_k: float = 0.1,
-        minimum_thickness: float = 1.0,
+        minimum_thickness: float = 0.05,
     ) -> "GridAgnosticWell":
         """
         Convert wells to imod5 data, loaded with
@@ -728,7 +729,7 @@ class Well(GridAgnosticWell):
         "screen_bottom": [
             AnyNoDataSchema(),
             EmptyIndexesSchema(),
-            AllValueSchema("<", "screen_top"),
+            AllValueSchema("<=", "screen_top"),
         ],
         "y": [AnyNoDataSchema(), EmptyIndexesSchema()],
         "x": [AnyNoDataSchema(), EmptyIndexesSchema()],
@@ -754,7 +755,7 @@ def __init__(
         concentration_boundary_type="aux",
         id: Optional[list[Any]] = None,
         minimum_k: float = 0.1,
-        minimum_thickness: float = 1.0,
+        minimum_thickness: float = 0.05,
         print_input: bool = False,
         print_flows: bool = False,
         save_flows: bool = False,
@@ -972,7 +973,7 @@ def _validate_imod5_depth_information(
             logger.log(loglevel=LogLevel.ERROR, message=log_msg, additional_depth=2)
             raise ValueError(log_msg)
 
-    def cleanup(self):
+    def cleanup(self, _: StructuredDiscretization | VerticesDiscretization):
         self.dataset = cleanup_wel(self.dataset)