Openspice

.github/workflows/pyspice-test.yml

@@ -5,9 +5,9 @@ name: Pyspice Test
 
 on:
   push:
-    branches: [ master ]
+    branches:  "*" 
   pull_request:
-    branches: [ master ]
+    branches:  "*" 
 
 jobs:
   build:

OpenSPICE-revamp/dep_sources.cir

@@ -0,0 +1,5 @@
+G1 1 0 1 0 1
+E1 1 0 1 0 1
+F1 1 0 1 0 1
+H1 1 0 1 0 1
+R1 1 0 1

OpenSPICE-revamp/ext_sources.cir

@@ -0,0 +1,4 @@
+V1 1 0 dc 0 external
+R1 1 2 1
+R2 2 3 1
+I1 3 0 dc 0 external

OpenSPICE-revamp/isource.cir

@@ -0,0 +1,2 @@
+I1 1 0 1
+R1 1 0 1

OpenSPICE-revamp/multi_r_netlist.cir

@@ -0,0 +1,4 @@
+R1 1 0 1
+R2 2 3 1
+R3 1 2 4
+R4 3 0 5

OpenSPICE-revamp/one_r_netlist.cir

@@ -0,0 +1 @@
+R1 1 0 1

OpenSPICE-revamp/op_pt.cir

@@ -0,0 +1,6 @@
+V1 1 0 1
+R1 1 0 1
+
+.control
+    .op
+.end

OpenSPICE-revamp/op_pt_divider.cir

@@ -0,0 +1,7 @@
+V1 1 0 1
+R1 1 2 1
+R2 2 0 1
+
+.control
+    .op
+.end

OpenSPICE-revamp/rc_netlist.cir

@@ -0,0 +1,2 @@
+R1 1 0 1
+C1 1 0 1

OpenSPICE-revamp/rc_netlist_w_ic.cir

@@ -0,0 +1,2 @@
+R1 1 0 1
+C1 1 0 1 ic=1

OpenSPICE-revamp/requirements.txt

@@ -0,0 +1 @@
+Arpeggio==1.10.2

OpenSPICE-revamp/rl_netlist.cir

@@ -0,0 +1,2 @@
+R1 1 0 1
+L1 1 0 1

OpenSPICE-revamp/rlc_netlist.cir

@@ -0,0 +1,3 @@
+R1 1 0 1
+L1 1 0 1
+C1 1 0 1

OpenSPICE-revamp/rlc_netlist_w_ic.cir

@@ -0,0 +1,3 @@
+R1 1 0 1
+L1 1 0 1 ic=1
+C1 1 0 1 ic=1

OpenSPICE-revamp/tran.cir

@@ -0,0 +1,7 @@
+V1 1 0 1
+R1 1 2 1
+C1 2 0 1 ic=1
+
+.control
+    .tran 1 100 0 1 uic
+.end

OpenSPICE-revamp/vccs.cir

@@ -0,0 +1,2 @@
+G1 1 0 1 0 1
+R1 1 0 1

OpenSPICE-revamp/vsource.cir

@@ -0,0 +1,2 @@
+V1 1 0 1
+R1 1 0 1

PySpice/Config/ConfigInstall.py

@@ -21,6 +21,8 @@ def __init__(self):
             self._name = 'windows'
         elif sys.platform.startswith('darwin'):
             self._name = 'osx'
+        elif sys.platform.startswith('freebsd'):
+            self._name = 'freebsd'
 
     ##############################################
 
@@ -40,6 +42,10 @@ def on_windows(self):
     def on_osx(self):
         return self._name == 'osx'
 
+    @property
+    def on_freebsd(self):
+        return self._name == 'freebsd'
+
 OS = OsFactory()
 
 ####################################################################################################

PySpice/Spice/NgSpice/Shared.py

@@ -416,17 +416,31 @@ def setup_platform(cls):
             cls.LIBRARY_PATH = _
         else:
             if ConfigInstall.OS.on_windows:
-                ngspice_path = Path(__file__).parent.joinpath('Spice64_dll')
-                cls.NGSPICE_PATH = ngspice_path
-                # path = ngspice_path.joinpath('dll-vs', 'ngspice-{version}{id}.dll')
-                path = ngspice_path.joinpath('dll-vs', 'ngspice{}.dll')
+                # Check for MSYSTEM environment first
+                msystem = os.environ.get('MSYSTEM')
+                mingw_prefix = os.environ.get('MINGW_PREFIX')
+
+                if msystem and mingw_prefix:
+                    # Use MINGW paths
+                    path = str(Path(mingw_prefix) / 'bin' / 'libngspice-0{}.dll')
+                    if 'SPICE_LIB_DIR' not in os.environ:
+                        os.environ['SPICE_LIB_DIR'] = str(Path(mingw_prefix) / 'share' / 'ngspice' / 'scripts')
+                else:
+                    # Fall back to original Windows paths
+                    ngspice_path = Path(__file__).parent.joinpath('Spice64_dll')
+                    cls.NGSPICE_PATH = ngspice_path
+                    # path = ngspice_path.joinpath('dll-vs', 'ngspice-{version}{id}.dll')
+                    path = str(ngspice_path.joinpath('dll-vs', 'ngspice{}.dll'))
 
             elif ConfigInstall.OS.on_osx:
                 path = 'libngspice{}.dylib'
 
             elif ConfigInstall.OS.on_linux:
                 path = 'libngspice{}.so'
 
+            elif ConfigInstall.OS.on_freebsd:
+                path = 'libngspice{}.so'
+
             else:
                 raise NotImplementedError
 
@@ -620,7 +634,12 @@ def _send_char(message_c, ngspice_id, user_data):
             self._stderr.append(content)
             if content.startswith('Warning:'):
                 func = self._logger.warning
-            # elif content.startswith('Warning:'):
+            elif content.startswith('Using'): # Ignore "Using ... as Direct Linear Solver" messages
+                func = self._logger.debug
+            elif content.startswith('doAnalyses:'): 
+                func = self._logger.debug
+            elif content.startswith('run simulation interrupted'): 
+                func = self._logger.debug
             else:
                 self._error_in_stderr = True
                 func = self._logger.error
@@ -697,6 +716,7 @@ def _background_thread_running(is_running, ngspice_id, user_data):
         self = ffi.from_handle(user_data)
         self._logger.debug('ngspice_id-{} background_thread_running {}'.format(ngspice_id, is_running))
         self._is_running = is_running
+        return 0
 
     ##############################################
 

PySpice/Spice/NgSpice/Simulation.py

@@ -109,19 +109,23 @@ def ngspice(self):
     ##############################################
 
     def _run(self, analysis_method, *args, **kwargs):
+        background = kwargs.pop('background', False)
 
         super()._run(analysis_method, *args, **kwargs)
 
         self._ngspice_shared.destroy()
         # load circuit and simulation
         # Fixme: Error: circuit not parsed.
         self._ngspice_shared.load_circuit(str(self))
-        self._ngspice_shared.run()
+        self._ngspice_shared.run(background=background)
         self._logger.debug(str(self._ngspice_shared.plot_names))
-        self.reset_analysis()
+        if not background:
+            self.reset_analysis()
 
-        plot_name = self._ngspice_shared.last_plot
-        if plot_name == 'const':
-            raise NameError('Simulation failed')
+            plot_name = self._ngspice_shared.last_plot
+            if plot_name == 'const':
+                raise NameError('Simulation failed')
+        else:
+            return True #Nothing to show yet!
 
         return self._ngspice_shared.plot(self, plot_name).to_analysis()

PySpice/Spice/NgSpice/SimulationType.py

@@ -82,7 +82,7 @@
     'charge',
 )
 
-LAST_VERSION = 34   # released on January 31st, 2021
+LAST_VERSION = 43   # released on January 31st, 2021
 
 for version in range(28, LAST_VERSION +1):
     SIMULATION_TYPE[version] = SIMULATION_TYPE[27]