NaxToPy 3.2.2__tar.gz → 3.2.3__tar.gz

{naxtopy-3.2.2/src/NaxToPy.egg-info → naxtopy-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NaxToPy
-Version: 3.2.2
+Version: 3.2.3
 Summary: Package for postprocessing FEM results in Python
 Home-page: https://www.idaerosolutions.com/Home/NaxToPy
 Download-URL: https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US
@@ -18,9 +18,9 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pythonnet>=3.0.4
-Requires-Dist: numpy>=1.26.0
+Requires-Dist: numpy>=1.25.1
 Requires-Dist: setuptools>=67.8.0
-Requires-Dist: h5py>=3.12.1
+Requires-Dist: h5py>=3.8.0
 Dynamic: download-url
 Dynamic: home-page
 Dynamic: license-file
@@ -292,7 +292,15 @@ is redundant. The coordinate system will prevail.
 1. BugFix: Logs message are not printed double when the buffer is called several times.
 2. BugFix: `get_load_case()` now returns correctly the load cases if it is called before and after calling `import_results_from_files()`.
 3. Refactor: New structure for the h5 files generated by N2PNeuber module.
-4. BugFix: MCID in CQUAD4 and CTRIA3 are now correctly readed from a bdf file.
+4. BugFix: MCID in CQUAD4 and CTRIA3 are now correctly read from a bdf file.
+
+### v.3.2.3
+1. Refactor: lower minimum required versions of NumPy and HDF5.
+   - numpy >= 1.25.1
+   - h5py >= 3.8.0
+2. Feat: Now is possible to read Nastran and Optistruct **SET**s. They are loaded as `N2Set`.
+3. Refactor: Reorder in `N2PNastranInputData.find_cards()` params making superElements optional. `category` is the first argument. `superElements` is now optional (default=None) to allow searching across all superelements by default.
+4. BugFix: Internal lazy dictionary for N2Cards (reading a Nastran or Optistruct input file) is fixed.
 
 # Documentation
 

{naxtopy-3.2.2 → naxtopy-3.2.3}/README.md

@@ -265,7 +265,15 @@ is redundant. The coordinate system will prevail.
 1. BugFix: Logs message are not printed double when the buffer is called several times.
 2. BugFix: `get_load_case()` now returns correctly the load cases if it is called before and after calling `import_results_from_files()`.
 3. Refactor: New structure for the h5 files generated by N2PNeuber module.
-4. BugFix: MCID in CQUAD4 and CTRIA3 are now correctly readed from a bdf file.
+4. BugFix: MCID in CQUAD4 and CTRIA3 are now correctly read from a bdf file.
+
+### v.3.2.3
+1. Refactor: lower minimum required versions of NumPy and HDF5.
+   - numpy >= 1.25.1
+   - h5py >= 3.8.0
+2. Feat: Now is possible to read Nastran and Optistruct **SET**s. They are loaded as `N2Set`.
+3. Refactor: Reorder in `N2PNastranInputData.find_cards()` params making superElements optional. `category` is the first argument. `superElements` is now optional (default=None) to allow searching across all superelements by default.
+4. BugFix: Internal lazy dictionary for N2Cards (reading a Nastran or Optistruct input file) is fixed.
 
 # Documentation
 

{naxtopy-3.2.2 → naxtopy-3.2.3}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "NaxToPy"
-version = "3.2.2"
+version = "3.2.3"
 license = {text = "MIT"}
 authors = [ { name = "Idaero Solutions", email = "manuel.sanchez@idaerosolutions.com" }, ]
 requires-python = ">=3.9"
 dependencies = ["pythonnet>=3.0.4",
-                "numpy>=1.26.0",
+                "numpy>=1.25.1",
                 "setuptools>=67.8.0",
-                "h5py>=3.12.1"]
+                "h5py>=3.8.0"]
 description = "Package for postprocessing FEM results in Python"
 readme = "README.md"
 classifiers = ["Intended Audience :: Science/Research",

{naxtopy-3.2.2 → naxtopy-3.2.3}/src/NaxToPy/Core/Classes/N2PNastranInputData.py

@@ -6,60 +6,86 @@ from typing import Union, overload, Literal
 
 from NaxToPy.Core.Errors.N2PLog import N2PLog
 
+from typing import Union
+
 class _LazyList(list):
     """
     A lazy list connected to a LazyDict. The items are lazily instantiated
-    from the LazyDict when accessed. It is immutable
+    from the LazyDict when accessed. It is immutable.
     """
     def __init__(self, lazy_dict):
-        super().__init__([None] * len(lazy_dict))  # Initialize list with placeholders
+        # Extract the C# object references (not the tuple keys!)
+        self._cs_refs = []
+        for hash_code, cs_list in lazy_dict._hash_to_cs_list.items():
+            self._cs_refs.extend(cs_list)
+        
+        super().__init__([None] * len(self._cs_refs))  # Initialize with placeholders
         self._lazy_dict = lazy_dict
-        self.keys = list(lazy_dict.keys())  # Extract keys from the LazyDict
 
     def __getitem__(self, index: Union[slice, int]):
-        if isinstance(index, int):
-            if not (0 <= index < len(self.keys)):
-                raise IndexError("list index out of range")
+        if isinstance(index, slice):
+            # Handle slice: load each item in the slice range
+            indices = range(*index.indices(len(self._cs_refs)))
+            return [self._load_item(i) for i in indices]
         else:
-            if index.stop > len(self.keys):
-                raise IndexError("list slice stop out of range")
-        
-        # Get the key corresponding to the index
-        key = self.keys[index]
+            # Handle single index
+            if not (-len(self._cs_refs) <= index < len(self._cs_refs)):
+                raise IndexError("list index out of range")
+            
+            # Normalize negative indices
+            if index < 0:
+                index = len(self._cs_refs) + index
+            
+            return self._load_item(index)
+    
+    def __iter__(self):
+        """Override iterator to trigger lazy loading."""
+        for i in range(len(self._cs_refs)):
+            yield self._load_item(i)
+    
+    def _load_item(self, index: int):
+        """Load and cache a single item at the given index."""
         value = super().__getitem__(index)
-
+        
         if value is None:
-            # Trigger the LazyDict to create the value
-            value = self._lazy_dict[key]
+            # Get the C# object reference and use it to access LazyDict
+            cs_ref = self._cs_refs[index]
+            value = self._lazy_dict[cs_ref]  # Pass C# object
             # Update the list with the created value
             super().__setitem__(index, value)
-
+        
         return value
-
+    
+    # Make it truly immutable by blocking mutations
     def __setitem__(self, index, value):
-        raise TypeError("ListBulkDataCards is immutable")
-
+        raise TypeError("_LazyList is immutable")
+    
+    def __delitem__(self, index):
+        raise TypeError("_LazyList is immutable")
+    
     def append(self, value):
-        raise TypeError("ListBulkDataCards is immutable")
-
+        raise TypeError("_LazyList is immutable")
+    
     def extend(self, iterable):
-        raise TypeError("ListBulkDataCards is immutable")
-
+        raise TypeError("_LazyList is immutable")
+    
     def insert(self, index, value):
-        raise TypeError("ListBulkDataCards is immutable")
-
-    def pop(self, index=-1):
-        raise TypeError("ListBulkDataCards is immutable")
-
+        raise TypeError("_LazyList is immutable")
+    
     def remove(self, value):
-        raise TypeError("ListBulkDataCards is immutable")
-
+        raise TypeError("_LazyList is immutable")
+    
+    def pop(self, index=-1):
+        raise TypeError("_LazyList is immutable")
+    
     def clear(self):
-        raise TypeError("ListBulkDataCards is immutable")
+        raise TypeError("_LazyList is immutable")
     
-    def __iter__(self):
-        for index in range(len(self.keys)):
-            yield self[index]  # Trigger lazy evaluation for each item
+    def sort(self, **kwargs):
+        raise TypeError("_LazyList is immutable")
+    
+    def reverse(self):
+        raise TypeError("_LazyList is immutable")
 
 
 class IndexTrackingList(list):
@@ -298,30 +324,44 @@ class N2PNastranInputData:
     #         self.__listcomments = [N2PInputDataNas(i) for i in self.__inputfiledata.StructuredInfo.ModelComments]
     #         return self.__listcomments
         
-    def find_cards(self, superElements: int,
+    def find_cards(self, 
                    category: Literal["GRID", "ELEMENT", "CONNECTOR", "PROPERTY", "MATERIAL", "COORDINATESYSTEM", "LOAD", "CONSTRAINT"],
-                   cardTypes: list[str] = None, filters: dict[str, object] = None) -> list [N2PCard]:
-        """Searches for cards based on specified criteria:
-        
-            - superElements (mandatory): integer number of 8 bits (1 byte)
-            - category (mandatory): Element, property, material, etc
-            - cardTypes (optional): Specific type of card: CQUAD4, PBEAM, COORD2R
-            - filters (optional): Each category has common fields. It is possible to filter acordinf to those fields.
+                   cardTypes: list[str] = None, filters: dict[str, object] = None, superElements: int = None) -> list [N2PCard]:
+        """Searches for cards based on specified criteria.
+
+        Args:
+            category: Card category to search. Valid values: GRID, ELEMENT, 
+                CONNECTOR, PROPERTY, MATERIAL, COORDINATESYSTEM, LOAD, CONSTRAINT.
+            cardTypes: Specific card types to filter by (e.g., CQUAD4, PBEAM, COORD2R).
+                If None, all card types within the category are returned.
+            filters: Dictionary of field-value pairs to filter results. Available 
+                fields depend on the category:
                 - GRID: "ID", "CP", "CD", "PS", "SEID", "X1", "X2", "X3"
-                - ELEMENT: "EID,  "PID", "NodeArray"
+                - ELEMENT: "EID", "PID", "NodeArray"
                 - CONNECTOR: 
                 - PROPERTY: "PID"
                 - MATERIAL: "MID"
                 - COORDINATESYSTEM: "CoordinateSystemIds", "ReferenceSystemId"
                 - LOAD:
                 - CONSTRAINT:
-
-        Example:
-
-            >>> grids = model.ModelInputData.find_cards(0, "GRID")
-            >>> cuads = model.ModelInputData.find_cards(0, "ELEMENT", ["CQUAD4"])
-            >>> pshell_3 = model.ModelInputData.find_cards(0, "PROPERTY", ["PSHELL"], {"PID": 3})
-            >>> grids_cp10 = model.ModelInputData.find_cards(0, "GRID", None, {"CP": 10})
+            superElements: Superelement (part) ID to search within. Use 0 for the 
+                global model. If None, searches across all superelements.
+
+        Returns:
+            List of N2PCard objects matching the specified criteria.
+
+        Examples:
+            >>> # Get all grids from global model
+            >>> grids = model.ModelInputData.find_cards("GRID", superElements=0)
+            
+            >>> # Get all CQUAD4 elements from global model
+            >>> quads = model.ModelInputData.find_cards("ELEMENT", ["CQUAD4"], superElements=0)
+            
+            >>> # Get PSHELL property with PID=3
+            >>> pshell_3 = model.ModelInputData.find_cards("PROPERTY", ["PSHELL"], {"PID": 3}, superElements=0)
+            
+            >>> # Get all grids with CP=10 across all superelements
+            >>> grids_cp10 = model.ModelInputData.find_cards("GRID", filters={"CP": 10})
         """
         # Convert superElements (part id) to System.Byte[] (or None)
         if not superElements and superElements != 0:
@@ -368,7 +408,7 @@ class N2PNastranInputData:
 
         cs_result = self.__inputfiledata.BulkDataSection.FindCards(part, category, cardTypes, filter_names, filter_values)
 
-        return [self.__dictcardscston2p[RuntimeHelpers.GetHashCode(i)] for i in cs_result]
+        return [self.__dictcardscston2p[i] for i in cs_result]
 
         
     def print_include_hierarchy(self) -> None:
@@ -13361,5 +13401,7 @@ CONSTRUCTDICT = {
     "SPCD_NASTRAN": SPCDNAS,
     "SPC1": SPC1,
     "SPCADD": SPCADD,
-    "UNSUPPORTED": N2PCard
+    "UNSUPPORTED": N2PCard,
+    "FIELD_MAPPING_ERROR_NASTRAN": N2PCard,
+    "FIELD_MAPPING_ERROR_OPTISTRUCT": N2PCard
 }

{naxtopy-3.2.2 → naxtopy-3.2.3}/src/NaxToPy/Core/Constants/Constants.py

@@ -1,15 +1,15 @@
 """Constants of the NaxToPy package"""
 
 # NaxToPy Version
-VERSION = "3.2.2"
+VERSION = "3.2.3"
 
 # Supported for Naxto:
 NAXTO_VERSION = '2025R2'
-NAXTO_STEP = "2"
-NAXTO_ADVANCED_INSTALLER = "2025.2.2"
+NAXTO_STEP = "3"
+NAXTO_ADVANCED_INSTALLER = "2025.2.3"
 
 # Assembly version of NaxToModel.dll
-VIZZER_COMPATIBILITY = ("5.2.0.2")
+VIZZER_COMPATIBILITY = ("5.2.0.3")
 """Tuple with the compatible versions of NaxToModel.dll"""
 
 # PYTHON EXTERNO ----------------------------------------------------------------------------------

{naxtopy-3.2.2 → naxtopy-3.2.3}/src/NaxToPy/Core/N2PModelContent.py

@@ -312,49 +312,47 @@ class N2PModelContent:
 
                 def __init__(self, keys_list: list):
                     super().__init__()
-                    self._hash_to_cs = dict()
-                    self._collision_counter = {}  # Track collision index per hash
+                    self._hash_to_cs_list = {}  # hash -> list of C# objects
                     
                     for cs_ref in keys_list:
                         if cs_ref.GetN2PCardType() not in CONSTRUCTDICT:
                             continue
                         
-                        hash = RuntimeHelpers.GetHashCode(cs_ref)
+                        hash_code = RuntimeHelpers.GetHashCode(cs_ref)
                         
-                        # Create unique key for collisions
-                        if hash in self._collision_counter:
-                            self._collision_counter[hash] += 1
-                            unique_key = (hash, self._collision_counter[hash])
-                        else:
-                            self._collision_counter[hash] = 0
-                            unique_key = (hash, 0)
+                        if hash_code not in self._hash_to_cs_list:
+                            self._hash_to_cs_list[hash_code] = []
                         
+                        self._hash_to_cs_list[hash_code].append(cs_ref)
+                        # Store with unique tuple key
+                        unique_key = (hash_code, len(self._hash_to_cs_list[hash_code]) - 1)
                         self[unique_key] = None
-                        self._hash_to_cs[unique_key] = cs_ref
 
-                def __getitem__(self, key):
-                    # Handle both (hash, index) and plain hash lookups
-                    if isinstance(key, tuple):
-                        hash, index = key
-                    else:
-                        hash = key
-                        index = 0
-                        key = (hash, 0)
+                def __getitem__(self, cs_key):
+                    hash_code = RuntimeHelpers.GetHashCode(cs_key)
                     
-                    if key not in self or self.get(key) is None:
-                        cs_ref = self._hash_to_cs.get(key)
-                        
-                        if not cs_ref:
-                            return None
-                        
-                        value = CONSTRUCTDICT.get(cs_ref.GetN2PCardType())
-                        if value:
-                            constructed = value(cs_ref)
-                            self[key] = constructed
-                            return constructed
-                        return None
-                    else:
-                        return self.get(key)
+                    if hash_code not in self._hash_to_cs_list:
+                        raise KeyError(f"Object not found")
+                    
+                    # Find the matching C# object by reference equality
+                    cs_objects = self._hash_to_cs_list[hash_code]
+                    
+                    for idx, cs_ref in enumerate(cs_objects):
+                        if System.Object.ReferenceEquals(cs_ref, cs_key):  # Checks C# object identity directly
+                            key = (hash_code, idx)
+                            
+                            if self.get(key) is None:
+                                # Lazy construction
+                                value = CONSTRUCTDICT.get(cs_ref.GetN2PCardType(), CONSTRUCTDICT["UNSUPPORTED"])
+                                if value:
+                                    constructed = value(cs_ref)
+                                    self[key] = constructed
+                                    return constructed
+                                return None
+                            else:
+                                return self.get(key)
+                    
+                    raise KeyError(f"Object not found in collision list")
 
             cslistbulkdatacards = self.__vzmodel.NasOptInputReader.BulkDataSection.GetCardDataBaseList()
             self.__modelinputdata = N2PNastranInputData(

{naxtopy-3.2.2 → naxtopy-3.2.3}/src/NaxToPy/Modules/static/fasteners/joints/N2PBolt.py

@@ -68,7 +68,7 @@ class N2PBolt:
         self._id: int = int(self.__info__.ID)
         self._one_dim_elems_id_list: list[int] = list(self.__info__.OneDimElemsIdList)
 
-        self._cards: list[N2PCard] = [self.__input_data_father__._N2PNastranInputData__dictcardscston2p[RuntimeHelpers.GetHashCode(i)]
+        self._cards: list[N2PCard] = [self.__input_data_father__._N2PNastranInputData__dictcardscston2p[i]
                                       for i in self.__info__.Cards if self.__info__.Cards[0] is not None]
         self._type: str = self.__info__.Type.ToString() 
 

{naxtopy-3.2.2 → naxtopy-3.2.3/src/NaxToPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NaxToPy
-Version: 3.2.2
+Version: 3.2.3
 Summary: Package for postprocessing FEM results in Python
 Home-page: https://www.idaerosolutions.com/Home/NaxToPy
 Download-URL: https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US
@@ -18,9 +18,9 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pythonnet>=3.0.4
-Requires-Dist: numpy>=1.26.0
+Requires-Dist: numpy>=1.25.1
 Requires-Dist: setuptools>=67.8.0
-Requires-Dist: h5py>=3.12.1
+Requires-Dist: h5py>=3.8.0
 Dynamic: download-url
 Dynamic: home-page
 Dynamic: license-file
@@ -292,7 +292,15 @@ is redundant. The coordinate system will prevail.
 1. BugFix: Logs message are not printed double when the buffer is called several times.
 2. BugFix: `get_load_case()` now returns correctly the load cases if it is called before and after calling `import_results_from_files()`.
 3. Refactor: New structure for the h5 files generated by N2PNeuber module.
-4. BugFix: MCID in CQUAD4 and CTRIA3 are now correctly readed from a bdf file.
+4. BugFix: MCID in CQUAD4 and CTRIA3 are now correctly read from a bdf file.
+
+### v.3.2.3
+1. Refactor: lower minimum required versions of NumPy and HDF5.
+   - numpy >= 1.25.1
+   - h5py >= 3.8.0
+2. Feat: Now is possible to read Nastran and Optistruct **SET**s. They are loaded as `N2Set`.
+3. Refactor: Reorder in `N2PNastranInputData.find_cards()` params making superElements optional. `category` is the first argument. `superElements` is now optional (default=None) to allow searching across all superelements by default.
+4. BugFix: Internal lazy dictionary for N2Cards (reading a Nastran or Optistruct input file) is fixed.
 
 # Documentation
 

{naxtopy-3.2.2 → naxtopy-3.2.3}/src/NaxToPy.egg-info/SOURCES.txt

@@ -108,8 +108,6 @@ src/NaxToPy/Modules/static/composite/__init__.py
 src/NaxToPy/Modules/static/composite/delamination/N2PEdgeDelamination.py
 src/NaxToPy/Modules/static/composite/delamination/__init__.py
 src/NaxToPy/Modules/static/composite/failure_analysis/N2PCompositeFailure.py
-src/NaxToPy/Modules/static/composite/failure_analysis/N2PFailureComposite_Backupy.py
-src/NaxToPy/Modules/static/composite/failure_analysis/N2PFailureComposite_Vectorisation.py
 src/NaxToPy/Modules/static/composite/failure_analysis/__init__.py
 src/NaxToPy/Modules/static/composite/sandwich/N2PSandwich.py
 src/NaxToPy/Modules/static/composite/sandwich/__init__.py

{naxtopy-3.2.2 → naxtopy-3.2.3}/src/NaxToPy.egg-info/requires.txt

@@ -1,4 +1,4 @@
 pythonnet>=3.0.4
-numpy>=1.26.0
+numpy>=1.25.1
 setuptools>=67.8.0
-h5py>=3.12.1
+h5py>=3.8.0