Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use new to_array API #102

Merged
merged 2 commits into from
Feb 1, 2022
Merged

use new to_array API #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68d370d
start removing mapdl req
akaszynski Jan 22, 2022
e763ab6
remove warning
akaszynski Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pytest
pytest-cov
vtk<9.1.0
pyvista>=0.24.0
ansys-mapdl-core==0.60.4
ansys-mapdl-core>=0.60.4
50 changes: 13 additions & 37 deletions tests/test_binary_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,17 @@
except ImportError:
HAS_FFMPEG = False

skip_no_ansys = pytest.mark.skipif(not _HAS_ANSYS, reason="Requires ANSYS installed")


test_path = os.path.dirname(os.path.abspath(__file__))
testfiles_path = os.path.join(test_path, 'testfiles')

IS_MAC = platform.system() == 'Darwin'
skip_no_ansys = pytest.mark.skipif(not _HAS_ANSYS, reason="Requires ANSYS installed")
skip_plotting = pytest.mark.skipif(not system_supports_plotting() or IS_MAC,
reason="Requires active X Server")
skip_plotting = pytest.mark.skipif(
not system_supports_plotting() or IS_MAC,
reason="Requires active X Server"
)

RSETS = list(zip(range(1, 9), [1]*8))

Expand Down Expand Up @@ -173,16 +177,7 @@ def transient_thermal(mapdl):
def test_prnsol_u(mapdl, cyclic_modal, rset):
mapdl.set(*rset)
# verify cyclic displacements
table = mapdl.prnsol('u').splitlines()
if isinstance(mapdl, MapdlGrpc):
array = np.genfromtxt(table[7:])
elif isinstance(mapdl, MapdlCorba):
array = np.genfromtxt(table[8:])
elif isinstance(mapdl, MapdlConsole):
array = np.genfromtxt(table[9:])
else:
raise RuntimeError('Invalid instance')

array = mapdl.prnsol('u').to_array()
ansys_nnum = array[:, 0].astype(np.int)
ansys_disp = array[:, 1:-1]

Expand All @@ -207,16 +202,9 @@ def test_presol_s(mapdl, cyclic_modal, rset):
enode = np.hstack(enode)

# parse ansys result
table = mapdl.presol('S').splitlines()
ansys_element_stress = []
line_length = len(table[15])
for line in table:
if len(line) == line_length:
ansys_element_stress.append(line)

ansys_element_stress = np.genfromtxt(ansys_element_stress)
ansys_enode = ansys_element_stress[:, 0].astype(np.int)
ansys_element_stress = ansys_element_stress[:, 1:]
array = mapdl.presol('S').to_array()
ansys_enode = array[:, 0].astype(np.int)
ansys_element_stress = array[:, 1:]

arr_sz = element_stress.shape[0]
assert np.allclose(element_stress, ansys_element_stress[:arr_sz])
Expand All @@ -229,13 +217,7 @@ def test_prnsol_s(mapdl, cyclic_modal, rset):
mapdl.set(*rset)

# verify cyclic displacements
table = mapdl.prnsol('s').splitlines()
if isinstance(mapdl, MapdlGrpc):
array = np.genfromtxt(table[7:])
elif isinstance(mapdl, MapdlCorba):
array = np.genfromtxt(table[8:])
else:
array = np.genfromtxt(table[10:])
array = mapdl.prnsol('s').to_array()
ansys_nnum = array[:, 0].astype(np.int)
ansys_stress = array[:, 1:]

Expand All @@ -257,13 +239,7 @@ def test_prnsol_prin(mapdl, cyclic_modal, rset):
mapdl.set(*rset)

# verify principal stress
table = mapdl.prnsol('prin').splitlines()
if isinstance(mapdl, MapdlGrpc):
array = np.genfromtxt(table[7:])
elif isinstance(mapdl, MapdlCorba):
array = np.genfromtxt(table[8:])
else:
array = np.genfromtxt(table[10:])
array = mapdl.prnsol('prin').to_array()
ansys_nnum = array[:, 0].astype(np.int)
ansys_stress = array[:, 1:]

Expand Down