PR comments

Author: dbochkov-flexcompute

tests/test_components/test_layerrefinement.py

@@ -369,9 +369,7 @@ def test_dl_min_from_smallest_feature():
         axis=2,
         size=(td.inf, td.inf, 2),
         corner_finder=td.CornerFinderSpec(
-            dl_min_spec=td.SmallestFeatureSpec(
-                convex_resolution=10, concave_resolution=0, mixed_resolution=0
-            )
+            convex_resolution=10,
         ),
     )
     dl_min = layer_spec._dl_min_from_smallest_feature([structure])
@@ -380,11 +378,7 @@ def test_dl_min_from_smallest_feature():
     layer_spec = td.LayerRefinementSpec(
         axis=2,
         size=(td.inf, td.inf, 2),
-        corner_finder=td.CornerFinderSpec(
-            dl_min_spec=td.SmallestFeatureSpec(
-                convex_resolution=0, concave_resolution=0, mixed_resolution=10
-            )
-        ),
+        corner_finder=td.CornerFinderSpec(mixed_resolution=10),
     )
     dl_min = layer_spec._dl_min_from_smallest_feature([structure])
     assert np.allclose(0.2 / 10, dl_min)
@@ -393,9 +387,7 @@ def test_dl_min_from_smallest_feature():
         axis=2,
         size=(td.inf, td.inf, 2),
         corner_finder=td.CornerFinderSpec(
-            dl_min_spec=td.SmallestFeatureSpec(
-                convex_resolution=0, concave_resolution=10, mixed_resolution=0
-            )
+            concave_resolution=10,
         ),
     )
     dl_min = layer_spec._dl_min_from_smallest_feature([structure])

tidy3d/__init__.py

@@ -201,7 +201,7 @@
 from .components.geometry.mesh import TriangleMesh
 from .components.geometry.polyslab import PolySlab
 from .components.geometry.primitives import Cylinder, Sphere
-from .components.grid.corner_finder import CornerFinderSpec, SmallestFeatureSpec
+from .components.grid.corner_finder import CornerFinderSpec
 from .components.grid.grid import Coords, Coords1D, FieldGrid, Grid, YeeGrid
 from .components.grid.grid_spec import (
     AutoGrid,
@@ -402,7 +402,6 @@ def set_logging_level(level: str) -> None:
     "LayerRefinementSpec",
     "GridRefinement",
     "CornerFinderSpec",
-    "SmallestFeatureSpec",
     "Box",
     "Sphere",
     "Cylinder",

tidy3d/components/grid/corner_finder.py

@@ -16,36 +16,6 @@
 CORNER_ANGLE_THRESOLD = 0.1 * np.pi
 
 
-class SmallestFeatureSpec(Tidy3dBaseModel):
-    """Specification for automatic detection of smallest geometric features in layered structures."""
-
-    concave_resolution: pd.NonNegativeInt = pd.Field(
-        2,
-        title="Concave Region Resolution.",
-        description="Specifies number of steps to use for determining `dl_min` based on concave featues."
-        "If set to 0, then the corresponding `dl_min` reduction is not applied.",
-    )
-    convex_resolution: pd.NonNegativeInt = pd.Field(
-        0,
-        title="Concave Region Resolution.",
-        description="Specifies number of steps to use for determining `dl_min` based on convex featues."
-        "If set to 0, then the corresponding `dl_min` reduction is not applied.",
-    )
-
-    mixed_resolution: pd.NonNegativeInt = pd.Field(
-        0,
-        title="Concave Region Resolution.",
-        description="Specifies number of steps to use for determining `dl_min` based on mixed featues."
-        "If set to 0, then the corresponding `dl_min` reduction is not applied.",
-    )
-
-    @cached_property
-    def _no_restriction(self):
-        return not any(
-            (self.concave_resolution != 0, self.convex_resolution != 0, self.mixed_resolution != 0)
-        )
-
-
 class CornerFinderSpec(Tidy3dBaseModel):
     """Specification for corner detection on a 2D plane."""
 
@@ -74,13 +44,37 @@ class CornerFinderSpec(Tidy3dBaseModel):
         "is below the threshold value based on Douglas-Peucker algorithm, the vertex is disqualified as a corner.",
     )
 
-    dl_min_spec: SmallestFeatureSpec = pd.Field(
-        SmallestFeatureSpec(),
-        title="Automatic `dl_min` Reduction",
-        description="Specfication for automatic reduction of global `dl_min` based on "
-        "autodetected smallest features.",
+    concave_resolution: Optional[pd.PositiveInt] = pd.Field(
+        2,
+        title="Concave Region Resolution.",
+        description="Specifies number of steps to use for determining `dl_min` based on concave featues."
+        "If set to ``None``, then the corresponding `dl_min` reduction is not applied.",
+    )
+
+    convex_resolution: Optional[pd.PositiveInt] = pd.Field(
+        None,
+        title="Convex Region Resolution.",
+        description="Specifies number of steps to use for determining `dl_min` based on convex featues."
+        "If set to ``None``, then the corresponding `dl_min` reduction is not applied.",
     )
 
+    mixed_resolution: Optional[pd.PositiveInt] = pd.Field(
+        None,
+        title="Mixed Region Resolution.",
+        description="Specifies number of steps to use for determining `dl_min` based on mixed featues."
+        "If set to ``None``, then the corresponding `dl_min` reduction is not applied.",
+    )
+
+    @cached_property
+    def _no_min_dl_override(self):
+        return all(
+            (
+                self.concave_resolution is None,
+                self.convex_resolution is None,
+                self.mixed_resolution is None,
+            )
+        )
+
     def _corners_and_convexity(
         self,
         normal_axis: Axis,

tidy3d/components/grid/grid_spec.py

@@ -1295,7 +1295,7 @@ def suggested_dl_min(self, grid_size_in_vacuum: float, structures: List[Structur
             dl_min = min(dl_min, self.corner_refinement._grid_size(grid_size_in_vacuum))
 
         # min feature size
-        if self.corner_finder is not None and not self.corner_finder.dl_min_spec._no_restriction:
+        if self.corner_finder is not None and not self.corner_finder._no_min_dl_override:
             dl_suggested = self._dl_min_from_smallest_feature(structures)
             dl_min = min(dl_min, dl_suggested)
 
@@ -1375,32 +1375,32 @@ def _dl_min_from_smallest_feature(self, structure_list: List[Structure]):
 
         dl_min = inf
 
-        if self.corner_finder is None or self.corner_finder.dl_min_spec._no_restriction:
+        if self.corner_finder is None or self.corner_finder._no_min_dl_override:
             return dl_min
 
-        dl_min_spec = self.corner_finder.dl_min_spec
+        finder = self.corner_finder
 
         for points, conv in zip(inplane_points, convexity):
             conv_nei = np.roll(conv, -1)
             lengths = np.linalg.norm(points - np.roll(points, axis=0, shift=-1), axis=-1)
 
-            if dl_min_spec.convex_resolution > 0:
+            if finder.convex_resolution is not None:
                 convex_features = np.logical_and(conv, conv_nei)
                 if np.any(convex_features):
                     min_convex_size = np.min(lengths[convex_features])
-                    dl_min = min(dl_min, min_convex_size / dl_min_spec.convex_resolution)
+                    dl_min = min(dl_min, min_convex_size / finder.convex_resolution)
 
-            if dl_min_spec.concave_resolution > 0:
+            if finder.concave_resolution is not None:
                 concave_features = np.logical_not(np.logical_or(conv, conv_nei))
                 if np.any(concave_features):
                     min_concave_size = np.min(lengths[concave_features])
-                    dl_min = min(dl_min, min_concave_size / dl_min_spec.concave_resolution)
+                    dl_min = min(dl_min, min_concave_size / finder.concave_resolution)
 
-            if dl_min_spec.mixed_resolution > 0:
+            if finder.mixed_resolution is not None:
                 mixed_features = np.logical_xor(conv, conv_nei)
                 if np.any(mixed_features):
                     min_mixed_size = np.min(lengths[mixed_features])
-                    dl_min = min(dl_min, min_mixed_size / dl_min_spec.mixed_resolution)
+                    dl_min = min(dl_min, min_mixed_size / finder.mixed_resolution)
 
         return dl_min