fix #157

Author: FabriceSalvaire

PySpice/Spice/BasicElement.py

@@ -97,6 +97,8 @@
 
 ####################################################################################################
 
+import logging
+
 from ..Tools.StringTools import str_spice, join_list, join_dict
 from ..Unit import U_m, U_s, U_A, U_V, U_Degree, U_Ω, U_F, U_H, U_Hz
 from .Netlist import (Element, AnyPinElement, FixedPinElement, NPinElement, OptionalPin)
@@ -118,6 +120,10 @@
 
 ####################################################################################################
 
+_module_logger = logging.getLogger(__name__)
+
+####################################################################################################
+
 class DipoleElement(FixedPinElement):
     """This class implements a base class for dipole element."""
     __pins__ = ('plus', 'minus')
@@ -656,13 +662,28 @@ class CoupledInductor(AnyPinElement):
     inductor2 = ElementNamePositionalParameter(position=1, key_parameter=False)
     coupling_factor = FloatPositionalParameter(position=2, key_parameter=False)
 
+    _logger = _module_logger.getChild('CoupledInductor')
+
  ##############################################
 
     def __init__(self, name, *args, **kwargs):
 
         super().__init__(name, *args, **kwargs)
 
-        self._inductors = (self.inductor1, self.inductor2)
+        self._inductors = []
+        for inductor in (self.inductor1, self.inductor2):
+            try:
+                self.netlist.element(inductor)
+            except KeyError:
+                try:
+                    inductor = 'L' + inductor
+                    self.netlist.element(inductor)
+                    self._logger.info('Prefixed element {}'.format(inductor))
+                except KeyError:
+                    raise ValueError('Element with name {} not found'.format(inductor))
+            # Fixme: str or Element instance ?
+            self._inductors.append(inductor)
+        self.inductor1, self.inductor2 = self._inductors
 
 ####################################################################################################
 

PySpice/Spice/Netlist.py

@@ -895,15 +895,26 @@ def subcircuit_names(self):
 
     ##############################################
 
+    def element(self, name):
+        return self._elements[name]
+
+    def model(self, name):
+        return self._models[name]
+
+    def node(self, name):
+        return self._nodes[name]
+
+    ##############################################
+
     def __getitem__(self, attribute_name):
 
         if attribute_name in self._elements:
-            return self._elements[attribute_name]
+            return self.element(attribute_name)
         elif attribute_name in self._models:
-            return self._models[attribute_name]
+            return self.model(attribute_name)
         # Fixme: subcircuits
         elif attribute_name in self._nodes:
-            return self._nodes[attribute_name]
+            return self.node(attribute_name)
         else:
             raise IndexError(attribute_name) # KeyError
 

issues/issue-157-2.py

@@ -18,21 +18,23 @@
 L_S1 = 10e-6
 K_P1S1 = 0.1
 
-circuit = Circuit("2CoupledInductors")
+circuit = Circuit('2CoupledInductors')
 
 #Primary Side
-circuit.I("I2", circuit.gnd, "N1", "AC " + str(I_P1) + "")
-circuit.L("L_P1", circuit.gnd, "N1", str(L_P1))
+circuit.I('I2', circuit.gnd, 'N1', 'AC ' + str(I_P1) + '')
+circuit.L('L_P1', circuit.gnd, 'N1', str(L_P1))
 
 # Secondary Side
-circuit.L("L_S1", circuit.gnd,  "N2", str(L_S1) )
-circuit.K("K_P1S1", "LL_P1", "LL_S1", K_P1S1) # NB, it adds an L to the name of the inductor ... 
+circuit.L('L_S1', circuit.gnd,  'N2', str(L_S1) )
+circuit.K('K_P1S1', 'LL_P1', 'LL_S1', K_P1S1) # NB, it adds an L to the name of the inductor ...
 
-# Do the simulation
-simulator = circuit.simulator(temperature=25, nominal_temperature=25)
-analysis = simulator.ac(variation="lin", number_of_points=1, start_frequency=frequency, stop_frequency=frequency)
+print(circuit)
 
-# Print the results
-print("--- Results ---")
-for node in analysis.nodes.values():
-  print('Node {}: {:5.2f} V'.format(str(node), float(abs(node))))
+# # Do the simulation
+# simulator = circuit.simulator(temperature=25, nominal_temperature=25)
+# analysis = simulator.ac(variation='lin', number_of_points=1, start_frequency=frequency, stop_frequency=frequency)
+
+# # Print the results
+# print('--- Results ---')
+# for node in analysis.nodes.values():
+#   print('Node {}: {:5.2f} V'.format(str(node), float(abs(node))))

issues/issue-157.py

@@ -18,21 +18,25 @@
 L_S1 = 10e-6
 K_P1S1 = 0.1
 
-circuit = Circuit("2CoupledInductors")
+circuit = Circuit('2CoupledInductors')
 
 #Primary Side
-circuit.I("I2", circuit.gnd, "N1", "AC " + str(I_P1) + "")
-circuit.L("L_P1", circuit.gnd, "N1", str(L_P1))
+circuit.I('I2', circuit.gnd, 'N1', 'AC ' + str(I_P1) + '')
+circuit.L('L_P1', circuit.gnd, 'N1', str(L_P1))
 
 # Secondary Side
-circuit.L("L_S1", circuit.gnd,  "N2", str(L_S1) )
-circuit.K("K_P1S1", "L_P1", "L_S1", K_P1S1)
+circuit.L('L_S1', circuit.gnd,  'N2', str(L_S1) )
+circuit.K('K_P1S1', 'L_P1', 'L_S1', K_P1S1)
+# circuit.K('K_P1S1', 'L_P1', 'LL_S1', K_P1S1)
+# circuit.K('K_P1S1', 'LL_P1', 'LL_S1', K_P1S1)
+
+print(circuit)
 
 # Do the simulation
 simulator = circuit.simulator(temperature=25, nominal_temperature=25)
-analysis = simulator.ac(variation="lin", number_of_points=1, start_frequency=frequency, stop_frequency=frequency)
+analysis = simulator.ac(variation='lin', number_of_points=1, start_frequency=frequency, stop_frequency=frequency)
 
 # Print the results
-print("--- Results ---")
+print('--- Results ---')
 for node in analysis.nodes.values():
   print('Node {}: {:5.2f} V'.format(str(node), float(abs(node))))