CHORE: refacto maxwell test

src/ansys/aedt/core/application/analysis_3d.py

@@ -1312,9 +1312,6 @@ def import_dxf(
         import_method : int, bool
             Whether the import method is ``Script`` or ``Acis``.
             The default is ``1``, which means that the ``Acis`` is used.
-        sheet_bodies_2d : bool, optional
-            Whether importing as 2D sheet bodies causes imported objects to
-            be organized in terms of 2D sheets. The default is ``True``.
 
         Returns
         -------

src/ansys/aedt/core/maxwell.py

@@ -551,6 +551,10 @@
         >>> oModule.SetEddyEffect
         """
         solid_objects_names = self.get_all_conductors_names()
+        if not solid_objects_names:
+            self.logger.error("No conductors defined in active design.")
+            return False
+        assignment = self.modeler.convert_to_selections(assignment, True)
 
         EddyVector = ["NAME:EddyEffectVector"]
         if self.modeler._is3d:
@@ -1661,71 +1665,73 @@
 
             try:
                 if self.modeler._is3d:
+                    if self.solution_type == "Transient":
+                        self.logger.error(
+                            "Current density can only be applied to Eddy current or Magnetostatic " "solution types."
+                        )
+                        return False
+
+                    common_props = {
+                        "Objects": objects_list,
+                        "CurrentDensityX": current_density_x,
+                        "CurrentDensityY": current_density_y,
+                        "CurrentDensityZ": current_density_z,
+                        "CoordinateSystem Name": coordinate_system,
+                        "CoordinateSystem Type": coordinate_system_type,
+                    }
+
                     if len(objects_list) > 1:
                         current_density_group_names = []
                         for x in range(0, len(objects_list)):
                             current_density_group_names.append(current_density_name + f"_{str(x + 1)}")
-                        props = {}
-                        props["items"] = current_density_group_names
-                        props[current_density_group_names[0]] = dict(
-                            {
-                                "Objects": objects_list,
-                                "Phase": phase,
-                                "CurrentDensityX": current_density_x,
-                                "CurrentDensityY": current_density_y,
-                                "CurrentDensityZ": current_density_z,
-                                "CoordinateSystem Name": coordinate_system,
-                                "CoordinateSystem Type": coordinate_system_type,
-                            }
-                        )
-                        bound = BoundaryObject(self, current_density_group_names[0], props, "CurrentDensityGroup")
+                        bound_props = {"items": current_density_group_names}
+                        if self.solution_type == "EddyCurrent":
+                            common_props["Phase"] = phase
+                        bound_props[current_density_group_names[0]] = common_props.copy()
+                        bound_name = current_density_group_names[0]
+                        bound_type = "CurrentDensityGroup"
                     else:
-                        props = dict(
-                            {
-                                "Objects": objects_list,
-                                "Phase": phase,
-                                "CurrentDensityX": current_density_x,
-                                "CurrentDensityY": current_density_y,
-                                "CurrentDensityZ": current_density_z,
-                                "CoordinateSystem Name": coordinate_system,
-                                "CoordinateSystem Type": coordinate_system_type,
-                            }
-                        )
-                        bound = BoundaryObject(self, current_density_name, props, "CurrentDensity")
+                        if self.solution_type == "EddyCurrent":
+                            common_props["Phase"] = phase
+                        bound_props = common_props
+                        bound_name = current_density_name
+                        bound_type = "CurrentDensity"
+                    bound = BoundaryObject(self, bound_name, bound_props, bound_type)
                 else:
+                    common_props = {
+                        "Objects": objects_list,
+                        "Value": current_density_2d,
+                        "CoordinateSystem": "",
+                    }
                     if len(objects_list) > 1:
                         current_density_group_names = []
                         for x in range(0, len(objects_list)):
                             current_density_group_names.append(current_density_name + f"_{str(x + 1)}")
-                        props = {}
-                        props["items"] = current_density_group_names
-                        props[current_density_group_names[0]] = dict(
-                            {
-                                "Objects": objects_list,
-                                "Value": current_density_2d,
-                                "CoordinateSystem": "",
-                            }
-                        )
-                        bound = BoundaryObject(self, current_density_group_names[0], props, "CurrentDensityGroup")
+                        bound_props = {"items": current_density_group_names}
+                        if self.solution_type == "EddyCurrent":
+                            common_props["Phase"] = phase
+                        bound_props[current_density_group_names[0]] = common_props.copy()
+                        bound_name = current_density_group_names[0]
+                        bound_type = "CurrentDensityGroup"
                     else:
-                        props = dict(
-                            {
-                                "Objects": objects_list,
-                                "Value": current_density_2d,
-                                "CoordinateSystem": "",
-                            }
-                        )
-                        bound = BoundaryObject(self, current_density_name, props, "CurrentDensity")
+                        if self.solution_type == "EddyCurrent":
+                            common_props["Phase"] = phase
+                        bound_props = common_props
+                        bound_name = current_density_name
+                        bound_type = "CurrentDensity"
+                    bound = BoundaryObject(self, bound_name, bound_props, bound_type)
 
                 if bound.create():
                     self._boundaries[bound.name] = bound
                     return bound
-                return True
+                return False
             except Exception:
                 self.logger.error("Couldn't assign current density to desired list of objects.")
                 return False
         else:
-            self.logger.error("Current density can only be applied to Eddy current or magnetostatic solution types.")
+            self.logger.error(
+                "Current density can only be applied to Eddy current, Magnetostatic and 2D Transient " "solution types."
+            )
             return False
 
     @pyaedt_function_handler(input_object="assignment", radiation_name="radiation")
@@ -2455,8 +2461,8 @@
 
         Parameters
         ----------
-        assignment : list
-            Objects to assign the current to.
+        assignment : list of int or :class:`ansys.aedt.core.modeler.elements_3d.FacePrimitive`
+            Faces or sheet objects to assign the current density terminal to.
         current_density_name : str, optional
             Current density name.
             If no name is provided a random name is generated.
@@ -2472,23 +2478,28 @@
 
             objects_list = self.modeler.convert_to_selections(assignment, True)
 
-            existing_2d_objects_list = [x.name for x in self.modeler.object_list if not x.is3d]
-            if [x for x in objects_list if x not in existing_2d_objects_list]:
-                self.logger.error("Entity provided not a planar entity.")
-                return False
+            # existing_2d_objects_list = [x.name for x in self.modeler.object_list if not x.is3d]
+            # if [x for x in objects_list if x not in existing_2d_objects_list]:
+            #     self.logger.error("Entity provided not a planar entity.")
+            #     return False
 
             try:
+                if self.modeler._is3d:
+                    bound_objects = {"Faces": objects_list}
+                else:
+                    bound_objects = {"Objects": objects_list}
                 if len(objects_list) > 1:
                     current_density_group_names = []
                     for x in range(0, len(objects_list)):
                         current_density_group_names.append(current_density_name + f"_{str(x + 1)}")
-                    props = {}
-                    props["items"] = current_density_group_names
-                    props[current_density_group_names[0]] = dict({"Objects": objects_list})
-                    bound = BoundaryObject(self, current_density_group_names[0], props, "CurrentDensityTerminalGroup")
+                    bound_name = current_density_group_names[0]
+                    props = {"items": current_density_group_names, bound_name: bound_objects}
+                    bound_type = "CurrentDensityTerminalGroup"
                 else:
-                    props = dict({"Objects": objects_list})
-                    bound = BoundaryObject(self, current_density_name, props, "CurrentDensityTerminal")
+                    props = dict(bound_objects)
+                    bound_name = current_density_name
+                    bound_type = "CurrentDensityTerminal"
+                bound = BoundaryObject(self, bound_name, props, bound_type)
 
                 if bound.create():
                     self._boundaries[bound.name] = bound
@@ -2497,7 +2508,7 @@
             except Exception:
                 return False
         else:
-            self.logger.error("Current density can only be applied to Eddy current or magnetostatic solution types.")
+            self.logger.error("Current density can only be applied to Eddy current or Magnetostatic solution types.")
             return False
 
     @pyaedt_function_handler()

src/ansys/aedt/core/modules/mesh.py

@@ -1158,7 +1158,6 @@ def assign_length_mesh(self, assignment, inside_selection=True, maximum_length=1
         if maximum_length is None and maximum_elements is None:
             self.logger.error("mesh not assigned due to incorrect settings")
             return
-        assignment = self._app.modeler.convert_to_selections(assignment, True)
 
         if isinstance(assignment[0], int) and not inside_selection:
             seltype = "Faces"
@@ -1318,7 +1317,6 @@ def assign_curvilinear_elements(self, assignment, enable=True, name=None):
                     name = generate_unique_name(name)
         else:
             name = generate_unique_name("CurvilinearElements")
-        assignment = self._app.modeler.convert_to_selections(assignment, True)
 
         if isinstance(assignment[0], int):
             seltype = "Faces"

src/ansys/aedt/core/modules/solve_setup.py

@@ -866,7 +866,7 @@
             Name of the source design.
         solution : str, optional
             Name of the source design solution in the format ``"name : solution_name"``.
-            If ``None``, the default value is ``name : LastAdaptive``.
+            If ``None``, the default value is taken from the nominal adaptive solution.
         parameters : dict, optional
             Dictionary of the "mapping" variables from the source design.
             If ``None``, the default is `appname.available_variations.nominal_w_values_dict`.
@@ -919,9 +919,7 @@
                 design_type = self.p_app.design_type
             meshlinks["Product"] = design_type
             # design name
-            if not design or design is None:
-                raise ValueError("Provide design name to add mesh link to.")
-            elif design not in self.p_app.design_list:
+            if design not in self.p_app.design_list:
                 raise ValueError("Design does not exist in current project.")
             else:
                 meshlinks["Design"] = design
@@ -939,15 +937,8 @@
             meshlinks["ImportMesh"] = True
             # solution name
             if solution is None:
-                meshlinks["Soln"] = (
-                    f'{self.p_app.oproject.GetDesign(design).GetChildObject("Analysis").GetChildNames()[0]} : '
-                    f"LastAdaptive"
-                )
-            elif (
-                solution.split()[0] in self.p_app.oproject.GetDesign(design).GetChildObject("Analysis").GetChildNames()
-            ):
-                meshlinks["Soln"] = f"{solution.split()[0]} : LastAdaptive"
-            else:
+                meshlinks["Soln"] = self.p_app.nominal_adaptive
+            elif solution.split()[0] not in self.p_app.existing_analysis_setups:
                 raise ValueError("Setup does not exist in current design.")
             # parameters
             meshlinks["Params"] = {}

tests/system/general/conftest.py

@@ -82,7 +82,6 @@
 # Initialize default desktop configuration
 default_version = "2024.2"
 
-
 if inside_desktop and "oDesktop" in dir(sys.modules["__main__"]):
     default_version = sys.modules["__main__"].oDesktop.GetVersion()[0:6]
 config = {