NaxToPy 3.1.1__tar.gz → 3.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NaxToPy
-Version: 3.1.1
+Version: 3.1.2
 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
@@ -155,7 +155,7 @@ additional software beyond NaxTo (see the Download and Homepage links on the lef
 This version is compatible with **NaxTo 2025.1**. 
 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.0/#history) to find which newer version is compatible with it.
+📘**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.
 
 
 ## Installation
@@ -186,6 +186,7 @@ same directory. When ever you want to use the NaxToPy package add the following
       import sys
       sys.path.append("...\directory")
       import NaxToPy as n2p
+      
 ## Updating NaxToPy
 
 If python is callable from the command line:
@@ -367,6 +368,11 @@ is redundant. The coordinate system will prevail.
 7. Feat: Now, when a executable is created, if the version of NaxTo of the exe matches the instaled, it will use the **installed** NaxTo libraries. If the version doesn't match or NaxTo is not installed, **exe** NaxTo libraries will be used.
 8. BugFix: the keyword `THRU` is now supported in the bulk data card `SPC1` when reading from a Nastran Input File.
 
+### v.3.1.2
+1. BugFix: Changes to fix the Mat IDs attributes in N2Property from Abaqus files.
+2. Refactor: Updated vectorised method for N2PCompositeFailure module.
+3. Docs: Improved documentation in some methods.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

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

@@ -27,7 +27,7 @@ additional software beyond NaxTo (see the Download and Homepage links on the lef
 This version is compatible with **NaxTo 2025.1**. 
 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.0/#history) to find which newer version is compatible with it.
+📘**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.
 
 
 ## Installation
@@ -58,6 +58,7 @@ same directory. When ever you want to use the NaxToPy package add the following
       import sys
       sys.path.append("...\directory")
       import NaxToPy as n2p
+      
 ## Updating NaxToPy
 
 If python is callable from the command line:
@@ -239,6 +240,11 @@ is redundant. The coordinate system will prevail.
 7. Feat: Now, when a executable is created, if the version of NaxTo of the exe matches the instaled, it will use the **installed** NaxTo libraries. If the version doesn't match or NaxTo is not installed, **exe** NaxTo libraries will be used.
 8. BugFix: the keyword `THRU` is now supported in the bulk data card `SPC1` when reading from a Nastran Input File.
 
+### v.3.1.2
+1. BugFix: Changes to fix the Mat IDs attributes in N2Property from Abaqus files.
+2. Refactor: Updated vectorised method for N2PCompositeFailure module.
+3. Docs: Improved documentation in some methods.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "NaxToPy"
-version = "3.1.1"
+version = "3.1.2"
 license = {file = "LICENSE"}
 authors = [ { name = "Idaero Solutions", email = "manuel.sanchez@idaerosolutions.com" }, ]
 requires-python = ">=3.9"

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

@@ -96,77 +96,84 @@ class N2PComponent:
     def get_result_list(self, sections=None, aveSections=-1, cornerData=False, aveNodes=-1, variation=100,
                          realPolar=0, coordsys: int = -1000,
                          v1: Union[tuple, np.ndarray] = (1,0,0), v2: Union[tuple, np.ndarray] = (0,1,0)) -> tuple[list, str]:
-        """ 
-        Returns a tuple with the list of floats with the result array asked and a str with the position of the
-        results.
-
-        Args:
+        """Get the result array as a list with position information.
+            
+        Returns a tuple containing the list of floats with the requested results 
+        and a string indicating the position/location of the results.
         
-            sections: list[str] | list[N2PSection] -> Optional. Sections which operations are done.
-                None (Default) = All Sections
-
-            aveSections: int -> Optional. Operation Among Sections.
-
-                -1 : Maximum (Default),
-                -2 : Minimum,
-                -3 : Average,
-                -4 : Extreme,
-                -6 : Difference.
-
-            cornerData: bool -> Optional. Flag to get results in element nodal.
-
-                True : Results in Element-Nodal,
-                False : Results in centroid (Default).
-
-            aveNodes: int -> Optional. Operation among nodes when cornerData is selected.
-
-                 0 : None,
-                -1 : Maximum (Default),
-                -2 : Minimum,
-                -3 : Average,
-                -6 : Difference.
-
-            variation: int -> Optional. Integer between 0 & 100 to select.
-
-                0 : No average between nodes,
-                100 : Total average between nodes (Default).
-
-            realPolar: int -> Optional. Data type when complex result.
-
-                1 : Real / Imaginary,
-                2 : Magnitude / Phase.
-
-            coordsys: int -> Optional. Coordinate System where the result_array will be represented. By default,
-                the output is in element system:
-
-                0   : Global,
-                -1  : Material Coordinate System,
-                -10 : User defined,
-                -20 : Element/Node User Defined,
-                >0  : Solver ID of the Predefined Coordinate System.
-
-            v1: tuple -> Optional.
-
-            v2: tuple -> Optional. Directions vectors that generate the coordinate system axis:
-
-                x=v1,
-                z=v1^v2,
-                y=z^x.
-
-        Returns: 
-            results: tuple(list[float], str)
-
+        Parameters
+        ----------
+        sections : ``list[str] | list[N2PSection]``
+            Optional. Sections on which to perform operations. If None (default), operations 
+            are performed on all sections.
+        aveSections : ``int``, default -1
+            Optional. Operation to perform among sections:
+            
+            * -1: Maximum (default)
+            * -2: Minimum
+            * -3: Average
+            * -4: Extreme
+            * -6: Difference
+            
+        cornerData : ``bool``, default False
+            Optional. Flag to control result location:
+            
+            * True: Results at element nodes
+            * False: Results at element centroid (default)
+            
+        aveNodes : ``int``, default -1
+            Optional. Operation among nodes when ``cornerData=True``:
+            
+            * 0: None
+            * -1: Maximum (default)
+            * -2: Minimum
+            * -3: Average
+            * -6: Difference
+            
+        variation : ``int``, default 100
+            Optional. Averaging parameter between nodes (0-100):
+            
+            * 0: No averaging between nodes
+            * 100: Total averaging between nodes (default)
+            
+        realPolar : ``int``, default 0
+            Optional. Data type for complex results:
+            
+            * 1: Real/Imaginary
+            * 2: Magnitude/Phase
+            
+        coordsys : ``int``, default -1000
+            Optional. Coordinate system for result representation:
+            
+            * 0: Global coordinate system
+            * -1: Material coordinate system
+            * -10: User defined coordinate system
+            * -20: Element/Node user defined coordinate system
+            * -1000: Analysis coordinate system (default)
+            * \>0: Solver ID of predefined coordinate system
+            
+            .. note::
+            
+                In Nastran > 2021 the results in the OP2 could be in material coordinate 
+                system if the user requested it.
+            
+        v1 : ``tuple[float] | numpy.ndarray``, default (1, 0, 0)
+            Optional. 3D vector defining the x-axis of the coordinate system.
+        v2 : ``tuple[float] | numpy.ndarray``, default (0, 1, 0)
+            Optional. 3D vector defining the xy-plane. The coordinate system axes are generated as:
+            
+            * x = v1
+            * z = v1 ^ v2 (cross product)
+            * y = z ^ x (cross product)
+        
+        Returns
+        -------
+        tuple[list[float], str]
+            Tuple containing:
+            
+            * **results list**: list of floats with the requested results
+            * **position**: string indicating the location/position of the results
         """
-        # Aquí se prepara la llamada a la funcion de NaxToModel.N2PModelContent.getArraytoPlot(). Esta usa como
-        # argumento un objeto de la clase N2ParamImputResults. Por se instancia y se modifican sus propiedades antes
-        # de hacer la llamada a la funcion.
-
-        # Aqui se mete el sistema de coordenadas en el que queremos que nos saque la informacion.
-        # Para ello primero comprobamos que es viable hacer la tansformacion (puede que aun no este implementada o que
-        # la componente simplemente no la admita al ser un escalar a secas)
-
-        #resultsParameters.coordSys = -10
-        #orientationcoordinatesystem = algo
 
         resultsParameters = self._create_n2paraminputresult(None, sections, aveSections, cornerData, aveNodes, variation,
                                                             realPolar, coordsys, v1, v2)
@@ -190,76 +197,106 @@ class N2PComponent:
                          realPolar=0, coordsys: int = -1000,
                          v1: Union[tuple, np.ndarray ] = (1,0,0), v2: Union[tuple, np.ndarray ] = (0,1,0),
                          filter_list: list = None) -> tuple[np.array, str]:
-        """ 
-        Returns a tuple with the numpy array of floats with the result array asked and a str with the position of
-        the results.
-
-        Args:
-
-            sections: list[str] | list[N2PSection] -> Optional. Sections which operations are done.
-                None (Default) = All Sections
-
-            aveSections: int -> Optional. Operation Among Sections.
-
-                -1 : Maximum (Default),
-                -2 : Minimum,
-                -3 : Average,
-                -4 : Extreme,
-                -6 : Difference.
-
-            cornerData: bool -> Optional. Flag to get results in element nodal.
-
-                True : Results in Element-Nodal,
-                False : Results in centroid (Default).
-
-            aveNodes: int -> Optional. Operation among nodes when cornerData is selected.
-
-                 0 : None,
-                -1 : Maximum (Default),
-                -2 : Minimum,
-                -3 : Average,
-                -6 : Difference.
-
-            variation: int -> Optional. Integer between 0 & 100 to select.
-
-                0 : No average between nodes,
-                100 : Total average between nodes (Default).
-
-            realPolar: int -> Optional. Data type when complex result.
-
-                1 : Real / Imaginary,
-                2 : Magnitude / Phase.
-
-            coordsys: int -> Optional. Coordinate System where the result_array will be represented. By default,
-                the output is in element system:
-
-                0   : Global,
-                -1  : Material Coordinate System,
-                -10 : User defined,
-                -20 : Element/Node User Defined,
-                >0  : Solver ID of the Predefined Coordinate System.
-
-            v1: tuple -> Optional.
-
-            v2: tuple -> Optional. Directions vectors that generate the coordinate system axis:
-
-                x=v1,
-                z=v1^v2,
-                y=z^x.
-
-            filter_n2p: list[N2PElement|N2PNode] (optional)
-                List with the N2PElement or N2PNode where the results are asked. Filtering the results slows
-                the result extraction. If the results are needed in two separate list of itmes (nodes or elements)
-                ask first for both and filter them later.
-
-        Returns:
-            results: tuple(np.array, str)
-
+        """Get the result array as a numpy array with position information.
+    
+        Returns a tuple containing the numpy array of floats with the requested results 
+        and a string indicating the position/location of the results.
+        
+        Parameters
+        ----------
+        sections : ``list[str] | list[N2PSection]``
+            Optional. Sections on which to perform operations. If None (default), operations 
+            are performed on all sections.
+        aveSections : ``int``, default -1
+            Optional. Operation to perform among sections:
+            
+            * -1: Maximum (default)
+            * -2: Minimum
+            * -3: Average
+            * -4: Extreme
+            * -6: Difference
+            
+        cornerData : ``bool``, default False
+            Optional. Flag to control result location:
+            
+            * True: Results at element nodes
+            * False: Results at element centroid (default)
+            
+        aveNodes : ``int``, default -1
+            Optional. Operation among nodes when ``cornerData=True``:
+            
+            * 0: None
+            * -1: Maximum (default)
+            * -2: Minimum
+            * -3: Average
+            * -6: Difference
+            
+        variation : ``int``, default 100
+            Optional. Averaging parameter between nodes (0-100):
+            
+            * 0: No averaging between nodes
+            * 100: Total averaging between nodes (default)
+            
+        realPolar : ``int``, default 0
+            Optional. Data type for complex results:
+            
+            * 1: Real/Imaginary
+            * 2: Magnitude/Phase
+            
+        coordsys : ``int``, default -1000
+            Optional. Coordinate system for result representation:
+            
+            * 0: Global coordinate system
+            * -1: Material coordinate system
+            * -10: User defined coordinate system
+            * -20: Element/Node user defined coordinate system
+            * -1000: Analysis coordinate system (default)
+            * \>0: Solver ID of predefined coordinate system
+            
+            .. note::
+            
+                In Nastran > 2021 the results in the OP2 could be in material coordinate 
+                system if the user requested it.
+            
+        v1 : ``tuple[float] | numpy.ndarray``, default (1, 0, 0)
+            Optional. 3D vector defining the x-axis of the coordinate system.
+        v2 : ``tuple[float] | numpy.ndarray``, default (0, 1, 0)
+            Optional. 3D vector defining the xy-plane. The coordinate system axes are generated as:
+            
+            * x = v1
+            * z = v1 ^ v2 (cross product)
+            * y = z ^ x (cross product)
+            
+        filter_list : ``list[N2PElement] | list[N2PNode]``
+            Optional. List of elements or nodes where results are requested. If None, results 
+            for all elements/nodes are returned.
+            
+            .. warning::
+            
+                Filtering results can slow down extraction. If results are needed for multiple 
+                separate lists, extract all results first and filter afterward.
+        
+        Returns
+        -------
+        tuple[numpy.ndarray, str]
+            Tuple containing:
+            
+            * **results array**: numpy array of floats with the requested results
+            * **position**: string indicating the location/position of the results
+        
         Examples
-            >>> # N2PComponent is a N2PLoadCase.get_results("DISPLACEMENTS").get_component("X")
-            >>> displ_X_array, where = N2PComponent.get_result_ndarray(aveSections=-3, coordsys=-1)
-            >>> # N2PComponent is a N2PLoadCase.get_results("STRESSES").get_component("XX")
-            >>> stress_array, where = N2PComponent.get_result_ndarray(v1=(-1, 0, 0), v2=(0, -1, 0))
+        --------
+        >>> # N2PComponent is a N2PLoadCase.get_results("DISPLACEMENTS").get_component("X")
+        >>> displ_X_array, where = N2PComponent.get_result_ndarray(
+        ...     aveSections=-3, 
+        ...     coordsys=-1
+        ... )
+
+        >>> # N2PComponent is a N2PLoadCase.get_results("STRESSES").get_component("XX")
+        >>> stress_array, where = N2PComponent.get_result_ndarray(
+        ...     v1=(-1, 0, 0), 
+        ...     v2=(0, -1, 0)
+        ... )
         """
         resultsParameters = self._create_n2paraminputresult(None, sections, aveSections, cornerData, aveNodes, variation,
                                                             realPolar, coordsys, v1, v2)

{naxtopy-3.1.1 → naxtopy-3.1.2}/src/NaxToPy/Core/Classes/N2PProperty.py

@@ -123,7 +123,7 @@ class N2PComp(N2PProperty):
     def MatID(self) -> tuple[tuple[int, str]]:
         """Tuple with the solver tuple of thr id and part of the material for each ply of the laminate"""
         part = self.PartID
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return tuple((self.__model__._N2PModelContent__materialsID[mat], part) for mat in self.__info__.Mat)
         return tuple((mat, part) for mat in self.__info__.Mat)
 
@@ -388,21 +388,21 @@ class N2PShell(N2PProperty):
     @property
     def MatMemID(self) -> Union[tuple[int, str], tuple[str, str]]:
         """Material index for the membrane behavior"""
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatMemID], "ASSEMBLY")
         return (self.__info__.MatMemID, self.PartID)
 
     @property
     def MatBenID(self) -> Union[tuple[int, str], tuple[str, str]]:
         """Material index for the bending behavior"""
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatBenID], "ASSEMBLY")
         return (self.__info__.MatBenID, self.PartID)
 
     @property
     def MatSheID(self) -> Union[tuple[int, str], tuple[str, str]]:
         """Material index for the shell behavior"""
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatSheID], "ASSEMBLY")
         return (self.__info__.MatSheID, self.PartID)
 
@@ -435,7 +435,7 @@ class N2PShell(N2PProperty):
     @property
     def MatCouplID(self) -> Union[tuple[int, str], tuple[str, str]]:
         """Material identification number for membrane-bending coupling"""
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatCoupl], "ASSEMBLY")
         return (self.__info__.MatCoupl, self.PartID)
 # ----------------------------------------------------------------------------------------------------------------------
@@ -458,7 +458,7 @@ class N2PSolid(N2PProperty):
     @property
     def MatID(self) -> Union[tuple[int, str], tuple[str, str]]:
         """Index of the material of the solid property"""
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatID], "ASSEMBLY")
         return (self.__info__.MatID, self.PartID)
 
@@ -504,7 +504,7 @@ class N2PRod(N2PProperty):
     @property
     def MatID(self) -> Union[tuple[int, str], tuple[str, str]]:
         """Material identification number."""
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatID], "ASSEMBLY")
         return (self.__info__.MatID, self.PartID)
 
@@ -545,7 +545,7 @@ class N2PBeam(N2PProperty):
     def MatID(self) -> Union[tuple[int, str], tuple[str, str]]:
         """Material identification number."""
         mat_id = self.__info__.MatID
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[mat_id], "ASSEMBLY")
         elif mat_id == -1:
             return N2PLog.Warning.W702()
@@ -910,7 +910,7 @@ class N2PWeld(N2PProperty):
         """
         Material identification number.
         """
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatID], "ASSEMBLY")
         return (self.__info__.MatID, self.PartID)
     
@@ -967,7 +967,7 @@ class N2PBeamL(N2PProperty):
         """
         Material identification number.
         """
-        if self.__model__.Solver == "Abaqus" or self.__model__.Solver == "InputFileAbaqus":
+        if self.__model__.Solver == "InputFileAbaqus":
             return (self.__model__._N2PModelContent__materialsID[self.__info__.MatID], "ASSEMBLY")
         return (self.__info__.MatID, self.PartID)