Update the core test and docstring regarding new element types added server side (#1652)

* Update the core test and docstring regarding new element types added (INTER and MPC)

* Update the PR: complete docstring

---------

Co-authored-by: Rafael Canton <[email protected]>

Author: MichaelNale

src/ansys/dpf/core/results.py

@@ -419,17 +419,17 @@ def split_by_body(self):
 
         Examples
         --------
-        # >>> from ansys.dpf import core as dpf
-        # >>> from ansys.dpf.core import examples
-        # >>> model = dpf.Model(examples.download_all_kinds_of_complexity())
-        # >>> disp = model.results.displacement
-        # >>> fc_disp = disp.split_by_body.eval()
-        # >>> len(fc_disp)
-        # 11
-        # >>> fc_disp.get_mat_scoping().ids
-        # <BLANKLINE>
-        # ...1, 5, 6, 10, 2, 7, 8, 13, 4, 12, 15]...
-        # >>> disp_mat_10 = fc_disp.get_field_by_mat_id(10)
+        >>> from ansys.dpf import core as dpf
+        >>> from ansys.dpf.core import examples
+        >>> model = dpf.Model(examples.download_all_kinds_of_complexity())
+        >>> disp = model.results.displacement
+        >>> fc_disp = disp.split_by_body.eval()
+        >>> len(fc_disp)
+        13
+        >>> fc_disp.get_mat_scoping().ids
+        <BLANKLINE>
+        ...1, 5, 6, 10, 2, 7, 8, 13, 4, 12, 15, 16, 17]...
+        >>> disp_mat_10 = fc_disp.get_field_by_mat_id(10)
 
         """
         self._specific_fc_type = "body"

tests/test_field.py

@@ -9,7 +9,7 @@
 from ansys.dpf.core import operators as ops
 from ansys.dpf.core.common import locations, shell_layers
 from conftest import running_docker, SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_0
-
+from ansys.dpf.core.check_version import server_meet_version
 
 @pytest.fixture()
 def stress_field(allkindofcomplexity, server_type):
@@ -437,10 +437,13 @@ def test_to_nodal(stress_field):
     assert field_out.location == "Nodal"
 
 
-# def test_mesh_support_field(stress_field):
-#     mesh = stress_field.meshed_region
-#     assert len(mesh.nodes.scoping) == 15129
-#     assert len(mesh.elements.scoping) == 10292
+def test_mesh_support_field(stress_field):
+    mesh = stress_field.meshed_region
+    assert len(mesh.nodes.scoping) == 15129
+    if server_meet_version("9.0", mesh._server):
+        assert len(mesh.elements.scoping) == 10294
+    else:
+        assert len(mesh.elements.scoping) == 10292
 
 
 def test_shell_layers_1(allkindofcomplexity):
@@ -461,13 +464,16 @@ def test_shell_layers_2(velocity_acceleration):
     assert f.shell_layers == shell_layers.nonelayer
 
 
-# def test_mesh_support_field_model(allkindofcomplexity):
-#     model = dpf.core.Model(allkindofcomplexity)
-#     stress = model.results.stress()
-#     f = stress.outputs.fields_container()[0]
-#     mesh = f.meshed_region
-#     assert len(mesh.nodes.scoping) == 15129
-#     assert len(mesh.elements.scoping) == 10292
+def test_mesh_support_field_model(allkindofcomplexity):
+    model = dpf.core.Model(allkindofcomplexity)
+    stress = model.results.stress()
+    f = stress.outputs.fields_container()[0]
+    mesh = f.meshed_region
+    assert len(mesh.nodes.scoping) == 15129
+    if server_meet_version("9.0", model._server):
+        assert len(mesh.elements.scoping) == 10294
+    else:
+        assert len(mesh.elements.scoping) == 10292
 
 
 def test_delete_auto_field(server_type):

tests/test_fieldscontainer.py

@@ -5,6 +5,7 @@
 import os
 
 import conftest
+from ansys.dpf.core.check_version import server_meet_version
 from ansys.dpf import core as dpf
 from ansys.dpf.core import FieldsContainer, Field, TimeFreqSupport
 from ansys.dpf.core import errors as dpf_errors
@@ -401,13 +402,16 @@ def test_el_shape_time_fc():
         assert mesh.elements.element_by_id(id).shape == "solid"
 
 
-# def test_mat_time_fc():
-#     model = dpf.Model(examples.download_all_kinds_of_complexity_modal())
-#     fc = model.results.stress.on_all_time_freqs.split_by_body.eval()
-#     assert isinstance(fc, BodyFieldsContainer)
-#     assert len(fc.get_fields_by_mat_id(45)) == 45
-#     assert np.allclose(fc.get_fields_by_mat_id(45)[0].data, fc.get_field_by_mat_id(45, 1).data)
-#     assert len(fc.get_mat_scoping().ids) == 32
+def test_mat_time_fc():
+    model = dpf.Model(examples.download_all_kinds_of_complexity_modal())
+    fc = model.results.stress.on_all_time_freqs.split_by_body.eval()
+    assert isinstance(fc, BodyFieldsContainer)
+    assert len(fc.get_fields_by_mat_id(45)) == 45
+    assert np.allclose(fc.get_fields_by_mat_id(45)[0].data, fc.get_field_by_mat_id(45, 1).data)
+    if server_meet_version("9.0", model._server):
+        assert len(fc.get_mat_scoping().ids) == 44
+    else:
+        assert len(fc.get_mat_scoping().ids) == 32
 
 
 def test_add_operator_fields_container():

tests/test_meshregion.py

@@ -4,7 +4,7 @@
 
 from ansys import dpf
 import conftest
-
+from ansys.dpf.core.check_version import server_meet_version
 
 @pytest.fixture()
 def simple_bar_model(simple_bar, server_type):
@@ -298,15 +298,18 @@ def test_id_indeces_mapping_on_elements_1(multishells, server_type):
     assert mapping[1999] == 191
 
 
-# def test_id_indeces_mapping_on_elements_2(allkindofcomplexity, server_type):
-#     model = dpf.core.Model(allkindofcomplexity, server=server_type)
-#     mesh = model.metadata.meshed_region
-#     mapping = mesh.elements.mapping_id_to_index
-#     elements = mesh.elements
-#     assert len(mapping) == len(elements)
-#     assert len(elements) == 10292
-#     assert mapping[23] == 24
-#     assert mapping[4520] == 2011
+def test_id_indeces_mapping_on_elements_2(allkindofcomplexity, server_type):
+    model = dpf.core.Model(allkindofcomplexity, server=server_type)
+    mesh = model.metadata.meshed_region
+    mapping = mesh.elements.mapping_id_to_index
+    elements = mesh.elements
+    assert len(mapping) == len(elements)
+    if server_meet_version("9.0", mesh._server):
+        assert len(elements) == 10294
+    else:
+        assert len(elements) == 10292
+    assert mapping[23] == 24
+    assert mapping[4520] == 2011
 
 
 def test_named_selection_mesh(allkindofcomplexity, server_type):

tests/test_model.py

@@ -7,7 +7,7 @@
 from ansys.dpf.core import examples, misc
 from ansys.dpf.core.errors import ServerTypeError
 from conftest import SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_4_0
-
+from ansys.dpf.core.check_version import server_meet_version
 
 NO_PLOTTING = True
 
@@ -123,36 +123,42 @@ def test_result_not_overrided(plate_msup):
     assert len(model2.results) > len(model1.results)
 
 
-# def test_result_displacement_model():
-#     model = dpf.core.Model(examples.download_all_kinds_of_complexity_modal())
-#     results = model.results
-#     assert isinstance(results.displacement(), dpf.core.Operator)
-#     assert len(results.displacement.on_all_time_freqs.eval()) == 45
-#     assert results.displacement.on_first_time_freq.eval().get_label_scoping().ids == [1]
-#     assert results.displacement.on_last_time_freq.eval().get_label_scoping().ids == [45]
-#     assert len(results.displacement.split_by_body.eval()) == 32
-#     assert len(results.displacement.split_by_shape.eval()) == 4
-#     assert len(results.displacement.on_named_selection("_FIXEDSU").eval()[0].scoping) == 222
-#     all_time_ns = results.displacement.on_named_selection("_FIXEDSU").on_all_time_freqs.eval()
-#     assert len(all_time_ns) == 45
-#     assert len(all_time_ns[0].scoping) == 222
-#     assert len(all_time_ns[19].scoping) == 222
-#
-#
-# def test_result_stress_model():
-#     model = dpf.core.Model(examples.download_all_kinds_of_complexity_modal())
-#     results = model.results
-#     assert isinstance(results.stress(), dpf.core.Operator)
-#     assert len(results.stress.on_all_time_freqs.eval()) == 45
-#     assert results.stress.on_first_time_freq.eval().get_label_scoping().ids == [1]
-#     assert results.stress.on_last_time_freq.eval().get_label_scoping().ids == [45]
-#     assert len(results.stress.split_by_body.eval()) == 32
-#     assert len(results.stress.split_by_shape.eval()) == 4
-#     assert len(results.stress.on_named_selection("_FIXEDSU").eval()[0].scoping) == 222
-#     all_time_ns = results.stress.on_named_selection("_FIXEDSU").on_all_time_freqs.eval()
-#     assert len(all_time_ns) == 45
-#     assert len(all_time_ns[0].scoping) == 222
-#     assert len(all_time_ns[19].scoping) == 222
+def test_result_displacement_model():
+    model = dpf.core.Model(examples.download_all_kinds_of_complexity_modal())
+    results = model.results
+    assert isinstance(results.displacement(), dpf.core.Operator)
+    assert len(results.displacement.on_all_time_freqs.eval()) == 45
+    assert results.displacement.on_first_time_freq.eval().get_label_scoping().ids == [1]
+    assert results.displacement.on_last_time_freq.eval().get_label_scoping().ids == [45]
+    if server_meet_version("9.0", model._server):
+        assert len(results.displacement.split_by_body.eval()) == 44
+    else:
+        assert len(results.displacement.split_by_body.eval()) == 32
+    assert len(results.displacement.split_by_shape.eval()) == 4
+    assert len(results.displacement.on_named_selection("_FIXEDSU").eval()[0].scoping) == 222
+    all_time_ns = results.displacement.on_named_selection("_FIXEDSU").on_all_time_freqs.eval()
+    assert len(all_time_ns) == 45
+    assert len(all_time_ns[0].scoping) == 222
+    assert len(all_time_ns[19].scoping) == 222
+
+
+def test_result_stress_model():
+    model = dpf.core.Model(examples.download_all_kinds_of_complexity_modal())
+    results = model.results
+    assert isinstance(results.stress(), dpf.core.Operator)
+    assert len(results.stress.on_all_time_freqs.eval()) == 45
+    assert results.stress.on_first_time_freq.eval().get_label_scoping().ids == [1]
+    assert results.stress.on_last_time_freq.eval().get_label_scoping().ids == [45]
+    if server_meet_version("9.0", model._server):
+        assert len(results.stress.split_by_body.eval()) == 44
+    else:
+        assert len(results.stress.split_by_body.eval()) == 32
+    assert len(results.stress.split_by_shape.eval()) == 4
+    assert len(results.stress.on_named_selection("_FIXEDSU").eval()[0].scoping) == 222
+    all_time_ns = results.stress.on_named_selection("_FIXEDSU").on_all_time_freqs.eval()
+    assert len(all_time_ns) == 45
+    assert len(all_time_ns[0].scoping) == 222
+    assert len(all_time_ns[19].scoping) == 222
 
 
 def test_result_no_memory(plate_msup):
@@ -182,14 +188,17 @@ def test_result_time_scoping(plate_msup):
     assert np.allclose(fc.time_freq_support.time_frequencies.data, np.array([0.115, 0.125]))
 
 
-# def test_result_split_subset(allkindofcomplexity):
-#     model = dpf.core.Model(allkindofcomplexity)
-#     vol = model.results.elemental_volume
-#     assert len(vol.split_by_body.eval()) == 11
-#     assert len(vol.split_by_body.eval()[0].scoping) == 105
-#     assert len(vol.on_mesh_scoping([1, 2, 3, 10992]).split_by_body.eval()) == 2
-#     assert len(vol.eval()[0].scoping) == 3
-#     assert len(vol.eval()[1].scoping) == 1
+def test_result_split_subset(allkindofcomplexity):
+    model = dpf.core.Model(allkindofcomplexity)
+    vol = model.results.elemental_volume
+    if server_meet_version("9.0", model._server):
+        assert len(vol.split_by_body.eval()) == 13
+    else:
+        assert len(vol.split_by_body.eval()) == 11
+    assert len(vol.split_by_body.eval()[0].scoping) == 105
+    assert len(vol.on_mesh_scoping([1, 2, 3, 10992]).split_by_body.eval()) == 2
+    assert len(vol.eval()[0].scoping) == 3
+    assert len(vol.eval()[1].scoping) == 1
 
 
 def test_result_not_dynamic(plate_msup):