NaxToPy 2.0.1__tar.gz → 2.1.0__tar.gz

{naxtopy-2.0.1/src/NaxToPy.egg-info → naxtopy-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 2.0.1
+Version: 2.1.0
 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
@@ -147,7 +147,7 @@ links on the left).
 **NaxToPy** is a powerful tool for FEM analysis post-processing!
 
 **CAUTION:** To use NaxToPy, [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US) must be installed.
-This version is compatible with **NaxTo 2024.1**. It is compatible with all the steps of this version (2024.1.0, 2024.1.1, 2024.1.2, etc.).
+This version is compatible with **NaxTo 2024.2**. It is compatible with all the steps of this version (2024.2.0, 2024.2.1, 2024.2.2, etc.).
 Check in _Programs and Features_ the NaxTo version that is installed. 
 
 ## Installation
@@ -269,6 +269,12 @@ the LoadCases that are critical or the Increment that is critical instead of the
 It uses an object instaed of an int.
 3. Update of the examples of some docstrings.
 
+### v.2.1.0
+1. Reading a Natran Input File: SPC and SCP1 are now supported.
+2. Bug fix. The order in the components in new_report() does not affect now.
+3. Formula check in new_derived_loadcase(), new_enevelope_loadcase() and new_derived_component().
+4. New optional arguments if n2ptoexe() to add extra libaries, packages or files.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

{naxtopy-2.0.1 → naxtopy-2.1.0}/README.md

@@ -23,7 +23,7 @@ links on the left).
 **NaxToPy** is a powerful tool for FEM analysis post-processing!
 
 **CAUTION:** To use NaxToPy, [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US) must be installed.
-This version is compatible with **NaxTo 2024.1**. It is compatible with all the steps of this version (2024.1.0, 2024.1.1, 2024.1.2, etc.).
+This version is compatible with **NaxTo 2024.2**. It is compatible with all the steps of this version (2024.2.0, 2024.2.1, 2024.2.2, etc.).
 Check in _Programs and Features_ the NaxTo version that is installed. 
 
 ## Installation
@@ -145,6 +145,12 @@ the LoadCases that are critical or the Increment that is critical instead of the
 It uses an object instaed of an int.
 3. Update of the examples of some docstrings.
 
+### v.2.1.0
+1. Reading a Natran Input File: SPC and SCP1 are now supported.
+2. Bug fix. The order in the components in new_report() does not affect now.
+3. Formula check in new_derived_loadcase(), new_enevelope_loadcase() and new_derived_component().
+4. New optional arguments if n2ptoexe() to add extra libaries, packages or files.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

{naxtopy-2.0.1 → naxtopy-2.1.0}/pyproject.toml

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

{naxtopy-2.0.1 → naxtopy-2.1.0}/src/NaxToPy/Core/Classes/N2PModelInputData.py

@@ -12415,18 +12415,168 @@ class RSPLINE(N2PCard):
                 self.__cardinfo.C[i] = val
 
 
+class SPC(N2PCard):
+
+    def __init__(self, cardinfo):
+        super().__init__(cardinfo)
+        self.__cardinfo = cardinfo
+
+    @property
+    def CharName(self) -> str:
+        """
+           Card code (SPC)
+        """
+        return self.__cardinfo.CharName
+
+    @CharName.setter
+    def CharName(self, value: str) -> None:
+        self.__cardinfo.CharName = value
+
+    @property
+    def SID(self) -> int:
+        """
+           Identification number of the single-point constraint set
+        """
+        return self.__cardinfo.SID
+
+    @SID.setter
+    def SID(self, value: int) -> None:
+        self.__cardinfo.SID = value
+
+    @property
+    def G1(self) -> int:
+        """
+           Grid point identification number of connection points. (Integer > 0)
+           GA
+        """
+        return self.__cardinfo.G1
+
+    @G1.setter
+    def G1(self, value: int) -> None:
+        self.__cardinfo.G1 = value
+
+    @property
+    def C1(self) -> int:
+        """
+           C1
+        """
+        return self.__cardinfo.C1
+
+    @C1.setter
+    def C1(self, value: int) -> None:
+        self.__cardinfo.C1 = value
+
+
+    @property
+    def D1(self) -> float:
+        """
+           D1: enforced motion for components C1 at G1
+        """
+        return self.__cardinfo.D1
+
+    @D1.setter
+    def D1(self, value: float) -> None:
+        self.__cardinfo.D1 = value
+
+    @property
+    def G2(self) -> int:
+        """
+           Grid point identification number of connection points. (Integer > 0)
+           GA
+        """
+        return self.__cardinfo.G2
+
+    @G2.setter
+    def G2(self, value: int) -> None:
+        self.__cardinfo.G2 = value
+
+    @property
+    def C2(self) -> int:
+        """
+           C2
+        """
+        return self.__cardinfo.C2
+
+    @C2.setter
+    def C2(self, value: int) -> None:
+        self.__cardinfo.C2 = value
+
+
+    @property
+    def D2(self) -> float:
+        """
+           D2: enforced motion for components C2 at G2
+        """
+        return self.__cardinfo.D2
+
+    @D2.setter
+    def D2(self, value: float) -> None:
+        self.__cardinfo.D2 = value
+
+
+class SPC1(N2PCard):
+
+    def __init__(self, cardinfo):
+        super().__init__(cardinfo)
+        self.__cardinfo = cardinfo
+
+    @property
+    def CharName(self) -> str:
+        """
+           Card code (SPC1)
+        """
+        return self.__cardinfo.CharName
+
+    @CharName.setter
+    def CharName(self, value: str) -> None:
+        self.__cardinfo.CharName = value
+
+    @property
+    def SID(self) -> int:
+        """
+           Identification number of the single-point constraint set
+        """
+        return self.__cardinfo.SID
+
+    @SID.setter
+    def SID(self, value: int) -> None:
+        self.__cardinfo.SID = value
+
+    @property
+    def C(self) -> int:
+        """
+           Component numbers: 123456
+        """
+        return self.__cardinfo.C
+
+    @C.setter
+    def C(self, value: int) -> None:
+        self.__cardinfo.C = value
+
+
+    @property
+    def Grids(self) -> list[int, ...]:
+        """
+           Grid or scalar point identification numbers
+        """
+        return self.__cardinfo.NodeArray
+
+    @C.setter
+    def Grids(self, value: list[int, ...]) -> None:
+        self.__cardinfo.NodeArray = value
+
 # Diccionario con todas clases.
 CONSTRUCTDICT = {"CBAR": CBAR,
-                  "CBEAM": CBEAM,
-                  "CBUSH": CBUSH,
-                  "CELAS1": CELAS1,
-                  "CELAS2": CELAS2,
-                  "CELAS3": CELAS3,
-                  "CELAS4": CELAS4,
-                  "CFAST": CFAST,
-                  "CHEXA_NASTRAN": CHEXANAS,
-                  "CHEXA_OPTISTRUCT": CHEXAOPT,
-                  "CONM2": CONM2,
+                 "CBEAM": CBEAM,
+                 "CBUSH": CBUSH,
+                 "CELAS1": CELAS1,
+                 "CELAS2": CELAS2,
+                 "CELAS3": CELAS3,
+                 "CELAS4": CELAS4,
+                 "CFAST": CFAST,
+                 "CHEXA_NASTRAN": CHEXANAS,
+                 "CHEXA_OPTISTRUCT": CHEXAOPT,
+                 "CONM2": CONM2,
                  "CORD1C": CORD1C,
                  "CORD1R": CORD1R,
                  "CORD1S": CORD1S,
@@ -12485,4 +12635,7 @@ CONSTRUCTDICT = {"CBAR": CBAR,
                  "RBE2": RBE2,
                  "RBE3": RBE3,
                  "RSPLINE": RSPLINE,
-                 "UNSUPPORTED": N2PCard}
+                 "SPC": SPC,
+                 "SPC1": SPC1,
+                 "UNSUPPORTED": N2PCard
+                 }

{naxtopy-2.0.1 → naxtopy-2.1.0}/src/NaxToPy/Core/Classes/N2PProperty.py

@@ -180,6 +180,9 @@ class N2PComp(N2PProperty):
     def QMatrix(self,i) -> np.ndarray:
         """
         Returns the lamina stiffness matrix (Q-Bar) as a numpy 2D array
+        | σx |       |  ε  |
+        | σy | = [Q]*|  ε  |
+        | τxy|       | γ/2 |
         
         """                
 

{naxtopy-2.0.1 → naxtopy-2.1.0}/src/NaxToPy/Core/Classes/N2PResult.py

@@ -1,6 +1,8 @@
 from NaxToPy.Core.Classes.N2PComponent import N2PComponent
 from NaxToPy.Core.Errors.N2PLog import N2PLog
 from NaxToModel import N2Component
+from NaxToModel import N2ArithmeticSolver
+from NaxToModel import N2ErrorWarnningHandling
 from System.Collections.Generic import List
 
 
@@ -162,17 +164,17 @@ class N2PResult:
 
         The `Result|Component` must have this structure: `<CMPT_Result:Component>` or `<CMPTD:Component>`.
 
-        Examples:
-            - formula = "<0.5*CMPT_DISPLACEMENTS:MAGNITUDE_D>+2*<CMPT_DISPLACEMENTS:MAGNITUDE_R>"
-            - formula = "(<CMPTD:Example>-2*<CMPT_DISPLACEMENTS:MAGNITUDE_R>)^2"
-            - formula = "sqrt(<CMPT_STRESSES:XX>^2+<CMPT_STRESSES:YY>^2-<CMPT_STRESSES:XX>*<CMPT_STRESSES:YY>+3*<CMPT_STRESSES:XY>^2)"
-
         Args:
             name (str): The name of the component.
             formula (str): String containing the Result:Component intended to be used and the arithmetic operations.
 
         Returns:
             N2PComponent: Derived load case.
+
+        Examples:
+            >>> N2PResult.new_derived_component("dev_comp1", formula="<0.5*CMPT_DISPLACEMENTS:MAGNITUDE_D>+2*<CMPT_DISPLACEMENTS:MAGNITUDE_R>")
+            >>> N2PResult.new_derived_component("dev_comp2", formula="(<CMPTD:Example>-2*<CMPT_DISPLACEMENTS:MAGNITUDE_R>)^2"
+            >>> N2PResult.new_derived_component("dev_comp3", formula="sqrt(<CMPT_STRESSES:XX>^2+<CMPT_STRESSES:YY>^2-<CMPT_STRESSES:XX>*<CMPT_STRESSES:YY>+3*<CMPT_STRESSES:XY>^2)")
         """
 
         # Recuperamos la instancia N2ModelModelContent
@@ -192,6 +194,15 @@ class N2PResult:
         # Call the method that recalculate the data.
         new_d_comp.RecalculateCMPTInfo2Formule()
 
+        # Este metodo de N2ArithmeticSolver en NaxToModel comprueba que la formula introducida es correcta.
+        # Devuelve False si está mal y True si está bien.
+        err = N2ArithmeticSolver.CheckExpression(new_d_comp.Formula, mc, N2ArithmeticSolver.ExpressionType.COMPONENT)
+        if int(err) == 0:
+            pass
+        else:
+            N2PLog.Error.E230(formula, (formula, str(N2ErrorWarnningHandling.GetDescription(err).upper())) )  # error
+            return "ERROR"
+
         # The N2PComponent is instanced and added to the dictionary of derived loadcases:
         self.__derived_comps__[new_d_comp.Name] = N2PComponent(new_d_comp.Name, new_d_comp.Sections, self)
 

{naxtopy-2.0.1 → naxtopy-2.1.0}/src/NaxToPy/Core/Constants/Constants.py

@@ -1,14 +1,14 @@
 """Constants of the NaxToPy package"""
 
 # NaxToPy Version
-VERSION = "2.0.1"
+VERSION = "2.1.0"
 
 # Supported for Naxto:
-NAXTO_VERSION = '2024R1'
-NAXTO_STEP = "2"
+NAXTO_VERSION = '2024R2'
+NAXTO_STEP = "0"
 
 # Assembly version of NaxToModel.dll
-VIZZER_COMPATIBILITY = ("4.1.0.0", "4.1.0.1", "4.1.0.2")
+VIZZER_COMPATIBILITY = ("4.2.0.0")
 """Tuple with the compatible versions of NaxToModel.dll"""
 
 # PYTHON EXTERNO ----------------------------------------------------------------------------------

{naxtopy-2.0.1 → naxtopy-2.1.0}/src/NaxToPy/Core/Errors/N2PLog.py

@@ -581,6 +581,13 @@ own information message. Use the following structure as a standard message (I +
             message = f"E112: THE WINDOWS REGISTER COULDN'T BE MODIFIED. ERROR: {er}"
             N2PLog._N2PLog__logger.error(message)
 
+        @staticmethod
+        def E113(file) -> None:
+            """ Error raised when the Windows Register couldn't be modified
+            """
+            message = f"E113: THE FILE {file} DOESN'T EXIST OR COULDN'T BE FOUND"
+            N2PLog._N2PLog__logger.error(message)
+
         @staticmethod
         def E201(*args) -> None:
             ''' Error raised when the id of the node is not in the node dictionary.
@@ -783,6 +790,27 @@ own information message. Use the following structure as a standard message (I +
             message = f"E227: THE PROPERTY ID {-rep_id} IS REPEATED. ONE WILL BE SAVE WITH THE SIGN CHANGE"
             N2PLog._N2PLog__logger.error(message)
 
+        @staticmethod
+        def E228(formula, vz_msg) -> None:
+            ''' Error raised when the formula introduced for a new derived loadcase is wrong
+            '''
+            message = f"E228: THE FORMULA INTRODUCED TO CREATE A DERIVED LOAD CASE \"{formula}\" IS WRONG: {vz_msg}"
+            N2PLog._N2PLog__logger.error(message)
+
+        @staticmethod
+        def E229(formula, vz_msg) -> None:
+            ''' Error raised when the formula introduced for a new envelope loadcase is wrong
+            '''
+            message = f"E229: THE FORMULA INTRODUCED TO CREATE A ENVELOPE LOAD CASE \"{formula}\" IS WRONG: {vz_msg}"
+            N2PLog._N2PLog__logger.error(message)
+
+        @staticmethod
+        def E230(formula, vz_msg) -> None:
+            ''' Error raised when the formula introduced for a new derived component is wrong
+            '''
+            message = f"E230: THE FORMULA INTRODUCED TO CREATE DERIVED COMPONENT \"{formula}\" IS WRONG: {vz_msg}"
+            N2PLog._N2PLog__logger.error(message)
+
         @staticmethod
         def E300(args) -> None:
             ''' Error raised when the program fail to save the model (as a N2PModelContent object).

{naxtopy-2.0.1 → naxtopy-2.1.0}/src/NaxToPy/Core/N2PModelContent.py

@@ -4,6 +4,8 @@ from NaxToModel.Classes import N2AdjacencyFunctions
 from NaxToModel.Classes import N2FreeEdges
 from NaxToModel import EnvelopGroup
 from NaxToModel import EnvelopCriteria
+from NaxToModel import N2ArithmeticSolver
+from NaxToModel import N2ErrorWarnningHandling
 from NaxToPy.Core.Classes.N2PLoadCase import N2PLoadCase
 from NaxToPy.Core.Classes.N2PIncrement import N2PIncrement
 from NaxToPy.Core.Classes.N2PElement import N2PElement
@@ -1156,6 +1158,15 @@ class N2PModelContent:
         # Método de N2LoadCase que pone todoo en su sitio
         cs_lc.RecalculateLCInfo2Formule()
 
+        # Este metodo de N2ArithmeticSolver en NaxToModel comprueba que la formula introducida es correcta.
+        # Devuelve False si está mal y True si está bien.
+        err = N2ArithmeticSolver.CheckExpression(cs_lc.Formula, self.__vzmodel, N2ArithmeticSolver.ExpressionType.LOAD_CASE)
+        if int(err) == 0:
+            pass
+        else:
+            N2PLog.Error.E228(formula, str(N2ErrorWarnningHandling.GetDescription(err).upper()))   # error
+            return "ERROR"
+
         # Se transforma el caso de carga de NaxToModel en un N2PLoadCase de python
         py_lc = N2PLoadCase(cs_lc.ID, cs_lc.IDOriginal, cs_lc.Increments, cs_lc.IncrementsNumberList, cs_lc.IsComplex,
                             cs_lc.TypeLoadCase, cs_lc.Name, cs_lc.Results, cs_lc.SolutionType, cs_lc.Solver, self, cs_lc)
@@ -1242,6 +1253,15 @@ class N2PModelContent:
         # Método de N2LoadCase que pone todoo en su sitio
         cs_lc.RecalculateLCInfo2Formule()
 
+        # Este metodo de N2ArithmeticSolver en NaxToModel comprueba que la formula introducida es correcta.
+        # Devuelve False si está mal y True si está bien.
+        err = N2ArithmeticSolver.CheckExpression(cs_lc.Formula, self.__vzmodel, N2ArithmeticSolver.ExpressionType.LOAD_CASE)
+        if int(err) == 0:
+            pass
+        else:
+            N2PLog.Error.E229(formula, str(N2ErrorWarnningHandling.GetDescription(err).upper()))  # error
+            return "ERROR"
+
         # Se transforma el caso de carga de NaxToModel en un N2PLoadCase de python
         py_lc = N2PLoadCase(cs_lc.ID, cs_lc.IDOriginal, cs_lc.Increments, cs_lc.IncrementsNumberList, cs_lc.IsComplex,
                             cs_lc.TypeLoadCase, cs_lc.Name, cs_lc.Results, cs_lc.SolutionType, cs_lc.Solver, self, cs_lc)
@@ -1351,8 +1371,8 @@ class N2PModelContent:
             lcs = [int(lc.split(":")[0][3:]) for lc in lc_incr.split(",")]
             components = [c.split(":")[0][1:] for c in componentssections.split(",")]
             for lc in lcs:
-                all_comps = chain(self.get_load_case(lc).get_result(result).Components.keys(),
-                                  self.get_load_case(lc).get_result(result).DerivedComponents.keys())
+                all_comps = list(self.get_load_case(lc).get_result(result).Components.keys()) + \
+                            list(self.get_load_case(lc).get_result(result).DerivedComponents.keys())
                 if not all(c in all_comps for c in components):
                     N2PLog.Error.E312(lc, result)
                     return "ERROR"

{naxtopy-2.0.1 → naxtopy-2.1.0}/src/NaxToPy/Modules/N2PtoEXE/N2PtoEXE.py

@@ -114,7 +114,7 @@ def __list_ext_libs(libs_path, solver, abq_ver) -> list[str]:
 
 # Funcion principal que usa PyInstaller para generar el .exe -----------------------------------------------------------
 def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion: list[str] = None,
-             splash: str="") -> None:
+             splash: str = "", extra_packages: list[str] = None, extra_files: list[str] = None) -> None:
     """Function that creates .exe files of programs that use NaxToPy
 
     Args:
@@ -133,6 +133,17 @@ def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion
         splash: str -> Optional. Path to the splash image. If used, the user must introduce pyi_splash.close() at the
             beginning of the execution of the module. Import pyi_splash first. The splash image will appear during  the
             .exe unpacking. Image should be png and smaller than 500x500 pixels.
+        extra_packages: list[str] -> If some packages are not imported correctly by the function, they can be added
+                                     manually. An example of a package that usually fails is 'sv_ttk'.
+        extra_files: list[str] -> Lis of path of extra dll, images or other files the user want to add the exe. The
+                                  files will be saved in the ./bin directory inside the exe. To acces to the files
+                                  use: path_file = os.path.join(sys._MEIPASS, r"bin\mylib.dll")
+
+    Examples:
+        >>> n2ptoexe(r"C:\Scripts\myscript1.py")
+        >>> n2ptoexe(r"C:\Scripts\myscript2.py", console=False, solver="NASTRAN")
+        >>> n2ptoexe(r"C:\Scripts\myscript3.py", console=True, solver="OPTISTRUCT", splash=r"C:\Scripts\mysplash.jpg")
+        >>> n2ptoexe(r"C:\Scripts\myscript4.py", extra_packages=["sv_ttk"], extra_files=[r"C:\Scripts\icon.png"])
     """
 
     # 0 ) Genera el archivo .log y añade los logs de la importación ------------------------------------------------
@@ -164,7 +175,7 @@ def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion
         consl = "-w"
     else:
         N2PLog.Critical.C104()
-        # sys.exit("C104: THE ARGUMENT CONSOLE MUST BE A BOOLEAN: True | False")
+        raise Exception()
 
 
     if __busca_n2p(path):
@@ -187,6 +198,19 @@ def n2ptoexe(path: str, console: bool = True, solver: str = "ALL", abaqusversion
         if splash:
             pyinstaller_cmd += ['--splash', splash]
 
+        if extra_files:
+            for file in extra_files:
+                if os.path.isfile(file):
+                    pass
+                else:
+                    N2PLog.Error.E113(file)
+                    raise Exception()
+                pyinstaller_cmd += ["--add-data", f"{file};./bin"]
+
+        if extra_packages:
+            for package in extra_packages:
+                pyinstaller_cmd += ["--collect-data", package]
+
         PyIns.run(pyinstaller_cmd)
         N2PLog.Info.I201(os.getcwd())
     else:

{naxtopy-2.0.1 → naxtopy-2.1.0/src/NaxToPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 2.0.1
+Version: 2.1.0
 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
@@ -147,7 +147,7 @@ links on the left).
 **NaxToPy** is a powerful tool for FEM analysis post-processing!
 
 **CAUTION:** To use NaxToPy, [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US) must be installed.
-This version is compatible with **NaxTo 2024.1**. It is compatible with all the steps of this version (2024.1.0, 2024.1.1, 2024.1.2, etc.).
+This version is compatible with **NaxTo 2024.2**. It is compatible with all the steps of this version (2024.2.0, 2024.2.1, 2024.2.2, etc.).
 Check in _Programs and Features_ the NaxTo version that is installed. 
 
 ## Installation
@@ -269,6 +269,12 @@ the LoadCases that are critical or the Increment that is critical instead of the
 It uses an object instaed of an int.
 3. Update of the examples of some docstrings.
 
+### v.2.1.0
+1. Reading a Natran Input File: SPC and SCP1 are now supported.
+2. Bug fix. The order in the components in new_report() does not affect now.
+3. Formula check in new_derived_loadcase(), new_enevelope_loadcase() and new_derived_component().
+4. New optional arguments if n2ptoexe() to add extra libaries, packages or files.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.