NaxToPy 3.1.2__tar.gz → 3.2.1__tar.gz

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

@@ -1,112 +1,11 @@
 Metadata-Version: 2.4
 Name: NaxToPy
-Version: 3.1.2
+Version: 3.2.1
 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
 Author-email: Idaero Solutions <manuel.sanchez@idaerosolutions.com>
-License: Copyright (c) 2024 Idaero Solutions
-        
-        This freeware license agreement (“agreement”) is a legally binding contract
-        between the individual who downloads the software (“you”) and the licensor,
-        that should be read in its entirety. This is an agreement governing your use
-        this software own by Idaero Solutions, further defined herein as “software”,
-        and the licensor of the software is willing to provide you with access to the
-        software only on the condition that you accept all of the terms and conditions
-        contained in this agreement. You are deemed to have read, understood and accepted
-        all such terms and conditions upon executing a download of any free software.
-        
-        1. License Grant:
-        
-        	Subject to the terms and conditions of this Agreement, Idaero Solutions grants
-        	the User a limited, non-exclusive, non-transferable license to use the Software
-        	solely for non commercial purposes. This license does not grant any rights to the
-        	source code of the Software. It is only free for non-professional and non-commercial
-        	purposes. For commercial and professional purposes, you must install the professional
-            NaxTo(c) version.
-        
-        2. Ownership:
-        
-        	The User acknowledges that the Software, including any and all intellectual
-        	property rights associated with it, is the sole property of Idaero Solutions
-            and/or its Suppliers. The User agrees not to claim ownership or proprietary
-            rights over the Software.
-        
-        3. Distribution:
-        
-        	The User is allowed to distribute the Software to third parties free of charge,
-        	ONLY under .exe files that use the software as a dependence of the script,
-        	provided that the distribution includes the complete and unmodified Software
-        	package as originally provided by Idaero Solutions. The User must not charge
-        	any fees or payments for the distribution of the Software.
-        
-        4. Modifications:
-        
-        	The User agrees not to modify, adapt, reverse engineer, decompile or disassemble,
-        	the Software. Any attempt to do so shall be a violation of this Agreement. The
-        	User is allowed to develop further code based on the Software. However, the
-        	User agrees that the new software shall be subject to the same license terms
-        	as this Agreement, including the prohibition on modification, reverse
-        	engineering, and proprietization.
-        
-        5. Proprietization:
-        
-        	The User agrees not to use the Software or any part thereof to develop a
-        	competing product or service or engage in any activities that may lead to
-        	the proprietization of the Software.
-        
-        6. Termination:
-        
-        	This Agreement is effective until terminated. Idaero Solutions may terminate this
-        	Agreement immediately and without notice if the User fails to comply with any
-        	of the terms and conditions herein. Upon termination, the User must cease all
-        	use of the Software and destroy all copies in their possession.
-        
-        7. Warranty and Liability:
-        
-        	The software is provided "as is", without warranty of any kind, express or
-        	implied, including but not limited to the warranties of merchantability,
-        	fitness for a particular purpose and noninfringement. In no event shall the
-        	authors or copyright holders be liable for any claim, damages or other
-        	liability, whether in an action of contract, tort or otherwise, arising from,
-        	out of or in connection with the software or the use or other dealings in the
-        	software.
-        	
-        8. An extension of NaxTo(c) from Idaero Solutions:
-        
-        	The software is an extension of the NaxTo software developed by Idaero Solutions.
-        	Therefore, the terms of use of this software are an extension of the
-        	NaxTo license. In the event of any discrepancies, the NaxTo license takes precedence.
-        
-        9. Governing Law:
-        
-        	This Agreement shall be governed by and construed in accordance with the laws
-        	of the jurisdiction in which Idaero Solutions is located.
-        
-        
-        IDAERO DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING BUT NOT
-        LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-        AND NON-INFRINGEMENT. IDAERO DOES NOT GUARANTEE THAT THE PRODUCTS WILL MEET LICENSEE'S
-        REQUIREMENTS, OPERATE UNINTERRUPTED OR ERROR-FREE, OR BE COMPATIBLE WITH ANY SPECIFIC
-        HARDWARE OR SOFTWARE. THE ENTIRE RISK ASSOCIATED WITH THE USE, PERFORMANCE, OR RESULTS
-        OBTAINED FROM THE PRODUCTS RESTS WITH THE LICENSEE, NOT IDAERO. IDAERO MAKES
-        NO WARRANTIES REGARDING THE ACCURACY, COMPLETENESS, FUNCTIONALITY, SAFETY, PERFORMANCE,
-        OR ANY OTHER ASPECT OF ANY DESIGN, PROTOTYPE, OR FINAL PRODUCT DEVELOPED BY THE LICENSEE
-        USING THE PRODUCTS.
-        
-        IN NO EVENT SHALL IDAERO OR ITS SUPPLIERS BE LIABLE FOR INDIRECT, SPECIAL, INCIDENTAL,
-        OR CONSEQUENTIAL DAMAGES, INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR DATA, DEFECTS
-        IN DESIGN OR PRODUCTS CREATED USING THE PRODUCTS, OR ANY INJURY OR DAMAGE RESULTING
-        FROM SUCH DEFECTS, SUFFERED BY THE LICENSEE OR ANY THIRD PARTY, EVEN IF IDAERO OR
-        ITS SUPPLIERS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THE PRODUCTS
-        PROVIDED HEREUNDER ARE INTENDED ONLY TO AID THE LICENSEE IN DEVELOPING THEIR OWN
-        PRODUCTS OR CONDUCTING DATA ANALYSIS AND ARE NOT INTENDED TO SUBSTITUTE FOR SOUND
-        ENGINEERING JUDGMENT, INDEPENDENT TESTING OF PHYSICAL PROTOTYPES, CAREFUL NUMERICAL
-        REVIEW, OR SOUND BUSINESS JUDGMENT.
-        
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
+License: MIT
 Project-URL: Documentation, https://www.idaerosolutions.com/NaxToDocumentation/NaxToPy/3.1.0/index.html
 Project-URL: LinkedIn, https://www.linkedin.com/company/idaero/
 Keywords: NaxTo,Postprocessing,FEM
@@ -119,7 +18,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pythonnet>=3.0.4
-Requires-Dist: numpy>=1.22.0
+Requires-Dist: numpy>=1.26.0
 Requires-Dist: setuptools>=67.8.0
 Requires-Dist: h5py>=3.12.1
 Dynamic: download-url
@@ -152,7 +51,7 @@ additional software beyond NaxTo (see the Download and Homepage links on the lef
 ---------------
 
 ⚠️**Warning:** To use NaxToPy, [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US) must be installed.
-This version is compatible with **NaxTo 2025.1**. 
+This version is compatible with **NaxTo 2025.2**. 
 Check in _Programs and Features_ the NaxTo version that is installed.
 
 📘**Note:** If a specific NaxTo version is installed, search the [**NaxToPy History**](https://pypi.org/project/NaxToPy/3.1.2/#history) to find which newer version is compatible with it.
@@ -373,6 +272,22 @@ is redundant. The coordinate system will prevail.
 2. Refactor: Updated vectorised method for N2PCompositeFailure module.
 3. Docs: Improved documentation in some methods.
 
+### v.3.2.0
+1. Refactor: `N2PGetFasteners` and `N2PGetLoadFasteners`: Improvement in warning and error messages and documentation
+2. Refactor: `N2PNastranInputData`: The Nastran input file reading libraries (Bulk Data Files) have been updated, and this class has been adapted to the new changes, which improve memory management and file loading speed.
+3. Refactor: `NaxToPy.load_model()`: Improved file type selection (binary or text) and identification of which Solver type they belong to (`"InputFileNastran"`, `"InputFileAbaqus"`).
+4. Refactor: `N2PModelContent.get_result_by_LCs_Incr()`: Now, if the requested result or component does not exist in one of the load case-increment cases, the key-value pair is returned in the dictionary, but with the value set to a numpy array filled with "nan", instead of omitting the key from the dictionary.
+5. Refactor: `N2PCompositeFailure`: Improved module efficiency by vectorizing calculations and added a new failure criterion, FMC - Fiber Mode Concept, which is compatible with FirstPly and PlyByPly.
+6. Feat: `N2PCoefficientsFinder`: New NaxToPy module that detects and defines linear dependencies between rows of a given matrix.
+7. Feat: `N2PNastranInputData.find_cards()`: New method that replaces the old `get_cards_by_field()`. Allows searching for cards with various filter types efficiently.
+8. Feat: `N2PNastranInputData.get_failed_cards()`: New method that allows retrieving cards that are poorly formatted or have reading errors when opening a Nastran input file (.bdf).
+9. Feat: `N2PNastranInputData.create_card()`: New method that allows creating Nastran cards completely from scratch, which will be added to the end of the Nastran input file once the `rebuild_file()` command is executed.
+
+### 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()`.
+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.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

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

@@ -24,7 +24,7 @@ additional software beyond NaxTo (see the Download and Homepage links on the lef
 ---------------
 
 ⚠️**Warning:** To use NaxToPy, [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US) must be installed.
-This version is compatible with **NaxTo 2025.1**. 
+This version is compatible with **NaxTo 2025.2**. 
 Check in _Programs and Features_ the NaxTo version that is installed.
 
 📘**Note:** If a specific NaxTo version is installed, search the [**NaxToPy History**](https://pypi.org/project/NaxToPy/3.1.2/#history) to find which newer version is compatible with it.
@@ -245,6 +245,22 @@ is redundant. The coordinate system will prevail.
 2. Refactor: Updated vectorised method for N2PCompositeFailure module.
 3. Docs: Improved documentation in some methods.
 
+### v.3.2.0
+1. Refactor: `N2PGetFasteners` and `N2PGetLoadFasteners`: Improvement in warning and error messages and documentation
+2. Refactor: `N2PNastranInputData`: The Nastran input file reading libraries (Bulk Data Files) have been updated, and this class has been adapted to the new changes, which improve memory management and file loading speed.
+3. Refactor: `NaxToPy.load_model()`: Improved file type selection (binary or text) and identification of which Solver type they belong to (`"InputFileNastran"`, `"InputFileAbaqus"`).
+4. Refactor: `N2PModelContent.get_result_by_LCs_Incr()`: Now, if the requested result or component does not exist in one of the load case-increment cases, the key-value pair is returned in the dictionary, but with the value set to a numpy array filled with "nan", instead of omitting the key from the dictionary.
+5. Refactor: `N2PCompositeFailure`: Improved module efficiency by vectorizing calculations and added a new failure criterion, FMC - Fiber Mode Concept, which is compatible with FirstPly and PlyByPly.
+6. Feat: `N2PCoefficientsFinder`: New NaxToPy module that detects and defines linear dependencies between rows of a given matrix.
+7. Feat: `N2PNastranInputData.find_cards()`: New method that replaces the old `get_cards_by_field()`. Allows searching for cards with various filter types efficiently.
+8. Feat: `N2PNastranInputData.get_failed_cards()`: New method that allows retrieving cards that are poorly formatted or have reading errors when opening a Nastran input file (.bdf).
+9. Feat: `N2PNastranInputData.create_card()`: New method that allows creating Nastran cards completely from scratch, which will be added to the end of the Nastran input file once the `rebuild_file()` command is executed.
+
+### 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()`.
+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.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

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

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "NaxToPy"
-version = "3.1.2"
-license = {file = "LICENSE"}
+version = "3.2.1"
+license = {text = "MIT"}
 authors = [ { name = "Idaero Solutions", email = "manuel.sanchez@idaerosolutions.com" }, ]
 requires-python = ">=3.9"
 dependencies = ["pythonnet>=3.0.4",
-                "numpy>=1.22.0",
+                "numpy>=1.26.0",
                 "setuptools>=67.8.0",
                 "h5py>=3.12.1"]
 description = "Package for postprocessing FEM results in Python"

{naxtopy-3.1.2 → naxtopy-3.2.1}/src/NaxToPy/Core/Classes/ABQKeywords/N2PKeyword.py

@@ -1,9 +1,29 @@
 from __future__ import annotations  # For compatibility with Python 3.9 or higher
 
-from NaxToPy.Core.Classes.N2PNastranInputData import N2PInputData
+class N2PInputDataAbqs:
+    """General class for the information in an input file of Nastran
+    """
 
+    __slots__ = (
+        "__inputdata"
+    )
 
-class N2PKeyword(N2PInputData):
+    def __init__(self, inputdata):
+        self.__inputdata = inputdata
+
+    @property
+    def DataType(self) -> str:
+        return self.__inputdata.DataType.ToString()
+
+    @property
+    def Lines(self) -> list[str]:
+        return list(self.__inputdata.Lines)
+
+    @property
+    def FilePathId(self) -> int:
+        return self.__inputdata.FilePathId
+
+class N2PKeyword(N2PInputDataAbqs):
 
     def __init__(self, info, dictKeywordToN2P, dictEntityToN2P):
         super().__init__(info)

{naxtopy-3.1.2 → naxtopy-3.2.1}/src/NaxToPy/Core/Classes/N2PAbaqusInputData.py

@@ -4,11 +4,9 @@ from __future__ import annotations  # For compatibility with Python 3.9 or highe
 from typing import Literal, overload
 
 from NaxToPy.Core.Errors.N2PLog import N2PLog
-from NaxToPy.Core.Classes.N2PNastranInputData import N2PInputData
 from NaxToPy.Core.Classes.ABQKeywords import *
 from NaxToPy.Core.Classes.ABQEntities import *
 
-
 class N2PAbaqusInputData:
     """
     Class with the complete data of an Abaqus MEF input file (text file usually with the extension .inp).
@@ -87,14 +85,14 @@ class N2PAbaqusInputData:
 
     # Método para obtener la lista de comentarios en el Input File -----------------------------------------------------
     @property
-    def ListComments(self) -> list[N2PInputData, ]:
+    def ListComments(self) -> list[N2PInputDataAbqs, ]:
         """
         List with all the comments in the FEM Input File.
         """
         if self.__listcomments:
             return self.__listcomments
         else:
-            self.__listcomments = [N2PInputData(i) for i in self.__inputfiledata.StructuredInfo.ModelComments]
+            self.__listcomments = [N2PInputDataAbqs(i) for i in self.__inputfiledata.StructuredInfo.ModelComments]
             return self.__listcomments
     # ------------------------------------------------------------------------------------------------------------------
 

{naxtopy-3.1.2 → naxtopy-3.2.1}/src/NaxToPy/Core/Classes/N2PComponent.py

@@ -454,7 +454,14 @@ class N2PComponent:
         i = 0
         n_opt = 0
         n_lcs = len(list_lc_incr)
-        
+
+        if not sections:
+            if isinstance(list_lc_incr[0][0], int):
+                sections = list({section.Name for lc, _ in list_lc_incr for component in self._result_father._loadCase_father._modelFather.get_load_case(lc).Results[self._result_father.Name].Components.values() for section in component.Sections})
+            else:
+                sections = list({section.Name for lc, _ in list_lc_incr for component in lc.Results[self._result_father.Name].Components.values() for section in component.Sections})
+
+
         # A first shoot with a block of 5 load cases is made. The memory used in the process wil be measured
         # using the function _get_memory_usage(). Acording to de memory used, the optimum number of load cases
         # per block will be claculated and the remain load cases will be launched in blocks.
@@ -491,13 +498,13 @@ class N2PComponent:
 
                 if not components[0]:
                     py_dict.update({
-                        (int(key.split(":")[0].replace("DoF_LCD", "-").replace("DoF_LC", "")), int(key.split(":")[1][2:])) :
+                        (int(key.split(":")[0].replace("DoF_LCD", "-").replace("DoF_LC", "")), int(key.split(":")[1][2:].replace("_DoF", ""))) :
                         self._filter_array(np.array(value, np.float64), filter_list, None, ii_map, cornerData)
                         for key, value in dict(cs_dict[0]).items()
                     })
                 else:
                     py_dict.update({
-                        (int(key.split(":")[0].replace("DoF_LCD", "-").replace("DoF_LC", "")), int(key.split(":")[1][2:]), component) :
+                        (int(key.split(":")[0].replace("DoF_LCD", "-").replace("DoF_LC", "")), int(key.split(":")[1][2:].replace("_DoF", "")), component) :
                         self._filter_array(np.array(value, np.float64), filter_list, None, ii_map, cornerData)
                         for key, value in dict(cs_dict[0]).items()
                     })
@@ -520,6 +527,31 @@ class N2PComponent:
             self._result_father._loadCase_father._modelFather.clear_results_memory()
             # endwhile
         
+        # Check if the dictionary has the same number of keys as expected
+        if len(py_dict) != n_lcs * len(components):
+            N2PLog.Warning.W211()
+            
+            # Create NaN array template
+            len_arr = len(next(iter(py_dict.values())))
+            arr = np.full(len_arr, np.nan)
+            
+            # Fill missing keys
+            for lc_id, incr_id in list_lc_incr:
+                if isinstance(lc_id, int):
+                    base_key = (lc_id, incr_id)
+                else:
+                    base_key = (lc_id.ID, incr_id.ID)
+                
+                if not components[0]:
+                    # No components - use base key only
+                    if base_key not in py_dict:
+                        py_dict[base_key] = arr
+                else:
+                    # With components - add component to key
+                    for component in components:
+                        key = (*base_key, component)
+                        if key not in py_dict:
+                            py_dict[key] = arr
         return py_dict
     # ------------------------------------------------------------------------------------------------------------------
 
@@ -619,16 +651,11 @@ class N2PComponent:
             if not isinstance(sections, list):
                 msg = N2PLog.Error.E218()
                 raise TypeError(msg)
-            actual_sections = {s.Name for s in self.Sections}
             for section in sections:
                 if type(section) is N2PSection:
                     sectionParam += str(section.Name) + '#'
                 else:
-                    if section in actual_sections:
-                        sectionParam += str(section) + '#'
-                    else:
-                        msg = N2PLog.Error.E238(section, actual_sections)
-                        raise Exception(msg)
+                    sectionParam += str(section) + '#'
 
         resultsParameters.sectPoint = sectionParam