From 0c1e415dd35930cd4da656593f5ebd090ea91bab Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Mon, 29 Apr 2024 15:28:38 +0200 Subject: [PATCH 1/3] Test operator result.elemental_mass on an RST Signed-off-by: paul.profizi --- tests/operators/test_operator_elemental_mass.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tests/operators/test_operator_elemental_mass.py diff --git a/tests/operators/test_operator_elemental_mass.py b/tests/operators/test_operator_elemental_mass.py new file mode 100644 index 0000000000..85e0b109eb --- /dev/null +++ b/tests/operators/test_operator_elemental_mass.py @@ -0,0 +1,13 @@ +import ansys.dpf.core as dpf + + +def test_operator_elemental_mass_rst(allkindofcomplexity): + model = dpf.Model(allkindofcomplexity) + op = dpf.operators.result.elemental_mass(data_sources=model) + fc = op.eval() + assert len(fc) == 1 + field: dpf.Field = fc[0] + assert field.scoping.size == 9271 + assert field.component_count == 1 + assert field.location == dpf.locations.elemental + assert field.unit == "kg" From ebd4ce79781c51049c433f225484484c724400d9 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Mon, 29 Apr 2024 15:35:16 +0200 Subject: [PATCH 2/3] Fix retro-compatibility Signed-off-by: paul.profizi --- tests/conftest.py | 3 +++ tests/operators/test_operator_elemental_mass.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index bd63851974..f3e6675ac7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -304,6 +304,9 @@ def return_ds(server=None): return return_ds +SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_9_0 = meets_version( + get_server_version(core._global_server()), "9.0" +) SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_1 = meets_version( get_server_version(core._global_server()), "8.1" ) diff --git a/tests/operators/test_operator_elemental_mass.py b/tests/operators/test_operator_elemental_mass.py index 85e0b109eb..6e8f1c0d5a 100644 --- a/tests/operators/test_operator_elemental_mass.py +++ b/tests/operators/test_operator_elemental_mass.py @@ -1,6 +1,12 @@ +import conftest +import pytest import ansys.dpf.core as dpf +@pytest.mark.skipif( + not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_9_0, + reason="Elemental mass operator not functional before 9.0,", +) def test_operator_elemental_mass_rst(allkindofcomplexity): model = dpf.Model(allkindofcomplexity) op = dpf.operators.result.elemental_mass(data_sources=model) From 97cc0de0054c864adda5c93c259c55fb377b2162 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Mon, 29 Apr 2024 15:41:31 +0200 Subject: [PATCH 3/3] Fix retro-compatibility Signed-off-by: paul.profizi --- tests/conftest.py | 4 ++-- tests/operators/test_operator_elemental_mass.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index f3e6675ac7..bfaf525d53 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -304,8 +304,8 @@ def return_ds(server=None): return return_ds -SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_9_0 = meets_version( - get_server_version(core._global_server()), "9.0" +SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2 = meets_version( + get_server_version(core._global_server()), "8.2" ) SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_1 = meets_version( get_server_version(core._global_server()), "8.1" diff --git a/tests/operators/test_operator_elemental_mass.py b/tests/operators/test_operator_elemental_mass.py index 6e8f1c0d5a..9b96e3734f 100644 --- a/tests/operators/test_operator_elemental_mass.py +++ b/tests/operators/test_operator_elemental_mass.py @@ -4,8 +4,8 @@ @pytest.mark.skipif( - not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_9_0, - reason="Elemental mass operator not functional before 9.0,", + not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_2, + reason="Elemental mass operator not functional before 8.2,", ) def test_operator_elemental_mass_rst(allkindofcomplexity): model = dpf.Model(allkindofcomplexity)