Merge branch 'main' into release/0.4

Author: maxcapodi78

_unittest/test_01_Design.py

@@ -130,6 +130,7 @@ def test_14_get_nominal_variation(self):
         assert self.aedtapp.get_nominal_variation() != [] or self.aedtapp.get_nominal_variation() is not None
 
     def test_15a_duplicate_design(self):
+        self.aedtapp.duplicate_design("non_valid1", False)
         self.aedtapp.duplicate_design("myduplicateddesign")
         assert "myduplicateddesign" in self.aedtapp.design_list
         self.aedtapp.delete_design("myduplicateddesign", "NewDesign")
@@ -266,6 +267,7 @@ def test_29_change_registry_key(self):
         assert not desktop.change_registry_key("test_key", 2.0)
 
     def test_30_object_oriented(self):
+        self.aedtapp["my_oo_variable"] = "15mm"
         # self.aedtapp.set_active_design("myname")
         assert self.aedtapp.get_oo_name(self.aedtapp.oproject, "Variables")
         assert self.aedtapp.get_oo_name(self.aedtapp.odesign, "Variables")

_unittest/test_07_Object3D.py

@@ -434,7 +434,7 @@ def test_24_filter_faces_by_area(self):
         if faces_greater_equal:
             for face_object in faces_greater_equal:
                 for face in face_object:
-                    assert (face.area - 100) >= 1e-12
+                    assert (face.area - 100) >= -1e-12
 
         faces_smaller_equal = []
         for obj in self.aedtapp.modeler.object_list:
@@ -447,21 +447,21 @@ def test_24_filter_faces_by_area(self):
 
         faces_greater = []
         for obj in self.aedtapp.modeler.object_list:
-            if obj.faces_by_area(100):
-                faces_greater.append(obj.faces_by_area(100, ">"))
+            if obj.faces_by_area(99):
+                faces_greater.append(obj.faces_by_area(99, ">"))
         if faces_greater:
             for face_object in faces_greater:
                 for face in face_object:
-                    assert (face.area - 100) > 1e-12
+                    assert (face.area - 99) > 0
 
         faces_smaller = []
         for obj in self.aedtapp.modeler.object_list:
-            if obj.faces_by_area(100):
-                faces_smaller.append(obj.faces_by_area(100, "<"))
+            if obj.faces_by_area(105):
+                faces_smaller.append(obj.faces_by_area(105, "<"))
         if faces_smaller:
             for face_object in faces_smaller:
                 for face in face_object:
-                    assert (face.area - 100) < 1e-12
+                    assert (face.area - 105) < 0
 
         if not is_ironpython:
             with pytest.raises(ValueError):

pyaedt/application/Design.py

@@ -2922,7 +2922,7 @@ def copy_design_from(self, project_fullname, design_name):
         return new_designname
 
     @pyaedt_function_handler()
-    def duplicate_design(self, label):
+    def duplicate_design(self, label, save_after_duplicate=True):
         """Copy a design to a new name.
 
         The new name consists of the original
@@ -2933,6 +2933,9 @@ def duplicate_design(self, label):
         ----------
         label : str
             Name of the design to copy.
+        save_after_duplicate : bool, optional
+            Save project after the duplication is completed. If ``False``, pyaedt objects like boundaries will not be
+            available.
 
         Returns
         -------
@@ -2960,6 +2963,9 @@ def duplicate_design(self, label):
         self.design_name = newname
         self._close_edb()
         AedtObjects.__init__(self, is_inherithed=True)
+        if save_after_duplicate:
+            self.oproject.Save()
+            self._project_dictionary = None
         return True
 
     @pyaedt_function_handler()

pyaedt/desktop.py

@@ -342,6 +342,9 @@ def __init__(
             self._main.isoutsideDesktop = True
         self.release_on_exit = True
         self.logfile = None
+        self._logger = aedt_logger.AedtLogger(filename=self.logfile, level=logging.DEBUG)
+        self._logger.info("Logger Started")
+        self._main.aedt_logger = self._logger
         if "oDesktop" in dir():  # pragma: no cover
             self.release_on_exit = False
             self._main.oDesktop = oDesktop
@@ -361,11 +364,11 @@ def __init__(
                 del self._main.oDesktop
             self._main.student_version, version_key, version = self._set_version(specified_version, student_version)
             if _com == "ironpython":  # pragma: no cover
-                print("Launching PyAEDT outside AEDT with IronPython.")
+                self._logger.info("Launching PyAEDT outside AEDT with IronPython.")
                 self._init_ironpython(non_graphical, new_desktop_session, version)
             elif _com == "pythonnet_v3":
                 if version_key < "2022.2" or not settings.use_grpc_api:
-                    print("Launching PyAEDT outside Electronics Desktop with CPython and Pythonnet")
+                    self._logger.info("Launching PyAEDT outside Electronics Desktop with CPython and Pythonnet")
                     self._init_cpython(
                         non_graphical,
                         new_desktop_session,
@@ -376,9 +379,6 @@ def __init__(
                     )
                 else:
                     self._init_cpython_new(non_graphical, new_desktop_session, version, self._main.student_version)
-                # print("Launching PyAEDT outside AEDT with CPython and Pythonnet.")
-                # self._init_cpython(non_graphical, new_desktop_session, version,
-                # self._main.student_version, version_key)
             else:
                 oAnsoftApp = win32com.client.Dispatch(version)
                 self._main.oDesktop = oAnsoftApp.GetAppDesktop()
@@ -465,11 +465,11 @@ def current_version_student(self):
     def _init_desktop(self):
         self._main.AEDTVersion = self._main.oDesktop.GetVersion()[0:6]
         self._main.oDesktop.RestoreWindow()
-        self._logger = aedt_logger.AedtLogger(filename=self.logfile, level=logging.DEBUG)
-        self._logger.info("Logger Started on %s", self.logfile)
-        self._main.aedt_logger = self._logger
         self._main.sDesktopinstallDirectory = self._main.oDesktop.GetExeDir()
         self._main.pyaedt_initialized = True
+        self._logger = aedt_logger.AedtLogger(filename=self.logfile, level=logging.DEBUG)
+        self._logger.info("Logger file %s in use.")
+        self._main.aedt_logger = self._logger
 
     def _set_version(self, specified_version, student_version):
         student_version_flag = False
@@ -569,14 +569,13 @@ def _init_cpython(
         sys.path.append(base_path)
         sys.path.append(os.path.join(base_path, "PythonFiles", "DesktopPlugin"))
         launch_msg = "AEDT installation Path {}.".format(base_path)
-        print(launch_msg)
-        print("===================================================================================")
+        self.logger.info(launch_msg)
         clr.AddReference("Ansys.Ansoft.CoreCOMScripting")
         AnsoftCOMUtil = __import__("Ansys.Ansoft.CoreCOMScripting")
         self.COMUtil = AnsoftCOMUtil.Ansoft.CoreCOMScripting.Util.COMUtil
         self._main.COMUtil = self.COMUtil
         StandalonePyScriptWrapper = AnsoftCOMUtil.Ansoft.CoreCOMScripting.COM.StandalonePyScriptWrapper
-        print("pyaedt info: Launching AEDT with module Pythonnet.")
+        self.logger.info("Launching AEDT with module Pythonnet.")
         processID = []
         if IsWindows:
             processID = self._get_tasks_list_windows(student_version)
@@ -603,9 +602,9 @@ def _init_cpython(
             self._dispatch_win32(version)
         elif version_key >= "2021.2":
             if student_version:
-                print("pyaedt info: {} Student version started with process ID {}.".format(version, proc[0]))
+                self.logger.info("{} Student version started with process ID {}.".format(version, proc[0]))
             else:
-                print("pyaedt info: {} Started with process ID {}.".format(version, proc[0]))
+                self.logger.info("{} Started with process ID {}.".format(version, proc[0]))
             context = pythoncom.CreateBindCtx(0)
             running_coms = pythoncom.GetRunningObjectTable()
             monikiers = running_coms.EnumRunning()
@@ -617,7 +616,7 @@ def _init_cpython(
                     self._main.oDesktop = win32com.client.Dispatch(obj.QueryInterface(pythoncom.IID_IDispatch))
                     break
         else:
-            warnings.warn(
+            self.logger.warning(
                 "PyAEDT is not supported in AEDT versions older than 2021.2. Trying to launch PyAEDT with PyWin32."
             )
             self._dispatch_win32(version)
@@ -629,9 +628,8 @@ def _init_cpython_new(self, non_graphical, new_aedt_session, version, student_ve
         import ScriptEnv
 
         launch_msg = "AEDT installation Path {}".format(base_path)
-        print(launch_msg)
-        print("===================================================================================")
-        print("pyaedt info: Launching AEDT with PyDesktopPlugin.")
+        self.logger.info(launch_msg)
+        self.logger.info("Launching AEDT with PyDesktopPlugin.")
         if new_aedt_session or not self.port:
             self.port = _find_free_port()
             self.machine = ""
@@ -662,12 +660,12 @@ def _init_cpython_new(self, non_graphical, new_aedt_session, version, student_ve
             if non_graphical:
                 settings.enable_desktop_logs = False
             if student_version:
-                print("pyaedt info: {} Student version started with process ID {}.".format(version, _proc))
+                self.logger.info("{} Student version started with process ID {}.".format(version, _proc))
             else:
-                print("pyaedt info: {} Started with process ID {}.".format(version, _proc))
+                self.logger.info("{} Started with process ID {}.".format(version, _proc))
 
         else:
-            warnings.warn("PyDesktopPlugin is not supported in AEDT versions older than 2022.2.")
+            self.logger.warning("PyDesktopPlugin is not supported in AEDT versions older than 2022.2.")
 
     def _set_logger_file(self):
         # Set up the log file in the AEDT project directory

pyaedt/modeler/Object3d.py

@@ -2624,20 +2624,20 @@ def faces_by_area(self, area, area_filter="==", tolerance=1e-12):
 
         faces = []
         for face in self.faces:
-            if area_filter is "==":
+            if area_filter == "==":
                 if abs(face.area - area) < tolerance:
                     faces.append(face)
-            if area_filter is ">=":
-                if (face.area - area) >= tolerance:
+            if area_filter == ">=":
+                if (face.area - area) >= -tolerance:
                     faces.append(face)
-            if area_filter is "<=":
+            if area_filter == "<=":
                 if (face.area - area) <= tolerance:
                     faces.append(face)
-            if area_filter is ">":
-                if (face.area - area) > tolerance:
+            if area_filter == ">":
+                if (face.area - area) > 0:
                     faces.append(face)
-            if area_filter is "<":
-                if (face.area - area) < tolerance:
+            if area_filter == "<":
+                if (face.area - area) < 0:
                     faces.append(face)
 
         return faces

pyaedt/modules/Boundary.py

@@ -590,7 +590,7 @@ def update(self):
             self._app.oboundary.SetSBRTxRxSettings(self._get_args())  # pragma: no cover
         elif self.type == "Floquet Port":
             self._app.oboundary.EditFloquetPort(self._boundary_name, self._get_args())  # pragma: no cover
-        elif self.type == "EndConnection":
+        elif self.type == "End Connection":
             self._app.oboundary.EditEndConnection(self._boundary_name, self._get_args())
         else:
             return False  # pragma: no cover