tested the import_surface_field_and_integral

added example for imported surface

trim the path prefix of file_name of imported surface

lint

update solver version

use release-25.7.5 to run workflow using imported surfaces

remove solver version from submission

Author: feilin-flexcompute

examples/post_processing/imported_surfaces/import_surface_field_and_integral.py

@@ -0,0 +1,89 @@
+import flow360 as fl
+from flow360.examples import ObliqueChannel
+
+ObliqueChannel.get_files()
+
+project = fl.Project.from_volume_mesh(
+    ObliqueChannel.mesh_filename, name="Cartesian channel mesh",
+)
+
+volume_mesh = project.volume_mesh
+
+with fl.SI_unit_system:
+    op = fl.GenericReferenceCondition.from_mach(
+        mach=0.3,
+    )
+    massFlowRate = fl.UserVariable(
+        name="MassFluxProjected",
+        value=-1
+        * fl.solution.density
+        * fl.math.dot(fl.solution.velocity, fl.solution.node_unit_normal),
+    )
+    massFlowRateIntegral = fl.SurfaceIntegralOutput(
+        name="MassFluxIntegral",
+        output_fields=[massFlowRate],
+        surfaces=volume_mesh["VOLUME/LEFT"],
+    )
+    params = fl.SimulationParams(
+        operating_condition=op,
+        models=[
+            fl.Fluid(
+                navier_stokes_solver=fl.NavierStokesSolver(absolute_tolerance=1e-10),
+                turbulence_model_solver=fl.NoneSolver(),
+            ),
+            fl.Inflow(
+                entities=[volume_mesh["VOLUME/LEFT"]],
+                total_temperature=op.thermal_state.temperature * 1.018,
+                velocity_direction=(1.0, 0.0, 0.0),
+                spec=fl.MassFlowRate(
+                    value=op.velocity_magnitude * op.thermal_state.density * (0.2 * fl.u.m**2)
+                ),
+            ),
+            fl.Outflow(
+                entities=[volume_mesh["VOLUME/RIGHT"]],
+                spec=fl.Pressure(op.thermal_state.pressure),
+            ),
+            fl.SlipWall(
+                entities=[
+                    volume_mesh["VOLUME/FRONT"],
+                    volume_mesh["VOLUME/BACK"],
+                    volume_mesh["VOLUME/TOP"],
+                    volume_mesh["VOLUME/BOTTOM"],
+                ]
+            ),
+        ],
+        time_stepping=fl.Steady(),
+        outputs=[
+            fl.VolumeOutput(
+                output_format="paraview",
+                output_fields=["primitiveVars"],
+            ),
+            fl.SurfaceOutput(
+                output_fields=[
+                    fl.solution.velocity,
+                    fl.solution.Cp,
+                ],
+                surfaces=[
+                    fl.ImportedSurface(
+                        name="normal", file_name=ObliqueChannel.extra["rectangle_normal"]
+                    ),
+                    fl.ImportedSurface(
+                        name="oblique", file_name=ObliqueChannel.extra["rectangle_oblique"]
+                    ),
+                ],
+            ),
+            fl.SurfaceIntegralOutput(
+                name="MassFlowRateImportedSurface",
+                output_fields=[massFlowRate],
+                surfaces=[
+                    fl.ImportedSurface(
+                        name="normal", file_name=ObliqueChannel.extra["rectangle_normal"]
+                    ),
+                    fl.ImportedSurface(
+                        name="oblique", file_name=ObliqueChannel.extra["rectangle_oblique"]
+                    ),
+                ],
+            ),
+        ],
+    )
+project.run_case(params, "test_imported_surfaces_field_and_integral")

flow360/component/project.py

@@ -1446,8 +1446,8 @@ def _run(
 
         params.pre_submit_summary()
 
-        draft.update_simulation_params(params)
         upload_imported_surfaces_to_draft(params, draft, fork_from)
+        draft.update_simulation_params(params)
 
         if draft_only:
             # pylint: disable=import-outside-toplevel

flow360/component/project_utils.py

@@ -480,3 +480,10 @@ def upload_imported_surfaces_to_draft(params, draft, parent_case):
         if file_basename not in parent_existing_imported_file_basenames:
             deduplicated_surface_file_paths_to_import.append(file_path_to_import)
     draft.upload_imported_surfaces(deduplicated_surface_file_paths_to_import)
+
+    if params is not None and params.outputs is not None:
+        for output in params.outputs:
+            if isinstance(output, (SurfaceOutput, SurfaceIntegralOutput)):
+                for surface in output.entities.stored_entities:
+                    if isinstance(surface, ImportedSurface):
+                        surface.file_name = os.path.basename(surface.file_name)

flow360/examples/__init__.py

@@ -10,6 +10,7 @@
 from .evtol import EVTOL
 from .isolated_propeller import IsolatedPropeller
 from .monitors import MonitorsAndSlices
+from .oblique_channel import ObliqueChannel
 from .om6wing import OM6wing
 from .quadcopter import Quadcopter
 from .rotating_spheres import RotatingSpheres
@@ -50,4 +51,5 @@
     "TutorialRANSXv15",
     "TutorialUDDForcesMoments",
     "Quadcopter",
+    "ObliqueChannel",
 ]

flow360/examples/base_test_case.py

@@ -223,3 +223,6 @@ def get_files(cls):
             cls._get_file(cls.url.geometry, cls._geometry_filename)
         if hasattr(cls.url, "surface_json"):
             cls._get_file(cls.url.surface_json, cls._surface_json)
+        if hasattr(cls.url, "extra"):
+            for key, value in cls.url.extra.items():
+                cls._get_file(value, cls._extra[key])

flow360/examples/oblique_channel.py

@@ -0,0 +1,16 @@
+"""
+Cartesian mesh with oblique boundaries example
+"""
+
+from .base_test_case import BaseTestCase
+
+
+class ObliqueChannel(BaseTestCase):
+    name = "obliqueChannel"
+
+    class url:
+        mesh = "https://simcloud-public-1.s3.amazonaws.com/examples/obliqueChannel/cartesian_2d_mesh.oblique.cgns"
+        extra = {
+            "rectangle_normal": "https://simcloud-public-1.s3.amazonaws.com/examples/obliqueChannel/rectangle_normal.cgns",
+            "rectangle_oblique": "https://simcloud-public-1.s3.amazonaws.com/examples/obliqueChannel/rectangle_oblique.cgns",
+        }