Skip to content

Commit b5a8995

Browse files
gmalinvegmalinve
committed
Maxwell refactoring arguments
1 parent 4594372 commit b5a8995

30 files changed

+508
-484
lines changed

‎_unittest/example_models/T03/iron_pyaedt.amat

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
$begin '$base_index$'
2+
$begin 'properties'
3+
all_levels=000000000000
4+
time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
5+
version=000000000000
6+
$end 'properties'
7+
$begin '$base_index$'
8+
$index$(pos=000000004269, lin=000000000001, lvl=000000000000)
9+
$end '$base_index$'
10+
$end '$base_index$'
111

212
$begin 'iron_pyaedt'
313
$begin 'MaterialDef'
@@ -96,3 +106,10 @@ GUID: 04b3107f-45c5-4e7c-bdd6-3bf3cffc2ef2'
96106
$end '$Thermal_expansion_coefficient_with_temperature_1'
97107
$end 'RefDatasets'
98108
$end 'iron_pyaedt'
109+
$begin '$index$'
110+
$begin '$index$'
111+
iron_pyaedt(pos=370, lin=11, lvl=0)
112+
$base_index$(pos=0, lin=1, lvl=0)
113+
$index$(pos=4269, lin=1, lvl=0)
114+
$end '$index$'
115+
$end '$index$'

‎_unittest/example_models/T03/material_sample.amat

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$begin '$base_index$'
22
$begin 'properties'
33
all_levels=000000000000
4-
time(year=000000002022, month=000000000004, day=000000000026, hour=000000000014, min=000000000052, sec=000000000029)
4+
time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
55
version=000000000000
66
$end 'properties'
77
$begin '$base_index$'
@@ -79,3 +79,5 @@ $begin '$index$'
7979
$index$(pos=2021, lin=72, lvl=0)
8080
$end '$index$'
8181
$end '$index$'
82+
$index$'
83+

‎_unittest/example_models/T13/material_sample.amat

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$begin '$base_index$'
22
$begin 'properties'
33
all_levels=000000000000
4-
time(year=000000002022, month=000000000004, day=000000000026, hour=000000000014, min=000000000052, sec=000000000029)
4+
time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
55
version=000000000000
66
$end 'properties'
77
$begin '$base_index$'
@@ -79,3 +79,5 @@ $begin '$index$'
7979
$index$(pos=2021, lin=72, lvl=0)
8080
$end '$index$'
8181
$end '$index$'
82+
$index$'
83+

‎_unittest/example_models/syslib/Materials.amat

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
$begin '$base_index$'
22
$begin 'properties'
33
all_levels=000000000000
4-
time(year=000000002021, month=000000000009, day=000000000001, hour=000000000015, min=000000000032, sec=000000000052)
4+
time(year=000000002024, month=000000000004, day=000000000004, hour=000000000015, min=000000000038, sec=000000000006)
55
version=000000000000
66
$end 'properties'
77
$begin '$base_index$'
8-
$index$(pos=000000318773, lin=000000011311, lvl=000000000000)
8+
$index$(pos=000000003371, lin=000000000114, lvl=000000000000)
99
$end '$base_index$'
1010
$end '$base_index$'
1111
$begin 'FC-78'
@@ -113,11 +113,14 @@ $begin 'steel_stainless'
113113
$end 'steel_stainless'
114114
$begin '$index$'
115115
$begin '$index$'
116-
steel_stainless(pos=1224, lin=48, lvl=0)
117-
'Polyflon CuFlon (tm)'(pos=22164, lin=814, lvl=0)
118-
'FC-78'(pos=126130, lin=4842, lvl=0)
119-
'Water(@360K)'(pos=118115, lin=4556, lvl=0)
116+
'FC-78'(pos=370, lin=11, lvl=0)
117+
'Polyflon CuFlon (tm)'(pos=1370, lin=46, lvl=0)
118+
'Water(@360K)'(pos=1726, lin=59, lvl=0)
119+
steel_stainless(pos=2835, lin=96, lvl=0)
120120
$base_index$(pos=0, lin=1, lvl=0)
121-
$index$(pos=318773, lin=11311, lvl=0)
121+
$index$(pos=3371, lin=114, lvl=0)
122122
$end '$index$'
123123
$end '$index$'
124+
'$index$'
125+
$end '$index$'
126+

‎_unittest/test_12_PostProcessing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ def test_75_plot_field_line_traces(self, m2dtest):
823823
m2dtest.assign_voltage(rect.name, amplitude=0, name="Ground")
824824
m2dtest.assign_voltage(circle.name, amplitude=50e6, name="50kV")
825825
setup_name = "test"
826-
m2dtest.create_setup(setupname=setup_name)
826+
m2dtest.create_setup(setup_name=setup_name)
827827
m2dtest.analyze_setup(setup_name)
828828
plot = m2dtest.post.create_fieldplot_line_traces(["Ground", "Electrode"], "Region", plot_name="LineTracesTest4")
829829
assert plot

‎_unittest/test_20_HFSS.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,14 @@ def test_06a_create_linear_count_sweep(self):
269269
)
270270
self.aedtapp["der_var"] = "1mm"
271271
self.aedtapp["der_var2"] = "2mm"
272-
setup2 = self.aedtapp.create_setup("MySetup_2", setuptype=0)
272+
setup2 = self.aedtapp.create_setup("MySetup_2", setup_type=0)
273273
assert setup2.add_derivatives("der_var")
274274
assert "der_var" in setup2.get_derivative_variables()
275275
assert setup2.add_derivatives("der_var2")
276276
assert "der_var2" in setup2.get_derivative_variables()
277277
assert "der_var" in setup2.get_derivative_variables()
278278
setup2.delete()
279-
setup3 = self.aedtapp.create_setup("MySetup_3", setuptype=0)
279+
setup3 = self.aedtapp.create_setup("MySetup_3", setup_type=0)
280280
assert setup3.add_derivatives("der_var")
281281
assert "der_var" in setup3.get_derivative_variables()
282282
assert setup3.add_derivatives("der_var2")
@@ -368,7 +368,7 @@ def test_06d_create_single_point_sweep(self):
368368

369369
def test_06e_delete_setup(self):
370370
setup_name = "SetupToDelete"
371-
setuptd = self.aedtapp.create_setup(setupname=setup_name)
371+
setuptd = self.aedtapp.create_setup(setup_name=setup_name)
372372
assert setuptd.name in self.aedtapp.existing_analysis_setups
373373
assert self.aedtapp.delete_setup(setup_name)
374374
assert setuptd.name not in self.aedtapp.existing_analysis_setups
@@ -386,7 +386,7 @@ def test_06f_sweep_add_subrange(self):
386386
name="WaveForSweep",
387387
renormalize=False,
388388
)
389-
setup = self.aedtapp.create_setup(setupname="MySetupForSweep")
389+
setup = self.aedtapp.create_setup(setup_name="MySetupForSweep")
390390
assert not setup.get_sweep()
391391
sweep = setup.add_sweep()
392392
sweep1 = setup.get_sweep(sweep.name)
@@ -413,7 +413,7 @@ def test_06g_sweep_clear_subrange(self):
413413
renormalize=False,
414414
)
415415

416-
setup = self.aedtapp.create_setup(setupname="MySetupClearSweep")
416+
setup = self.aedtapp.create_setup(setup_name="MySetupClearSweep")
417417
sweep = setup.add_sweep()
418418
assert sweep.add_subrange("LinearCount", 1.1, 3.6, 10, "GHz", clear=True)
419419
assert sweep.props["RangeType"] == "LinearCount"

‎_unittest/test_27_Maxwell2D.py

+30-31
Original file line numberDiff line numberDiff line change
@@ -49,34 +49,34 @@ def test_03_assign_initial_mesh_from_slider(self):
4949
assert self.aedtapp.mesh.assign_initial_mesh_from_slider(4)
5050

5151
def test_04_create_winding(self):
52-
bounds = self.aedtapp.assign_winding(current_value=20e-3, coil_terminals=["Coil"])
52+
bounds = self.aedtapp.assign_winding(faces=["Coil"], current_value=20e-3)
5353
assert bounds
5454
o = self.aedtapp.modeler.create_rectangle([0, 0, 0], [3, 1], name="Rectangle2", matname="copper")
55-
bounds = self.aedtapp.assign_winding(current_value=20e-3, coil_terminals=o.id)
55+
bounds = self.aedtapp.assign_winding(faces=o.id, current_value=20e-3)
5656
assert bounds
57-
bounds = self.aedtapp.assign_winding(current_value="20e-3A", coil_terminals=["Coil"])
57+
bounds = self.aedtapp.assign_winding(faces=["Coil"], current_value="20e-3A")
5858
assert bounds
59-
bounds = self.aedtapp.assign_winding(res="1ohm", coil_terminals=["Coil"])
59+
bounds = self.aedtapp.assign_winding(faces=["Coil"], resistance="1ohm")
6060
assert bounds
61-
bounds = self.aedtapp.assign_winding(ind="1H", coil_terminals=["Coil"])
61+
bounds = self.aedtapp.assign_winding(faces=["Coil"], inductance="1H")
6262
assert bounds
63-
bounds = self.aedtapp.assign_winding(voltage="10V", coil_terminals=["Coil"])
63+
bounds = self.aedtapp.assign_winding(faces=["Coil"], voltage="10V")
6464
assert bounds
6565
bounds_name = generate_unique_name("Coil")
66-
bounds = self.aedtapp.assign_winding(coil_terminals=["Coil"], name=bounds_name)
66+
bounds = self.aedtapp.assign_winding(faces=["Coil"], name=bounds_name)
6767
assert bounds_name == bounds.name
6868

6969
def test_04a_assign_coil(self):
70-
bound = self.aedtapp.assign_coil(input_object=["Coil"])
70+
bound = self.aedtapp.assign_coil(objects=["Coil"])
7171
assert bound
7272
polarity = "Positive"
73-
bound = self.aedtapp.assign_coil(input_object=["Coil"], polarity=polarity)
73+
bound = self.aedtapp.assign_coil(objects=["Coil"], polarity=polarity)
7474
assert bound.props["PolarityType"] == polarity.lower()
7575
polarity = "Negative"
76-
bound = self.aedtapp.assign_coil(input_object=["Coil"], polarity=polarity)
76+
bound = self.aedtapp.assign_coil(objects=["Coil"], polarity=polarity)
7777
assert bound.props["PolarityType"] == polarity.lower()
7878
bound_name = generate_unique_name("Coil")
79-
bound = self.aedtapp.assign_coil(input_object=["Coil"], name=bound_name)
79+
bound = self.aedtapp.assign_coil(objects=["Coil"], name=bound_name)
8080
assert bound_name == bound.name
8181

8282
def test_05_create_vector_potential(self):
@@ -114,7 +114,7 @@ def test_10_assign_torque(self):
114114
assert T.props["Objects"][0] == "Rotor_Section1"
115115
assert T.props["Is Positive"]
116116
assert T.delete()
117-
T = self.aedtapp.assign_torque(input_object="Rotor_Section1", is_positive=False, torque_name="Torque_Test")
117+
T = self.aedtapp.assign_torque(objects="Rotor_Section1", is_positive=False, torque_name="Torque_Test")
118118
assert T.name == "Torque_Test"
119119
assert not T.props["Is Positive"]
120120
assert T.props["Objects"][0] == "Rotor_Section1"
@@ -125,7 +125,7 @@ def test_11_assign_force(self):
125125
assert F.props["Objects"][0] == "Magnet2_Section1"
126126
assert F.props["Reference CS"] == "Global"
127127
assert F.delete()
128-
F = self.aedtapp.assign_force(input_object="Magnet2_Section1", force_name="Force_Test")
128+
F = self.aedtapp.assign_force(objects="Magnet2_Section1", force_name="Force_Test")
129129
assert F.name == "Force_Test"
130130

131131
def test_12_assign_current_source(self):
@@ -137,8 +137,7 @@ def test_12_assign_current_source(self):
137137

138138
def test_13_assign_master_slave(self):
139139
mas, slave = self.aedtapp.assign_master_slave(
140-
self.aedtapp.modeler["Rectangle2"].edges[0].id,
141-
self.aedtapp.modeler["Rectangle2"].edges[2].id,
140+
self.aedtapp.modeler["Rectangle2"].edges[0].id, self.aedtapp.modeler["Rectangle2"].edges[2].id
142141
)
143142
assert "Independent" in mas.name
144143
assert "Dependent" in slave.name
@@ -298,10 +297,10 @@ def test_21_symmetry_multiplier(self):
298297

299298
def test_22_eddycurrent(self):
300299
self.aedtapp.set_active_design("Basis_Model_For_Test")
301-
assert self.aedtapp.eddy_effects_on(["Coil_1"], activate_eddy_effects=True)
300+
assert self.aedtapp.eddy_effects_on(["Coil_1"], eddy_effects=True)
302301
oModule = self.aedtapp.odesign.GetModule("BoundarySetup")
303302
assert oModule.GetEddyEffect("Coil_1")
304-
self.aedtapp.eddy_effects_on(["Coil_1"], activate_eddy_effects=False)
303+
self.aedtapp.eddy_effects_on(["Coil_1"], eddy_effects=False)
305304
assert not oModule.GetEddyEffect("Coil_1")
306305

307306
def test_23_read_motion_boundary(self):
@@ -338,7 +337,7 @@ def test_25_export_rl_matrix(self):
338337
self.aedtapp.assign_matrix(sources=["PM_I1_1_I0", "PM_I1_I0"], matrix_name="Test1")
339338
self.aedtapp.assign_matrix(sources=["Phase_A", "Phase_B", "Phase_C"], matrix_name="Test2")
340339
setup_name = "setupTestMatrixRL"
341-
setup = self.aedtapp.create_setup(setupname=setup_name)
340+
setup = self.aedtapp.create_setup(setup_name=setup_name)
342341
setup.props["MaximumPasses"] = 2
343342
export_path_1 = os.path.join(self.local_scratch.path, "export_rl_matrix_Test1.txt")
344343
assert not self.aedtapp.export_rl_matrix("Test1", export_path_1)
@@ -483,7 +482,7 @@ def test_34_start_continue_from_previous_setup(self):
483482

484483
example_project_copy = os.path.join(self.local_scratch.path, test_name + "_copy.aedt")
485484
assert os.path.exists(example_project_copy)
486-
self.aedtapp.create_setup(setupname="test_setup")
485+
self.aedtapp.create_setup(setup_name="test_setup")
487486
assert self.aedtapp.setups[2].start_continue_from_previous_setup(
488487
design_name="design_for_test", solution_name="Setup1 : Transient", project_name=example_project_copy
489488
)
@@ -494,51 +493,51 @@ def test_34_start_continue_from_previous_setup(self):
494493
def test_35_solution_types_setup(self, add_app):
495494
m2d = add_app(application=Maxwell2d, design_name="test_setups")
496495
m2d.solution_type = SOLUTIONS.Maxwell2d.TransientXY
497-
setup = m2d.create_setup(setuptype=m2d.solution_type)
496+
setup = m2d.create_setup(setup_type=m2d.solution_type)
498497
assert setup
499498
setup.delete()
500499
m2d.solution_type = SOLUTIONS.Maxwell2d.TransientZ
501-
setup = m2d.create_setup(setuptype=m2d.solution_type)
500+
setup = m2d.create_setup(setup_type=m2d.solution_type)
502501
assert setup
503502
setup.delete()
504503
m2d.solution_type = SOLUTIONS.Maxwell2d.MagnetostaticXY
505-
setup = m2d.create_setup(setuptype=m2d.solution_type)
504+
setup = m2d.create_setup(setup_type=m2d.solution_type)
506505
assert setup
507506
setup.delete()
508507
m2d.solution_type = SOLUTIONS.Maxwell2d.MagnetostaticZ
509-
setup = m2d.create_setup(setuptype=m2d.solution_type)
508+
setup = m2d.create_setup(setup_type=m2d.solution_type)
510509
assert setup
511510
setup.delete()
512511
m2d.solution_type = SOLUTIONS.Maxwell2d.EddyCurrentXY
513-
setup = m2d.create_setup(setuptype=m2d.solution_type)
512+
setup = m2d.create_setup(setup_type=m2d.solution_type)
514513
assert setup
515514
setup.delete()
516515
m2d.solution_type = SOLUTIONS.Maxwell2d.EddyCurrentZ
517-
setup = m2d.create_setup(setuptype=m2d.solution_type)
516+
setup = m2d.create_setup(setup_type=m2d.solution_type)
518517
assert setup
519518
setup.delete()
520519
m2d.solution_type = SOLUTIONS.Maxwell2d.ElectroStaticXY
521-
setup = m2d.create_setup(setuptype=m2d.solution_type)
520+
setup = m2d.create_setup(setup_type=m2d.solution_type)
522521
assert setup
523522
setup.delete()
524523
m2d.solution_type = SOLUTIONS.Maxwell2d.ElectroStaticZ
525-
setup = m2d.create_setup(setuptype=m2d.solution_type)
524+
setup = m2d.create_setup(setup_type=m2d.solution_type)
526525
assert setup
527526
setup.delete()
528527
m2d.solution_type = SOLUTIONS.Maxwell2d.DCConductionXY
529-
setup = m2d.create_setup(setuptype=m2d.solution_type)
528+
setup = m2d.create_setup(setup_type=m2d.solution_type)
530529
assert setup
531530
setup.delete()
532531
m2d.solution_type = SOLUTIONS.Maxwell2d.DCConductionZ
533-
setup = m2d.create_setup(setuptype=m2d.solution_type)
532+
setup = m2d.create_setup(setup_type=m2d.solution_type)
534533
assert setup
535534
setup.delete()
536535
m2d.solution_type = SOLUTIONS.Maxwell2d.ACConductionXY
537-
setup = m2d.create_setup(setuptype=m2d.solution_type)
536+
setup = m2d.create_setup(setup_type=m2d.solution_type)
538537
assert setup
539538
setup.delete()
540539
m2d.solution_type = SOLUTIONS.Maxwell2d.ACConductionZ
541-
setup = m2d.create_setup(setuptype=m2d.solution_type)
540+
setup = m2d.create_setup(setup_type=m2d.solution_type)
542541
assert setup
543542
setup.delete()
544543

0 commit comments

Comments
 (0)