fix(): Removing order of accuracy for steady time stepping (#610)

flexcompute · Dec 4, 2024 · 600fe4c · 600fe4c
1 parent ba16a55
commit 600fe4c
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 20 deletions.
diff --git a/flow360/component/simulation/time_stepping/time_stepping.py b/flow360/component/simulation/time_stepping/time_stepping.py
@@ -1,6 +1,5 @@
 """Time stepping setting for simulation"""
 
-from abc import ABCMeta
 from typing import Literal, Optional, Union
 
 import pydantic as pd
@@ -87,15 +86,7 @@ def default_steady(cls):
         return cls(max=1e4, convergence_limiting_factor=0.25, max_relative_change=1)
 
 
-class BaseTimeStepping(Flow360BaseModel, metaclass=ABCMeta):
-    """
-    Base class for time stepping component
-    """
-
-    order_of_accuracy: Literal[1, 2] = pd.Field(2)
-
-
-class Steady(BaseTimeStepping):
+class Steady(Flow360BaseModel):
     """
     :class:`Steady` class for specifying steady simulation.
     """
@@ -123,7 +114,7 @@ def set_default_cfl(cls, values):
         return values
 
 
-class Unsteady(BaseTimeStepping):
+class Unsteady(Flow360BaseModel):
     """
     :class:`Unsteady` class for specifying unsteady simulation.
     """
@@ -140,6 +131,7 @@ class Unsteady(BaseTimeStepping):
         default=AdaptiveCFL.default_unsteady(),
         description="CFL settings within each physical step.",
     )
+    order_of_accuracy: Literal[1, 2] = pd.Field(2, description="Temporal order of accuracy.")
 
     @pd.model_validator(mode="before")
     @classmethod

diff --git a/flow360/component/simulation/translator/solver_translator.py b/flow360/component/simulation/translator/solver_translator.py
@@ -877,7 +877,7 @@ def get_solver_json(
         translated["timeStepping"] = {
             "CFL": dump_dict(ts.CFL),
             "physicalSteps": 1,
-            "orderOfAccuracy": ts.order_of_accuracy,
+            "orderOfAccuracy": 2,  # Solver always want to read this even if it is steady... Setting dummy value here.
             "maxPseudoSteps": ts.max_steps,
             "timeStepSize": "inf",
         }

diff --git a/tests/ref/simulation/service_init_geometry.json b/tests/ref/simulation/service_init_geometry.json
@@ -209,7 +209,6 @@
   }
 ],
 "time_stepping": {
-  "order_of_accuracy": 2,
   "type_name": "Steady",
   "max_steps": 2000,
   "CFL": {

diff --git a/tests/ref/simulation/service_init_volume_mesh.json b/tests/ref/simulation/service_init_volume_mesh.json
@@ -176,7 +176,6 @@
         }
     ],
     "time_stepping": {
-        "order_of_accuracy": 2,
         "type_name": "Steady",
         "max_steps": 2000,
         "CFL": {

diff --git a/tests/ref/simulation/simulation_json_with_multi_constructor_used.json b/tests/ref/simulation/simulation_json_with_multi_constructor_used.json
@@ -384,7 +384,6 @@
             "type": "adaptive"
         },
         "max_steps": 2000,
-        "order_of_accuracy": 2,
         "type_name": "Steady"
     },
     "unit_system": {

diff --git a/tests/simulation/service/simulation_param.json b/tests/simulation/service/simulation_param.json
@@ -529,7 +529,6 @@
             "type": "adaptive"
         },
         "max_steps": 2000,
-        "order_of_accuracy": 2,
         "type_name": "Steady"
     },
     "unit_system": {

diff --git a/tests/simulation/service/test_services_v2.py b/tests/simulation/service/test_services_v2.py
@@ -44,7 +44,6 @@ def test_validate_service():
             "area": {"value": 1.0, "units": "m**2"},
         },
         "time_stepping": {
-            "order_of_accuracy": 2,
             "type_name": "Steady",
             "max_steps": 10,
             "CFL": {"type": "ramp", "initial": 1.5, "final": 1.5, "ramp_steps": 5},
@@ -136,7 +135,6 @@ def test_validate_error():
             "area": {"value": 1.0, "units": "m**2"},
         },
         "time_stepping": {
-            "order_of_accuracy": 2,
             "type_name": "Steady",
             "max_steps": 10,
             "CFL": {"type": "ramp", "initial": 1.5, "final": 1.5, "ramp_steps": 5},
@@ -202,7 +200,6 @@ def test_validate_multiple_errors():
             "area": {"value": -10.0, "units": "m**2"},
         },
         "time_stepping": {
-            "order_of_accuracy": 2,
             "type_name": "Steady",
             "max_steps": 10,
             "CFL": {"type": "ramp", "initial": 1.5, "final": 1.5, "ramp_steps": 5},

diff --git a/tests/simulation/service/test_translator_service.py b/tests/simulation/service/test_translator_service.py
@@ -470,7 +470,6 @@ def test_simulation_to_case_json():
             "CFL": {"final": 200.0, "initial": 5.0, "ramp_steps": 40, "type": "ramp"},
             "max_steps": 2000,
             "type_name": "Steady",
-            "order_of_accuracy": 2,
         },
         "user_defined_fields": [
             {