Merge pull request #1740 from flexcompute/develop

Merge develop into main, starting next release cycle

Author: benflexcompute

flow360/component/simulation/meshing_param/meshing_specs.py

@@ -161,7 +161,21 @@ class MeshingDefaults(Flow360BaseModel):
 
     remove_non_manifold_faces: bool = pd.Field(
         False,
-        description="Flag to remove non-manifold and interior faces.",
+        description="Flag to remove non-manifold and interior faces. "
+        + "This option is only supported when using geometry AI.",
+    )
+
+    remove_hidden_geometry: bool = pd.Field(
+        False,
+        description="Flag to remove hidden geometry that is not visible to flow. "
+        + "This option is only supported when using geometry AI.",
+    )
+
+    flooding_cell_size: Optional[LengthType.Positive] = pd.Field(
+        None,
+        description="Minimum cell size used for flood-fill exterior classification. "
+        + "If not specified, the value is derived from geometry_accuracy and sealing_size. "
+        + "This option is only supported when using geometry AI.",
     )
 
     @contextual_field_validator("number_of_boundary_layers", mode="after")
@@ -190,13 +204,34 @@ def invalid_geometry_accuracy(cls, value, param_info: ParamsValidationInfo):
         "preserve_thin_geometry",
         "sealing_size",
         "remove_non_manifold_faces",
+        "remove_hidden_geometry",
+        "flooding_cell_size",
         mode="after",
     )
     @classmethod
     def ensure_geometry_ai_features(cls, value, info, param_info: ParamsValidationInfo):
         """Validate that the feature is only used when Geometry AI is enabled."""
         return check_geometry_ai_features(cls, value, info, param_info)
 
+    @pd.model_validator(mode="after")
+    def validate_mutual_exclusion(self):
+        """Ensure remove_non_manifold_faces and remove_hidden_geometry are not both True."""
+        if self.remove_non_manifold_faces and self.remove_hidden_geometry:
+            raise ValueError(
+                "'remove_non_manifold_faces' and 'remove_hidden_geometry' cannot both be True. "
+                "Please enable only one of these options."
+            )
+        return self
+
+    @pd.model_validator(mode="after")
+    def validate_flooding_cell_size_requires_remove_hidden_geometry(self):
+        """Ensure flooding_cell_size is only specified when remove_hidden_geometry is True."""
+        if self.flooding_cell_size is not None and not self.remove_hidden_geometry:
+            raise ValueError(
+                "'flooding_cell_size' can only be specified when 'remove_hidden_geometry' is True."
+            )
+        return self
+
 
 class VolumeMeshingDefaults(Flow360BaseModel):
     """

flow360/component/simulation/translator/surface_meshing_translator.py

@@ -727,6 +727,8 @@ def _get_gai_setting_whitelist(input_params: SimulationParams) -> dict:
         "surface_max_adaptation_iterations": None,
         "sealing_size": None,
         "remove_non_manifold_faces": None,
+        "remove_hidden_geometry": None,
+        "flooding_cell_size": None,
         "planar_face_tolerance": None,
     }
 

tests/ref/simulation/service_init_geometry.json

@@ -23,7 +23,8 @@
                 "units": "m"
             },
             "sliding_interface_tolerance": 0.01,
-            "remove_non_manifold_faces": false
+            "remove_non_manifold_faces": false,
+            "remove_hidden_geometry": false
         },
         "outputs": [],
         "refinements": [],

tests/ref/simulation/service_init_surface_mesh.json

@@ -23,7 +23,8 @@
                 "units": "m"
             },
             "sliding_interface_tolerance": 0.01,
-            "remove_non_manifold_faces": false
+            "remove_non_manifold_faces": false,
+            "remove_hidden_geometry": false
         },
         "outputs": [],
         "refinements": [],

tests/simulation/params/meshing_validation/test_meshing_param_validation.py

@@ -1474,3 +1474,103 @@ def test_wind_tunnel_farfield_requires_geometry_ai():
         with CGS_unit_system:
             farfield = WindTunnelFarfield()
             assert farfield.type == "WindTunnelFarfield"
+
+
+def test_remove_non_manifold_faces_and_remove_hidden_geometry_mutual_exclusion():
+    """Test that remove_non_manifold_faces and remove_hidden_geometry cannot both be True."""
+    gai_context = ParamsValidationInfo({}, [])
+    gai_context.use_geometry_AI = True
+
+    # Test 1: Both True should raise ValueError
+    with pytest.raises(
+        pd.ValidationError,
+        match=r"'remove_non_manifold_faces' and 'remove_hidden_geometry' cannot both be True",
+    ):
+        with ValidationContext(SURFACE_MESH, gai_context):
+            with SI_unit_system:
+                MeshingDefaults(
+                    geometry_accuracy=0.01 * u.m,
+                    surface_max_edge_length=0.1 * u.m,
+                    remove_non_manifold_faces=True,
+                    remove_hidden_geometry=True,
+                )
+
+    # Test 2: Only remove_non_manifold_faces=True should work
+    with ValidationContext(SURFACE_MESH, gai_context):
+        with SI_unit_system:
+            defaults = MeshingDefaults(
+                geometry_accuracy=0.01 * u.m,
+                surface_max_edge_length=0.1 * u.m,
+                remove_non_manifold_faces=True,
+                remove_hidden_geometry=False,
+            )
+            assert defaults.remove_non_manifold_faces is True
+            assert defaults.remove_hidden_geometry is False
+
+    # Test 3: Only remove_hidden_geometry=True should work
+    with ValidationContext(SURFACE_MESH, gai_context):
+        with SI_unit_system:
+            defaults = MeshingDefaults(
+                geometry_accuracy=0.01 * u.m,
+                surface_max_edge_length=0.1 * u.m,
+                remove_non_manifold_faces=False,
+                remove_hidden_geometry=True,
+            )
+            assert defaults.remove_non_manifold_faces is False
+            assert defaults.remove_hidden_geometry is True
+
+    # Test 4: Both False should work (default case)
+    with ValidationContext(SURFACE_MESH, gai_context):
+        with SI_unit_system:
+            defaults = MeshingDefaults(
+                geometry_accuracy=0.01 * u.m,
+                surface_max_edge_length=0.1 * u.m,
+                remove_non_manifold_faces=False,
+                remove_hidden_geometry=False,
+            )
+            assert defaults.remove_non_manifold_faces is False
+            assert defaults.remove_hidden_geometry is False
+
+
+def test_flooding_cell_size_requires_remove_hidden_geometry():
+    """Test that flooding_cell_size can only be specified when remove_hidden_geometry is True."""
+    gai_context = ParamsValidationInfo({}, [])
+    gai_context.use_geometry_AI = True
+
+    # Test 1: flooding_cell_size with remove_hidden_geometry=False should raise
+    with pytest.raises(
+        pd.ValidationError,
+        match=r"'flooding_cell_size' can only be specified when 'remove_hidden_geometry' is True",
+    ):
+        with ValidationContext(SURFACE_MESH, gai_context):
+            with SI_unit_system:
+                MeshingDefaults(
+                    geometry_accuracy=0.01 * u.m,
+                    surface_max_edge_length=0.1 * u.m,
+                    remove_hidden_geometry=False,
+                    flooding_cell_size=0.005 * u.m,
+                )
+
+    # Test 2: flooding_cell_size with remove_hidden_geometry=True should work
+    with ValidationContext(SURFACE_MESH, gai_context):
+        with SI_unit_system:
+            defaults = MeshingDefaults(
+                geometry_accuracy=0.01 * u.m,
+                surface_max_edge_length=0.1 * u.m,
+                remove_hidden_geometry=True,
+                flooding_cell_size=0.005 * u.m,
+            )
+            assert defaults.flooding_cell_size == 0.005 * u.m
+            assert defaults.remove_hidden_geometry is True
+
+    # Test 3: remove_hidden_geometry=True without flooding_cell_size should work (it's optional)
+    with ValidationContext(SURFACE_MESH, gai_context):
+        with SI_unit_system:
+            defaults = MeshingDefaults(
+                geometry_accuracy=0.01 * u.m,
+                surface_max_edge_length=0.1 * u.m,
+                remove_hidden_geometry=True,
+                flooding_cell_size=None,
+            )
+            assert defaults.flooding_cell_size is None
+            assert defaults.remove_hidden_geometry is True

tests/simulation/translator/ref/Flow360_mirrored_surface_meshing.json

@@ -12,6 +12,7 @@
             "planar_face_tolerance": 1e-06,
             "preserve_thin_geometry": false,
             "remove_non_manifold_faces": false,
+            "remove_hidden_geometry": false,
             "resolve_face_boundaries": false,
             "sealing_size": {
                 "units": "1.0*m",

tests/simulation/translator/ref/surface_meshing/gai_surface_mesher.json

@@ -23,6 +23,7 @@
                 "units": "1.0*m"
             },
             "remove_non_manifold_faces": false,
+            "remove_hidden_geometry": false,
             "planar_face_tolerance": 1e-06
         },
         "refinements": [

tests/simulation/translator/ref/surface_meshing/gai_windtunnel.json

@@ -23,6 +23,7 @@
                 "units": "1.0*m"
             },
             "remove_non_manifold_faces": false,
+            "remove_hidden_geometry": false,
             "planar_face_tolerance": 0.001
         },
         "refinements": [],