Fixed all the unit test warnings

flow360/component/simulation/models/solver_numerics.py

@@ -156,7 +156,7 @@ class NavierStokesSolver(GenericSolverSettings):
     limit_velocity: bool = pd.Field(False)
     limit_pressure_density: bool = pd.Field(False)
 
-    model_type: Literal["Compressible"] = pd.Field("Compressible", frozen=True)
+    type_name: Literal["Compressible"] = pd.Field("Compressible", frozen=True)
 
     low_mach_preconditioner: bool = pd.Field(False)
     low_mach_preconditioner_threshold: Optional[NonNegativeFloat] = pd.Field(None)
@@ -165,15 +165,15 @@ class NavierStokesSolver(GenericSolverSettings):
 class SpalartAllmarasModelConstants(Flow360BaseModel):
     """:class:`SpalartAllmarasModelConstants` class"""
 
-    model_type: Literal["SpalartAllmarasConsts"] = pd.Field("SpalartAllmarasConsts", frozen=True)
+    type_name: Literal["SpalartAllmarasConsts"] = pd.Field("SpalartAllmarasConsts", frozen=True)
     C_DES: NonNegativeFloat = pd.Field(0.72)
     C_d: NonNegativeFloat = pd.Field(8.0)
 
 
 class KOmegaSSTModelConstants(Flow360BaseModel):
     """:class:`KOmegaSSTModelConstants` class"""
 
-    model_type: Literal["kOmegaSSTConsts"] = pd.Field("kOmegaSSTConsts", frozen=True)
+    type_name: Literal["kOmegaSSTConsts"] = pd.Field("kOmegaSSTConsts", frozen=True)
     C_DES1: NonNegativeFloat = pd.Field(0.78)
     C_DES2: NonNegativeFloat = pd.Field(0.61)
     C_d1: NonNegativeFloat = pd.Field(20.0)
@@ -230,7 +230,7 @@ class TurbulenceModelSolver(GenericSolverSettings, metaclass=ABCMeta):
         Specifes the length used for the computation of LES length scale. The allowed inputs are "maxEdgeLength"
         (default) and "meanEdgeLength"
 
-    model_constants :
+    modeling_constants :
         Here, user can change the default values used for DDES coefficients in the solver:
         SpalartAllmaras: "C_DES" (= 0.72), "C_d" (= 8.0)
         kOmegaSST: "C_DES1" (= 0.78), "C_DES2" (= 0.61), "C_d1" (= 20.0), "C_d2" (= 3.0)
@@ -248,32 +248,32 @@ class TurbulenceModelSolver(GenericSolverSettings, metaclass=ABCMeta):
     """
 
     CFL_multiplier: PositiveFloat = pd.Field(2.0)
-    model_type: str = pd.Field()
+    type_name: str = pd.Field()
     absolute_tolerance: PositiveFloat = pd.Field(1e-8)
     equation_eval_frequency: PositiveInt = pd.Field(4)
     DDES: bool = pd.Field(False)
     grid_size_for_LES: Literal["maxEdgeLength", "meanEdgeLength"] = pd.Field("maxEdgeLength")
     reconstruction_gradient_limiter: pd.confloat(ge=0, le=2) = pd.Field(1.0)
     quadratic_constitutive_relation: bool = pd.Field(False)
-    model_constants: Optional[TurbulenceModelConstants] = pd.Field(discriminator="model_type")
+    modeling_constants: Optional[TurbulenceModelConstants] = pd.Field(discriminator="type_name")
 
     linear_solver: LinearSolver = pd.Field(LinearSolver(max_iterations=20))
 
 
 class KOmegaSST(TurbulenceModelSolver):
     """:class:`KOmegaSST` class"""
 
-    model_type: Literal["kOmegaSST"] = pd.Field("kOmegaSST", frozen=True)
-    model_constants: KOmegaSSTModelConstants = pd.Field(KOmegaSSTModelConstants())
+    type_name: Literal["kOmegaSST"] = pd.Field("kOmegaSST", frozen=True)
+    modeling_constants: KOmegaSSTModelConstants = pd.Field(KOmegaSSTModelConstants())
 
 
 class SpalartAllmaras(TurbulenceModelSolver):
     """:class:`SpalartAllmaras` class"""
 
-    model_type: Literal["SpalartAllmaras"] = pd.Field("SpalartAllmaras", frozen=True)
+    type_name: Literal["SpalartAllmaras"] = pd.Field("SpalartAllmaras", frozen=True)
     rotation_correction: bool = pd.Field(False)
 
-    model_constants: Optional[SpalartAllmarasModelConstants] = pd.Field(
+    modeling_constants: Optional[SpalartAllmarasModelConstants] = pd.Field(
         SpalartAllmarasModelConstants()
     )
     reconstruction_gradient_limiter: Optional[pd.confloat(ge=0, le=2)] = pd.Field(0.5)
@@ -282,7 +282,7 @@ class SpalartAllmaras(TurbulenceModelSolver):
 class NoneSolver(Flow360BaseModel):
     """:class:`SolverNone` class"""
 
-    model_type: Literal["None"] = pd.Field("None", frozen=True)
+    type_name: Literal["None"] = pd.Field("None", frozen=True)
 
 
 TurbulenceModelSolverType = Union[NoneSolver, SpalartAllmaras, KOmegaSST]
@@ -319,7 +319,7 @@ class HeatEquationSolver(GenericSolverSettings):
         )
     """
 
-    model_type: Literal["HeatEquation"] = pd.Field("HeatEquation", frozen=True)
+    type_name: Literal["HeatEquation"] = pd.Field("HeatEquation", frozen=True)
     update_jacobian_frequency: PositiveInt = pd.Field(1)
     absolute_tolerance: PositiveFloat = pd.Field(1e-9)
     equation_eval_frequency: PositiveInt = pd.Field(10)
@@ -347,7 +347,7 @@ class TransitionModelSolver(GenericSolverSettings):
     >>> ts = TransitionModelSolver(absolute_tolerance=1e-10)
     """
 
-    model_type: Literal["AmplificationFactorTransport"] = pd.Field(
+    type_name: Literal["AmplificationFactorTransport"] = pd.Field(
         "AmplificationFactorTransport", frozen=True
     )
     absolute_tolerance: PositiveFloat = pd.Field(1e-7)

flow360/component/simulation/models/turbulence_quantities.py

@@ -23,7 +23,7 @@ class TurbulentKineticEnergy(Flow360BaseModel):
         Turbulent kinetic energy. Applicable only when using SST model.
     """
 
-    model_type: Literal["TurbulentKineticEnergy"] = pd.Field("TurbulentKineticEnergy", frozen=True)
+    type_name: Literal["TurbulentKineticEnergy"] = pd.Field("TurbulentKineticEnergy", frozen=True)
     turbulent_kinetic_energy: SpecificEnergyType.NonNegative = pd.Field()
 
 
@@ -36,7 +36,7 @@ class TurbulentIntensity(Flow360BaseModel):
         Note the use of the freestream velocity U_ref instead of C_inf.
     """
 
-    model_type: Literal["TurbulentIntensity"] = pd.Field("TurbulentIntensity", frozen=True)
+    type_name: Literal["TurbulentIntensity"] = pd.Field("TurbulentIntensity", frozen=True)
     turbulent_intensity: pd.NonNegativeFloat = pd.Field()
 
 
@@ -46,9 +46,7 @@ class _SpecificDissipationRate(Flow360BaseModel, metaclass=ABCMeta):
         Turbulent specific dissipation rate. Applicable only when using SST model.
     """
 
-    model_type: Literal["SpecificDissipationRate"] = pd.Field(
-        "SpecificDissipationRate", frozen=True
-    )
+    type_name: Literal["SpecificDissipationRate"] = pd.Field("SpecificDissipationRate", frozen=True)
     specific_dissipation_rate: FrequencyType.NonNegative = pd.Field()
 
 
@@ -58,9 +56,7 @@ class TurbulentViscosityRatio(Flow360BaseModel):
         The ratio of turbulent eddy viscosity over the freestream viscosity. Applicable for both SA and SST model.
     """
 
-    model_type: Literal["TurbulentViscosityRatio"] = pd.Field(
-        "TurbulentViscosityRatio", frozen=True
-    )
+    type_name: Literal["TurbulentViscosityRatio"] = pd.Field("TurbulentViscosityRatio", frozen=True)
     turbulent_viscosity_ratio: pd.NonNegativeFloat = pd.Field()
 
 
@@ -74,7 +70,7 @@ class TurbulentLengthScale(Flow360BaseModel, metaclass=ABCMeta):
         Applicable only when using SST model.
     """
 
-    model_type: Literal["TurbulentLengthScale"] = pd.Field("TurbulentLengthScale", frozen=True)
+    type_name: Literal["TurbulentLengthScale"] = pd.Field("TurbulentLengthScale", frozen=True)
     turbulent_length_scale: LengthType.Positive = pd.Field()
 
 
@@ -85,7 +81,7 @@ class ModifiedTurbulentViscosityRatio(Flow360BaseModel):
         Applicable only when using SA model.
     """
 
-    model_type: Literal["ModifiedTurbulentViscosityRatio"] = pd.Field(
+    type_name: Literal["ModifiedTurbulentViscosityRatio"] = pd.Field(
         "ModifiedTurbulentViscosityRatio", frozen=True
     )
     modified_turbulent_viscosity_ratio: pd.PositiveFloat = pd.Field()
@@ -97,7 +93,7 @@ class ModifiedTurbulentViscosity(Flow360BaseModel):
         The modified turbulent eddy viscosity (SA). Applicable only when using SA model.
     """
 
-    model_type: Literal["ModifiedTurbulentViscosity"] = pd.Field(
+    type_name: Literal["ModifiedTurbulentViscosity"] = pd.Field(
         "ModifiedTurbulentViscosity", frozen=True
     )
     modified_turbulent_viscosity: Optional[ViscosityType.Positive] = pd.Field()
@@ -107,61 +103,61 @@ class ModifiedTurbulentViscosity(Flow360BaseModel):
 class SpecificDissipationRateAndTurbulentKineticEnergy(
     _SpecificDissipationRate, TurbulentKineticEnergy
 ):
-    model_type: Literal["SpecificDissipationRateAndTurbulentKineticEnergy"] = pd.Field(
+    type_name: Literal["SpecificDissipationRateAndTurbulentKineticEnergy"] = pd.Field(
         "SpecificDissipationRateAndTurbulentKineticEnergy", frozen=True
     )
 
 
 class TurbulentViscosityRatioAndTurbulentKineticEnergy(
     TurbulentViscosityRatio, TurbulentKineticEnergy
 ):
-    model_type: Literal["TurbulentViscosityRatioAndTurbulentKineticEnergy"] = pd.Field(
+    type_name: Literal["TurbulentViscosityRatioAndTurbulentKineticEnergy"] = pd.Field(
         "TurbulentViscosityRatioAndTurbulentKineticEnergy", frozen=True
     )
 
 
 class TurbulentLengthScaleAndTurbulentKineticEnergy(TurbulentLengthScale, TurbulentKineticEnergy):
-    model_type: Literal["TurbulentLengthScaleAndTurbulentKineticEnergy"] = pd.Field(
+    type_name: Literal["TurbulentLengthScaleAndTurbulentKineticEnergy"] = pd.Field(
         "TurbulentLengthScaleAndTurbulentKineticEnergy", frozen=True
     )
 
 
 class TurbulentIntensityAndSpecificDissipationRate(TurbulentIntensity, _SpecificDissipationRate):
-    model_type: Literal["TurbulentIntensityAndSpecificDissipationRate"] = pd.Field(
+    type_name: Literal["TurbulentIntensityAndSpecificDissipationRate"] = pd.Field(
         "TurbulentIntensityAndSpecificDissipationRate", frozen=True
     )
 
 
 class TurbulentIntensityAndTurbulentViscosityRatio(TurbulentIntensity, TurbulentViscosityRatio):
-    model_type: Literal["TurbulentIntensityAndTurbulentViscosityRatio"] = pd.Field(
+    type_name: Literal["TurbulentIntensityAndTurbulentViscosityRatio"] = pd.Field(
         "TurbulentIntensityAndTurbulentViscosityRatio", frozen=True
     )
 
 
 class TurbulentIntensityAndTurbulentLengthScale(TurbulentIntensity, TurbulentLengthScale):
-    model_type: Literal["TurbulentIntensityAndTurbulentLengthScale"] = pd.Field(
+    type_name: Literal["TurbulentIntensityAndTurbulentLengthScale"] = pd.Field(
         "TurbulentIntensityAndTurbulentLengthScale", frozen=True
     )
 
 
 class SpecificDissipationRateAndTurbulentViscosityRatio(
     _SpecificDissipationRate, TurbulentViscosityRatio
 ):
-    model_type: Literal["SpecificDissipationRateAndTurbulentViscosityRatio"] = pd.Field(
+    type_name: Literal["SpecificDissipationRateAndTurbulentViscosityRatio"] = pd.Field(
         "SpecificDissipationRateAndTurbulentViscosityRatio", frozen=True
     )
 
 
 class SpecificDissipationRateAndTurbulentLengthScale(
     _SpecificDissipationRate, TurbulentLengthScale
 ):
-    model_type: Literal["SpecificDissipationRateAndTurbulentLengthScale"] = pd.Field(
+    type_name: Literal["SpecificDissipationRateAndTurbulentLengthScale"] = pd.Field(
         "SpecificDissipationRateAndTurbulentLengthScale", frozen=True
     )
 
 
 class TurbulentViscosityRatioAndTurbulentLengthScale(TurbulentViscosityRatio, TurbulentLengthScale):
-    model_type: Literal["TurbulentViscosityRatioAndTurbulentLengthScale"] = pd.Field(
+    type_name: Literal["TurbulentViscosityRatioAndTurbulentLengthScale"] = pd.Field(
         "TurbulentViscosityRatioAndTurbulentLengthScale", frozen=True
     )
 

flow360/component/simulation/models/volume_models.py

@@ -51,19 +51,19 @@ class ExpressionInitialConditionBase(Flow360BaseModel):
 
 
 class NavierStokesInitialCondition(ExpressionInitialConditionBase):
-    rho: str = pd.Field(displayed="rho [non-dim]")
-    u: str = pd.Field(displayed="u [non-dim]")
-    v: str = pd.Field(displayed="v [non-dim]")
-    w: str = pd.Field(displayed="w [non-dim]")
-    p: str = pd.Field(displayed="p [non-dim]")
+    rho: str = pd.Field()
+    u: str = pd.Field()
+    v: str = pd.Field()
+    w: str = pd.Field()
+    p: str = pd.Field()
 
 
 class NavierStokesModifiedRestartSolution(NavierStokesInitialCondition):
     type: Literal["restartManipulation"] = pd.Field("restartManipulation", frozen=True)
 
 
 class HeatEquationInitialCondition(ExpressionInitialConditionBase):
-    temperature: str = pd.Field(displayed="T [non-dim]")
+    temperature: str = pd.Field()
 
 
 class PDEModelBase(Flow360BaseModel):

flow360/component/simulation/time_stepping/time_stepping.py

@@ -10,7 +10,7 @@
 def _apply_default_to_none(original, default):
     for field_name, value in original.model_dump().items():
         if value is None:
-            setattr(original, field_name, default.dict()[field_name])
+            setattr(original, field_name, default.model_dump()[field_name])
     return original
 
 
@@ -86,7 +86,7 @@ class Steady(BaseTimeStepping):
     Steady time stepping component
     """
 
-    model_type: Literal["Steady"] = pd.Field("Steady", frozen=True)
+    type_name: Literal["Steady"] = pd.Field("Steady", frozen=True)
     max_steps: int = pd.Field(2000, gt=0, le=100000, description="Maximum number of pseudo steps.")
     CFL: Union[RampCFL, AdaptiveCFL] = pd.Field(
         default=AdaptiveCFL.default_steady(),
@@ -113,7 +113,7 @@ class Unsteady(BaseTimeStepping):
     Unsteady time stepping component
     """
 
-    model_type: Literal["Unsteady"] = pd.Field("Unsteady", frozen=True)
+    type_name: Literal["Unsteady"] = pd.Field("Unsteady", frozen=True)
     max_pseudo_steps: int = pd.Field(
         100, gt=0, le=100000, description="Maximum pseudo steps within one physical step."
     )

flow360/component/simulation/translator/solver_translator.py

@@ -101,11 +101,11 @@ def get_solver_json(
         "Temperature": op.thermal_state.temperature.to("K").v.item(),
         "muRef": op.thermal_state.mu_ref(mesh_unit),
     }
-    if "reference_velocity_magnitude" in op.__fields__ and op.reference_velocity_magnitude:
+    if "reference_velocity_magnitude" in op.model_fields.keys() and op.reference_velocity_magnitude:
         translated["freestream"]["MachRef"] = op.reference_velocity_magnitude.v.item()
 
     ts = input_params.time_stepping
-    if ts.model_type == "Unsteady":
+    if ts.type_name == "Unsteady":
         translated["timeStepping"] = {
             "CFL": to_dict(ts.CFL),
             "physicalSteps": ts.physical_steps,
@@ -135,9 +135,9 @@ def get_solver_json(
         if isinstance(model, Fluid):
             translated["navierStokesSolver"] = to_dict(model.navier_stokes_solver)
             translated["turbulenceModelSolver"] = to_dict(model.turbulence_model_solver)
-            model_constants = translated["turbulenceModelSolver"]["modelConstants"]
-            model_constants["C_d"] = model_constants.pop("CD")
-            model_constants["C_DES"] = model_constants.pop("CDES")
+            modeling_constants = translated["turbulenceModelSolver"]["modelingConstants"]
+            modeling_constants["C_d"] = modeling_constants.pop("CD")
+            modeling_constants["C_DES"] = modeling_constants.pop("CDES")
         elif isinstance(model, (Freestream, SlipWall, SymmetryPlane, Wall)):
             for surface in model.entities.stored_entities:
                 spec = to_dict(model)