Maxwell refactoring arguments

Author: gmalinve

_unittest/example_models/T03/iron_pyaedt.amat

@@ -1,3 +1,13 @@
+$begin '$base_index$'
+  $begin 'properties'
+    all_levels=000000000000
+    time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
+    version=000000000000
+  $end 'properties'
+  $begin '$base_index$'
+    $index$(pos=000000004269, lin=000000000001, lvl=000000000000)
+  $end '$base_index$'
+$end '$base_index$'
 
 $begin 'iron_pyaedt'
 	$begin 'MaterialDef'
@@ -96,3 +106,10 @@ GUID: 04b3107f-45c5-4e7c-bdd6-3bf3cffc2ef2'
 	$end '$Thermal_expansion_coefficient_with_temperature_1'
 	$end 'RefDatasets'
 $end 'iron_pyaedt'
+$begin '$index$'
+	$begin '$index$'
+		iron_pyaedt(pos=370, lin=11, lvl=0)
+		$base_index$(pos=0, lin=1, lvl=0)
+		$index$(pos=4269, lin=1, lvl=0)
+	$end '$index$'
+$end '$index$'

_unittest/example_models/T03/material_sample.amat

@@ -1,7 +1,7 @@
 $begin '$base_index$'
   $begin 'properties'
     all_levels=000000000000
-    time(year=000000002022, month=000000000004, day=000000000026, hour=000000000014, min=000000000052, sec=000000000029)
+    time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
     version=000000000000
   $end 'properties'
   $begin '$base_index$'
@@ -79,3 +79,5 @@ $begin '$index$'
 		$index$(pos=2021, lin=72, lvl=0)
 	$end '$index$'
 $end '$index$'
+$index$'
+          

_unittest/example_models/T13/material_sample.amat

@@ -1,7 +1,7 @@
 $begin '$base_index$'
   $begin 'properties'
     all_levels=000000000000
-    time(year=000000002022, month=000000000004, day=000000000026, hour=000000000014, min=000000000052, sec=000000000029)
+    time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
     version=000000000000
   $end 'properties'
   $begin '$base_index$'
@@ -79,3 +79,5 @@ $begin '$index$'
 		$index$(pos=2021, lin=72, lvl=0)
 	$end '$index$'
 $end '$index$'
+$index$'
+          

_unittest/example_models/syslib/Materials.amat

@@ -1,11 +1,11 @@
 $begin '$base_index$'
   $begin 'properties'
     all_levels=000000000000
-    time(year=000000002021, month=000000000009, day=000000000001, hour=000000000015, min=000000000032, sec=000000000052)
+    time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
     version=000000000000
   $end 'properties'
   $begin '$base_index$'
-    $index$(pos=000000318773, lin=000000011311, lvl=000000000000)
+    $index$(pos=000000003371, lin=000000000114, lvl=000000000000)
   $end '$base_index$'
 $end '$base_index$'
 $begin 'FC-78'
@@ -113,11 +113,14 @@ $begin 'steel_stainless'
 $end 'steel_stainless'
 $begin '$index$'
 	$begin '$index$'
-		steel_stainless(pos=1224, lin=48, lvl=0)
-		'Polyflon CuFlon (tm)'(pos=22164, lin=814, lvl=0)
-		'FC-78'(pos=126130, lin=4842, lvl=0)
-    'Water(@360K)'(pos=118115, lin=4556, lvl=0)
+		'FC-78'(pos=370, lin=11, lvl=0)
+		'Polyflon CuFlon (tm)'(pos=1370, lin=46, lvl=0)
+		'Water(@360K)'(pos=1726, lin=59, lvl=0)
+		steel_stainless(pos=2835, lin=96, lvl=0)
 		$base_index$(pos=0, lin=1, lvl=0)
-		$index$(pos=318773, lin=11311, lvl=0)
+		$index$(pos=3371, lin=114, lvl=0)
 	$end '$index$'
 $end '$index$'
+'$index$'
+$end '$index$'
+          

_unittest/test_12_PostProcessing.py

@@ -823,7 +823,7 @@ def test_75_plot_field_line_traces(self, m2dtest):
         m2dtest.assign_voltage(rect.name, amplitude=0, name="Ground")
         m2dtest.assign_voltage(circle.name, amplitude=50e6, name="50kV")
         setup_name = "test"
-        m2dtest.create_setup(setupname=setup_name)
+        m2dtest.create_setup(setup_name=setup_name)
         m2dtest.analyze_setup(setup_name)
         plot = m2dtest.post.create_fieldplot_line_traces(["Ground", "Electrode"], "Region", plot_name="LineTracesTest4")
         assert plot

_unittest/test_20_HFSS.py

@@ -269,14 +269,14 @@ def test_06a_create_linear_count_sweep(self):
             )
         self.aedtapp["der_var"] = "1mm"
         self.aedtapp["der_var2"] = "2mm"
-        setup2 = self.aedtapp.create_setup("MySetup_2", setuptype=0)
+        setup2 = self.aedtapp.create_setup("MySetup_2", setup_type=0)
         assert setup2.add_derivatives("der_var")
         assert "der_var" in setup2.get_derivative_variables()
         assert setup2.add_derivatives("der_var2")
         assert "der_var2" in setup2.get_derivative_variables()
         assert "der_var" in setup2.get_derivative_variables()
         setup2.delete()
-        setup3 = self.aedtapp.create_setup("MySetup_3", setuptype=0)
+        setup3 = self.aedtapp.create_setup("MySetup_3", setup_type=0)
         assert setup3.add_derivatives("der_var")
         assert "der_var" in setup3.get_derivative_variables()
         assert setup3.add_derivatives("der_var2")
@@ -368,7 +368,7 @@ def test_06d_create_single_point_sweep(self):
 
     def test_06e_delete_setup(self):
         setup_name = "SetupToDelete"
-        setuptd = self.aedtapp.create_setup(setupname=setup_name)
+        setuptd = self.aedtapp.create_setup(setup_name=setup_name)
         assert setuptd.name in self.aedtapp.existing_analysis_setups
         assert self.aedtapp.delete_setup(setup_name)
         assert setuptd.name not in self.aedtapp.existing_analysis_setups
@@ -386,7 +386,7 @@ def test_06f_sweep_add_subrange(self):
             name="WaveForSweep",
             renormalize=False,
         )
-        setup = self.aedtapp.create_setup(setupname="MySetupForSweep")
+        setup = self.aedtapp.create_setup(setup_name="MySetupForSweep")
         assert not setup.get_sweep()
         sweep = setup.add_sweep()
         sweep1 = setup.get_sweep(sweep.name)
@@ -413,7 +413,7 @@ def test_06g_sweep_clear_subrange(self):
             renormalize=False,
         )
 
-        setup = self.aedtapp.create_setup(setupname="MySetupClearSweep")
+        setup = self.aedtapp.create_setup(setup_name="MySetupClearSweep")
         sweep = setup.add_sweep()
         assert sweep.add_subrange("LinearCount", 1.1, 3.6, 10, "GHz", clear=True)
         assert sweep.props["RangeType"] == "LinearCount"

_unittest/test_27_Maxwell2D.py

@@ -49,34 +49,34 @@ def test_03_assign_initial_mesh_from_slider(self):
         assert self.aedtapp.mesh.assign_initial_mesh_from_slider(4)
 
     def test_04_create_winding(self):
-        bounds = self.aedtapp.assign_winding(current_value=20e-3, coil_terminals=["Coil"])
+        bounds = self.aedtapp.assign_winding(faces=["Coil"], current_value=20e-3)
         assert bounds
         o = self.aedtapp.modeler.create_rectangle([0, 0, 0], [3, 1], name="Rectangle2", matname="copper")
-        bounds = self.aedtapp.assign_winding(current_value=20e-3, coil_terminals=o.id)
+        bounds = self.aedtapp.assign_winding(faces=o.id, current_value=20e-3)
         assert bounds
-        bounds = self.aedtapp.assign_winding(current_value="20e-3A", coil_terminals=["Coil"])
+        bounds = self.aedtapp.assign_winding(faces=["Coil"], current_value="20e-3A")
         assert bounds
-        bounds = self.aedtapp.assign_winding(res="1ohm", coil_terminals=["Coil"])
+        bounds = self.aedtapp.assign_winding(faces=["Coil"], resistance="1ohm")
         assert bounds
-        bounds = self.aedtapp.assign_winding(ind="1H", coil_terminals=["Coil"])
+        bounds = self.aedtapp.assign_winding(faces=["Coil"], inductance="1H")
         assert bounds
-        bounds = self.aedtapp.assign_winding(voltage="10V", coil_terminals=["Coil"])
+        bounds = self.aedtapp.assign_winding(faces=["Coil"], voltage="10V")
         assert bounds
         bounds_name = generate_unique_name("Coil")
-        bounds = self.aedtapp.assign_winding(coil_terminals=["Coil"], name=bounds_name)
+        bounds = self.aedtapp.assign_winding(faces=["Coil"], name=bounds_name)
         assert bounds_name == bounds.name
 
     def test_04a_assign_coil(self):
-        bound = self.aedtapp.assign_coil(input_object=["Coil"])
+        bound = self.aedtapp.assign_coil(objects=["Coil"])
         assert bound
         polarity = "Positive"
-        bound = self.aedtapp.assign_coil(input_object=["Coil"], polarity=polarity)
+        bound = self.aedtapp.assign_coil(objects=["Coil"], polarity=polarity)
         assert bound.props["PolarityType"] == polarity.lower()
         polarity = "Negative"
-        bound = self.aedtapp.assign_coil(input_object=["Coil"], polarity=polarity)
+        bound = self.aedtapp.assign_coil(objects=["Coil"], polarity=polarity)
         assert bound.props["PolarityType"] == polarity.lower()
         bound_name = generate_unique_name("Coil")
-        bound = self.aedtapp.assign_coil(input_object=["Coil"], name=bound_name)
+        bound = self.aedtapp.assign_coil(objects=["Coil"], name=bound_name)
         assert bound_name == bound.name
 
     def test_05_create_vector_potential(self):
@@ -114,7 +114,7 @@ def test_10_assign_torque(self):
         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")
+        T = self.aedtapp.assign_torque(objects="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"
@@ -125,7 +125,7 @@ def test_11_assign_force(self):
         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")
+        F = self.aedtapp.assign_force(objects="Magnet2_Section1", force_name="Force_Test")
         assert F.name == "Force_Test"
 
     def test_12_assign_current_source(self):
@@ -137,8 +137,7 @@ def test_12_assign_current_source(self):
 
     def test_13_assign_master_slave(self):
         mas, slave = self.aedtapp.assign_master_slave(
-            self.aedtapp.modeler["Rectangle2"].edges[0].id,
-            self.aedtapp.modeler["Rectangle2"].edges[2].id,
+            self.aedtapp.modeler["Rectangle2"].edges[0].id, self.aedtapp.modeler["Rectangle2"].edges[2].id
         )
         assert "Independent" in mas.name
         assert "Dependent" in slave.name
@@ -298,10 +297,10 @@ def test_21_symmetry_multiplier(self):
 
     def test_22_eddycurrent(self):
         self.aedtapp.set_active_design("Basis_Model_For_Test")
-        assert self.aedtapp.eddy_effects_on(["Coil_1"], activate_eddy_effects=True)
+        assert self.aedtapp.eddy_effects_on(["Coil_1"], eddy_effects=True)
         oModule = self.aedtapp.odesign.GetModule("BoundarySetup")
         assert oModule.GetEddyEffect("Coil_1")
-        self.aedtapp.eddy_effects_on(["Coil_1"], activate_eddy_effects=False)
+        self.aedtapp.eddy_effects_on(["Coil_1"], eddy_effects=False)
         assert not oModule.GetEddyEffect("Coil_1")
 
     def test_23_read_motion_boundary(self):
@@ -338,7 +337,7 @@ def test_25_export_rl_matrix(self):
         self.aedtapp.assign_matrix(sources=["PM_I1_1_I0", "PM_I1_I0"], matrix_name="Test1")
         self.aedtapp.assign_matrix(sources=["Phase_A", "Phase_B", "Phase_C"], matrix_name="Test2")
         setup_name = "setupTestMatrixRL"
-        setup = self.aedtapp.create_setup(setupname=setup_name)
+        setup = self.aedtapp.create_setup(setup_name=setup_name)
         setup.props["MaximumPasses"] = 2
         export_path_1 = os.path.join(self.local_scratch.path, "export_rl_matrix_Test1.txt")
         assert not self.aedtapp.export_rl_matrix("Test1", export_path_1)
@@ -483,7 +482,7 @@ def test_34_start_continue_from_previous_setup(self):
 
         example_project_copy = os.path.join(self.local_scratch.path, test_name + "_copy.aedt")
         assert os.path.exists(example_project_copy)
-        self.aedtapp.create_setup(setupname="test_setup")
+        self.aedtapp.create_setup(setup_name="test_setup")
         assert self.aedtapp.setups[2].start_continue_from_previous_setup(
             design_name="design_for_test", solution_name="Setup1 : Transient", project_name=example_project_copy
         )
@@ -494,51 +493,51 @@ def test_34_start_continue_from_previous_setup(self):
     def test_35_solution_types_setup(self, add_app):
         m2d = add_app(application=Maxwell2d, design_name="test_setups")
         m2d.solution_type = SOLUTIONS.Maxwell2d.TransientXY
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.TransientZ
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.MagnetostaticXY
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.MagnetostaticZ
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.EddyCurrentXY
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.EddyCurrentZ
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.ElectroStaticXY
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.ElectroStaticZ
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.DCConductionXY
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.DCConductionZ
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.ACConductionXY
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()
         m2d.solution_type = SOLUTIONS.Maxwell2d.ACConductionZ
-        setup = m2d.create_setup(setuptype=m2d.solution_type)
+        setup = m2d.create_setup(setup_type=m2d.solution_type)
         assert setup
         setup.delete()