assign force and torque implementation 2D and 3D (#1183)

* assign force and torque implementation 2D and 3D

* update 3D tests

Author: gmalinve

_unittest/test_27_Maxwell2D.py

@@ -101,11 +101,25 @@ def test_09_read_design_data(self):
 
     @pyaedt_unittest_check_desktop_error
     def test_10_assign_torque(self):
-        assert self.aedtapp.assign_torque("Rotor_Section1")
+        T = self.aedtapp.assign_torque("Rotor_Section1")
+        assert T.type == "Torque"
+        assert T.props["Objects"][0] == "Rotor_Section1"
+        assert T.props["Is Positive"]
+        assert T.delete()
+        T = self.aedtapp.assign_torque(input_object="Rotor_Section1", is_positive=False, torque_name="Torque_Test")
+        assert T.name == "Torque_Test"
+        assert not T.props["Is Positive"]
+        assert T.props["Objects"][0] == "Rotor_Section1"
 
     @pyaedt_unittest_check_desktop_error
     def test_11_assign_force(self):
-        assert self.aedtapp.assign_force("Magnet2_Section1")
+        F = self.aedtapp.assign_force("Magnet2_Section1")
+        assert F.type == "Force"
+        assert F.props["Objects"][0] == "Magnet2_Section1"
+        assert F.props["Reference CS"] == "Global"
+        assert F.delete()
+        F = self.aedtapp.assign_force(input_object="Magnet2_Section1", force_name="Force_Test")
+        assert F.name == "Force_Test"
 
     @pyaedt_unittest_check_desktop_error
     def test_12_assign_current_source(self):

_unittest/test_28_Maxwell3D.py

@@ -300,10 +300,28 @@ def test_27_create_udm(self):
         )
 
     def test_28_assign_torque(self):
-        assert self.aedtapp.assign_torque("Coil")
+        T = self.aedtapp.assign_torque("Coil")
+        assert T.type == "Torque"
+        assert T.props["Objects"][0] == "Coil"
+        assert T.props["Is Positive"]
+        assert T.props["Is Virtual"]
+        assert T.props["Coordinate System"] == "Global"
+        assert T.props["Axis"] == "Z"
+        assert T.delete()
+        T = self.aedtapp.assign_torque(input_object="Coil", is_positive=False, torque_name="Torque_Test")
+        assert not T.props["Is Positive"]
+        assert T.name == "Torque_Test"
 
     def test_29_assign_force(self):
-        assert self.aedtapp.assign_force("Coil")
+        F = self.aedtapp.assign_force("Coil")
+        assert F.type == "Force"
+        assert F.props["Objects"][0] == "Coil"
+        assert F.props["Reference CS"] == "Global"
+        assert F.props["Is Virtual"]
+        assert F.delete()
+        F = self.aedtapp.assign_force(input_object="Coil", is_virtual=False, force_name="Force_Test")
+        assert F.name == "Force_Test"
+        assert not F.props["Is Virtual"]
 
     def test_30_assign_movement(self):
         self.aedtapp.insert_design("Motion")

pyaedt/maxwell.py

@@ -1056,26 +1056,35 @@ def assign_force(self, input_object, reference_cs="Global", is_virtual=True, for
 
         >>> oModule.AssignForce
         """
-        input_object = self.modeler.convert_to_selections(input_object, True)
-        if not force_name:
-            force_name = generate_unique_name("Force")
-        if self.design_type == "Maxwell 3D":
-            self.o_maxwell_parameters.AssignForce(
-                [
-                    "NAME:" + force_name,
-                    "Reference CS:=",
-                    reference_cs,
-                    "Is Virtual:=",
-                    is_virtual,
-                    "Objects:=",
-                    input_object,
-                ]
-            )
+        if self.solution_type not in ["ACConduction", "DCConduction"]:
+            input_object = self.modeler.convert_to_selections(input_object, True)
+            if not force_name:
+                force_name = generate_unique_name("Force")
+            if self.design_type == "Maxwell 3D":
+                prop = OrderedDict(
+                    {
+                        "Name": force_name,
+                        "Reference CS": reference_cs,
+                        "Is Virtual": is_virtual,
+                        "Objects": input_object,
+                    }
+                )
+            else:
+                prop = OrderedDict(
+                    {
+                        "Name": force_name,
+                        "Reference CS": reference_cs,
+                        "Objects": input_object,
+                    }
+                )
+
+            bound = MaxwellParameters(self, force_name, prop, "Force")
+            if bound.create():
+                self.boundaries.append(bound)
+                return bound
         else:
-            self.o_maxwell_parameters.AssignForce(
-                ["NAME:" + force_name, "Reference CS:=", reference_cs, "Objects:=", input_object]
-            )
-        return True
+            self.logger.error("Solution Type has not Matrix Parameter")
+            return False
 
     @pyaedt_function_handler()
     def assign_torque(
@@ -1108,38 +1117,40 @@ def assign_torque(
 
         >>> oModule.AssignTorque
         """
-        input_object = self.modeler.convert_to_selections(input_object, True)
-        if not torque_name:
-            torque_name = generate_unique_name("Torque")
-        if self.design_type == "Maxwell 3D":
-            self.o_maxwell_parameters.AssignTorque(
-                [
-                    "NAME:" + torque_name,
-                    "Is Virtual:=",
-                    is_virtual,
-                    "Coordinate System:=",
-                    reference_cs,
-                    "Axis:=",
-                    axis,
-                    "Is Positive:=",
-                    is_positive,
-                    "Objects:=",
-                    input_object,
-                ]
-            )
+        if self.solution_type not in ["ACConduction", "DCConduction"]:
+            if self.solution_type is "Transient":
+                is_virtual = True
+            input_object = self.modeler.convert_to_selections(input_object, True)
+            if not torque_name:
+                torque_name = generate_unique_name("Torque")
+            if self.design_type == "Maxwell 3D":
+                prop = OrderedDict(
+                    {
+                        "Name": torque_name,
+                        "Is Virtual": is_virtual,
+                        "Coordinate System": reference_cs,
+                        "Axis": axis,
+                        "Is Positive": is_positive,
+                        "Objects": input_object,
+                    }
+                )
+            else:
+                prop = OrderedDict(
+                    {
+                        "Name": torque_name,
+                        "Coordinate System": reference_cs,
+                        "Is Positive": is_positive,
+                        "Objects": input_object,
+                    }
+                )
+
+            bound = MaxwellParameters(self, torque_name, prop, "Torque")
+            if bound.create():
+                self.boundaries.append(bound)
+                return bound
         else:
-            self.o_maxwell_parameters.AssignTorque(
-                [
-                    "NAME:" + torque_name,
-                    "Coordinate System:=",
-                    reference_cs,
-                    "Is Positive:=",
-                    is_positive,
-                    "Objects:=",
-                    input_object,
-                ]
-            )
-        return True
+            self.logger.error("Solution Type has not Matrix Parameter")
+            return False
 
     @pyaedt_function_handler()
     def solve_inside(self, name, activate=True):

pyaedt/modules/Boundary.py

@@ -84,7 +84,7 @@ def delete(self):
             ``True`` when successful, ``False`` when failed.
 
         """
-        if self.type == "Matrix":
+        if self.type == "Matrix" or self.type == "Force" or self.type == "Torque":
             self._app.o_maxwell_parameters.DeleteParameters([self.name])
         else:
             self._app.oboundary.DeleteBoundaries([self.name])
@@ -694,9 +694,9 @@ def create(self):
         if self.type == "Matrix":
             self._app.o_maxwell_parameters.AssignMatrix(self._get_args())
         elif self.type == "Torque":
-            self._app.oboundary.AssignPerfectH(self._get_args())
+            self._app.o_maxwell_parameters.AssignTorque(self._get_args())
         elif self.type == "Force":
-            self._app.oboundary.AssignAperture(self._get_args())
+            self._app.o_maxwell_parameters.AssignForce(self._get_args())
         else:
             return False
         return True
@@ -713,6 +713,10 @@ def update(self):
         """
         if self.type == "Matrix":
             self._app.o_maxwell_parameters.EditMatrix(self._boundary_name, self._get_args())
+        elif self.type == "Force":
+            self._app.o_maxwell_parameters.EditForce(self._boundary_name, self._get_args())
+        elif self.type == "Torque":
+            self._app.o_maxwell_parameters.EditTorque(self._boundary_name, self._get_args())
         else:
             return False
         self._boundary_name = self.name