NaxToPy 1.1.0__tar.gz → 1.1.1__tar.gz

{NaxToPy-1.1.0/src/NaxToPy.egg-info → NaxToPy-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 1.1.0
+Version: 1.1.1
 Summary: Package for postprocessing FEM results in Python
 Home-page: https://idaerosolutions.com/
 Download-URL: https://appsource.microsoft.com/en-us/product/SaaS/idaerosolutionssl1685692009813.naxto?signInModalType=2&ctaType=1
@@ -204,7 +204,7 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.
 
-This version is only compatible with **NaxTo 2024.0.0**.
+This version is only compatible with **NaxTo 2024.0.1**.
 Check in Programs and Features the NaxTo version that is installed.
 
 NaxToPy only use three dependeces:

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/README.md

@@ -80,7 +80,7 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.
 
-This version is only compatible with **NaxTo 2024.0.0**.
+This version is only compatible with **NaxTo 2024.0.1**.
 Check in Programs and Features the NaxTo version that is installed.
 
 NaxToPy only use three dependeces:

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/pyproject.toml

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

NaxToPy-1.1.1/src/NaxToPy/Core/Classes/AllClasses.py

@@ -0,0 +1,15 @@
+from NaxToPy.Core.Classes.N2PComponent import *
+from NaxToPy.Core.Classes.N2PResult import *
+from NaxToPy.Core.Classes.ProgresBar import *
+from NaxToPy.Core.Classes import N2PModelInputData
+from NaxToPy.Core.Classes.N2PConnector import *
+from NaxToPy.Core.Classes.N2PFreeBody import *
+from NaxToPy.Core.Classes.N2PCoord import *
+from NaxToPy.Core.Classes.N2PIncrement import *
+from NaxToPy.Core.Classes.N2PSection import *
+from NaxToPy.Core.Classes.N2PSet import *
+from NaxToPy.Core.Classes.N2PMaterial import *
+from NaxToPy.Core.Classes.N2PLoadCase import *
+from NaxToPy.Core.Classes.N2PNode import *
+from NaxToPy.Core.Classes.N2PElement import *
+from NaxToPy.Core.Classes.N2PProperty import *

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/Core/Classes/N2PComponent.py

@@ -141,13 +141,7 @@ class N2PComponent:
 
         resultsParameters = self._create_n2paraminputresult(sections, aveSections, cornerData, aveNodes, variation,
                                                             realPolar, coordsys, v1, v2)
-
-        if self.__result_father__.__loadCase_father__.TypeLC == "DERIVED":
-            results = list(self.__result_father__.__loadCase_father__._N2PLoadCase__n2loadcase.CalculateLastArray(
-                           resultsParameters, 0))
-
-        else:
-            results = list(
+        results = list(
             self.__result_father__.__loadCase_father__.__modelFather__._N2PModelContent__vzmodel.CalculateArrayLastResult(
                 resultsParameters, 0))
 
@@ -380,7 +374,8 @@ class N2PComponent:
         cs_dict = self.__result_father__.__loadCase_father__.__modelFather__._N2PModelContent__vzmodel.CalculateArrayLastResult(
                 formula, resultsParameters, 0)
 
-        py_dict = {(int(key.split(":")[0].split("LC")[1]), int(key.split(":")[1][2:])): np.array(value, np.float64)
+        py_dict = {(int(key.split(":")[0].replace("DoF_LCD", "-").replace("DoF_LC", "")),
+                    int(key.split(":")[1][2:])): np.array(value, np.float64)
                    for key, value in dict(cs_dict[0]).items()}
 
         return py_dict

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/Core/Classes/N2PCoord.py

@@ -27,13 +27,13 @@ class N2PCoord(object):
     def ID(self) -> int:
         return int(self.__info.ID)
 
-    @property
-    def PartID(self) -> str:
-        try:
-            partid = int(self.__info.partID)
-        except:
-            partid = 0
-        return self.__model__._N2PModelContent__partIDtoStr.get(self.__info.Part, -1)
+    # @property
+    # def PartID(self) -> str:
+    #     try:
+    #         partid = int(self.__info.partID)
+    #     except:
+    #         partid = 0
+    #     return self.__model__._N2PModelContent__partIDtoStr.get(self.__info.Part, -1)
     
     @property
     def TypeSys(self) -> str:

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/Core/Classes/N2PLoadCase.py

@@ -27,7 +27,7 @@ class N2PLoadCase:
 
     # Constructor de N2PLoadCase ---------------------------------------------------------------------------------------
     def __init__(self, id, id_original, increments, increments_number_list, is_complex, lc_type, name, results,
-                 solution_type, model_father, n2loadcase):
+                 solution_type, solver, model_father, n2loadcase):
         '''Python Load Case Constructor
         Input:
             ID: int -> Identification Number of the Load Case
@@ -37,6 +37,7 @@ class N2PLoadCase:
             IsComplex: bool -> boolean value. True if the LC is associated to a complex LC
             LCType: str -> Type of solution applied in the load case
             Name : str -> Name of the load case
+            Solver : str -> Solver of the load case
             Results: list[N2Results] -> list with instances of N2Results
         ----------
         Returns:
@@ -66,6 +67,7 @@ class N2PLoadCase:
 
         self.__solutiontype__ = solution_type
         self.__activeIncrement__ = list(increments)[-1].number
+        self.__solver__ = solver
         self.__modelFather__ = model_father
         self.__n2loadcase = n2loadcase
     # ------------------------------------------------------------------------------------------------------------------
@@ -155,6 +157,12 @@ class N2PLoadCase:
         return(str(self.__solutiontype__))
     # ------------------------------------------------------------------------------------------------------------------
 
+    # Metodo para obtener el solver del caso de carga ------------------------------------------------------------------
+    @property
+    def Solver(self) -> str:
+        return(str(self.__solver__))
+    # ------------------------------------------------------------------------------------------------------------------
+
     # Metodo para obtener los incrementos disponibles en el caso de carga ----------------------------------------------
     def get_increments(self, id: Union[int, str]) -> N2PIncrement:
         ''' Returns the N2PIncrement object with the id=ID or the id=Name of the Increment

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/Core/Classes/N2PNode.py

@@ -135,14 +135,18 @@ class N2PNode:
     # Metodo para obtener la coordenada z en el sistema local de entrada del nodo -----------------
     @property
     def Connectivity(self) -> list["N2PElement", "N2PConnector", ...]:
-        """Returns the N2PElements and N2PConnector that the node is connected to. Slow property.
+        """Returns the N2PElements and N2PConnector that the node is connected to
         """
+
         malla = self.__model__._N2PModelContent__vzmodel.UMesh
-        iid = array.array("q", [self.InternalID])
-        cells_iid = list(N2AdjacencyFunctions.GetElementsFromNodes(malla, iid))
-        #celllist = list(self.__model__.ElementsDict.values()) + list(self.__model__.ConnectorsDict.values())
         celllist = self.__model__._N2PModelContent__cells_list
-        return [celllist[cell_iid] for cell_iid in cells_iid]
+
+        if not self.__model__._N2PModelContent__connectivity_dict:
+            self.__model__._N2PModelContent__connectivity_dict = dict(N2AdjacencyFunctions.connectivityDict(malla))
+
+        cs_list = self.__model__._N2PModelContent__connectivity_dict[self.InternalID]
+
+        return [celllist[cell_iid] for cell_iid in cs_list]
     # ---------------------------------------------------------------------------------------------
 
     # Special Method for Object Representation -------------------------------------------------------------------------

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/Core/Classes/N2PProperty.py

@@ -126,54 +126,54 @@ class N2PComp(N2PProperty):
         """
         return [(self.MatID[i], self.Thickness[i], self.Theta[i]) for i in range(self.NumPiles)]
 
-    #@property
-    #def QMatrix(self) -> list:
-    #    """
-    #    Returns the lamina stiffness matrix (Q-Bar)
-    #    """
+    @property
+    def EqQMatrix(self) -> list:
+       """
+       Returns the lamina stiffness matrix (Q-Bar)
+       """
         
-    #    q11_t = 0
-    #    q12_t = 0
-    #    q22_t = 0
-    #    q16_t = 0
-    #    q26_t = 0
-    #    q66_t = 0
-
-    #    t_thick = sum(self.Thickness) #! is self.Thickness a numpy array?
-
-    #    for i in range(self.NumPiles):
-    #        c = math.cos(math.radians(self.Theta[i]))   
-    #        s = math.sin(math.radians(self.Theta[i]))   
-
-    #        thick = self.Thickness[i]
-    #        rel_thick = thick/t_thick
-
-    #        mat = self.__model__._N2PModelContent__material_dict[self.MatID[i]]
-
-    #        s11 = 1 / mat.YoungX
-    #        s22 = 1 / mat.YoungY
-    #        s12 = (-1) * mat.PoissonXY / mat.YoungX
-    #        s66 = 1 / mat.ShearXY
-
-    #        # Calculate the terms of the reduced stiffness matrix Q in the laminae coordinate system
-    #        q11 = s22 / (s11 * s22 - s12 ** 2)
-    #        q12 = (-1) * s12 / (s11 * s22 - s12 ** 2)
-    #        q22 = s11 / (s11 * s22 - s12 ** 2)
-    #        q66 = 1 / s66
-
-    #        # Calculate the terms of the reduced stiffness matrix Q' in the laminate coordinate system
-    #        q11_t += (q11 * c ** 4 + 2 * (q12 + 2 * q66) * s ** 2 * c ** 2 + q22 * s ** 4) * rel_thick #! why multiply by the thickness
-    #        q12_t += ((q11 + q22 - 4 * q66) * s ** 2 * c ** 2 + q12 * (s ** 4 + c ** 4)) * rel_thick
-    #        q22_t += (q11 * s ** 4 + 2 * (q12 + 2 * q66) * s ** 2 * c ** 2 + q22 * c ** 4) * rel_thick
-    #        q16_t += ((q11 - q12 - 2 * q66) * s * c ** 3 + (q12 - q22 + 2 * q66) * s ** 3 * c) * rel_thick
-    #        q26_t += ((q11 - q12 - 2 * q66) * s ** 3 * c + (q12 - q22 + 2 * q66) * s * c ** 3) * rel_thick
-    #        q66_t += ((q11 + q22 - 2 * q12 - 2 * q66) * s ** 2 * c ** 2 + q66 * (s ** 4 + c ** 4)) * rel_thick
-
-    #    Q = [[q11_t, q12_t, q16_t],
-    #         [q12_t, q22_t, q26_t],
-    #         [q16_t, q26_t, q66_t]]
-
-    #    return Q
+       q11_t = 0
+       q12_t = 0
+       q22_t = 0
+       q16_t = 0
+       q26_t = 0
+       q66_t = 0
+
+       t_thick = sum(self.Thickness) #! is self.Thickness a numpy array?
+
+       for i in range(self.NumPiles):
+           c = math.cos(math.radians(self.Theta[i]))
+           s = math.sin(math.radians(self.Theta[i]))
+
+           thick = self.Thickness[i]
+           rel_thick = thick/t_thick
+
+           mat = self.__model__._N2PModelContent__material_dict[self.MatID[i]]
+
+           s11 = 1 / mat.YoungX
+           s22 = 1 / mat.YoungY
+           s12 = (-1) * mat.PoissonXY / mat.YoungX
+           s66 = 1 / mat.ShearXY if mat.ShearXY != 0.0 else mat.YoungX/(2*(1+mat.PoissonXY))
+
+           # Calculate the terms of the reduced stiffness matrix Q in the laminae coordinate system
+           q11 = s22 / (s11 * s22 - s12 ** 2)
+           q12 = (-1) * s12 / (s11 * s22 - s12 ** 2)
+           q22 = s11 / (s11 * s22 - s12 ** 2)
+           q66 = 1 / s66
+
+           # Calculate the terms of the reduced stiffness matrix Q' in the laminate coordinate system
+           q11_t += (q11 * c ** 4 + 2 * (q12 + 2 * q66) * s ** 2 * c ** 2 + q22 * s ** 4) * rel_thick #! why multiply by the thickness
+           q12_t += ((q11 + q22 - 4 * q66) * s ** 2 * c ** 2 + q12 * (s ** 4 + c ** 4)) * rel_thick
+           q22_t += (q11 * s ** 4 + 2 * (q12 + 2 * q66) * s ** 2 * c ** 2 + q22 * c ** 4) * rel_thick
+           q16_t += ((q11 - q12 - 2 * q66) * s * c ** 3 + (q12 - q22 + 2 * q66) * s ** 3 * c) * rel_thick
+           q26_t += ((q11 - q12 - 2 * q66) * s ** 3 * c + (q12 - q22 + 2 * q66) * s * c ** 3) * rel_thick
+           q66_t += ((q11 + q22 - 2 * q12 - 2 * q66) * s ** 2 * c ** 2 + q66 * (s ** 4 + c ** 4)) * rel_thick
+
+       Q = [[q11_t, q12_t, q16_t],
+            [q12_t, q22_t, q26_t],
+            [q16_t, q26_t, q66_t]]
+
+       return Q
 # ----------------------------------------------------------------------------------------------------------------------
 
     
@@ -191,7 +191,8 @@ class N2PComp(N2PProperty):
         s11 = 1 / mat.YoungX
         s22 = 1 / mat.YoungY
         s12 = (-1) * mat.PoissonXY / mat.YoungX
-        s66 = 1 / mat.ShearXY
+        shear = mat.ShearXY if mat.ShearXY != 0.0 else mat.YoungX/(2*(1+mat.PoissonXY))
+        s66 = 1 / shear
 
         # Calculate the terms of the reduced stiffness matrix Q in the lamina, principal axis, coordinate system
         q11 = s22 / (s11 * s22 - s12 ** 2)

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/Core/Constants/Constants.py

@@ -1,7 +1,7 @@
 """Constants of the NaxToPy package"""
 
 # NaxToPy Version
-VERSION = "1.1.0"
+VERSION = "1.1.1"
 
 # Supported for Naxto:
 NAXTO_VERSION = '2024R0'

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/Core/N2PModelContent.py

@@ -66,6 +66,7 @@ class N2PModelContent:
         self.__elements_coord_sys = None
         self.__material_coord_sys = None
         self.__cells_list = None  # Lista con N2PElement y N2PConnector
+        self.__connectivity_dict = {}
 
         if (solver is None) and (solver != "InputFileNastran") and (solver != "Binary"):
             t1 = time.time()
@@ -255,7 +256,8 @@ class N2PModelContent:
         del listadeconectores
         # OJO. EN NASTRAN SE PUEDEN TENER VARIOS MPC CON EL MISMO ID, POR TANTO SE GUARDARAN COMO UNA LISTA DE
         # N2PConnectors
-        self.__cells_list += list(self.__connector_dict.values())
+        self.__cells_list += [conn for conn_list in self.__connector_dict.values()
+                              for conn in (conn_list if isinstance(conn_list, list) else [conn_list])]
         t2 = time.time()
         N2PLog.Debug.D100("N2PConnector Dictionary", t2-t1)
         # --------------------------------------------------------------------------------------------------------------
@@ -885,6 +887,7 @@ class N2PModelContent:
                                            lc.Name,
                                            lc.Results,
                                            lc.SolutionType,
+                                           lc.Solver.ToString(),
                                            self,
                                            lc) for lc in lcs]
 

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy/__init__.py

@@ -3,6 +3,7 @@ from NaxToPy.Core.N2PModelContent import initialize, load_model
 from NaxToPy.Modules.N2PtoEXE.N2PtoEXE import n2ptoexe
 from NaxToPy.Modules.N2PEnvelope.N2PEnvelope import envelope_list, envelope_ndarray
 from NaxToPy.Core.Constants.Constants import VERSION
+from NaxToPy.Core.Classes import AllClasses
 
 __all__ = ['N2PLog', 'initialize', 'load_model', 'n2ptoexe', 'envelope_list', 'envelope_ndarray', 'VERSION']
 

{NaxToPy-1.1.0 → NaxToPy-1.1.1/src/NaxToPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 1.1.0
+Version: 1.1.1
 Summary: Package for postprocessing FEM results in Python
 Home-page: https://idaerosolutions.com/
 Download-URL: https://appsource.microsoft.com/en-us/product/SaaS/idaerosolutionssl1685692009813.naxto?signInModalType=2&ctaType=1
@@ -204,7 +204,7 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.
 
-This version is only compatible with **NaxTo 2024.0.0**.
+This version is only compatible with **NaxTo 2024.0.1**.
 Check in Programs and Features the NaxTo version that is installed.
 
 NaxToPy only use three dependeces:

{NaxToPy-1.1.0 → NaxToPy-1.1.1}/src/NaxToPy.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/NaxToPy.egg-info/requires.txt
 src/NaxToPy.egg-info/top_level.txt
 src/NaxToPy/Core/N2PModelContent.py
 src/NaxToPy/Core/__init__.py
+src/NaxToPy/Core/Classes/AllClasses.py
 src/NaxToPy/Core/Classes/N2PComponent.py
 src/NaxToPy/Core/Classes/N2PConnector.py
 src/NaxToPy/Core/Classes/N2PCoord.py