Merge branch 'main' into create_rectangle

Author: MaxJPRey

_unittest/test_00_EDB.py

@@ -4,7 +4,7 @@
 
 from pyaedt import Edb
 from pyaedt.edb_core.components import resistor_value_parser
-from pyaedt.generic.constants import SourceType
+from pyaedt.edb_core.EDB_Data import SimulationConfiguration
 
 # Setup paths for module imports
 # Import required modules
@@ -32,7 +32,9 @@ def setup_class(self):
         self.local_scratch.copyfolder(example_project2, self.target_path2)
 
     def teardown_class(self):
-        BasisTest.my_teardown(self)
+        self.edbapp.close_edb()
+        self.local_scratch.remove()
+        del self.edbapp
 
     def test_00_export_ipc2581(self):
         ipc_path = os.path.join(self.local_scratch.path, "test.xml")
@@ -65,35 +67,12 @@ def test_01_find_by_name(self):
         assert isinstance(parameters[1], list)
         assert isinstance(parameters[0], int)
 
-    def test_01A_create_ports(self):
-        pins = self.edbapp.core_components.get_pin_from_component("J1")
-        nets = self.edbapp.core_components.get_nets_from_pin_list(pins)
-        assert len(nets) == 6
-        assert "IO13_ICSP_R" in nets
-        assert "V5_ALW_ON" in nets
-        assert "GND" in nets
-        assert "IO11_ICSP_R" in nets
-        assert "RESET_N_SHLD" in nets
-        assert "IO12_ICSP_R" in nets
-
-        assert self.edbapp.core_components.create_port_on_component(
-            component="J1", net_list=nets[:2], port_type=SourceType.CoaxPort, do_pingroup=True, reference_net="GND"
-        )
-        assert self.edbapp.core_components.create_port_on_component(
-            component="J1", net_list=nets[3], port_type=SourceType.CoaxPort, do_pingroup=False, reference_net="GND"
-        )
-        assert self.edbapp.core_components.create_port_on_component(
-            component="J1", net_list=nets[-2:], port_type=SourceType.CircPort, do_pingroup=False, reference_net="GND"
-        )
-
     def test_01B_get_vias_from_nets(self):
         assert self.edbapp.core_padstack.get_via_instance_from_net("GND")
         assert not self.edbapp.core_padstack.get_via_instance_from_net(["GND2"])
 
-    def test_01C_create_lumped_port_at_location(self):
-        assert self.edbapp.core_hfss.create_lumped_port_on_trace(
-            nets="M_DQ<11>", reference_layer="GND", point_list=[(17.169892e-3, 38.874954e-3)]
-        )
+    def test_01C_create_coax_port_on_component(self):
+        assert self.edbapp.core_hfss.create_coax_port_on_component("U1A1", "M_DQS_N<1>")
 
     def test_02_get_properties(self):
         assert len(self.edbapp.core_components.components) > 0
@@ -625,9 +604,8 @@ def test_67_add_void(self):
 
     def test_69_create_solder_balls_on_component(self):
         assert self.edbapp.core_components.set_solder_ball("U2A5")
-        assert self.edbapp.core_components.set_solder_ball("U2A5", "100um", "150um")
 
-    @pytest.mark.skipif(is_ironpython, reason="This Test uses Matplotlib that is not supported by Ironpython")
+    @pytest.mark.skipif(is_ironpython, reason="This test uses Matplotlib, which is not supported by IronPython.")
     def test_70_plot_on_matplotlib(self):
         local_png = os.path.join(self.local_scratch.path, "test.png")
         self.edbapp.core_nets.plot(None, None, save_plot=local_png)
@@ -760,124 +738,6 @@ def test_79_get_placement_vector(self):
         edb2.close_edb()
         del edb2
 
-    def test_79b_get_placement_vector(self):
-        laminate_edb = Edb(
-            os.path.join(local_path, "example_models", "lam_for_bottom_place.aedb"), edbversion=desktop_version
-        )
-        chip_edb = Edb(os.path.join(local_path, "example_models", "chip.aedb"), edbversion=desktop_version)
-        try:
-            laminate_cmp = laminate_edb.core_components.get_component_by_name("U3")
-            chip_cmp = chip_edb.core_components.get_component_by_name("U1")
-            result, vector, rotation, solder_ball_height = laminate_edb.core_components.get_component_placement_vector(
-                chip_cmp, laminate_cmp, "1", "2", "1", "2", True
-            )
-            assert result
-            assert abs(rotation - math.pi / 2) < 1e-9
-            assert solder_ball_height == 0
-            assert abs(vector[0] - 0.5e-3) < 1e-9
-            assert abs(vector[1] + 0.5e-3) < 1e-9
-        finally:
-            chip_edb.close_edb()
-            laminate_edb.close_edb()
-
-    def test_79c_get_placement_vector(self):
-        laminate_edb = Edb(
-            os.path.join(local_path, "example_models", "lam_for_bottom_place.aedb"), edbversion=desktop_version
-        )
-        chip_edb = Edb(os.path.join(local_path, "example_models", "chip.aedb"), edbversion=desktop_version)
-        try:
-            laminate_cmp = laminate_edb.core_components.get_component_by_name("U1")
-            chip_cmp = chip_edb.core_components.get_component_by_name("U1")
-            result, vector, rotation, solder_ball_height = laminate_edb.core_components.get_component_placement_vector(
-                chip_cmp, laminate_cmp, "1", "2", "1", "2"
-            )
-            assert result
-            assert abs(rotation) < 1e-9
-            assert solder_ball_height == 0
-            assert abs(vector[0]) < 1e-9
-            assert abs(vector[1]) < 1e-9
-        finally:
-            chip_edb.close_edb()
-            laminate_edb.close_edb()
-
-    def test_79d_get_placement_vector_offset(self):
-        laminate_edb = Edb(
-            os.path.join(local_path, "example_models", "lam_for_bottom_place.aedb"), edbversion=desktop_version
-        )
-        chip_edb = Edb(os.path.join(local_path, "example_models", "chip_offset.aedb"), edbversion=desktop_version)
-        try:
-            laminate_cmp = laminate_edb.core_components.get_component_by_name("U3")
-            chip_cmp = chip_edb.core_components.get_component_by_name("U1")
-            result, vector, rotation, solder_ball_height = laminate_edb.core_components.get_component_placement_vector(
-                chip_cmp, laminate_cmp, "1", "4", "1", "4", True
-            )
-            assert result
-            assert abs(rotation - math.pi / 2) < 1e-9
-            assert solder_ball_height == 0
-            assert abs(vector[0] - 0.2e-3) < 1e-9
-            assert abs(vector[1] + 0.8e-3) < 1e-9
-        finally:
-            chip_edb.close_edb()
-            laminate_edb.close_edb()
-
-    def test_79e_get_placement_vector_offset(self):
-        laminate_edb = Edb(
-            os.path.join(local_path, "example_models", "lam_for_bottom_place.aedb"), edbversion=desktop_version
-        )
-        chip_edb = Edb(os.path.join(local_path, "example_models", "chip_offset.aedb"), edbversion=desktop_version)
-        try:
-            laminate_cmp = laminate_edb.core_components.get_component_by_name("U1")
-            chip_cmp = chip_edb.core_components.get_component_by_name("U1")
-            result, vector, rotation, solder_ball_height = laminate_edb.core_components.get_component_placement_vector(
-                chip_cmp, laminate_cmp, "1", "4", "1", "4"
-            )
-            assert result
-            assert abs(rotation) < 1e-9
-            assert solder_ball_height == 0
-            assert abs(vector[0] - 0.3e-3) < 1e-9
-            assert abs(vector[1] - 0.3e-3) < 1e-9
-        finally:
-            chip_edb.close_edb()
-            laminate_edb.close_edb()
-
-    def test_79f_get_placement_vector_offset(self):
-        laminate_edb = Edb(
-            os.path.join(local_path, "example_models", "lam_for_top_place.aedb"), edbversion=desktop_version
-        )
-        chip_edb = Edb(os.path.join(local_path, "example_models", "chip_offset.aedb"), edbversion=desktop_version)
-        try:
-            laminate_cmp = laminate_edb.core_components.get_component_by_name("U3")
-            chip_cmp = chip_edb.core_components.get_component_by_name("U1")
-            result, vector, rotation, solder_ball_height = laminate_edb.core_components.get_component_placement_vector(
-                chip_cmp, laminate_cmp, "1", "4", "1", "4", False
-            )
-            assert result
-            assert abs(rotation - math.pi / 2) < 1e-9
-            assert solder_ball_height == 0
-            assert abs(vector[0] - 0.8e-3) < 1e-9
-            assert abs(vector[1] + 0.8e-3) < 1e-9
-        finally:
-            chip_edb.close_edb()
-            laminate_edb.close_edb()
-
-    def test_79g_get_placement_vector(self):
-        board_edb = Edb(os.path.join(local_path, "example_models", "invert_board.aedb"), edbversion=desktop_version)
-        package_edb = Edb(os.path.join(local_path, "example_models", "package2.aedb"), edbversion=desktop_version)
-        try:
-            laminate_cmp = board_edb.core_components.get_component_by_name("U100")
-            chip_cmp = package_edb.core_components.get_component_by_name("BGA")
-            result, vector, rotation, solder_ball_height = board_edb.core_components.get_component_placement_vector(
-                chip_cmp, laminate_cmp, "A12", "A14", "A12", "A14", True
-            )
-            assert result
-            assert abs(rotation) < 1e-9
-            assert abs(solder_ball_height - 315e-6) < 1e-9
-            assert abs(vector[0] + 48.7e-3) < 10e-9
-            assert abs(vector[1] - 59.7e-3) < 10e-9
-        finally:
-            package_edb.close_edb()
-            board_edb.close_edb()
-
     def test_80_edb_without_path(self):
         edbapp_without_path = Edb(edbversion=desktop_version, isreadonly=False)
         time.sleep(2)
@@ -894,22 +754,12 @@ def test_80_create_rectangle_in_pad(self):
         edb_padstacks = Edb(
             edbpath=os.path.join(self.local_scratch.path, "padstacks2.aedb"),
             edbversion=desktop_version,
-            isreadonly=False,
+            isreadonly=True,
         )
         for i in range(7):
             padstack_instance = list(edb_padstacks.core_padstack.padstack_instances.values())[i]
             result = padstack_instance.create_rectangle_in_pad("s")
             assert result
-            points = padstack_instance.create_rectangle_in_pad("s", return_points=True)
-            assert len(points) == 4
-            assert len(points[0]) == 2
-        # for i in range(8, 10):
-        #     padstack_instance = list(edb_padstacks.core_padstack.padstack_instances.values())[i]
-        #     result = padstack_instance.create_rectangle_in_pad("g")
-        #     assert result
-        #     points = padstack_instance.create_rectangle_in_pad("g", return_points=True)
-        #     assert len(points) == 4
-        #     assert len(points[0]) == 2
         edb_padstacks.close_edb()
 
     def test_81_edb_with_dxf(self):
@@ -1077,7 +927,27 @@ def test_82c_place_on_bottom_of_lam_with_mold_solder(self):
             chipEdb.close_edb()
             laminateEdb.close_edb()
 
-    def test_83_set_component_type(self):
+    def test_83_build_siwave_project_from_config_file(self):
+        cfg_file = os.path.join(os.path.dirname(self.edbapp.edbpath), "test.cfg")
+        with open(cfg_file, "w") as f:
+            f.writelines("SolverType = 'Siwave'\n")
+            f.writelines("PowerNets = ['GND']\n")
+            f.writelines("Components = ['U2A5', 'U1B5']")
+
+        sim_config = SimulationConfiguration(cfg_file)
+        assert self.edbapp.build_simulation_project(sim_config)
+
+    def test_84_build_hfss_project_from_config_file(self):
+        cfg_file = os.path.join(os.path.dirname(self.edbapp.edbpath), "test.cfg")
+        with open(cfg_file, "w") as f:
+            f.writelines("SolverType = 'Hfss3dLayout'\n")
+            f.writelines("PowerNets = ['GND']\n")
+            f.writelines("Components = ['U2A5', 'U1B5']")
+
+        sim_config = SimulationConfiguration(cfg_file)
+        assert self.edbapp.build_simulation_project(sim_config)
+
+    def test_85_set_component_type(self):
         comp = self.edbapp.core_components.components["R2L18"]
         comp.type = "Resistor"
         assert comp.type == "Resistor"
@@ -1092,10 +962,6 @@ def test_83_set_component_type(self):
         comp.type = "Other"
         assert comp.type == "Other"
 
-    def test_84_create_coax_port_on_component_pin(self):
-        assert self.edbapp.core_hfss.create_coax_port_on_component_per_pin("U1A1", "D1", "port1")
-        assert self.edbapp.core_hfss.create_coax_port_on_component_per_net("U1A1", "M_DQS_N<1>", "port2")
-
     def test_85_deactivate_rlc(self):
         assert self.edbapp.core_components.deactivate_rlc_component(component="C1", create_circuit_port=True)
         assert self.edbapp.core_components.deactivate_rlc_component(component="C2", create_circuit_port=False)

_unittest/test_32_RMxprt.py

@@ -28,7 +28,31 @@ def test_02_changeesolution(self):
         assert self.aedtapp.disable_modelcreation("LSSM")
         assert self.aedtapp.enable_modelcreation("WRIM")
 
-    def test_06a_create_setup(self):
+    def test_03_getchangeproperty(self):
+        # test increment statorOD by 1mm
+        self.aedtapp.disable_modelcreation("ASSM")
+        statorOD = self.aedtapp.stator["Outer Diameter"]
+        assert statorOD
+        self.aedtapp.stator["Outer Diameter"] = statorOD + "+1mm"
+
+    def test_04_create_setup(self):
+        # first test GRM (use Inner-Rotor Induction Machine)
+        assert self.aedtapp.enable_modelcreation("IRIM")
         mysetup = self.aedtapp.create_setup()
+        assert mysetup.props["RatedOutputPower"]
         mysetup.props["RatedOutputPower"] = "100W"
-        assert mysetup.update()
+        assert mysetup.update()  # update only needed for assertion
+        # second test ASSM setup
+        self.aedtapp.delete_setup(mysetup.name)
+        assert self.aedtapp.disable_modelcreation("ASSM")
+        mysetup = self.aedtapp.create_setup()
+        assert mysetup.props["RatedSpeed"]
+        mysetup.props["RatedSpeed"] = "3600rpm"
+        assert mysetup.update()  # update only needed for assertion
+        # third test TPSM/SYNM setup
+        self.aedtapp.delete_setup(mysetup.name)
+        assert self.aedtapp.disable_modelcreation("TPSM")
+        mysetup = self.aedtapp.create_setup()
+        assert mysetup.props["RatedVoltage"]
+        mysetup.props["RatedVoltage"] = "208V"
+        assert mysetup.update()  # update only needed for assertion

pyaedt/application/design_solutions.py

@@ -345,7 +345,7 @@
         "ORIM": {"name": "ORIM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
         "SRIM": {"name": "SRIM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
         "WRIM": {"name": "WRIM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "DFIG": {"name": "DFIG", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
+        "DFIG": {"name": "DFIG", "options": None, "report_type": None, "default_setup": 43, "default_adaptive": None},
         "AFIM": {"name": "AFIM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
         "HM": {"name": "HM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
         "RFSM": {"name": "RFSM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
@@ -355,18 +355,18 @@
         "APSM": {"name": "APSM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
         "IBDM": {"name": "IBDM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
         "ABDM": {"name": "ABDM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "TPIM": {"name": "TPIM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "SPIM": {"name": "SPIM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "TPSM": {"name": "TPSM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "BLDC": {"name": "BLDC", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "ASSM": {"name": "ASSM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "PMDC": {"name": "PMDC", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "SRM": {"name": "SRM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "LSSM": {"name": "LSSM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "UNIM": {"name": "UNIM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "DCM": {"name": "DCM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "CPSM": {"name": "CPSM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
-        "NSSM": {"name": "NSSM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},
+        "TPIM": {"name": "TPIM", "options": None, "report_type": None, "default_setup": 44, "default_adaptive": None},
+        "SPIM": {"name": "SPIM", "options": None, "report_type": None, "default_setup": 45, "default_adaptive": None},
+        "TPSM": {"name": "SYNM", "options": None, "report_type": None, "default_setup": 46, "default_adaptive": None},
+        "BLDC": {"name": "BLDC", "options": None, "report_type": None, "default_setup": 47, "default_adaptive": None},
+        "ASSM": {"name": "ASSM", "options": None, "report_type": None, "default_setup": 48, "default_adaptive": None},
+        "PMDC": {"name": "PMDC", "options": None, "report_type": None, "default_setup": 49, "default_adaptive": None},
+        "SRM": {"name": "SRM", "options": None, "report_type": None, "default_setup": 50, "default_adaptive": None},
+        "LSSM": {"name": "LSSM", "options": None, "report_type": None, "default_setup": 51, "default_adaptive": None},
+        "UNIM": {"name": "UNIM", "options": None, "report_type": None, "default_setup": 52, "default_adaptive": None},
+        "DCM": {"name": "DCM", "options": None, "report_type": None, "default_setup": 53, "default_adaptive": None},
+        "CPSM": {"name": "CPSM", "options": None, "report_type": None, "default_setup": 54, "default_adaptive": None},
+        "NSSM": {"name": "NSSM", "options": None, "report_type": None, "default_setup": 55, "default_adaptive": None},
     },
     "ModelCreation": {
         "GRM": {"name": "GRM", "options": None, "report_type": None, "default_setup": 34, "default_adaptive": None},