Revert "Scheduled sync: main → develop (#1422)"

This reverts commit ac56ca0.

Author: chai-flex

.gitignore

@@ -331,6 +331,4 @@ tmp/
 /.vscode
 
 # test residual
-flow360/examples/cylinder2D/flow360mesh.json
-
-/local_tests
+flow360/examples/cylinder2D/flow360mesh.json

examples/advanced_simulations/aerodynamics/dynamic_derivatives/dynamic_derivatives.py

@@ -1,9 +1,3 @@
-"""
-Example script for calculating dynamic derivatives using sliding interfaces in Flow360
-See documentation for more information:
- https://docs.flexcompute.com/projects/flow360/en/latest/tutorials/DynamicDerivatives/DynamicDerivatives.html
-"""
-
 import math
 
 import flow360 as fl
@@ -71,11 +65,8 @@
         operating_condition=fl.AerospaceCondition(
             velocity_magnitude=50,
         ),
-        time_stepping=fl.Unsteady(
-            max_pseudo_steps=80,
-            steps=400,
-            step_size=0.01 * 2.0 * math.pi / 20.0 * fl.u.s,
-            CFL=fl.AdaptiveCFL(),
+        time_stepping=fl.Steady(
+            max_steps=10000, CFL=fl.RampCFL(initial=1, final=100, ramp_steps=1000)
         ),
         outputs=[
             fl.VolumeOutput(
@@ -94,7 +85,7 @@
         models=[
             fl.Rotation(
                 volumes=cylinder,
-                spec=fl.AngleExpression("0.0349066 * sin(0.05877271 * t)"),
+                spec=fl.AngularVelocity(0 * fl.u.rad / fl.u.s),
             ),
             fl.Freestream(surfaces=farfield.farfield),
             fl.Wall(surfaces=geometry["wing"]),
@@ -110,8 +101,27 @@
             ),
         ],
     )
-# Run unsteady case with an oscillating sliding interface to collecting the data.
+
+# Run steady case with a fixed sliding interface for initializing the flow field.
+project.run_case(
+    params=params,
+    name="Tutorial Calculating Dynamic Derivatives using Sliding Interfaces (Steady)",
+)
+parent_case = fl.Case.from_cloud(project.case.id)
+
+# Update the parameters for the unsteady case.
+with fl.SI_unit_system:
+    params.time_stepping = fl.Unsteady(
+        max_pseudo_steps=80,
+        steps=400,
+        step_size=0.01 * 2.0 * math.pi / 20.0 * fl.u.s,
+        CFL=fl.RampCFL(initial=1, final=1e8, ramp_steps=20),
+    )
+    params.models[0].spec = fl.AngleExpression("0.0349066 * sin(0.05877271 * t)")
+
+# Run unsteady case with an oscillating sliding interface for collecting the data.
 project.run_case(
     params=params,
-    name="Tutorial Calculating Dynamic Derivatives using Sliding Interfaces",
+    name="Tutorial Calculating Dynamic Derivatives using Sliding Interfaces (Unsteady)",
+    fork_from=parent_case,
 )

flow360/__init__.py

@@ -96,7 +96,6 @@
     PorousMedium,
     Rotation,
     Solid,
-    StopCriterion,
     XFOILFile,
     XROTORFile,
 )
@@ -118,7 +117,6 @@
     ImportedSurfaceIntegralOutput,
     ImportedSurfaceOutput,
     IsosurfaceOutput,
-    MovingStatistic,
     Observer,
     ProbeOutput,
     SliceOutput,
@@ -309,6 +307,4 @@
     "get_user_variable",
     "show_user_variables",
     "remove_user_variable",
-    "StopCriterion",
-    "MovingStatistic",
 ]

flow360/component/case.py

@@ -66,7 +66,6 @@
 from .simulation import services
 from .simulation.simulation_params import SimulationParams
 from .utils import (
-    _local_download_file_list_overwrite,
     _local_download_overwrite,
     is_valid_uuid,
     shared_account_confirm_proceed,
@@ -748,10 +747,8 @@ def from_local_storage(cls, local_storage_path, meta_data: CaseMeta) -> Case:
             An instance of `Case` with data loaded from local storage.
         """
         _local_download_file = _local_download_overwrite(local_storage_path, cls.__name__)
-        _local_download_file_list = _local_download_file_list_overwrite(local_storage_path)
         case = cls._from_meta(meta_data)
         case._download_file = _local_download_file
-        case.get_download_file_list = _local_download_file_list
         case._results = CaseResultsModel(case=case)
         case.results.set_local_storage(local_storage_path, keep_remote_structure=True)
         return case
@@ -906,9 +903,15 @@ def pass_download_function(self):
                 value._get_params_method = lambda: self.case.params
                 value.local_storage = self.local_storage
 
-                if hasattr(value, "get_download_file_list_method"):
-                    value.get_download_file_list_method = self.case.get_download_file_list
+        return self
 
+    @pd.model_validator(mode="after")
+    def pass_get_files_function(self):
+        """
+        Pass file getters into fields of the case results
+        """
+        # pylint: disable=no-member,assigning-non-slot
+        self.monitors.get_download_file_list_method = self.case.get_download_file_list
         return self
 
     # pylint: disable=protected-access,no-member

flow360/component/project_utils.py

@@ -3,7 +3,7 @@
 """
 
 import datetime
-from typing import List, Literal, Optional, get_args
+from typing import List, Literal, Optional
 
 import pydantic as pd
 
@@ -14,14 +14,12 @@
 from flow360.component.simulation.framework.base_model import Flow360BaseModel
 from flow360.component.simulation.framework.entity_base import EntityList
 from flow360.component.simulation.framework.param_utils import AssetCache
-from flow360.component.simulation.models.volume_models import Fluid
 from flow360.component.simulation.outputs.output_entities import (
     Point,
     PointArray,
     PointArray2D,
     Slice,
 )
-from flow360.component.simulation.outputs.outputs import MonitorOutputType
 from flow360.component.simulation.primitives import (
     Box,
     CustomVolume,
@@ -348,35 +346,6 @@ def _set_up_default_reference_geometry(params: SimulationParams, length_unit: Le
     return params
 
 
-def _set_up_monitor_output_from_stopping_criterion(params: SimulationParams):
-    """
-    Setting up the monitor output in the stopping criterion if not provided in params.outputs.
-    """
-    if not params.models:
-        return params
-    stopping_criterion = None
-    for model in params.models:
-        if not isinstance(model, Fluid):
-            continue
-        stopping_criterion = model.stopping_criterion
-    if not stopping_criterion:
-        return params
-    monitor_output_ids = []
-    if params.outputs is not None:
-        for output in params.outputs:
-            if not isinstance(output, get_args(get_args(MonitorOutputType)[0])):
-                continue
-            monitor_output_ids.append(output.private_attribute_id)
-    for criterion in stopping_criterion:
-        monitor_output = criterion.monitor_output
-        if isinstance(monitor_output, str):
-            continue
-        if monitor_output.private_attribute_id not in monitor_output_ids:
-            params.outputs.append(monitor_output)
-            monitor_output_ids.append(monitor_output.private_attribute_id)
-    return params
-
-
 def set_up_params_for_uploading(
     root_asset,
     length_unit: LengthType,
@@ -422,7 +391,6 @@ def set_up_params_for_uploading(
     params = _set_up_default_geometry_accuracy(root_asset, params, use_geometry_AI)
 
     params = _set_up_default_reference_geometry(params, length_unit)
-    params = _set_up_monitor_output_from_stopping_criterion(params=params)
 
     # Convert all reference of UserVariables to VariableToken
     params = save_user_variables(params)

flow360/component/results/base_results.py

@@ -638,12 +638,3 @@ def _filtered_sum(self):
                 regex_pattern = rf"^(?!total).*{variable}$"
                 df[new_col_name] = list(df.filter(regex=regex_pattern).sum(axis=1))
         self.update(df)
-
-    def reload_data(self, filter_physical_steps_only: bool = False, include_time: bool = False):
-        """
-        Change default behavior of data loader, reload
-        """
-        super().reload_data(
-            filter_physical_steps_only=filter_physical_steps_only, include_time=include_time
-        )
-        self._filtered_sum()

flow360/component/results/case_results.py

@@ -5,7 +5,6 @@
 import re
 from collections import defaultdict
 from enum import Enum
-from pathlib import Path
 from typing import Callable, Dict, List, Optional
 
 import numpy as np
@@ -15,7 +14,6 @@
 from flow360.component.results.base_results import (
     _PHYSICAL_STEP,
     _PSEUDO_STEP,
-    _TIME,
     PerEntityResultCSVModel,
     ResultBaseModel,
     ResultCSVModel,
@@ -357,7 +355,6 @@ class SurfaceHeatTransferResultCSVModel(PerEntityResultCSVModel, TimeSeriesResul
 class AeroacousticsResultCSVModel(TimeSeriesResultCSVModel):
     """AeroacousticsResultCSVModel"""
 
-    _x_columns: List[str] = [_PHYSICAL_STEP, _TIME]
     remote_file_name: str = pd.Field(CaseDownloadable.AEROACOUSTICS.value, frozen=True)
 
 
@@ -394,9 +391,9 @@ def monitor_names(self):
                 file["fileName"]
                 for file in self.get_download_file_list_method()  # pylint:disable=not-callable
             ]
-            for filepath in file_list:
-                if str(Path(filepath).parent) == "results":
-                    filename = Path(filepath).name
+            for filename in file_list:
+                if filename.startswith("results/"):
+                    filename = filename.split("results/")[1]
                     match = re.match(pattern, filename)
                     if match:
                         name = match.group(1)
@@ -476,9 +473,9 @@ def udd_names(self):
                 file["fileName"]
                 for file in self.get_download_file_list_method()  # pylint:disable=not-callable
             ]
-            for filepath in file_list:
-                if str(Path(filepath).parent) == "results":
-                    filename = Path(filepath).name
+            for filename in file_list:
+                if filename.startswith("results/"):
+                    filename = filename.split("results/")[1]
                     match = re.match(pattern, filename)
                     if match:
                         name = match.group(1)

flow360/component/simulation/meshing_param/face_params.py

@@ -66,15 +66,8 @@ class GeometryRefinement(Flow360BaseModel):
     entities: EntityList[Surface] = pd.Field(alias="faces")
     # pylint: disable=no-member
 
-    geometry_accuracy: Optional[LengthType.Positive] = pd.Field(
-        None,
-        description="The smallest length scale that will be resolved accurately by the surface meshing process. ",
-    )
-
-    preserve_thin_geometry: Optional[bool] = pd.Field(
-        False,
-        description="Flag to specify whether thin geometry features with thickness roughly equal "
-        + "to geometry_accuracy should be resolved accurately during the surface meshing process.",
+    geometry_accuracy: LengthType.Positive = pd.Field(
+        description="The smallest length scale that will be resolved accurately by the surface meshing process. "
     )
 
     @pd.field_validator("entities", mode="after")

flow360/component/simulation/meshing_param/params.py

@@ -152,13 +152,6 @@ class MeshingDefaults(Flow360BaseModel):
         context=SURFACE_MESH,
     )
 
-    preserve_thin_geometry: Optional[bool] = pd.Field(
-        False,
-        description="Flag to specify whether thin geometry features with thickness roughly equal "
-        + "to geometry_accuracy should be resolved accurately during the surface meshing process."
-        + "This can be overridden with class: ~flow360.GeometryRefinement",
-    )
-
     @pd.field_validator("number_of_boundary_layers", mode="after")
     @classmethod
     def invalid_number_of_boundary_layers(cls, value):
@@ -189,14 +182,11 @@ def invalid_geometry_accuracy(cls, value):
         return value
 
     @pd.field_validator(
-        "surface_max_aspect_ratio",
-        "surface_max_adaptation_iterations",
-        "preserve_thin_geometry",
-        mode="after",
+        "surface_max_aspect_ratio", "surface_max_adaptation_iterations", mode="after"
     )
     @classmethod
     def invalid_geometry_ai_features(cls, value, info):
-        """Ensure GAI features are not specified when GAI is not used"""
+        """Ensure surface max aspect ratio is not specified when GAI is not used"""
         validation_info = get_validation_info()
 
         if validation_info is None: