NaxToPy 3.2.1__tar.gz → 3.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NaxToPy
-Version: 3.2.1
+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
@@ -285,9 +285,23 @@ is redundant. The coordinate system will prevail.
 
 ### v.3.2.1
 1. BugFix: Derived components are now founded right while using `get_result_by_LCs_Incr()`.
-1. BugFix: All sections are now founded right while using `get_result_by_LCs_Incr()`.
+2. BugFix: All sections are now founded right while using `get_result_by_LCs_Incr()`.
 3. BugFix: Now symbols like "\" or "-" are supported as part of the name of Components and Load Cases while creating new derived Components and Derived Load Cases.
 
+### v.3.2.2
+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 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** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

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

@@ -258,9 +258,23 @@ is redundant. The coordinate system will prevail.
 
 ### v.3.2.1
 1. BugFix: Derived components are now founded right while using `get_result_by_LCs_Incr()`.
-1. BugFix: All sections are now founded right while using `get_result_by_LCs_Incr()`.
+2. BugFix: All sections are now founded right while using `get_result_by_LCs_Incr()`.
 3. BugFix: Now symbols like "\" or "-" are supported as part of the name of Components and Load Cases while creating new derived Components and Derived Load Cases.
 
+### v.3.2.2
+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 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** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

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

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "NaxToPy"
-version = "3.2.1"
+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.1 → naxtopy-3.2.3}/src/NaxToPy/Core/Classes/N2PComponent.py

@@ -150,7 +150,7 @@ class N2PComponent:
             * -10: User defined coordinate system
             * -20: Element/Node user defined coordinate system
             * -1000: Analysis coordinate system (default)
-            * \>0: Solver ID of predefined coordinate system
+            * >0: Solver ID of predefined coordinate system
             
             .. note::
             
@@ -251,7 +251,7 @@ class N2PComponent:
             * -10: User defined coordinate system
             * -20: Element/Node user defined coordinate system
             * -1000: Analysis coordinate system (default)
-            * \>0: Solver ID of predefined coordinate system
+            * >0: Solver ID of predefined coordinate system
             
             .. note::
             

{naxtopy-3.2.1 → 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):
@@ -230,6 +256,7 @@ class N2PNastranInputData:
         "__executivecontrolinstructions",
         "__listcomments",
         "__lazylist",
+        "__bdfFiles"
     )
 
     def __init__(self, dictcardscston2p: dict, inputfiledata):
@@ -239,6 +266,7 @@ class N2PNastranInputData:
         self.__executivecontrolinstructions = []
         self.__listcomments = []
         self.__lazylist = None
+        self.__bdfFiles = {bdf.BdfFilePath: bdf for bdf in inputfiledata.BdfFiles}
 
     @property
     def ListBulkDataCards(self) -> list[N2PCard]:
@@ -296,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:
@@ -366,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:
@@ -417,9 +459,33 @@ class N2PNastranInputData:
                     N2PLog.Error.E100(error.StatusMessage)
         return failed_cards
 
-    def create_card(self, card_type: str, parentBdfFile: object, rawContent: str = None, superElemntId:int = 0) -> N2PCard:
-        """Method that creates a new card of the type specified."""
-        card = self.__inputfiledata.CreateCard(card_type, parentBdfFile, rawContent, superElemntId)
+    def create_card(self, card_type: str, bdf_file: str, rawContent: str = None, superElemntId:int = 0) -> N2PCard:
+        """Method that creates a new card of the type specified. By default, the card is created empty, with small field format.
+        
+        Example:
+            >>> new_cbar = model.ModelInputData.create_card("CBAR", "C:\\bdf\\mesh\\model.bdf")
+            >>> # new_cbar is now a N2PCard object of type CBAR empty. You can set its properties:
+            >>> new_cbar.EID = 1001
+            >>> new_cbar.PID = 2001
+            >>> new_cbar.GA = 10
+            >>> new_cbar.GB = 20
+            >>> new_cbar.X1 = 1.0
+            >>> new_cbar.X2 = 0.0
+            >>> new_cbar.X3 = 0.0
+
+            >>> # It is also possible to create a card with raw content and specifying the superelement id:
+            >>> raw_content = "CBAR        1002    2001      30      40     0.0     1.0     0.0"
+            >>> new_cbar2 = model.ModelInputData.create_card("CBAR", "C:\\bdf\\mesh\\model.bdf", rawContent=raw_content, superElemntId=0)
+
+        """
+        bdfFileObject = self.__bdfFiles.get(bdf_file, None)
+        if bdfFileObject is None:
+            N2PLog.Warning.W212(bdf_file)
+            bdfFileObject = self.__inputfiledata.BdfFiles[0]
+        card = self.__inputfiledata.BulkDataSection.CreateCard(card_type, bdfFileObject, rawContent, superElemntId)
+        card.CardType = card_type
+        card.FieldsFormat = "SMALL"
+
         return card
 
 class N2PModelInputData(N2PNastranInputData):
@@ -13335,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.1 → naxtopy-3.2.3}/src/NaxToPy/Core/Constants/Constants.py

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

{naxtopy-3.2.1 → naxtopy-3.2.3}/src/NaxToPy/Core/Errors/N2PLog.py

@@ -446,7 +446,7 @@ own information message. Use the following structure as a standard message (I +
         def I116() -> None:
             """ Working with the installed naxto libraries
             """
-            message = "I116: Working with NaxTo installed libraries (in Program Files\IDAERO)"
+            message = r"I116: Working with NaxTo installed libraries (in Program Files\IDAERO)"
             N2PLog._N2PLog__logger.info(message)
 
         @staticmethod
@@ -676,6 +676,14 @@ own information message. Use the following structure as a standard message (I +
             message = f"W211: The result asked is not available in all the load cases selected"
             N2PLog._N2PLog__logger.warning(message)
 
+        @staticmethod
+        def W212(path) -> None:
+            """
+            Warning raised when the path for the new N2PCard is not in the include's tree.
+            """
+            message = f"W212: The path '{path}' for the new N2PCard is not in the include's tree. The card will be added in the launch bdf."
+            N2PLog._N2PLog__logger.warning(message)
+
         @staticmethod
         def W300() -> None:
             """ Warning raised when there are more dimensions than points in n2p.envelope
@@ -1259,6 +1267,14 @@ own information message. Use the following structure as a standard message (I +
             message = f"E114: THE FILE {file} IS A INPUT TEXT FILE BUT THE SOLVER IS UNKNOWN. SPECIFY THE 'file_type'."
             N2PLog._N2PLog__logger.error(message)
             return message
+        
+        @staticmethod
+        def E115() -> str:
+            """ Error raised when a dictionary for filtering is passed but not where the filter is applied
+            """
+            message = f"E115: A DICTIONARY FOR FILTERING IS PASSED BUT NOT WHERE THE FILTER IS APPLIED. 'filter' MUST BE 'ELEMENTS', 'PROPERTIES', 'PARTS' OR 'NODES'"
+            N2PLog._N2PLog__logger.error(message)
+            return message
 
         @staticmethod
         def E201(*args) -> None:

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

@@ -66,8 +66,9 @@ class N2PModelContent:
         """
         # 0 ) Genera el archivo .log y añade los logs de la importación ------------------------------------------------
         # Configura el logger para que escriba automaticamente los logs ------------------------------------------------
-        N2PLog._N2PLog__fh.write_buffered_records()
-        N2PLog._N2PLog__fh.immediate_logging()
+        if not N2PLog._N2PLog__fh.immediate:
+            N2PLog._N2PLog__fh.write_buffered_records()
+            N2PLog._N2PLog__fh.immediate_logging()
 
         # 1) Extraer Toda la Informacion Principal de NaxTo ------------------------------------------------------------
         # Inicializador de atributos
@@ -311,28 +312,47 @@ class N2PModelContent:
 
                 def __init__(self, keys_list: list):
                     super().__init__()
-                    self._hash_to_cs = dict()
+                    self._hash_to_cs_list = {}  # hash -> list of C# objects
+                    
                     for cs_ref in keys_list:
                         if cs_ref.GetN2PCardType() not in CONSTRUCTDICT:
                             continue
-                        # As the C# references can be moved by the CLR garbage collector, a dictionary using the
-                        # hash is used.
-                        hash = RuntimeHelpers.GetHashCode(cs_ref)
-                        self[hash] = None
-                        self._hash_to_cs[hash] = cs_ref
-
-                def __getitem__(self, hash):
-
-                    if hash not in self or self.get(hash) is None:
-                        cs_ref = self._hash_to_cs.get(hash)
-                        value = CONSTRUCTDICT.get(cs_ref.GetN2PCardType())
-                        if value:
-                            self[hash] = value(cs_ref)
-                        else:
-                            return value
-                        return value(cs_ref)
-                    else:
-                        return self.get(hash)
+                        
+                        hash_code = RuntimeHelpers.GetHashCode(cs_ref)
+                        
+                        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
+
+                def __getitem__(self, cs_key):
+                    hash_code = RuntimeHelpers.GetHashCode(cs_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(
@@ -1427,11 +1447,13 @@ class N2PModelContent:
         for result_file in results_files:
             if os.path.isfile(result_file):
                 self.__vzmodel.ImportResults(str(result_file))
-                self._import_load_cases()
                 N2PLog.Debug.D201(str(result_file))
             else:
                 N2PLog.Error.E232(str(result_file))
 
+        self._import_load_cases()
+        self.__LCs_by_ID__ = {lc.ID: lc for lc in self.LoadCases}
+
     # ------------------------------------------------------------------------------------------------------------------
 
     ####################################################################################################################
@@ -2422,7 +2444,7 @@ def load_model(path: str, parallelprocessing: bool = True,
             ("InputFileAbaqus") or binary result file ("Binary").
         filter: str.
             Optional. It specifies what to load in dict_gen (elements, properties, parts or nodes)
-        dict_gem: dict.
+        dict_gen: dict.
             Optional. Dictionary that represents what elements/properties/parts/nodes to load. For 
             elements and nodes, the dictionary is in the form {Part ID (str): [Elements ID/Nodes ID]}. For parts or 
             properties, the dictionary could simply be in the form {Part ID (str) / Property ID (str): []}. 
@@ -2451,6 +2473,9 @@ def load_model(path: str, parallelprocessing: bool = True,
     if path.split(".")[-1] in BINARY_EXTENSIONS and file_type == "InputFileNastran":
         N2PLog.Error.E111()
 
+    if dict_gen and not filter:
+        N2PLog.Error.E115()
+
     return N2PModelContent(path, parallelprocessing, file_type, __transform_dict(dict_gen), filter, loadconnectors=loadconnectors)
 # ----------------------------------------------------------------------------------------------------------------------
 

{naxtopy-3.2.1 → naxtopy-3.2.3}/src/NaxToPy/Modules/common/data_input_hdf5.py

@@ -31,6 +31,7 @@ class DataEntry:
         self._loadcase: int = None 
         self._loadcase_description: str = "LOAD CASE"
         self._loadcase_name: str = None
+        self._solution_type: int = 101 
         self._increment: int = 1 
         self._increment_description: str = "INCREMENT"
         self._increment_value: float = 0.0 
@@ -38,6 +39,7 @@ class DataEntry:
         self._section_description: str = "SECTION"
         self._part: str = None 
         self._data: np.ndarray = None
+        
         self._data_input: np.ndarray = None
         self._data_input_name: str = None
         self._data_description: str = "Data"
@@ -217,7 +219,15 @@ class DataEntry:
 
         return self._loadcase_name
     #-------------------------------------------------------------------------------------------------------------------
-
+    
+    # Method to obtain the Solution Type ------------------------------------------------------------------------------
+    @property
+    def SolutionType(self) -> int:
+        """
+        Returns the Solution Type ID (e.g., 101 for Nastran linear static).
+        """
+        return self._solution_type
+    # ------------------------------------------------------------------------------------------------------------------
 
 
     # Setters ----------------------------------------------------------------------------------------------------------
@@ -354,3 +364,12 @@ class DataEntry:
             N2PLog.Error.E535(value, str)
     # ------------------------------------------------------------------------------------------------------------------
 
+
+    @SolutionType.setter
+    def SolutionType(self, value: int) -> None:
+        if type(value) == int: 
+            self._solution_type = value 
+        else: 
+            N2PLog.Error.E535(value, int)
+    # ------------------------------------------------------------------------------------------------------------------
+    

{naxtopy-3.2.1 → naxtopy-3.2.3}/src/NaxToPy/Modules/common/hdf5.py

@@ -80,10 +80,10 @@ class HDF5_NaxTo:
 
     # Method used to create an HDF5 file -------------------------------------------------------------------------------
     def create_hdf5(self) -> None:
-
         """
         Method used to create an HDF5 file, either in disk (if the FilePath attribute has been filled in), or in memory 
-        (if the FilePath boolean attribute has not been filled in). This file will have the following default attributes: 
+        (if the FilePath boolean attribute has not been filled in). This file will have the following default attributes:
+        
             - "SOFTWARE", which will always be "NAXTO". 
             - "DESCRIPTION", which will be the FileDescription attribute (if it has been set). 
             - "CREATION_DATE", which will be the exact date when this function is called. Its structure will be 
@@ -142,7 +142,7 @@ class HDF5_NaxTo:
                 section = resultsName.require_group(sectionName)
                 firstEntry = dataEntry[0]
                 loadCase.attrs.update({"DESCRIPTION": firstEntry.LoadCaseDescription, "ID": firstEntry.LoadCase, 
-                                       "SUBTITLE": firstEntry.LoadCaseName, "SOLUTION_TYPE": np.int32(1)})
+                       "SUBTITLE": firstEntry.LoadCaseName, "SOLUTION_TYPE": np.int32(firstEntry.SolutionType)})
                 increment.attrs.update({"DESCRIPTION": firstEntry.IncrementDescription, 
                                         "VALUE": firstEntry.IncrementValue, "ID": firstEntry.Increment})
                 resultsName.attrs.update({"DESCRIPTION": firstEntry.ResultsNameDescription, 

{naxtopy-3.2.1 → naxtopy-3.2.3}/src/NaxToPy/Modules/common/property.py

@@ -100,18 +100,20 @@ class CompositeShell(Property):
     It is mandatory that NumPlies is set in first place. Other attributes might be set with no order.
     
     EXAMPLE
-        laminate = CompositeShell()
-        laminate.NumPlies = 6
-        laminate.PartIDs = '0'
-        laminate.MatIDs = [(11100000,'0'),(11100000,'0'),(11100000,'0'),(11100000,'0'),(11100000,'0'),(11100000,'0')]
-        laminate.thicknesses = [0.1,0.1,0.1,0.1,0.1,0.1]
-        laminate.theta = [0,45,0,90,0,-45]
-        model = n2p.load_model(r"")
-        laminate.MaterialDict = model.MaterialDict
-        laminate.simmetry = True
-
-        *** Every given list must have the same length as the number of plies of the laminate. Otherwise, instance will not be created.
+
+        >>> laminate = CompositeShell()
+        >>> laminate.NumPlies = 6
+        >>> laminate.PartIDs = '0'
+        >>> laminate.MatIDs = [(11100000,'0'),(11100000,'0'),(11100000,'0'),(11100000,'0'),(11100000,'0'),(11100000,'0')]
+        >>> laminate.thicknesses = [0.1,0.1,0.1,0.1,0.1,0.1]
+        >>> laminate.theta = [0,45,0,90,0,-45]
+        >>> model = n2p.load_model(r"")
+        >>> laminate.MaterialDict = model.MaterialDict
+        >>> laminate.simmetry = True
+
+    .. warning::
     
+        Every given list must have the same length as the number of plies of the laminate. Otherwise, instance will not be created.
     """
     __slots__ = (
         '_n2p_property',

{naxtopy-3.2.1 → naxtopy-3.2.3}/src/NaxToPy/Modules/static/fasteners/N2PCalculatorRFJoints.py

@@ -23,9 +23,9 @@ class N2PCalculatorRFJoints:
 
     Example: 
         >>> import NaxToPy as n2p 
-        >>> from NaxToPy.Modules.Fasteners.N2PGetFasteners import N2PGetFasteners
-        >>> from NaxToPy.Modules.Fasteners.N2PGetLoadFasteners import N2PGetLoadFasteners
-        >>> from NaxToPy.Modules.Fasteners.Joints.N2PFastenerSystem import N2PFastenerSystem
+        >>> from NaxToPy.Modules.static.fasteners.N2PGetFasteners import N2PGetFasteners
+        >>> from NaxToPy.Modules.static.fasteners.N2PGetLoadFasteners import N2PGetLoadFasteners
+        >>> from NaxToPy.Modules.static.fasteners.N2PFastenerSystem import N2PFastenerSystem
         >>> from N2PCalculatorRFJoints import N2PCalculatorRFJoints
         >>> model1 = n2p.get_model(route.fem) # model loaded 
         >>> fasteners = N2PGetFasteners()