pyuff 2.6.0__tar.gz → 2.6.1__tar.gz

{pyuff-2.6.0 → pyuff-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyuff
-Version: 2.6.0
+Version: 2.6.1
 Summary: UFF (Universal File Format) read/write.
 Project-URL: homepage, https://github.com/ladisk/pyuff
 Project-URL: documentation, https://pyuff.readthedocs.io/en/latest/

{pyuff-2.6.0 → pyuff-2.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyuff"
-version = "2.6.0"
+version = "2.6.1"
 authors = [{name = "Primož Čermelj, Janko Slavič", email = "janko.slavic@fs.uni-lj.si"}]
 maintainers = [{name = "Janko Slavič et al.", email = "janko.slavic@fs.uni-lj.si"}]
 license = "MIT"

{pyuff-2.6.0 → pyuff-2.6.1}/pyuff/datasets/dataset_2414.py

@@ -668,12 +668,10 @@ def _write2414(fh, dset):
             
             # The data and structure of Record 14 and 15 depend on the 'dataset_location'
             if dset['dataset_location'] == 1:
-                for index in range(dset['node_nums'].shape[0]):
-                    fh.write('%10i\n' % (dset['node_nums'][index]))
-                    for field in dset['data_at_node'][index]:
-                        # number of values unknown, so loop
-                        fh.write('%13.5e' % (field))
-                    fh.write('\n')
+                # the number of values may differ from node to node
+                lines = ['%10i\n' % node + '%13.5e' * len(values) % tuple(values) + '\n'
+                         for node, values in zip(dset['node_nums'], dset['data_at_node'])]
+                fh.write(''.join(lines))
                 fh.write('%6i\n' % (-1))
 
             elif dset['dataset_location'] == 2:
@@ -788,10 +786,9 @@ def _extract2414(block_data):
             split_data = split_data.splitlines()
             if dset['dataset_location'] == 1:
                 # Data at nodes
-                record14 = np.asarray([str.split() for str in split_data[0::2]], 'U')
                 # record 15 not always same number of fields, so a list of ndarray
-                record15 = [np.array([float(elem) for elem in item.split()], float) for item in split_data[1::2]]
-                dset['node_nums'] = np.array(record14[:,0].copy(), dtype=int)
+                record15 = [np.array(line.split(), float) for line in split_data[1::2]]
+                dset['node_nums'] = np.array([line.split()[0] for line in split_data[0::2]], dtype=int)
                 dset['data_at_node'] = record15
 
             elif dset['dataset_location'] == 2:

{pyuff-2.6.0 → pyuff-2.6.1}/pyuff/datasets/dataset_55.py

@@ -426,26 +426,21 @@ def _write55(fh, dset):
                 dset['modal_b'].real, dset['modal_b'].imag))
         else:
             raise ValueError('Unsupported analysis type')
-        n = len(dset['node_nums'])
+        # Records 14 and 15 of every node: node number, then its values
         if data_type == 2:
             # Real data
             if n_data_per_node == 3:
-                for k in range(0, n):
-                    fh.write('%10i\n' % dset['node_nums'][k])
-                    fh.write('%13.5e%13.5e%13.5e\n' % (dset['r1'][k], dset['r2'][k], dset['r3'][k]))
+                rows = zip(dset['node_nums'], dset['r1'], dset['r2'], dset['r3'])
+                fh.write(''.join('%10i\n%13.5e%13.5e%13.5e\n' % row for row in rows))
             else:
-                for k in range(0, n):
-                    fh.write('%10i\n' % dset['node_nums'][k])
-                    fh.write('%13.5e%13.5e%13.5e%13.5e%13.5e%13.5e\n' %
-                                (dset['r1'][k], dset['r2'][k], dset['r3'][k], dset['r4'][k], dset['r5'][k],
-                                dset['r6'][k]))
+                rows = zip(dset['node_nums'], dset['r1'], dset['r2'], dset['r3'], dset['r4'], dset['r5'], dset['r6'])
+                fh.write(''.join('%10i\n%13.5e%13.5e%13.5e%13.5e%13.5e%13.5e\n' % row for row in rows))
         elif data_type == 5:
             # Complex data; n_data_per_node is assumed being 3
-            for k in range(0, n):
-                fh.write('%10i\n' % dset['node_nums'][k])
-                fh.write('%13.5e%13.5e%13.5e%13.5e%13.5e%13.5e\n' %
-                            (dset['r1'][k].real, dset['r1'][k].imag, dset['r2'][k].real, dset['r2'][k].imag,
-                            dset['r3'][k].real, dset['r3'][k].imag))
+            rows = zip(dset['node_nums'], dset['r1'], dset['r2'], dset['r3'])
+            fh.write(''.join('%10i\n%13.5e%13.5e%13.5e%13.5e%13.5e%13.5e\n' %
+                             (node, r1.real, r1.imag, r2.real, r2.imag, r3.real, r3.imag)
+                             for node, r1, r2, r3 in rows))
         else:
             raise ValueError('Unsupported data type')
         fh.write('%6i\n' % -1)
@@ -504,7 +499,9 @@ def _extract55(block_data):
             # Body
         split_data = ''.join(split_data[10:])
         node_nums = np.asarray([int(str) for str in split_data.splitlines(True)[::2]])
-        node_vals = np.array([[str[i*13:(i+1)*13] for i in range(len(str)//13) ] for str in split_data.splitlines(True)[1::2]], 'd').flatten()
+        # values are in fields of 13 characters, which may touch each other
+        value_lines = split_data.splitlines()[1::2]
+        node_vals = np.array([line[i:i + 13] for line in value_lines for i in range(0, len(line) - 12, 13)], 'd')
         if dset['data_type'] == 2:
             # real data
             if dset['n_data_per_node'] == 3:

{pyuff-2.6.0 → pyuff-2.6.1}/pyuff/pyuff.py

@@ -225,9 +225,11 @@ class UFF:
                     si = self._block_ind[ii, 0]
                     ei = self._block_ind[ii, 1]
                     try:
-                        block_data = data[si:ei + 1].splitlines()
-                        self._set_types[ii] = int(block_data[1][0:6])
-                        if block_data[1][6].lower() == 'b':
+                        # only the second line (data-set type, 'b' for binary) is
+                        # needed; it follows the '    -1' line within 200 bytes
+                        type_line = data[si:min(si + 200, ei + 1)].splitlines()[1]
+                        self._set_types[ii] = int(type_line[0:6])
+                        if type_line[6:7].lower() == b'b':
                             self._set_formats[ii] = 1
                     except:
                         # Some non-valid blocks found; ignore the exception
@@ -257,6 +259,11 @@ class UFF:
                      This usefull for large files.         
         """
         dset = []
+        if not self.file_exists():
+            raise Exception('Cannot read from a non-existing file: ' + self._filename)
+        if not self._refreshed:
+            if not self.refresh():
+                raise Exception('Cannot read from the file: ' + self._filename)
         if setn is None:
             read_range = range(0, self._n_sets)
         else:
@@ -264,11 +271,6 @@ class UFF:
                 read_range = [setn]
             else:
                 read_range = setn
-        if not self.file_exists():
-            raise Exception('Cannot read from a non-existing file: ' + self._filename)
-        if not self._refreshed:
-            if not self.refresh():
-                raise Exception('Cannot read from the file: ' + self._filename)
         try:
             for ii in read_range:
                 dset.append(self._read_set(ii, header_only=header_only))
@@ -324,6 +326,7 @@ class UFF:
                 self._write_set(dsets[ii], 'add', force_double=force_double)
         else:
             raise Exception('Unknown mode: ' + mode)
+        self.refresh()
 
     def _read_set(self, n, header_only=False):
         """
@@ -490,7 +493,9 @@ class UFF:
             raise  # re-raise the last exception
         else:
             fh.close()
-        self.refresh()
+        # the file has changed: its index of data-sets is rebuilt when it is
+        # needed next, not after every data-set (write_sets writes many)
+        self._refreshed = False
 
 
 if __name__ == '__main__':