Add constants Field in expression Initial condition (#201)

* Add constants Field in expression Initial condition Remove the comments * Fix unit test
flexcompute · Mar 11, 2024 · 670b9e1 · 670b9e1
1 parent 82fcb25
commit 670b9e1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/flow360/component/flow360_params/flow360_output.py b/flow360/component/flow360_params/flow360_output.py
@@ -652,7 +652,7 @@ class SliceNamedLegacy(Flow360BaseModel):
     slice_name: str = pd.Field(alias="sliceName")
     slice_normal: Axis = pd.Field(alias="sliceNormal")
     slice_origin: Coordinate = pd.Field(alias="sliceOrigin")
-    output_fields: Optional[List[str]] = pd.Field(alias="outputFields")
+    output_fields: Optional[List[str]] = pd.Field([], alias="outputFields")
 
 
 class SliceOutputLegacy(SliceOutput, LegacyOutputFormat, LegacyModel):

diff --git a/flow360/component/flow360_params/flow360_params.py b/flow360/component/flow360_params/flow360_params.py
@@ -1401,7 +1401,9 @@ def update_model(self) -> Flow360BaseModel:
 class FreestreamLegacy(LegacyModel):
     """:class: `FreestreamLegacy` class"""
 
-    Reynolds: Optional[PositiveFloat] = pd.Field()
+    Reynolds: Optional[Union[pd.confloat(gt=0, allow_inf_nan=False), Literal["inf"]]] = pd.Field(
+        displayed="Reynolds number"
+    )
     Mach: Optional[NonNegativeFloat] = pd.Field()
     Mach_Ref: Optional[PositiveFloat] = pd.Field(alias="MachRef")
     mu_ref: Optional[PositiveFloat] = pd.Field(alias="muRef")

diff --git a/flow360/component/flow360_params/initial_condition.py b/flow360/component/flow360_params/initial_condition.py
@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import Union
+from typing import Dict, Optional, Union
 
 import pydantic as pd
 from typing_extensions import Literal
@@ -28,6 +28,7 @@ class ExpressionInitialCondition(InitialCondition):
     """:class:`ExpressionInitialCondition` class"""
 
     type: Literal["expression"] = pd.Field("expression", const=True)
+    constants: Optional[Dict[str, str]] = pd.Field(alias="constants")
     rho: str = pd.Field(displayed="rho [non-dim]")
     u: str = pd.Field(displayed="u [non-dim]")
     v: str = pd.Field(displayed="v [non-dim]")

diff --git a/tests/data/cases/case_customDynamics1.json b/tests/data/cases/case_customDynamics1.json
@@ -46,17 +46,11 @@
         "linearIterations" : 25,
         "kappaMUSCL" : -1.0
     },
-    "turbulenceModelSolver" : {
-        "modelType" : "None",
-        "tolerance" : 1e-8,
-        "linearIterations" : 15,
-        "kappaMUSCL" : -1.0
-    },
     "freestream" :
     {
         "Reynolds" : "inf",
         "Mach" : 0.5,
-        "Temperature" : -1,
+        "Temperature" : 283,
         "alphaAngle" : 3.12,
         "betaAngle" : 0.0
     },

diff --git a/tests/test_updater.py b/tests/test_updater.py
@@ -88,6 +88,7 @@ def test_updater_from_files():
         "case_14_bet.json",
         "case_udd.json",
         "case_unsteady.json",
+        "case_customDynamics1.json",
     ]
 
     for file in files: