pyuff 2.5.2__tar.gz → 2.5.4__tar.gz

{pyuff-2.5.2 → pyuff-2.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyuff
-Version: 2.5.2
+Version: 2.5.4
 Summary: UFF (Universal File Format) read/write.
 Project-URL: homepage, https://github.com/ladisk/pyuff
 Project-URL: documentation, https://pyuff.readthedocs.io/en/latest/
@@ -15,7 +15,7 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: numpy
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'
@@ -36,7 +36,7 @@ Universal File Format read and write
 ------------------------------------
 This module defines an UFF class to manipulate with the UFF (Universal File Format) files.
 
-Read from and write of data-set types **15, 55, 58, 58b, 82, 151, 164, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
+Read from and write of data-set types **15, 55, 58, 58b, 82, 151, 164, 1858, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
 
 Check out the `documentation <https://pyuff.readthedocs.io/en/latest/index.html>`_.
 

{pyuff-2.5.2 → pyuff-2.5.4}/README.rst

@@ -7,7 +7,7 @@ Universal File Format read and write
 ------------------------------------
 This module defines an UFF class to manipulate with the UFF (Universal File Format) files.
 
-Read from and write of data-set types **15, 55, 58, 58b, 82, 151, 164, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
+Read from and write of data-set types **15, 55, 58, 58b, 82, 151, 164, 1858, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
 
 Check out the `documentation <https://pyuff.readthedocs.io/en/latest/index.html>`_.
 

{pyuff-2.5.2 → pyuff-2.5.4}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyuff"
-version = "2.5.2"
+version = "2.5.4"
 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"
 description = "UFF (Universal File Format) read/write."
 readme = "README.rst"
 keywords = ['UFF', 'UNV', 'Universal File Format', 'read/write']
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "numpy",
 ]

{pyuff-2.5.2 → pyuff-2.5.4}/pyuff/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.5.2"
+__version__ = "2.5.4"
 from .pyuff import *
 from .datasets import *
 

{pyuff-2.5.2 → pyuff-2.5.4}/pyuff/datasets/dataset_55.py

@@ -672,18 +672,18 @@ def prepare_55(
         raise ValueError('data_type can be 2:Real or 5:Complex')
     if np.array(n_data_per_node).dtype != int and n_data_per_node != None:
         raise TypeError('n_data_per_node must be integers')
-    if np.array(r1).dtype != float and r1 != None:
-        raise TypeError('r1 must have float values')
-    if np.array(r2).dtype != float and r2 != None:
-        raise TypeError('r2 must have float values')
-    if np.array(r3).dtype != float and r3 != None:
-        raise TypeError('r3 must have float values')
-    if np.array(r4).dtype != float and r4 != None:
-        raise TypeError('r4 must have float values')
-    if np.array(r5).dtype != float and r5 != None:
-        raise TypeError('r5 must have float values')
-    if np.array(r6).dtype != float and r6 != None:
-        raise TypeError('r6 must have float values')
+    if not np.issubdtype(np.array(r1).dtype, np.number) and r1 != None:
+        raise TypeError('r1 must have numeric (float or complex) values')
+    if not np.issubdtype(np.array(r2).dtype, np.number) and r2 != None:
+        raise TypeError('r2 must have numeric (float or complex) values')
+    if not np.issubdtype(np.array(r3).dtype, np.number) and r3 != None:
+        raise TypeError('r3 must have numeric (float or complex) values')
+    if not np.issubdtype(np.array(r4).dtype, np.number) and r4 != None:
+        raise TypeError('r4 must have numeric (float or complex) values')
+    if not np.issubdtype(np.array(r5).dtype, np.number) and r5 != None:
+        raise TypeError('r5 must have numeric (float or complex) values')
+    if not np.issubdtype(np.array(r6).dtype, np.number) and r6 != None:
+        raise TypeError('r6 must have numeric (float or complex) values')
     if type(load_case) != int and load_case != None:
         raise TypeError('load_case must be integer')
     if type(mode_n) != int and mode_n != None:
@@ -696,12 +696,12 @@ def prepare_55(
         raise TypeError('modal_damp_vis must be float')
     if type(modal_damp_his) != float and modal_damp_his != None:
         raise TypeError('modal_damp_his must be float')
-    if np.array(eig).dtype != float and eig != None:
-        raise TypeError('eig must be float')
-    if np.array(modal_a).dtype != float and modal_a != None:
-        raise TypeError('modal_a must be float')   
-    if np.array(modal_b).dtype != float and modal_b != None:
-        raise TypeError('modal_b must be float')
+    if not np.issubdtype(np.array(eig).dtype, np.number) and eig != None:
+        raise TypeError('eig must be numeric (float or complex)')
+    if not np.issubdtype(np.array(modal_a).dtype, np.number) and modal_a != None:
+        raise TypeError('modal_a must be numeric (float or complex)')
+    if not np.issubdtype(np.array(modal_b).dtype, np.number) and modal_b != None:
+        raise TypeError('modal_b must be numeric (float or complex)')
     if type(freq_step_n) != int and freq_step_n != None:
         raise TypeError('freq_step_n must be int')
     if np.array(node_nums).dtype != int and node_nums != None:

{pyuff-2.5.2 → pyuff-2.5.4}/pyuff/datasets/dataset_58.py

@@ -902,11 +902,6 @@ def _write58(fh, dset, mode='add', _filename=None, force_double=True):
 
         # handling abscissa spacing automatically
         # is_even = len( set( [ dset['x'][ii]-dset['x'][ii-1] for ii in range(1,len(dset['x'])) ] ) ) == 1
-        # decode utf to ascii
-        for k, v in dset.items():
-            if type(v) == str:
-                dset[k] = v.encode("utf-8").decode('ascii','ignore')
-
         dset['abscissa_min'] = dset['x'][0]
         dx = dset['x'][1] - dset['x'][0]
         fh.write('%6i\n%6i' % (-1, 58))
@@ -977,9 +972,9 @@ def _write58(fh, dset, mode='add', _filename=None, force_double=True):
                 [fh.write(struct.pack('>d', datai)) for datai in data]
             fh.close()
             if mode.lower() == 'overwrite':
-                fh = open(_filename, 'wt')
+                fh = open(_filename, 'wt', encoding='utf-8')
             elif mode.lower() == 'add':
-                fh = open(_filename, 'at')
+                fh = open(_filename, 'at', encoding='utf-8')
         else:
             if is_double: # write double precision
                 n4_blocks = len(data) // 4
@@ -993,7 +988,7 @@ def _write58(fh, dset, mode='add', _filename=None, force_double=True):
                         fh.write(n4_blocks * '%13.5e%20.11e%13.5e%20.11e\n' % tuple(data[:4 * n4_blocks]))
                         if rem_vals > 0:
                             fmt = ['%13.5e', '%20.11e', '%13.5e', '%20.11e']
-                            fh.write((''.join(fmt[rem_vals]) + '\n') % tuple(data[4 * n4_blocks:]))
+                            fh.write((''.join(fmt[:rem_vals]) + '\n') % tuple(data[4 * n4_blocks:]))
                 else:
                     if is_even:
                         fh.write(n4_blocks * '%20.11e%20.11e%20.11e%20.11e\n' % tuple(data[:4 * n4_blocks]))

{pyuff-2.5.2 → pyuff-2.5.4}/pyuff/pyuff.py

@@ -416,13 +416,13 @@ class UFF:
         if mode.lower() == 'overwrite':
             # overwrite mode
             try:
-                fh = open(self._filename, 'wt')
+                fh = open(self._filename, 'wt', encoding='utf-8')
             except:
                 raise Exception('Cannot access the file: ' + self._filename + ' to write to.')
         elif mode.lower() == 'add':
             # add (append) mode
             try:
-                fh = open(self._filename, 'at')
+                fh = open(self._filename, 'at', encoding='utf-8')
             except:
                 raise Exception('Cannot access the file: ' + self._filename + ' to write to.')
         else: