Modular meshing and Snappy

flow360/__init__.py

@@ -24,9 +24,25 @@
     PassiveSpacing,
     SurfaceRefinement,
 )
-from flow360.component.simulation.meshing_param.params import (
+from flow360.component.simulation.meshing_param.meshing_specs import (
+    BetaVolumeMeshingDefaults,
     MeshingDefaults,
+    SnappyCastellatedMeshControls,
+    SnappyQualityMetrics,
+    SnappySmoothControls,
+    SnappySnapControls,
+    SnappySurfaceMeshingDefaults,
+)
+from flow360.component.simulation.meshing_param.params import (
+    BetaVolumeMeshingParams,
     MeshingParams,
+    ModularMeshingWorkflow,
+    SnappySurfaceMeshingParams,
+)
+from flow360.component.simulation.meshing_param.surface_mesh_refinements import (
+    SnappyBodyRefinement,
+    SnappyRegionRefinement,
+    SnappySurfaceEdgeRefinement,
 )
 from flow360.component.simulation.meshing_param.volume_params import (
     AutomatedFarfield,
@@ -145,6 +161,8 @@
     Cylinder,
     ImportedSurface,
     ReferenceGeometry,
+    SeedpointZone,
+    SnappyBody,
 )
 from flow360.component.simulation.simulation_params import SimulationParams
 from flow360.component.simulation.time_stepping.time_stepping import (
@@ -306,6 +324,20 @@
     "math",
     "solution",
     "report",
+    "ModularMeshingWorkflow",
+    "SnappySurfaceMeshingDefaults",
+    "SnappySnapControls",
+    "SnappyCastellatedMeshControls",
+    "SnappyQualityMetrics",
+    "SnappySmoothControls",
+    "SnappyBodyRefinement",
+    "SnappyRegionRefinement",
+    "SnappySurfaceEdgeRefinement",
+    "SnappyBody",
+    "SeedpointZone",
+    "SnappySurfaceMeshingParams",
+    "BetaVolumeMeshingParams",
+    "BetaVolumeMeshingDefaults",
     "get_user_variable",
     "show_user_variables",
     "remove_user_variable",

flow360/component/case.py

@@ -293,7 +293,7 @@ def to_case(self) -> Case:
     @before_submit_only
     def submit(self, force_submit: bool = False) -> Case:
         """
-        submits case to cloud for running
+        Submits case to cloud for running.
         """
         assert self.name
         assert self.volume_mesh_id or self.other_case or self.parent_id or self.parent_case

flow360/component/simulation/framework/base_model.py

@@ -658,7 +658,7 @@ def preprocess(
                     exclude=exclude,
                     registry_lookup=registry_lookup,
                 )
-            elif isinstance(value, list):
+            elif isinstance(value, (list, tuple)):
                 # Use the helper to handle nested lists.
                 solver_values[property_name] = _preprocess_nested_list(
                     value, [loc_name], params, exclude, registry_lookup

flow360/component/simulation/framework/param_utils.py

@@ -152,6 +152,7 @@ def register_entity_list(model: Flow360BaseModel, registry: EntityRegistry) -> N
             register_entity_list(field, registry)
 
 
+# pylint: disable=too-many-branches
 def _update_entity_full_name(
     model: Flow360BaseModel,
     target_entity_type: Union[type[_SurfaceEntityBase], type[_VolumeEntityBase]],
@@ -170,20 +171,36 @@ def _update_entity_full_name(
             field._update_entity_info_with_metadata(volume_mesh_meta_data)
 
         if isinstance(field, EntityList):
+            added_entities = []
             for entity in field.stored_entities:
                 if isinstance(entity, target_entity_type):
                     # pylint: disable=protected-access
-                    entity._update_entity_info_with_metadata(volume_mesh_meta_data)
+                    partial_additions = entity._update_entity_info_with_metadata(
+                        volume_mesh_meta_data
+                    )
+                    if partial_additions is not None:
+                        added_entities.extend(partial_additions)
+            field.stored_entities.extend(added_entities)
 
         elif isinstance(field, (list, tuple)):
+            added_entities = []
             for item in field:
                 if isinstance(item, target_entity_type):
-                    item._update_entity_info_with_metadata(  # pylint: disable=protected-access
-                        volume_mesh_meta_data
+                    partial_additions = (
+                        item._update_entity_info_with_metadata(  # pylint: disable=protected-access
+                            volume_mesh_meta_data
+                        )
                     )
+                    if partial_additions is not None:
+                        added_entities.extend(partial_additions)
                 elif isinstance(item, Flow360BaseModel):
                     _update_entity_full_name(item, target_entity_type, volume_mesh_meta_data)
 
+            if isinstance(field, list):
+                field.extend(added_entities)
+            if isinstance(field, tuple):
+                field += tuple(added_entities)
+
         elif isinstance(field, Flow360BaseModel):
             _update_entity_full_name(field, target_entity_type, volume_mesh_meta_data)
 

flow360/component/simulation/framework/updater.py

@@ -367,6 +367,15 @@ def _to_25_7_2(params_as_dict):
     return params_as_dict
 
 
+def _to_25_8_0(params_as_dict):
+    # new method of specifying meshing was added, as well as the method discriminator
+    meshing = params_as_dict.get("meshing")
+    if meshing:
+        meshing["type"] = "MeshingParams"
+
+    return params_as_dict
+
+
 VERSION_MILESTONES = [
     (Flow360Version("24.11.1"), _to_24_11_1),
     (Flow360Version("24.11.7"), _to_24_11_7),
@@ -380,6 +389,7 @@ def _to_25_7_2(params_as_dict):
     (Flow360Version("25.6.5"), _to_25_6_5),
     (Flow360Version("25.6.6"), _to_25_6_6),
     (Flow360Version("25.7.2"), _to_25_7_2),
+    (Flow360Version("25.8.0"), _to_25_8_0),
 ]  # A list of the Python API version tuple with there corresponding updaters.