Patch *.dat Reader (ansys#318)

* add DAT example file and update reader

* added string parameter reader

* version bump to 0.44.19

* ignore additional NBLOCKs

* use smaller example *.dat file

* add missing test file and add file closing within binary reader

Author: akaszynski

pyansys/_version.py

@@ -1,5 +1,5 @@
 # major, minor, patch
-version_info = 0, 44, 18
+version_info = 0, 44, 19
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))

pyansys/cython/_binary_reader.pyx

@@ -305,6 +305,9 @@ def load_elements(filename, int64_t loc, int nelem, int64_t [::1] e_disp_table):
     # add final position here for parser to know the size of the last element
     elem_off[nelem] = c
 
+    # this isn't collected automatically, must close manually
+    del binfile
+
     return np.array(elem[:c]), np.array(elem_off)
 
 
@@ -341,6 +344,9 @@ def read_element_stress(filename, int64_t [::1] ele_ind_table,
                                 &ele_data_arr[c, 0], as_global)
             c += nnode_elem
 
+    # this isn't collected automatically, must close manually
+    del binfile
+
 
 def populate_surface_element_result(filename,
                                     int64_t [::1] ele_ind_table, 
@@ -473,6 +479,9 @@ def populate_surface_element_result(filename,
                 data[cj] = 0
                 cj += 1
 
+    # this isn't collected automatically, must close manually
+    del binfile
+
     return np.array(data)
 
 
@@ -913,11 +922,9 @@ def read_nodal_values_dist(filename,
 
         c += 1  # global solution cell index
 
-    # must delete to manually collect
+    # this isn't collected automatically, must close manually
     del binfile
 
-    # have to increment again
-    # return c + 1
     return c
 
 # indices of a wedge must be reordered (see _parser.store_weg)

pyansys/cython/_reader.pyx

@@ -187,9 +187,21 @@ def read(filename, read_parameters=False, debug=False):
 
                 # element number and element type
                 et_val = line.decode().split(',')
-                elem_type.append([int(et_val[1]), int(et_val[2])])
+                try:
+                    int(et_val[1])
+                    elem_type.append([int(et_val[1]), int(et_val[2])])
+                except:
+                    if debug:
+                        print('Invalid "ET" command %s' % line.decode())
+                    continue
 
             elif b'EBLOCK,' == line[:7] or b'eblock,' == line[:7]:
+                if eblock_read:
+                    # Sometimes, DAT files contain two EBLOCKs.  Read
+                    # only the first block.
+                    if debug:
+                        print('EBLOCK already read, skipping...')
+                    continue
                 if debug:
                     print('reading EBLOCK')
 
@@ -283,6 +295,10 @@ def read(filename, read_parameters=False, debug=False):
         elif 'N' == line[0] or 'n' == line[0]:
             # if line contains the start of the node block
             if line[:6] == b'NBLOCK' or line[:6] == b'nblock':
+                if nodes_read:
+                    if debug:
+                        print('Skipping additional NBLOCK')
+                    continue
                 start_pos = n
                 if debug:
                     print('reading NBLOCK')
@@ -385,38 +401,36 @@ def read(filename, read_parameters=False, debug=False):
                 elif b'ELEM' in line_comp_type:
                     elem_comps[comname] = component_interperter(component)
 
-        elif '*' == line[0] and read_parameters:  # dim
+        elif '*' == line[0] and read_parameters:  # maybe *DIM
             if b'DIM' in line:
-                _, name, _, dim0, dim1, dim2, _ = line.decode().split(',')
-
-                # dim = []
-                # for d in [dim0, dim1, dim2]:
-                #     if d.strip():
-                #         dim.append(int(d))
-
-                # while dim[-1] == 1:
-                #     if len(dim) == 1:
-                #         break
-                #     del dim[-1]
-
-                # init_arr = np.zeros(np.prod(dim))
+                items = line.decode().split(',')
+                if len(items) < 3:
+                    continue
 
-                myfgets(line, raw, &n, fsize)
-                if b'PREAD' in line:
-                    if debug:
-                        print('reading PREAD')
+                name = items[1]
+                if items[2].lower() == 'string':
+                    myfgets(line, raw, &n, fsize)
+                    string_items = line.decode().split('=')
+                    if len(string_items) > 1:
+                        parameters[name] = string_items[1].replace("'", '').strip()
+                    else:
+                        parameters[name] = line.decode()
+                elif items[2].lower() == 'array':
+                    myfgets(line, raw, &n, fsize)
+                    if b'PREAD' in line:
+                        if debug:
+                            print('reading PREAD')
 
-                    _, name, arr_size = line.decode().split(',')
-                    name = name.strip()
-                    st = n
-                    en = raw.find(b'END PREAD', n)
-                    if debug:
-                        print(st, en)
-                    if st != -1 and en != -1:
-                        lines = raw[st:en].split()
-                        arr = np.genfromtxt(raw[st:en].split())
-                        # init_arr[arr.size] = arr
-                        parameters[name] = arr
+                        _, name, arr_size = line.decode().split(',')
+                        name = name.strip()
+                        st = n
+                        en = raw.find(b'END PREAD', n)
+                        if debug:
+                            print(st, en)
+                        if st != -1 and en != -1:
+                            lines = raw[st:en].split()
+                            arr = np.genfromtxt(raw[st:en].split())
+                            parameters[name] = arr
 
     # if the node block was not read for some reason
     if not nodes_read:

pyansys/mapdl.py

@@ -1,4 +1,5 @@
 """Module to control interaction with MAPDL through Python"""
+import time
 import glob
 import re
 import os
@@ -1244,7 +1245,8 @@ def _flush_stored(self):
 
         self._store_commands = False
         self._stored_commands = []
-        out = self.input(tmp_inp, write_to_log=False)
+        _ = self.input(tmp_inp, write_to_log=False)
+        time.sleep(0.1)  # allow MAPDL to close the file
         if os.path.isfile(tmp_out):
             self._response = '\n' + open(tmp_out).read()
 

pyansys/parameters.py

@@ -437,7 +437,7 @@ def _write_numpy_array(self, filename, arr):
             self._mapdl.upload(filename, progress_bar=False)
 
 def interp_star_status(status):
-    """Interperts \*STATUS command output from MAPDL
+    """Interprets \*STATUS command output from MAPDL
 
     Parameters
     ----------

tests/archive/test_archive.py

@@ -23,6 +23,7 @@
 
 test_path = os.path.dirname(os.path.abspath(__file__))
 testfiles_path = os.path.join(test_path, 'test_data')
+DAT_FILE = os.path.join(testfiles_path, 'Panel_Transient.dat')
 
 
 @pytest.fixture(scope='module')
@@ -40,6 +41,14 @@ def all_solid_cells_archive_linear():
     return pyansys.Archive(os.path.join(testfiles_path, 'all_solid_cells.cdb'),
                            force_linear=True)
 
+
+def test_load_dat():
+    arch = pyansys.Archive(DAT_FILE, read_parameters=True)
+    assert arch.n_node == 1263  # through inspection of the dat file
+    assert arch.n_elem == 160  # through inspection of the dat file
+    assert 'Panelflattern' in arch.parameters['_wb_userfiles_dir']
+
+
 def test_repr(hex_archive):
     assert '%s' % hex_archive.n_node in str(hex_archive)
     assert '%s' % hex_archive.n_elem in str(hex_archive)