NaxToPy 1.5.2__tar.gz → 1.5.4__tar.gz

{NaxToPy-1.5.2/src/NaxToPy.egg-info → NaxToPy-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NaxToPy
-Version: 1.5.2
+Version: 1.5.4
 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
@@ -232,11 +232,21 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 1. Bug Fix. If the name for a derivated load case is repeated for a second time, the name is changed. 
 2. Bug Fix. Now is possible to change the criteria for a new envelope load case.
 
-### v1.5.2
+### v.1.5.2
 1. Bug fix: A bug has been resolved that previously prevented the generation of a .log file while executing the N2PtoEXE module.
 2. Bug fix: An internal error related to finding the libraries has been resolved.
 3. The option to include a splash image in an executable has been added.
 
+### v.1.5.3
+1. Bug fix for the EXE generation.
+2. Updates in the log messages.
+
+### v.1.5.4
+1. Bug Fix: After calling the method get_load_cases(), the new derived cases weren't found. Now they does.
+2. N2PLoadCase has now two properties for the ID: OriginalID, that was in the files readed and ID that is the one that is used in NaxToPy. Usually, they are the same.
+3. New method new_derived_component() in the class N2PResult that allows to create new N2PComponent based on the original components.
+4. New module N2PUpdateFastener. This module updates the stiffness of the CBUSH and CFAST acordint to their properties and shells properties.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/README.md

@@ -108,11 +108,21 @@ To see previous version see the pre-release versions in https://test.pypi.org/pr
 1. Bug Fix. If the name for a derivated load case is repeated for a second time, the name is changed. 
 2. Bug Fix. Now is possible to change the criteria for a new envelope load case.
 
-### v1.5.2
+### v.1.5.2
 1. Bug fix: A bug has been resolved that previously prevented the generation of a .log file while executing the N2PtoEXE module.
 2. Bug fix: An internal error related to finding the libraries has been resolved.
 3. The option to include a splash image in an executable has been added.
 
+### v.1.5.3
+1. Bug fix for the EXE generation.
+2. Updates in the log messages.
+
+### v.1.5.4
+1. Bug Fix: After calling the method get_load_cases(), the new derived cases weren't found. Now they does.
+2. N2PLoadCase has now two properties for the ID: OriginalID, that was in the files readed and ID that is the one that is used in NaxToPy. Usually, they are the same.
+3. New method new_derived_component() in the class N2PResult that allows to create new N2PComponent based on the original components.
+4. New module N2PUpdateFastener. This module updates the stiffness of the CBUSH and CFAST acordint to their properties and shells properties.
+
 # Documentation
 
 **NaxToPy** is a package developed by Idaero Solutions© as a part of the **NaxTo** software.

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/pyproject.toml

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

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/src/NaxToPy/Core/Classes/N2PLoadCase.py

@@ -74,13 +74,13 @@ class N2PLoadCase:
 
     # Metodo para obtener el numero de identificacion interno del caso de carga ----------------------------------------
     @property
-    def InternalID(self) -> int:
+    def ID(self) -> int:
         return(int(self.__id__))
     # ------------------------------------------------------------------------------------------------------------------
 
     # Metodo oara obtener el numero de identificacion original del caso de carga ---------------------------------------
     @property
-    def ID(self) -> int:
+    def OriginalID(self) -> int:
         return(int(self.__idoriginal__))
     # ------------------------------------------------------------------------------------------------------------------
 

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/src/NaxToPy/Core/Classes/N2PModelInputData.py

@@ -164,7 +164,7 @@ class N2PModelInputData:
         """Method that writes the solver input file with the same file structure that was read in the folder is specified
 
         Args:
-            folder: str -> Path of the foler where the file or files will be writen
+            folder: str -> Path of the folder where the file or files will be writen
         """
         self.__inputfiledata.RebuildFile(folder)
 

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/src/NaxToPy/Core/Classes/N2PResult.py

@@ -1,5 +1,7 @@
 from NaxToPy.Core.Classes.N2PComponent import N2PComponent
 from NaxToPy.Core.Errors.N2PLog import N2PLog
+from VizzerClasses import N2Component
+from System.Collections.Generic import List
 
 
 # Clase Result de Python --------------------------------------------------------------------------
@@ -124,6 +126,55 @@ class N2PResult:
             N2PLog.Error.E216()
     # ---------------------------------------------------------------------------------------------
 
+    def new_derived_component(self, name: str, formula: str) -> N2PComponent:
+        """Generate a new N2PComponent combination of n components from N2PResult.
+
+        These combinations can be obtained later with the method `get_derived_component()`.
+
+        To define the combination, pass a string with the result and component names, along with the arithmetic commands as strings.
+        The name of the new derived component must be set. To add a component to the formula, it must start with `CMPT_`
+        followed by the Result name (the result must be the same) if it is an original component, and with `CMPTD` (only that),
+        then `:` and finally the Component name.
+
+        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.
+        """
+
+        # Recuperamos la instancia N2ModelModelContent
+        mc = self.__loadCase_father__.__modelFather__._N2PModelContent__vzmodel
+
+        # Llamada al constructor de N2Component de VizzerClasses
+        new_d_comp = N2Component(mc, name, formula)
+
+        # Se incluye en la lista de compornentes derivadas de vizzerclasses. Para ello tengo que comprobar que existe
+        # dicha lista. Si no existe la tengo que crear como lista de C#
+        if not mc.DerivedComponents:
+            mc.DerivedComponents = List[N2Component]()
+
+        # Now I add the new derived component to the list
+        mc.DerivedComponents.Add(new_d_comp)
+
+        # Call the method that recalculate the data.
+        new_d_comp.RecalculateCMPTInfo2Formule()
+
+        # 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)
+
+        return self.__derived_comps__[new_d_comp.Name]
+
+
+
     # # Metodo para obtener los resultados de todas las componentes del resultado como DataFrame ----
     # def get_results_dataframe(self, sections=None, aveSections=-1, cornerData=False, aveNodes=-1,
     #                           variation=100, realPolar=0) -> DataFrame:

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/src/NaxToPy/Core/Constants/Constants.py

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

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/src/NaxToPy/Core/Errors/N2PLog.py

@@ -137,7 +137,7 @@ class N2PLog(ABC):
         @staticmethod
         def D101(path) -> None:
             """Method that shows the location of the VizzerClasses library found"""
-            message = f"VizzerClasses founded at: {path}"
+            message = f"VizzerClasses found at: {path}"
             N2PLog._N2PLog__logger.debug(message)
 
         @staticmethod
@@ -152,6 +152,40 @@ class N2PLog(ABC):
             message = f"The parallel processing has been set to {parallel}"
             N2PLog._N2PLog__logger.debug(message)
 
+        @staticmethod
+        def D500(current_time,tinit) -> None:
+            """ Information given for the extraction time.
+            """
+            message = f"D500: Extraction time: {current_time-tinit} s"
+            N2PLog._N2PLog__logger.info(message)
+
+        @staticmethod
+        def D501(current_time,tinit) -> None:
+            """ Information given for computation time of elastic modulus.
+            """
+            message = f"D501: Elastic modulus calculation time: {current_time-tinit} s"
+            N2PLog._N2PLog__logger.info(message)
+
+        @staticmethod
+        def D502(current_time,tinit) -> None:
+            """ Information given for computation time of set intersection
+            """
+            message = f"D502: Set intersection computation time: {current_time-tinit} s"
+            N2PLog._N2PLog__logger.info(message)
+
+        @staticmethod
+        def D503(current_time,tinit) -> None:
+            """ Information given for computation time of fastener update
+            """
+            message = f"D503: Fastener update computation time: {current_time-tinit} s"
+            N2PLog._N2PLog__logger.info(message)
+
+        @staticmethod
+        def D504(current_time,tinit) -> None:
+            """ Information given for loading time of the model
+            """
+            message = f"D504: Model loading time: {current_time-tinit} s"
+            N2PLog._N2PLog__logger.info(message)
     # ------------------------------------------------------------------------------------------------------------------
 
     ############################################  INFO  ################################################################
@@ -178,6 +212,11 @@ own information message. Use the following structure as a standard message (I +
 
             time_date = DateTime.Now
             licen = LicenseManager()
+
+            if licen.HasLicense():
+                err = LicenseManager.GenerateCommunityLicense()
+                licen.HasLicense()
+
             code = licen.GetRunCode(time_date)
             message = f"I100: The NaxToPy Running with the code: {code}"
             N2PLog._set_format2(time_date.ToString().split(" ")[1])
@@ -290,6 +329,8 @@ own information message. Use the following structure as a standard message (I +
             message = f"I203: Executing N2PEnvelope..."
             N2PLog._N2PLog__logger.info(message)
 
+
+
     # ------------------------------------------------------------------------------------------------------------------
 
     ###########################################  WARNING  ##############################################################
@@ -327,14 +368,14 @@ own information message. Use the following structure as a standard message (I +
             """ Warning raised when the Windows Register is modified by NaxToPy
             """
             message = f"W102: The Windows Register has been modified: CURRENT_USER/SOFTWARE/IDAERO -> Path = {path}" + \
-                "If NaxTo is installed afterwards, this key must be deleted"
+                "  If NaxTo is installed afterwards, this key must be deleted"
             N2PLog._N2PLog__logger.warning(message)
 
         @staticmethod
         def W103() -> None:
             """ Warning raised when the Windows Register is modified by NaxToPy: The Path value is deleted
             """
-            message = f"W103: The Path Value in Windows Register has been deleted: Using installed NaxTo libraries"
+            message = f"W103: The Path Value in Windows Register has been deleted."
             N2PLog._N2PLog__logger.warning(message)
 
         @staticmethod
@@ -823,6 +864,13 @@ own information message. Use the following structure as a standard message (I +
             N2PLog._N2PLog__logger.error(message)
     # ------------------------------------------------------------------------------------------------------------------
 
+        @staticmethod
+        def E311(propID) -> None:
+            ''' Error raised when young modulus is not found.
+            '''
+            message = f"E311: YOUNG MODULUS COULD NOT BE FOUND FOR PROPERTY {propID}"
+            N2PLog._N2PLog__logger.error(message)
+
     ###########################################  CRITICAL  #############################################################
     class Critical:
         """Class with all the critical errors.
@@ -942,7 +990,7 @@ own information message. Use the following structure as a standard message (I +
             """
             message = f"C112: ERROR RAISED WHEN THERE IS AN ERROR IN THE SA OF ELEMENTS. THIS MAY BE CAUSED BY A MEMORY" \
                       f"LEAK IN THE LOW LEVEL LIBRERIES. A SOLUTION MAY BE CHANGE THE \"initilaize\" method to parallel:" \
-                      f"model = NaxToPy.initialize(path, parallelprocessing=True)"
+                      f"model = NaxToPy.load_model(path, parallelprocessing=True)"
             N2PLog._N2PLog__logger.critical(message)
 
         @staticmethod

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/src/NaxToPy/Core/N2PModelContent.py

@@ -1108,6 +1108,10 @@ class N2PModelContent:
         # Se añade el case de carga de python a N2PModelContent
         self.__load_cases__.append(py_lc)
 
+        # Se añade al diccionario si este ya existe
+        if self.__LCs_by_ID__:
+            self.__LCs_by_ID__[py_lc.ID] = py_lc
+
         return py_lc
 
     def new_envelope_loadcase(self, name: str, formula: str, criteria: str="ExtremeMax") -> N2PLoadCase:
@@ -1175,6 +1179,10 @@ class N2PModelContent:
         # Se añade el case de carga de python a N2PModelContent
         self.__load_cases__.append(py_lc)
 
+        # Se añade al diccionario si este ya existe
+        if self.__LCs_by_ID__:
+            self.__LCs_by_ID__[py_lc.ID] = py_lc
+
         return py_lc
     # ------------------------------------------------------------------------------------------------------------------
 

{NaxToPy-1.5.2 → NaxToPy-1.5.4}/src/NaxToPy/Core/Reference_Finder/__Reference_Finder.py

@@ -127,7 +127,7 @@ def create_register() -> None:
             # La ruta que vamos a meter es la de la carpeta en la que esta una carpeta llamada bin. En ella
             # estan las bibliotecas de NaxTo. Debe funcionar esta carpeta para los ejecutables y para las
             # versiones de desarrollo. En las salidas normales este path no debe estar.
-            naxtopy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+            naxtopy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))
             winreg.SetValueEx(naxto_key, "Path", 0, winreg.REG_SZ, naxtopy_path + "\\")
             N2PLog.Warning.W102(naxtopy_path)
 
@@ -144,9 +144,10 @@ def destroy_register() -> None:
     """
     naxto_key = open_idaero_key()
     try:
-        winreg.QueryValueEx(naxto_key, "Path")
-        winreg.DeleteValue(naxto_key, "Path")
-        N2PLog.Warning.W103()
+        naxto_path = winreg.QueryValueEx(naxto_key, "Path")[0]
+        if "GIT_REPOSITORIES" not in naxto_path:
+            winreg.DeleteValue(naxto_key, "Path")
+            N2PLog.Warning.W103()
     except FileNotFoundError:
         pass
 # ----------------------------------------------------------------------------------------------------------------------
@@ -184,13 +185,15 @@ def __reference_finder():
     # Si se crea un .exe queremos que encuentre unas nuevas librerias distribuibles, que estarán en la carpeta temporal que se
     # crea cuando se ejecuta el .exe. Tampoco se ejecutan los modulos del reference finder
     if getattr(sys, 'frozen', False):
+        destroy_register()
         create_register()
         exe_dir = sys._MEIPASS
-        vizzer_path = exe_dir + "\\libraries\\VizzerClasses.dll"
+        vizzer_path = exe_dir + "\\bin\\VizzerClasses.dll"
         N2PLog.Info.I107()
 
     elif os.path.isfile(developer_vizzer):
         if VERSION.split(".")[-1][0:3] == "dev":
+            destroy_register()
             create_register()
 
         vizzer_path = developer_vizzer