NaxToPy 2.0.0__tar.gz → 2.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 2.0.0
+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
@@ -135,9 +135,9 @@ Requires-Dist: setuptools>=67.8.0
 
 **NaxToPy** is the [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US)
 library designed for Python, which allows reading and manipulating FEM
-analysis results files from the most common tools: Nastran (op2, xdb, h5), Abaqus (odb), Optistruct
-(h3d, op2) and Ansys (rst); and stores them in a user-friendly Python structure. Additionally, it
-can read input files from Nastran (bdf, fem) and change it contents.
+analysis results files from the most common tools: Nastran (.op2, .xdb, .h5), Abaqus (odb), Optistruct
+(.h3d, .op2) and Ansys (.rst); and stores them in a user-friendly Python structure. Additionally, it
+can read input files from Nastran (.bdf, .fem) and change their contents.
 
 It could be easily combined with other Python packages as Matplotlib or Pandas. This provides access
 to the full coding power of Python to interpret and process the results, without the need to install
@@ -147,15 +147,18 @@ 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 may be 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
 
+If python is installed and `pip` is added to the PATH:
 
-If python is callable from the command line:
+`pip install NaxToPy`
+
+An alternative, if Python is callable from the command line:
 
-`py -m pip install NaxToPy`
+`python -m pip install NaxToPy`
 
 For **Visual Studio** users:
 - Open "Python Environments" window
@@ -179,7 +182,7 @@ same directory. When ever you want to use the NaxToPy package add the following
 
 If python is callable from the command line:
 
-`py -m pip install -U NaxToPy`
+`python -m pip install -U NaxToPy`
 
 For Visual Studio users:
 - Open "Python Environments" window
@@ -260,6 +263,18 @@ the LoadCases that are critical or the Increment that is critical instead of the
 2. New internal methods to look for the compatibility with low-level dependencies.
 3. The name of the .log is now NaxToPy_Year-Month-Day.log.
 
+### v.2.0.1
+1. The compatibility is extended to all NaxTo steps of the same version.
+2. The property N2PLoadCase.ActiveIncrement is subtitued by N2PLoadCase.ActiveN2PIncrement.
+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.
@@ -339,7 +354,7 @@ loadcaseslist = model.LoadCases
 pressure_lc = model.get_load_case("pressure")
 
 # Change the active increment (by default is the last one):
-pressure_lc.ActiveIncrement = 10
+pressure_lc.ActiveN2PIncrement = pressure_lc.get_increment(10)
 
 # Look for all results
 all_results = pressure_lc.Results

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

@@ -11,9 +11,9 @@
 
 **NaxToPy** is the [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US)
 library designed for Python, which allows reading and manipulating FEM
-analysis results files from the most common tools: Nastran (op2, xdb, h5), Abaqus (odb), Optistruct
-(h3d, op2) and Ansys (rst); and stores them in a user-friendly Python structure. Additionally, it
-can read input files from Nastran (bdf, fem) and change it contents.
+analysis results files from the most common tools: Nastran (.op2, .xdb, .h5), Abaqus (odb), Optistruct
+(.h3d, .op2) and Ansys (.rst); and stores them in a user-friendly Python structure. Additionally, it
+can read input files from Nastran (.bdf, .fem) and change their contents.
 
 It could be easily combined with other Python packages as Matplotlib or Pandas. This provides access
 to the full coding power of Python to interpret and process the results, without the need to install
@@ -23,15 +23,18 @@ 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 may be 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
 
+If python is installed and `pip` is added to the PATH:
 
-If python is callable from the command line:
+`pip install NaxToPy`
+
+An alternative, if Python is callable from the command line:
 
-`py -m pip install NaxToPy`
+`python -m pip install NaxToPy`
 
 For **Visual Studio** users:
 - Open "Python Environments" window
@@ -55,7 +58,7 @@ same directory. When ever you want to use the NaxToPy package add the following
 
 If python is callable from the command line:
 
-`py -m pip install -U NaxToPy`
+`python -m pip install -U NaxToPy`
 
 For Visual Studio users:
 - Open "Python Environments" window
@@ -136,6 +139,18 @@ the LoadCases that are critical or the Increment that is critical instead of the
 2. New internal methods to look for the compatibility with low-level dependencies.
 3. The name of the .log is now NaxToPy_Year-Month-Day.log.
 
+### v.2.0.1
+1. The compatibility is extended to all NaxTo steps of the same version.
+2. The property N2PLoadCase.ActiveIncrement is subtitued by N2PLoadCase.ActiveN2PIncrement.
+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.
@@ -215,7 +230,7 @@ loadcaseslist = model.LoadCases
 pressure_lc = model.get_load_case("pressure")
 
 # Change the active increment (by default is the last one):
-pressure_lc.ActiveIncrement = 10
+pressure_lc.ActiveN2PIncrement = pressure_lc.get_increment(10)
 
 # Look for all results
 all_results = pressure_lc.Results

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

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

{naxtopy-2.0.0 → naxtopy-2.1.0}/src/NaxToPy/Core/Classes/N2PLoadCase.py

@@ -119,15 +119,17 @@ class N2PLoadCase:
 
     # Metodo para obtener el incremento activo. Influye en la funcion de llamada a get_result_array
     @property
-    def ActiveIncrement(self) -> str:
-        ''' Returns the active increment of the load case. By default, is the last one.'''
+    def ActiveIncrement(self) -> int:
+        """DEPRECATED PROPERTY. Use ActiveN2PIncrement.ID instaed. Returns the active increment of the load case. By
+        default, is the last one."""
+        N2PLog.Warning.W206()
         return self.__activeIncrement__
     # ------------------------------------------------------------------------------------------------------------------
 
-    # Metodo para obtener el incremento activo. Influye en la funcion de llamada a get_result_array
+    # Metodo para establecer el incremento activo. Influye en la funcion de llamada a get_result_array
     @ActiveIncrement.setter
     def ActiveIncrement(self, id: Union[int, str]) -> None:
-        ''' Sets the active increment of the load case. By defult is the last one.
+        ''' DEPRECATED PROPERTY. Use ActiveN2PIncrement instead. Sets the active increment of the load case. By defult is the last one.
 
         Args:
             id: int | str -> ID or Name of the N2PIncrement
@@ -141,6 +143,24 @@ class N2PLoadCase:
             N2PLog.Error.E207(id)
     # ------------------------------------------------------------------------------------------------------------------
 
+    # Metodo para obtener el incremento activo. Influye en la funcion de llamada a get_result_array
+    @property
+    def ActiveN2PIncrement(self) -> N2PIncrement:
+        """Returns the active increment of the load case. By default, is the last one."""
+        return self.get_increments(self.__activeIncrement__)
+    # ------------------------------------------------------------------------------------------------------------------
+
+    # Metodo para establecer el incremento activo. Influye en la funcion de llamada a get_result_array
+    @ActiveN2PIncrement.setter
+    def ActiveN2PIncrement(self, incr: N2PIncrement) -> None:
+        """Sets the active increment of the load case. By defult is the last one.
+
+        Args:
+            incr: N2PIncrement -> ID or Name of the N2PIncrement
+        """
+        self.__activeIncrement__ = incr.ID
+    # ------------------------------------------------------------------------------------------------------------------
+
     # Metodo como propiedad que devuelve todos los N2PResult. Es igual que llamar a get_results sin
     # parametros
     @property

{naxtopy-2.0.0 → 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.0 → 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.0 → 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.0 → naxtopy-2.1.0}/src/NaxToPy/Core/Constants/Constants.py

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

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

@@ -152,6 +152,12 @@ class N2PLog(ABC):
             message = f"The parallel processing has been set to {parallel}"
             N2PLog._N2PLog__logger.debug(message)
 
+        @staticmethod
+        def D200(assembly) -> None:
+            """Message that shows the assembly version of the core library"""
+            message = f"The assembly version is: {assembly}"
+            N2PLog._N2PLog__logger.debug(message)
+
         @staticmethod
         def D500(current_time,tinit) -> None:
             """ Information given for the extraction time.
@@ -443,6 +449,14 @@ own information message. Use the following structure as a standard message (I +
             message = f"W205: Initialize is a deprecated function. Please, use load_model instead"
             N2PLog._N2PLog__logger.warning(message)
 
+        @staticmethod
+        def W206() -> None:
+            """ Warning raised when there the Deprecated property "ActiveIncrement" is called.
+            """
+            message = f"W206: ActiveIncrement is a deprecated property. Please, ActiveN2pIncrement to obtain a " \
+                      f"N2PIncrement or ActiveN2pIncrement.ID to obtain the ID"
+            N2PLog._N2PLog__logger.warning(message)
+
         @staticmethod
         def W300() -> None:
             """ Warning raised when there are more dimensions than points in n2p.envelope
@@ -567,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.
@@ -769,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.0 → 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
@@ -873,6 +875,14 @@ class N2PModelContent:
 
         Returns:
             freebody: N2PFreeBody
+
+        Example:
+            >>> model = load_model("model.op2")
+            >>> lc = model.get_load_case(5)
+            >>> incr = lc.ActiveN2PIncrement
+            >>> node_list = model.get_nodes([1000, 1001, 1002, 1003, 1004, 1005])
+            >>> elem_list = model.get_elements([1000, 1001, 1002, 1003, 1004])
+
         """
 
         if increment is None:
@@ -909,6 +919,13 @@ class N2PModelContent:
 
             Args:
                 results_files: list[str, ...]
+
+            Example:
+                >>> model1 = load_model("model1_lc1.odb")
+                >>> model1.import_results_from_files(["model1_lc2.odb", "mode1l_lc3.odb"])
+
+                >>> model2 = load_model("model2.dat", "InputFileNastran")
+                >>> model2.import_results_from_files(["model2_lc1.op2", "model2_lc2.op2"])
             """
         if isinstance(results_files, str):
             results_files = [results_files]
@@ -930,6 +947,14 @@ class N2PModelContent:
         Args:
             cells: list[N2PElement, N2PConnector, ...]
             domain: list[N2PElement, N2PConnector, ...] -> Optional. Set the domain where to look for the adjacent elements
+
+        Returns:
+            list[N2PElement, N2PConnector, ...]
+
+        Example:
+            >>> model = load_model("model.odb")
+            >>> domain_S4 = [e for e in model.get_elements() if e.TypeElement == "S4"]
+            >>> elems_adj = model.get_elements_adjacent(model.get_elements(17500), domain=domain_S4)
             """
         if not isinstance(cells, list):
             cells = [cells]
@@ -962,6 +987,14 @@ class N2PModelContent:
         Args:
             cells: list[N2PElement, N2PConnector, ...]
             domain: list[N2PElement, N2PConnector, ...] -> Optional. Set the domain where to look for the adjacent elements
+
+        Returns:
+            list[N2PElement, N2PConnector, ...]
+
+        Example:
+            >>> model = load_model("model.h3d")
+            >>> domain_elems = model.get_elements()
+            >>> elems_att = model.get_elements_attached(model.get_elements(17500), domain=domain_elems)
             """
         if not isinstance(cells, list):
             cells = [cells]
@@ -997,9 +1030,21 @@ class N2PModelContent:
 
         Args:
             cells: list[N2PElement, N2PConnector, ...]
+
             tolerance_angle: float -> Optional (30º by default). Max angle[º] between two elements to be considered in the same face
+
             one_element_adjacent: bool -> Optional (True by default). If true, two elements are connected to arist of a selected element they will no be consisidered.
+
             domain: list[N2PElement, N2PConnector, ...] -> Optional. Set the domain where to look for the adjacent elements
+
+        Returns:
+            list[N2PElement, N2PConnector, ...]
+
+        Example:
+            >>> model = load_model("model.op2")
+            >>> elems1 = model.get_elements_by_face(model.get_elements(17500))
+            >>> domain_cquad = [e for e in model.get_elements() if e.TypeElement == "CQUAD4"]
+            >>> elems2 = model.get_elements_by_face(model.get_elements([17500, 17501]), 25, domain=domain_cquad)
             """
         if not isinstance(cells, list):
             cells = [cells]
@@ -1036,13 +1081,16 @@ class N2PModelContent:
     def get_free_edges(self,
                        domain: list[N2PElement, N2PConnector, ...] = None) -> list[tuple[N2PElement, N2PNode, N2PNode], ...]:
 
-        """ Method of N2PModelContent that returns a list of tuples of N2PElement and two N2PNode of that element. 
+        """ Method of N2PModelContent that returns a list of tuples of a N2PElement and two N2PNode of that element.
         The two nodes define the edge of the element that is contained in the free edge of the mesh If a domain is selected, 
         the tuple will only be searched in that domain. Notice that connectors, although they may be given in the domain,
         they are never included in the free edges.
 
         Args:
-            domain: list[N2PElement, N2PConnector, ...] -> Optional. Set the domain where to look for the adjacent elements
+            domain: list[N2PElement, N2PConnector, ...] -> Optional. Set the domain where to look for the free edges
+
+        Returns:
+            list[tuple[N2PElement, N2PNode, N2PNode], ...]
             """
 
         csharp_bool_array = System.Array.CreateInstance(System.Boolean,
@@ -1076,12 +1124,21 @@ class N2PModelContent:
             - formula = "0.5*<LC1:FR2>"
             - formula = "5*<LC2:FR3>-2*<LC3:FR3>"
 
+        Note:
+            The derived load cases will have only one frame/increment with id 0. So it is used in a formula the string
+            will be "<LC-1:FR0>".
+
         Args:
             name: str -> String with the name of the load case.
             formula: str -> String that must have the loadcase|frame is intended to use and the arithmetical opreations.
 
         Returns:
             N2PLoadCase -> Derived load case
+
+        Examples:
+            >>> dev_lc1 = new_derived_loadcase("dev_lc1", "<LC1:FR1>+2*<LC2:FR1>+0.5*<LC5:FR3>")
+            >>> dev_lc2 = new_derived_loadcase("dev_lc2", "0.5*<LC1:FR2>")
+            >>> dev_lc3 = new_derived_loadcase("dev_lc3", "5*<LC-1:FR0>-2*<LC3:FR3>")
         """
         # Comprobamos que el nombre no se repite:
         i = 0
@@ -1101,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)
@@ -1147,6 +1213,10 @@ class N2PModelContent:
 
         Returns:
             N2PLoadCase
+
+        Examples:
+            >>> env_lc1 = new_envelope_loadcase("env_lc1", formula="<LC1:FR1>,<LC2:FR1>")
+            >>> env_lc2 = new_envelope_loadcase("env_lc2", formula="<LC1:FR1>,<LC2:FR8>,<LC-3:FR0>", criteria="Min", envelgroup="ByLoadCaseID")
         """
         # Comprobamos que el nombre no se repite:
         i = 0
@@ -1183,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)
@@ -1282,19 +1361,18 @@ class N2PModelContent:
                 y=z^x.
 
         Examples:
-            report1 = model.new_report("<LC1:FR1>,<LC2:FR1>", False, "DISPLACEMNETS", "<X:NONE#>,<Y:NONE#>", False,
-            list_n2pnodes, "LC")
+            >>> report1 = model.new_report("<LC1:FR1>,<LC2:FR1>", False, "DISPLACEMNETS", "<X:NONE#>,<Y:NONE#>", False, list_n2pnodes, "LC")
 
-            report2 = model.new_report("<LC1:FR1>,<LC1:FR2>,<LC4:FR6>", False, "STRESSES", "<VON_MISES:Z1#Z2#>,<MAX_SHEAR:Z1#Z2#>",
-            False, list_n2pelements, "IDS", aveSections=-4, coordsys=-1)
+            >>> report2 = model.new_report("<LC1:FR1>,<LC1:FR2>,<LC4:FR6>", False, "STRESSES", "<VON_MISES:Z1#Z2#>,<MAX_SHEAR:Z1#Z2#>", \
+                                           False, list_n2pelements, "IDS", aveSections=-4, coordsys=-1)
         """
         # Here it is checkd if the components, the loadcases and the result exist and the formula is right
         try:
             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"
@@ -1319,8 +1397,8 @@ class N2PModelContent:
         and the values are numpy arrays.
 
         Examples:
-            vonmises = .get_result_by_LCs_Incr([(1,2),(2,2)], "STRESSES", "VON_MISES")
-            XX = .get_result_by_LCs_Incr([(loadcase1, increment2), (loadcase2, increment2), "STRAINS", "XX"])
+            >>> vonmises = N2PModelContent.get_result_by_LCs_Incr([(1,2),(2,2)], "STRESSES", "VON_MISES")
+            >>> XX = N2PModelContent.get_result_by_LCs_Incr([(loadcase1, increment2), (loadcase2, increment2), "STRAINS", "XX"])
 
         Args:
 
@@ -1430,7 +1508,7 @@ def load_model(path: str, parallelprocessing: bool = False, file_type: str = Non
 
         Supports .op2, .xdb, .odb, .h5, .h3d and .rst file extensions read from a local filesystem or URL.
 
-        Supports Nastran input files. (Typically .bdf extension)
+        Supports Nastran Input Files. (Typically .bdf extension)
 
         Args:
             path: str
@@ -1439,6 +1517,20 @@ def load_model(path: str, parallelprocessing: bool = False, file_type: str = Non
 
         Returns:
             model: N2PModelContent
+
+        Examples:
+            >>> model1 = load_model(r"C:\MODELS\FEM\model1.dat")
+
+            >>> # file_type is not needed. It only helps the program and saves a checking
+            >>> model2 = load_model(r"C:\MODELS\FEM\model2.dat", file_type="InputFileNastran")
+
+            >>> # parallelprocessing is only aviable for Binary files. It is helpful in some big files.
+            >>> model3 = load_model(r"C:\MODELS\RESULTS\model1.op2", parallelprocessing=True)
+
+            >>> model4 = load_model(r"C:\MODELS\RESULTS\model2.xdb", file_type="Binary")
+            >>> model5 = load_model(r"C:\MODELS\RESULTS\model5.h3d")
+            >>> model6 = load_model(r"C:\MODELS\RESULTS\model6.odb", True, "Binary")
+
         """
     if not os.path.exists(path):
         N2PLog.Critical.C108(path)

{naxtopy-2.0.0 → naxtopy-2.1.0}/src/NaxToPy/Core/Reference_Finder/__Reference_Finder.py

@@ -168,12 +168,13 @@ def compatible_vizzer(vizzer_libs: list) -> tuple[str, bool]:
                 versionInfo = FileVersionInfo.GetVersionInfo(lib_path)
                 assemblyVersion = versionInfo.FileVersion
 
-                # Si la version es compatible se devuelve la ruta y un boleano indicando si es compatible
-                if assemblyVersion in VIZZER_COMPATIBILITY:
-                    return lib_path, True
+                N2PLog.Debug.D200(assemblyVersion)
+
+                # Se va a suponer que la todos los steps de una version NaxTo son compatibles con todos los steps de
+                # una version de NaxToPy: NaxTo 2024.1.X <---> 2.0.Y
+                return lib_path, True
 
     N2PLog.Warning.W104(NAXTO_VERSION)
-    # Aunque la version este bien, el assembly no. Puede que de un step a otro no haya compatibilidad.
     backup = ""
 
     # Comprobamos si hay alguna version que contenga una dll compatible

{naxtopy-2.0.0 → 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.0 → naxtopy-2.1.0/src/NaxToPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 2.0.0
+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
@@ -135,9 +135,9 @@ Requires-Dist: setuptools>=67.8.0
 
 **NaxToPy** is the [**NaxTo**](https://apps.microsoft.com/detail/XP9MMH0KDKGRJN?hl=en-US&gl=US)
 library designed for Python, which allows reading and manipulating FEM
-analysis results files from the most common tools: Nastran (op2, xdb, h5), Abaqus (odb), Optistruct
-(h3d, op2) and Ansys (rst); and stores them in a user-friendly Python structure. Additionally, it
-can read input files from Nastran (bdf, fem) and change it contents.
+analysis results files from the most common tools: Nastran (.op2, .xdb, .h5), Abaqus (odb), Optistruct
+(.h3d, .op2) and Ansys (.rst); and stores them in a user-friendly Python structure. Additionally, it
+can read input files from Nastran (.bdf, .fem) and change their contents.
 
 It could be easily combined with other Python packages as Matplotlib or Pandas. This provides access
 to the full coding power of Python to interpret and process the results, without the need to install
@@ -147,15 +147,18 @@ 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 may be 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
 
+If python is installed and `pip` is added to the PATH:
 
-If python is callable from the command line:
+`pip install NaxToPy`
+
+An alternative, if Python is callable from the command line:
 
-`py -m pip install NaxToPy`
+`python -m pip install NaxToPy`
 
 For **Visual Studio** users:
 - Open "Python Environments" window
@@ -179,7 +182,7 @@ same directory. When ever you want to use the NaxToPy package add the following
 
 If python is callable from the command line:
 
-`py -m pip install -U NaxToPy`
+`python -m pip install -U NaxToPy`
 
 For Visual Studio users:
 - Open "Python Environments" window
@@ -260,6 +263,18 @@ the LoadCases that are critical or the Increment that is critical instead of the
 2. New internal methods to look for the compatibility with low-level dependencies.
 3. The name of the .log is now NaxToPy_Year-Month-Day.log.
 
+### v.2.0.1
+1. The compatibility is extended to all NaxTo steps of the same version.
+2. The property N2PLoadCase.ActiveIncrement is subtitued by N2PLoadCase.ActiveN2PIncrement.
+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.
@@ -339,7 +354,7 @@ loadcaseslist = model.LoadCases
 pressure_lc = model.get_load_case("pressure")
 
 # Change the active increment (by default is the last one):
-pressure_lc.ActiveIncrement = 10
+pressure_lc.ActiveN2PIncrement = pressure_lc.get_increment(10)
 
 # Look for all results
 all_results = pressure_lc.Results