FIX: Fix equivalent circuit export (#6139)

Co-authored-by: pyansys-ci-bot <[email protected]>

Author: Samuelopez-ansys

doc/changelog.d/6139.fixed.md

@@ -0,0 +1 @@
+Fix equivalent circuit export

src/ansys/aedt/core/q3d.py

@@ -1121,45 +1121,49 @@ def export_equivalent_circuit(
                 else:
                     circuit_settings = self.oanalysis.GetCircuitSettings()
                     for setting in circuit_settings:
-                        if isinstance(setting, tuple):
+                        if isinstance(setting, tuple) or isinstance(setting, list):
                             if setting[0] == "NAME:CPPInfo":
                                 cpp_settings = setting
-
+                                break
         if self.modeler._is3d:
             try:
+                export_circuit_context = [
+                    "NAME:CircuitData",
+                    "MatrixName:=",
+                    matrix,
+                    "NumberOfCells:=",
+                    str(cells),
+                    "UserHasChangedSettings:=",
+                    user_changed_settings,
+                    "IncludeCap:=",
+                    include_cap,
+                    "IncludeCond:=",
+                    include_cond,
+                    coupling_limits,
+                    "IncludeDCR:=",
+                    include_dcr,
+                    "IncudeDCL:=",
+                    include_dcl,
+                    "IncludeACR:=",
+                    include_acr,
+                    "IncludeACL:=",
+                    include_acl,
+                    "ADDResistance:=",
+                    add_resistance,
+                    "ParsePinNames:=",
+                    parse_pin_names,
+                ]
+
+                if include_cpp:
+                    export_circuit_context.append("IncludeCPP:=")
+                    export_circuit_context.append(include_cpp)
+                    export_circuit_context.append(cpp_settings)
+
                 self.oanalysis.ExportCircuit(
                     analysis_setup,
                     variations,
                     output_file,
-                    [
-                        "NAME:CircuitData",
-                        "MatrixName:=",
-                        matrix,
-                        "NumberOfCells:=",
-                        str(cells),
-                        "UserHasChangedSettings:=",
-                        user_changed_settings,
-                        "IncludeCap:=",
-                        include_cap,
-                        "IncludeCond:=",
-                        include_cond,
-                        [coupling_limits],
-                        "IncludeDCR:=",
-                        include_dcr,
-                        "IncudeDCL:=",
-                        include_dcl,
-                        "IncludeACR:=",
-                        include_acr,
-                        "IncludeACL:=",
-                        include_acl,
-                        "ADDResistance:=",
-                        add_resistance,
-                        "ParsePinNames:=",
-                        parse_pin_names,
-                        "IncludeCPP:=",
-                        include_cpp,
-                        cpp_settings,
-                    ],
+                    export_circuit_context,
                     model,
                     frequency,
                 )

tests/system/solvers/test_31_Q3D.py

@@ -483,6 +483,18 @@ def test_equivalent_circuit(self, q3d_solved2):
         assert not q3d.export_equivalent_circuit(
             output_file=os.path.join(self.local_scratch.path, "test_export_circuit.cir"), setup="Setup1", sweep="Sweep1"
         )
+
+        assert q3d.export_equivalent_circuit(
+            output_file=os.path.join(self.local_scratch.path, "test_export_circuit.cir"),
+            matrix="Original",
+            cells=1,
+            include_acr=True,
+            include_acl=True,
+            include_cap=True,
+            include_cond=True,
+            include_cpp=True,
+        )
+
         assert q3d.export_equivalent_circuit(
             output_file=os.path.join(self.local_scratch.path, "test_export_circuit.cir"), matrix="Original"
         )