pyuff 2.5.3__tar.gz → 2.5.5__tar.gz

{pyuff-2.5.3 → pyuff-2.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyuff
-Version: 2.5.3
+Version: 2.5.5
 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, 1858, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
+Read from and write of data-set types **15, 55, 58, 58b, 82, 151, 164, 1858, 2400, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
 
 Check out the `documentation <https://pyuff.readthedocs.io/en/latest/index.html>`_.
 

{pyuff-2.5.3 → pyuff-2.5.5}/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, 1858, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
+Read from and write of data-set types **15, 55, 58, 58b, 82, 151, 164, 1858, 2400, 2411, 2412, 2414, 2420, 2429, 2467** are supported.
 
 Check out the `documentation <https://pyuff.readthedocs.io/en/latest/index.html>`_.
 

{pyuff-2.5.3 → pyuff-2.5.5}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyuff"
-version = "2.5.3"
+version = "2.5.5"
 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.3 → pyuff-2.5.5}/pyuff/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.5.3"
+__version__ = "2.5.5"
 from .pyuff import *
 from .datasets import *
 

{pyuff-2.5.3 → pyuff-2.5.5}/pyuff/datasets/__init__.py

@@ -5,6 +5,7 @@ from .dataset_82 import prepare_82
 from .dataset_151 import prepare_151
 from .dataset_164 import prepare_164
 from .dataset_1858 import prepare_1858
+from .dataset_2400 import prepare_2400
 from .dataset_2411 import prepare_2411
 from .dataset_2412 import prepare_2412
 from .dataset_2414 import prepare_2414

pyuff-2.5.5/pyuff/datasets/dataset_2400.py

@@ -0,0 +1,208 @@
+import numpy as np
+
+from ..tools import _opt_fields, _parse_header_line, check_dict_for_none
+
+
+def get_structure_2400(raw=False):
+    """(source: https://www.ceas3.uc.edu/sdrluff/"""
+    out = """
+Universal Dataset Number: 2400
+
+Name:   Model Header
+-----------------------------------------------------------------------
+
+Record 1:       FORMAT(I12,2I6,I12)
+                Field 1      -- model UID
+                Field 2      -- entity type
+                Field 3      -- entity subtype
+                Field 4      -- version number
+Record 2:       FORMAT(40A2)
+                Field 1      -- entity name
+Record 3:       FORMAT(40A2)
+                Field 1      -- part number
+Record 4:       FORMAT(32I2)
+                Field 1      -- status mask (32 values)
+Record 5:       FORMAT(10A1,10A1,3I12)
+                Field 1      -- date (DD-MMM-YY)
+                Field 2      -- time (HH:MM:SS)
+                Field 3      -- IDM version ID
+                Field 4      -- IDM item ID
+                Field 5      -- primary parent UID
+Record 6:       FORMAT(I12)
+                Field 1      -- optimization switches
+                                =0  geometry OFF, analysis OFF
+                                =1  geometry ON,  analysis OFF
+                                =2  geometry OFF, analysis ON
+                                =3  geometry ON,  analysis ON
+
+-----------------------------------------------------------------
+"""
+    if raw:
+        return out
+    else:
+        print(out)
+
+
+def _write2400(fh, dset):
+    """Writes dset data - data-set 2400 - to an open file fh."""
+    try:
+        dset = _opt_fields(dset, {
+            'model_uid': 0,
+            'entity_type': 0,
+            'entity_subtype': 0,
+            'version_number': 0,
+            'entity_name': '',
+            'part_number': '',
+            'status_mask': [0] * 32,
+            'date': '',
+            'time': '',
+            'idm_version_id': 0,
+            'idm_item_id': 0,
+            'primary_parent_uid': 0,
+            'optimization_switches': 0,
+        })
+        fh.write('%6i\n%6i%74s\n' % (-1, 2400, ' '))
+        fh.write('%12i%6i%6i%12i\n' % (dset['model_uid'], dset['entity_type'],
+                                        dset['entity_subtype'], dset['version_number']))
+        fh.write('%-80s\n' % dset['entity_name'])
+        fh.write('%-80s\n' % dset['part_number'])
+        fh.write('%s\n' % ''.join(['%2i' % v for v in dset['status_mask']]))
+        fh.write('%-10s%-10s%12i%12i%12i\n' % (dset['date'], dset['time'],
+                                                 dset['idm_version_id'], dset['idm_item_id'],
+                                                 dset['primary_parent_uid']))
+        fh.write('%12i\n' % dset['optimization_switches'])
+        fh.write('%6i\n' % -1)
+    except KeyError as msg:
+        raise Exception('The required key \'' + msg.args[0] + '\' not present when writing data-set #2400')
+    except:
+        raise Exception('Error writing data-set #2400')
+
+
+def _extract2400(block_data):
+    """Extract dset data - data-set 2400."""
+    dset = {'type': 2400}
+    try:
+        split_data = block_data.splitlines(True)
+        dset.update(_parse_header_line(split_data[2], 4, [12, 6, 6, 12], [2, 2, 2, 2],
+                                       ['model_uid', 'entity_type', 'entity_subtype', 'version_number']))
+        dset.update(_parse_header_line(split_data[3], 1, [80], [1], ['entity_name']))
+        dset.update(_parse_header_line(split_data[4], 1, [80], [1], ['part_number']))
+        # Record 4: 32 consecutive I2 fields
+        status_line = split_data[5]
+        dset['status_mask'] = [int(status_line[i*2:(i*2)+2]) for i in range(32)]
+        dset.update(_parse_header_line(split_data[6], 5, [10, 10, 12, 12, 12], [1, 1, 2, 2, 2],
+                                       ['date', 'time', 'idm_version_id', 'idm_item_id', 'primary_parent_uid']))
+        dset.update(_parse_header_line(split_data[7], 1, [12], [2], ['optimization_switches']))
+    except:
+        raise Exception('Error reading data-set #2400')
+    return dset
+
+
+def prepare_2400(
+        model_uid=None,
+        entity_type=None,
+        entity_subtype=None,
+        version_number=None,
+        entity_name=None,
+        part_number=None,
+        status_mask=None,
+        date=None,
+        time=None,
+        idm_version_id=None,
+        idm_item_id=None,
+        primary_parent_uid=None,
+        optimization_switches=None,
+        return_full_dict=False):
+    """Name: Model Header
+
+    R-Record, F-Field
+
+    :param model_uid: R1 F1, Model UID
+    :param entity_type: R1 F2, Entity type
+    :param entity_subtype: R1 F3, Entity subtype
+    :param version_number: R1 F4, Version number
+    :param entity_name: R2 F1, Entity name
+    :param part_number: R3 F1, Part number
+    :param status_mask: R4 F1, Status mask (list of 32 integers)
+    :param date: R5 F1, Date (DD-MMM-YY)
+    :param time: R5 F2, Time (HH:MM:SS)
+    :param idm_version_id: R5 F3, IDM version ID
+    :param idm_item_id: R5 F4, IDM item ID
+    :param primary_parent_uid: R5 F5, Primary parent UID
+    :param optimization_switches: R6 F1, Optimization switches
+    :param return_full_dict: If True full dict with all keys is returned, else only specified arguments are included
+
+    **Test prepare_2400**
+
+    >>> import pyuff
+    >>> import os
+    >>> save_to_file = 'test_pyuff'
+    >>> dataset = pyuff.prepare_2400(
+    >>>     model_uid=1,
+    >>>     entity_type=7,
+    >>>     entity_subtype=-1,
+    >>>     version_number=0,
+    >>>     entity_name='MyModel',
+    >>>     part_number='PART-001',
+    >>>     status_mask=[0]*32,
+    >>>     date='27-FEB-26',
+    >>>     time='12:00:00',
+    >>>     idm_version_id=0,
+    >>>     idm_item_id=0,
+    >>>     primary_parent_uid=0,
+    >>>     optimization_switches=0)
+    >>> if save_to_file:
+    >>>     if os.path.exists(save_to_file):
+    >>>         os.remove(save_to_file)
+    >>>     uffwrite = pyuff.UFF(save_to_file)
+    >>>     uffwrite._write_set(dataset, 'add')
+    >>> dataset
+    """
+    if np.array(model_uid).dtype != int and model_uid != None:
+        raise TypeError('model_uid must be integer')
+    if np.array(entity_type).dtype != int and entity_type != None:
+        raise TypeError('entity_type must be integer')
+    if np.array(entity_subtype).dtype != int and entity_subtype != None:
+        raise TypeError('entity_subtype must be integer')
+    if np.array(version_number).dtype != int and version_number != None:
+        raise TypeError('version_number must be integer')
+    if type(entity_name) != str and entity_name != None:
+        raise TypeError('entity_name must be string')
+    if type(part_number) != str and part_number != None:
+        raise TypeError('part_number must be string')
+    if status_mask != None and (not hasattr(status_mask, '__len__') or len(status_mask) != 32):
+        raise ValueError('status_mask must be a list of 32 integers')
+    if type(date) != str and date != None:
+        raise TypeError('date must be string')
+    if type(time) != str and time != None:
+        raise TypeError('time must be string')
+    if np.array(idm_version_id).dtype != int and idm_version_id != None:
+        raise TypeError('idm_version_id must be integer')
+    if np.array(idm_item_id).dtype != int and idm_item_id != None:
+        raise TypeError('idm_item_id must be integer')
+    if np.array(primary_parent_uid).dtype != int and primary_parent_uid != None:
+        raise TypeError('primary_parent_uid must be integer')
+    if np.array(optimization_switches).dtype != int and optimization_switches != None:
+        raise TypeError('optimization_switches must be integer')
+
+    dataset = {
+        'type': 2400,
+        'model_uid': model_uid,
+        'entity_type': entity_type,
+        'entity_subtype': entity_subtype,
+        'version_number': version_number,
+        'entity_name': entity_name,
+        'part_number': part_number,
+        'status_mask': status_mask,
+        'date': date,
+        'time': time,
+        'idm_version_id': idm_version_id,
+        'idm_item_id': idm_item_id,
+        'primary_parent_uid': primary_parent_uid,
+        'optimization_switches': optimization_switches,
+    }
+
+    if return_full_dict is False:
+        dataset = check_dict_for_none(dataset)
+
+    return dataset

{pyuff-2.5.3 → pyuff-2.5.5}/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.3 → pyuff-2.5.5}/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

{pyuff-2.5.3 → pyuff-2.5.5}/pyuff/pyuff.py

@@ -7,7 +7,7 @@ This module defines an UFF class to manipulate with the
 UFF (Universal File Format) files, i.e., to read from and write
 to UFF files. Among the variety of UFF formats, only some of the
 formats (data-set types) frequently used in structural dynamics
-are supported: **15, 55, 58, 58b, 82, 151, 164, 2411, 2412, 2414, 2420, 2429, 2467** 
+are supported: **15, 55, 58, 58b, 82, 151, 164, 1858, 2400, 2411, 2412, 2414, 2420, 2429, 2467** 
 Data-set **58b** is actually a hybrid format [1]_ where the signal is written in the
 binary form, while the header-part is slightly different from 58 but still in the
 ascii format.
@@ -54,6 +54,7 @@ from .datasets.dataset_82 import _write82, _extract82, get_structure_82
 from .datasets.dataset_151 import _write151, _extract151, get_structure_151
 from .datasets.dataset_164 import _write164, _extract164, get_structure_164
 from .datasets.dataset_1858 import _write1858, _extract1858, get_structure_1858
+from .datasets.dataset_2400 import _write2400, _extract2400, get_structure_2400
 from .datasets.dataset_2411 import _write2411, _extract2411, get_structure_2411
 from .datasets.dataset_2412 import _write2412, _extract2412, get_structure_2412
 from .datasets.dataset_2414 import _write2414, _extract2414, get_structure_2414
@@ -61,7 +62,7 @@ from .datasets.dataset_2420 import _write2420, _extract2420, get_structure_2420
 from .datasets.dataset_2429 import _write2429, _extract2429, get_structure_2429
 from .datasets.dataset_2467 import _write2467, _extract2467, get_structure_2467
 
-_SUPPORTED_SETS = ['15', '55', '58', '58b', '82', '151', '164', '1858', '2411', '2412', '2414', '2420', '2429', '2467']
+_SUPPORTED_SETS = ['15', '55', '58', '58b', '82', '151', '164', '1858', '2400', '2411', '2412', '2414', '2420', '2429', '2467']
 
 
 class UFF:
@@ -379,6 +380,8 @@ class UFF:
             dset = _extract164(block_data)
         elif self._set_types[int(n)] == 1858:
             dset = _extract1858(block_data)
+        elif self._set_types[int(n)] == 2400:
+            dset = _extract2400(block_data)
         elif self._set_types[int(n)] == 2411:
             dset = _extract2411(block_data)  # TEMP ADD
         elif self._set_types[int(n)] == 2412:
@@ -416,13 +419,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:
@@ -452,6 +455,8 @@ class UFF:
                 _write164(fh, dset)
             elif set_type == 1858:
                 _write1858(fh, dset)
+            elif set_type == 2400:
+                _write2400(fh, dset)
             elif set_type == 2411:
                 _write2411(fh, dset)
             elif set_type == 2412: