improved dynamic link method

Author: maxcapodi78

_unittest/test_22_Circuit_DynamicLink.py

@@ -2,7 +2,7 @@
 import os
 from _unittest.conftest import local_path, scratch_path, config, desktop_version
 
-from pyaedt import Circuit, Q2d, Q3d, Hfss
+from pyaedt import Circuit
 from pyaedt.generic.filesystem import Scratch
 import gc
 
@@ -30,11 +30,10 @@ def setup_class(self):
                 source_project = os.path.join(local_path, "example_models", src_project_name + ".aedt")
                 linked_project = os.path.join(local_path, "example_models", linked_project_name + ".aedt")
 
-                q3d = os.path.join(local_path, "example_models", "q2d_q3d.aedt")
+                self.q3d = os.path.join(local_path, "example_models", "q2d_q3d.aedt")
                 self.test_project = self.local_scratch.copyfile(example_project)
                 self.test_src_project = self.local_scratch.copyfile(source_project)
                 self.test_lkd_project = self.local_scratch.copyfile(linked_project)
-                self.q3d = self.local_scratch.copyfile(q3d)
 
                 self.local_scratch.copyfolder(
                     os.path.join(local_path, "example_models", test_project_name + ".aedb"),
@@ -191,15 +190,19 @@ def test_09_setup(self):
 
     def test_10_q3d_link(self):
         self.aedtapp.insert_design("test_link")
-        app = Q2d(projectname=self.q3d, specified_version=desktop_version)
-        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link(app, extrusion_length=25)
-        self.aedtapp.close_project(app.project_name, False)
-        app = Q3d(projectname=self.q3d, specified_version=desktop_version)
-        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link(app)
-        self.aedtapp.close_project(app.project_name, False)
-        app = Hfss(projectname=self.q3d, specified_version=desktop_version)
-        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link(app, solution_name="Setup1 : Sweep")
-        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link(
-            app, solution_name="Setup2 : Sweep", tline_port="1"
+        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link("2DExtractorDesign1",
+                                                                          self.q3d,
+                                                                          solution_name="Setup1 : Sweep",
+                                                                          extrusion_length=25)
+        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link("Q3DDesign1",
+                                                                          self.q3d,
+                                                                          solution_name="Setup1 : LastAdaptive")
+        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link("Terminal",
+                                                                          self.q3d,
+                                                                          solution_name="Setup1 : Sweep")
+        assert self.aedtapp.modeler.schematic.add_subcircuit_dynamic_link("Terminal",
+                                                                          self.q3d,
+                                                                          solution_name="Setup2 : Sweep",
+                                                                          tline_port="1"
         )
-        self.aedtapp.close_project(app.project_name, False)
+

pyaedt/modeler/PrimitivesNexxim.py

@@ -1173,9 +1173,10 @@ def add_subcircuit_hfss_link(
     @aedt_exception_handler
     def add_subcircuit_dynamic_link(
         self,
-        pyaedt_app,
-        solution_name=None,
-        extrusion_length=10,
+        source_design_name,
+        source_project_path,
+        solution_name,
+        extrusion_length=None,
         enable_cable_modeling=True,
         default_matrix="",
         tline_port="",
@@ -1184,12 +1185,14 @@ def add_subcircuit_dynamic_link(
 
         Parameters
         ----------
-        pyaedt_app : :class:`pyaedt.q3d.Q3d` or :class:`pyaedt.q3d.Q2d` or :class:`pyaedt.q3d.Hfss`
-            pyaedt application object to include. It could be an Hfss object, a Q3d object or a Q2d.
+        source_design_name : str
+            Source Project Design Name.
+        source_project_path : str
+            Source Project full path.
         solution_name : str, optional
             Name of the solution and sweep. The default is ``"Setup1 : Sweep"``.
         extrusion_length : float, str, optional
-            Extrusion length for 2D Models. Default is 10 (in model units).
+            Extrusion length for 2D Models (q2d or Hfss). Default is `None`.
         enable_cable_modeling : bool, optional
             Either if the Hfss Cable modeling has to be enabled for 2D subcircuits.
         default_matrix : str, optional
@@ -1210,16 +1213,8 @@ def add_subcircuit_dynamic_link(
         >>> oDesign.AddCompInstance
         >>> oDesign.AddDynamicLink
         """
-        comp_name = generate_unique_name(pyaedt_app.design_name)
-        source_project_path = pyaedt_app.project_file
-        source_design_name = pyaedt_app.design_name
-        if not solution_name:
-            solution_name = pyaedt_app.nominal_sweep
-        if pyaedt_app.design_type == "HFSS":
-            default_matrix = ""
-            enable_cable_modeling = False
-        else:
-            tline_port = ""
+        comp_name = generate_unique_name(source_design_name)
+
         self._app.odesign.AddDynamicLink(
             source_design_name,
             source_project_path,
@@ -1233,9 +1228,9 @@ def add_subcircuit_dynamic_link(
         self.refresh_all_ids()
         for el in self.components:
             if comp_name in self.components[el].composed_name:
-                if pyaedt_app.design_type == "2D Extractor":
+                if extrusion_length:
                     self.components[el].set_property("Length", extrusion_length)
-                elif pyaedt_app.design_type == "HFSS" and tline_port:
+                if tline_port and extrusion_length:
                     self.components[el].set_property("TLineLength", extrusion_length)
                 return self.components[el]
         return False