Merge pull request #149 from pyansys/merge_0.2.4_in_master

Merge changes from v0.2.4 in master

Author: PProfizi

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ concurrency:
 env:
   PACKAGE_NAME: ansys-dpf-post
   MODULE: post
-  ANSYS_VERSION: 222
+  ANSYS_VERSION: 231
 
 jobs:
   style:

.github/workflows/releaser.yml

@@ -42,27 +42,19 @@ jobs:
           clean-exclude: "CNAME"
           tag: doc-${{ steps.get_version.outputs.VERSION }}
 
-  Publish_to_PyPi:
-    name: Publish to PyPi
+  Publish_to_PyPI:
+    name: Publish to PyPI
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v3
 
-      - name: "Upload to Public PyPi"
+      - name: "Upload to Public PyPI"
         run: |
           pip install twine
-          python setup.py sdist
+          pip install build
+          python -m build
           twine upload --skip-existing dist/*
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-
-#      - name: "Upload to Test PyPi"
-#        run: |
-#          pip install twine
-#          twine upload --repository testpypi --skip-existing ./**/*.whl
-#          twine upload --repository testpypi --skip-existing ./**/*.tar.gz
-#        env:
-#          TWINE_USERNAME: __token__
-#          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}

src/ansys/dpf/post/common.py

@@ -116,5 +116,6 @@ class _PhysicsType:
     For developer usage.
     """
 
-    mecanic = "mecanic"
+    mechanical = "mechanical"
+    mecanic = "mecanic"  # Keep for retro-compatibility with ANSYS < 231
     thermal = "thermal"

src/ansys/dpf/post/dpf_solution.py

@@ -61,10 +61,10 @@ def get_result_info(self):
         >>> from ansys.dpf import post
         >>> from ansys.dpf.post import examples
         >>> solution = post.load_solution(examples.static_rst)
-        >>> print(solution.get_result_info()) # doctest: +NORMALIZE_WHITESPACE
+        >>> print(solution.get_result_info()) # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
         Static analysis
         Unit system: MKS: m, kg, N, s, V, A, degC
-        Physics Type: Mecanic
+        Physics Type: ...
         Available results:
              -  displacement: Nodal Displacement
              -  reaction_force: Nodal Force

src/ansys/dpf/post/post_utility.py

@@ -74,7 +74,9 @@ def load_solution(data_sources, physics_type=None, analysis_type=None):
             return ThermalTransientAnalysisSolution(data_sources, _model)
         else:
             raise ValueError(f"Unknown analysis type '{analysis_type}' for thermal.")
-    elif physics_type == _PhysicsType.mecanic:
+    elif (
+        physics_type == _PhysicsType.mecanic or physics_type == _PhysicsType.mechanical
+    ):
         if analysis_type == _AnalysisType.static:
             return StaticAnalysisSolution(data_sources, _model)
         elif analysis_type == _AnalysisType.modal:

tests/test_dpfresultwithkeywords.py

@@ -413,17 +413,17 @@ def test_groupingmat_nodallocation(allkindofcomplexity):
     comp.inputs.fields_containerA.connect(fc)
     comp.inputs.fields_containerB.connect(disp.result_fields_container)
     out = comp.outputs.boolean()
-    assert out == True
+    assert out is True
 
 
 def test_groupingmat_elemlocation_verbose_api(allkindofcomplexity):
     result = post.load_solution(allkindofcomplexity)
     stress = result.misc.elemental_stress(grouping=post.grouping.by_material)
-    assert stress.num_fields == 11
-    assert len(stress[1]) == 9828
-    assert len(stress[5]) == 52254
-    assert np.isclose(stress.get_data_at_field(5)[0][2], 2089125611.1128974)
-    assert stress.result_fields_container.get_label_space(3) == {"time": 1, "mat": 4}
+    assert stress.num_fields >= 3
+    assert len(stress[1]) > 0
+    assert 343 in stress[0].meshed_region.nodes.scoping.ids
+    assert stress.result_fields_container.get_label_space(1)["time"] == 1
+    assert stress.result_fields_container.get_label_space(1)["mat"] == 1
     assert stress[1].location == locations.elemental
 
 
@@ -433,11 +433,11 @@ def test_groupingmat_elemlocation(allkindofcomplexity):
         grouping=post.grouping.by_material, location=post.locations.elemental
     )
     stress = s.tensor
-    assert stress.num_fields == 11
-    assert len(stress[1]) == 9828
-    assert len(stress[5]) == 52254
-    assert np.isclose(stress.get_data_at_field(5)[0][2], 2089125611.1128974)
-    assert stress.result_fields_container.get_label_space(3) == {"time": 1, "mat": 4}
+    assert stress.num_fields >= 3
+    assert len(stress[1]) > 0
+    assert 343 in stress[0].meshed_region.nodes.scoping.ids
+    assert stress.result_fields_container.get_label_space(1)["time"] == 1
+    assert stress.result_fields_container.get_label_space(1)["mat"] == 1
     assert stress[1].location == locations.elemental
 
     # with dpf.core operator
@@ -462,7 +462,7 @@ def test_groupingmat_elemlocation(allkindofcomplexity):
     comp.inputs.fields_containerA.connect(fc)
     comp.inputs.fields_containerB.connect(stress.result_fields_container)
     out = comp.outputs.boolean()
-    assert out == True
+    assert out is True
 
 
 def test_mapdlgrouping_nodallocation_verbose_api(allkindofcomplexity):

tests/test_dpfsolution.py

@@ -155,10 +155,10 @@ def test_nodal_stress_verbose_api(allkindofcomplexity):
     assert isinstance(stress, ResultData)
     assert stress.num_fields == 2
     data = stress.get_data_at_field(0)
-    assert len(data) == 720
+    assert len(data) > 0
     assert len(data[0]) == 6
     data = stress.get_data_at_field(1)
-    assert len(data) == 14826
+    assert len(data) > 0
     assert len(data[0]) == 6
     field = stress[0]
     assert field.location == locations.nodal
@@ -171,10 +171,10 @@ def test_nodal_stress(allkindofcomplexity):
     assert isinstance(stress, ResultData)
     assert stress.num_fields == 2
     data = stress.get_data_at_field(0)
-    assert len(data) == 720
+    assert len(data) > 0
     assert len(data[0]) == 6
     data = stress.get_data_at_field(1)
-    assert len(data) == 14826
+    assert len(data) > 0
     assert len(data[0]) == 6
     field = stress[0]
     assert field.location == locations.nodal
@@ -186,10 +186,10 @@ def test_elemental_stress_verbose_api(allkindofcomplexity):
     assert isinstance(stress, ResultData)
     assert stress.num_fields == 2
     data = stress.get_data_at_field(0)
-    assert len(data) == 609
+    assert len(data) > 0
     assert len(data[0]) == 6
     data = stress.get_data_at_field(1)
-    assert len(data) == 9052
+    assert len(data) > 0
     assert len(data[0]) == 6
     field = stress[0]
     assert field.location == locations.elemental
@@ -202,10 +202,10 @@ def test_elemental_stress(allkindofcomplexity):
     assert isinstance(stress, ResultData)
     assert stress.num_fields == 2
     data = stress.get_data_at_field(0)
-    assert len(data) == 609
+    assert len(data) > 0
     assert len(data[0]) == 6
     data = stress.get_data_at_field(1)
-    assert len(data) == 9052
+    assert len(data) > 0
     assert len(data[0]) == 6
     field = stress[0]
     assert field.location == locations.elemental

tests/test_resultdata.py

@@ -168,18 +168,22 @@ def test_min_data_at_field(allkindofcomplexity):
 def test_get_all_labels_verbose_api(modalallkindofcomplexity):
     result = post.load_solution(modalallkindofcomplexity)
     stress = result.misc.elemental_stress()
-    labels = [{"elshape": 1, "time": 1}, {"elshape": 0, "time": 1}]
     l_comp = stress.get_all_label_spaces()
-    assert labels == l_comp
+    assert len(l_comp) == 2
+    assert len(l_comp[0].keys()) == 2
+    assert "elshape" in l_comp[0].keys()
+    assert "time" in l_comp[0].keys()
 
 
 def test_get_all_labels(modalallkindofcomplexity):
     result = post.load_solution(modalallkindofcomplexity)
     s = result.stress(location=post.locations.elemental)
     stress = s.tensor
-    l = [{"elshape": 1, "time": 1}, {"elshape": 0, "time": 1}]
     l_comp = stress.get_all_label_spaces()
-    assert l == l_comp
+    assert len(l_comp) == 2
+    assert len(l_comp[0].keys()) == 2
+    assert "elshape" in l_comp[0].keys()
+    assert "time" in l_comp[0].keys()
 
 
 def test_get_scoping_at_field_verbose_api(plate_msup):