Skip to content

Commit cf099e4

Browse files
authored
Modify test for internal fluid variables (#2468)
1 parent bd177cb commit cf099e4

File tree

1 file changed

+50
-46
lines changed

1 file changed

+50
-46
lines changed

tests/test_resultinfo.py

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1,
3232
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_0,
3333
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0,
34+
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_11_0,
3435
)
3536

3637
if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0:
@@ -201,52 +202,55 @@ def test_print_available_result_with_qualifiers(cfx_heating_coil, server_type):
201202
assert len(ar.qualifier_combinations) == 20
202203

203204

204-
# @pytest.mark.skipif(
205-
# not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0, reason="Available with CFF starting 7.0"
206-
# )
207-
# def test_print_result_info_with_qualifiers(cfx_heating_coil, server_type):
208-
# model = Model(cfx_heating_coil(server=server_type), server=server_type)
209-
# if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0:
210-
# ref = """Static analysis
211-
# Unit system: Custom: m, kg, N, s, V, A, K
212-
# Physics Type: Fluid
213-
# Available results:
214-
# - specific_heat: Nodal Specific Heat
215-
# - epsilon: Nodal Epsilon
216-
# - enthalpy: Nodal Enthalpy
217-
# - turbulent_kinetic_energy: Nodal Turbulent Kinetic Energy
218-
# - thermal_conductivity: Nodal Thermal Conductivity
219-
# - dynamic_viscosity: Nodal Dynamic Viscosity
220-
# - turbulent_viscosity: Nodal Turbulent Viscosity
221-
# - static_pressure: Nodal Static Pressure
222-
# - total_pressure: Nodal Total Pressure
223-
# - density: Nodal Density
224-
# - entropy: Nodal Entropy
225-
# - temperature: Nodal Temperature
226-
# - total_temperature: Nodal Total Temperature
227-
# - velocity: Nodal Velocity
228-
# Available qualifier labels:""" # noqa
229-
# else:
230-
# ref = """Static analysis
231-
# Unit system: SI: m, kg, N, s, V, A, K
232-
# Physics Type: Fluid
233-
# Available results:
234-
# - specific_heat: Nodal Specific Heat
235-
# - epsilon: Nodal Epsilon
236-
# - enthalpy: Nodal Enthalpy
237-
# - turbulent_kinetic_energy: Nodal Turbulent Kinetic Energy
238-
# - thermal_conductivity: Nodal Thermal Conductivity
239-
# - dynamic_viscosity: Nodal Dynamic Viscosity
240-
# - turbulent_viscosity: Nodal Turbulent Viscosity
241-
# - static_pressure: Nodal Static Pressure
242-
# - total_pressure: Nodal Total Pressure
243-
# - density: Nodal Density
244-
# - entropy: Nodal Entropy
245-
# - temperature: Nodal Temperature
246-
# - total_temperature: Nodal Total Temperature
247-
# - velocity: Nodal Velocity
248-
# Available qualifier labels:""" # noqa
249-
# assert ref in str(model.metadata.result_info)
205+
@pytest.mark.skipif(
206+
not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0, reason="Available with CFF starting 7.0"
207+
)
208+
def test_print_result_info_with_qualifiers(cfx_heating_coil, server_type):
209+
model = Model(cfx_heating_coil(server=server_type), server=server_type)
210+
available_results_names = []
211+
for result in model.metadata.result_info.available_results:
212+
available_results_names.append(result.name)
213+
214+
expected_results = [
215+
"specific_heat",
216+
"epsilon",
217+
"enthalpy",
218+
"turbulent_kinetic_energy",
219+
"thermal_conductivity",
220+
"dynamic_viscosity",
221+
"turbulent_viscosity",
222+
"static_pressure",
223+
"total_pressure",
224+
"density",
225+
"entropy",
226+
"temperature",
227+
"total_temperature",
228+
"velocity",
229+
]
230+
if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_11_0:
231+
expected_results.append("aspect_ratio")
232+
expected_results.append("static_enthalpy_beta")
233+
expected_results.append("velocity_u_beta")
234+
expected_results.append("velocity_v_beta")
235+
expected_results.append("velocity_w_beta")
236+
expected_results.append("courant_number")
237+
expected_results.append("volume_of_finite_volumes")
238+
expected_results.append("volume_porosity")
239+
expected_results.append("static_enthalpy_gradient")
240+
expected_results.append("pressure_gradient")
241+
expected_results.append("velocity_u_gradient")
242+
expected_results.append("velocity_v_gradient")
243+
expected_results.append("velocity_w_gradient")
244+
expected_results.append("mesh_expansion_factor")
245+
expected_results.append("orthogonality_angle")
246+
expected_results.append("absolute_pressure")
247+
expected_results.append("specific_heat_capacity_at_constant_volume")
248+
expected_results.append("specific_volume")
249+
expected_results.append("shear_strain_rate")
250+
expected_results.append("turbulence_eddy_frequency")
251+
252+
for result in expected_results:
253+
assert result in available_results_names
250254

251255

252256
@pytest.mark.skipif(True, reason="Used to test memory leaks")

0 commit comments

Comments
 (0)