Merge branch 'pre-master-45' into bt_dev

README.SEEgenerator

@@ -0,0 +1,192 @@
+SEE (single event effects) generator
+
+The SEE generator generates current pulses, which resemble the 
+charge generation and flow causes by a penetrating particle.
+
+How to use it:
+Select LET and charge collection depth cdepth, define them as parameters.
+Identify all nodes of a circuit netlist which are pn junctions,
+and thus are sensitive to pulses.
+
+Set up the SEEgenerator by adding for example
+
+* charge collection depth (in µm)
+.param d = 1
+* LET (linear energy transfer) in MeV*cm²/mg
+.param let = 12
+aseegen1 NULL mon [%id(xcell.n1 m1) %id(xcell.n2 m2) %id(xcell.n1 m1) %id(xcell.n2 m2)] seemod1
+.model seemod1 seegen (tdelay = 11n tperiod=25n let='let' cdepth='d')
+
+to the netlist. 
+
+Each sensitive node from the (flattend) netlist may be added to the output vector of assegen1
+(in brackets [...]), together with its reference node, for example GND for NMOS, nwell potential
+for PMOS. This procedure is currently to be done manually, a semi-automated setup using
+a GUI is in preparation.
+
+Instead of NULL, one may give a control signal to aseegen1, to start the pulse sequence. 
+'mon' is a monitoring output, showing each pulse as a voltage equivalent to the current.
+
+After a transient simulation, plotting the data output versus a non-radiated device
+may reveal the SEE influence.
+
+Several examples are gieven in ./src/axamples/xspice/see: inverters, SRAM cell, opamp,
+also as loop with varying LET to detect the threshold. 
+
+As literature please see for example
+    Ygor Quadros de Aguiar, Frédéric Wrobel. Jean-Luc Autran, Rubén García Alía
+    Single-Event Effects, from Space to Accelerator Environments
+    Springer 2025
+
+Detailed description (will be added to the manual):
+
+NAME_TABLE:
+
+C_Function_Name:       cm_seegen
+Spice_Model_Name:      seegen
+Description:           "single event effect generator"
+
+
+PORT_TABLE:
+
+Port_Name:             ctrl                 mon
+Description:          "control input"       "monitor"
+Direction:             in                   out
+Default_Type:          v                    v
+Allowed_Types:         [v,vd,i,id]          [v]
+Vector:                no                   no
+Vector_Bounds:         -                    -
+Null_Allowed:          yes                  yes
+
+
+PORT_TABLE:
+
+Port_Name:             out
+Description:           "output"
+Direction:             out
+Default_Type:          i
+Allowed_Types:         [i,id]
+Vector:                yes
+Vector_Bounds:         [1 -]
+Null_Allowed:          no
+
+
+PARAMETER_TABLE:
+
+Parameter_Name:     tfall                    trise
+Description:        "pulse fall time"        "pulse rise time"
+Data_Type:          real                     real
+Default_Value:      500e-12                  20e-12
+Limits:             -                        -
+Vector:              no                      no
+Vector_Bounds:       -                       -
+Null_Allowed:       yes                      yes
+
+
+PARAMETER_TABLE:
+
+Parameter_Name:     tdelay                 inull
+Description:        "pulse delay"          "max current"
+Data_Type:          real                   real
+Default_Value:      0                      0
+Limits:             -                      -
+Vector:              no                    no
+Vector_Bounds:       -                      -
+Null_Allowed:       yes                    yes
+
+
+PARAMETER_TABLE:
+
+Parameter_Name:     tperiod                ctrlthres
+Description:        "pulse repetition"     "control voltage threshold"
+Data_Type:          real                   real
+Default_Value:      0                      0.5
+Limits:             -                      -
+Vector:              no                    no
+Vector_Bounds:      -                      -
+Null_Allowed:       yes                    yes
+
+
+PARAMETER_TABLE:
+
+Parameter_Name:     let                    cdepth
+Description:        "lin energy transfer"  "charge collection depth"
+Data_Type:          real                   real
+Default_Value:      10                     1
+Limits:             -                      -
+Vector:             no                     no
+Vector_Bounds:      -                      -
+Null_Allowed:       yes                    yes
+
+
+PARAMETER_TABLE:
+
+Parameter_Name:     angle                  perlim
+Description:        "particle angle"       "pulse repetition"
+Data_Type:          real                   boolean
+Default_Value:      0                      TRUE
+Limits:             [0 1.57079]            -
+Vector:             no                     no
+Vector_Bounds:      -                      -
+Null_Allowed:       yes                    yes
+
+STATIC_VAR_TABLE:
+
+Static_Var_Name:    last_t_value
+Data_Type:          pointer
+Vector:              no
+Description:        "next pulse start time"
+
+STATIC_VAR_TABLE:
+
+Static_Var_Name:    pulse_number
+Data_Type:          pointer
+Vector:              no
+Description:        "number of pulse"
+
+STATIC_VAR_TABLE:
+
+Static_Var_Name:    last_ctrl
+Data_Type:          pointer
+Vector:              no
+Description:        "last control value"
+
+Description
+This code model generates "double exponentially" formed current pulses according to
+
+i(t) = inull * (exp(-(t-tdelay)/tfall) - (exp(-(t-tdelay)/trise) for t > tdelay
+i(t) = 0       for t < tdelay
+
+with inull given as parameter input or (if not given), calculated as
+inull = 1.035e-14 * let/cos(angle) * cdepth / (tfall - trise)
+with data for silicon, cdepth in µm, let in MeV*cm²/mg, angle in radians.
+
+Minimum is one pulse output (a node pair, or a single node with the other grounded).
+Several output node pairs may be defined per code model instance. Parameter tperiod
+may then be used to create pulses in sequence. Per default only one sequence is running,
+with one pulse for each node.
+Parameter perlim, set to FALSE, allows running and repeating the sequence until
+the end of the simulation. The first pulse is issued in the first
+node pair of the node list in the vector [], the second (after time tperiod has elapsed), 
+is injected by the second node (pair) of the list and so on. When the sequence is repeated, 
+again the output starts pulsing at port (node pair) number 1.
+
+The control input ctrl (voltage or current) may be used
+to start or repeat the whole sequence, depending on the circuit status. A rising voltage
+at ctrl, when crossing the threshold given by ctrlthres, will initiate the sequence (including
+tdelay and tperiod). If set to NULL, the pulse (sequence) will start immediately after tdelay.
+
+'mon' is a monitoring output, showing each pulse as a voltage equivalent to the current. It
+may be used just for plotting, or for re-triggering an action.
+
+This model will work in transient analysis.
+
+Example ngspice usage (with control)
+
+aseegen1 ctrl mon [%id(n1 m1) %id(n2 m2) %id(n1 m1) %id(n2 m2)] seemod1
+.model seemod1 seegen (tdelay = 8n tperiod=25n)
+
+Example ngspice usage (without control, ctrl replaced by NULL, parameters as offered by default)
+
+aseegen2 NULL mon [%id(n1 m1) %id(n5 n6) %id(n6 n7) %i(isingle) ] seemod2
+.model seemod2 seegen (tdelay = 0 tperiod=0 ctrlthres=0.5 inull=0 tfall=500p trise=20p perlim=FALSE)

examples/measure/meas_expression.cir

@@ -14,6 +14,19 @@ run
 ** evaluate '0.9*v(2)' in control language command
 let vint = 0.9*v(2)
 meas tran yeval2 FIND v(2) WHEN v(1)= vint
+unlet vint
+
+* new expression evaluation
+meas tran yeval3 FIND v(2) WHEN v(1)= 0.9*v(2)
+
+* standard meas with val being a number:
+meas tran tdiff1 TRIG v(1) VAL=0.5 RISE=1 TARG v(1) VAL=0.5 RISE=3
+
+* expression evaluation with vector of length 1 only:
+let onevec = 1
+meas tran tdiff2 TRIG v(1) VAL=onevec-0.5 RISE=1 TARG v(1) VAL=onevec/2 RISE=3
+
+
 plot V(1) v(2)
 .endc
 

examples/xspice/see/CMOSComparator/Fig27_12_see.sp

@@ -0,0 +1,77 @@
+** CMOS comparator ***
+* Figure 27.12
+* Baker: "CMOS: Circuit Design, Layout, and Simulation", Wiley, 2005
+
+.param VCC = 5
+.option scale=1u
+.tran 9.5p 1600n
+
+VDD 	VDD	0	DC	{VCC}
+Vp	vp	0	DC	0	PULSE {VCC/2-0.1} {VCC/2+0.1} 30n 1n 1n 350n 700n
+Vctrl ct 0 PULSE {VCC/2-0.2} {VCC/2+0.2} 270n 1n 1n 5n 350n
+vm	vm	0	DC	{VCC/2}
+
+X1	vbiasn	vbiasp	vdd	bias
+M1	n1	vp	vss	0	N_1u L=1 W=10
+M2	n2	vm	vss	0	N_1u L=1 W=10
+M3a	vss	vbiasn	0	0	N_1u L=2 W=20
+M31	n1	n1	vdd	vdd	P_1u L=1 W=20
+M41	n2	n2	vdd	vdd	P_1u L=1 W=20
+M3	vop	n1	vdd	vdd	P_1u L=1 W=20
+M4	vom	n2	vdd	vdd	P_1u L=1 W=20
+M5	vop	vop	vc	0	N_1u L=1 W=10
+M6	vop	vom	vc	0	N_1u L=1 W=10
+M7	vom	vop	vc	0	N_1u L=1 W=10
+M8	vom	vom	vc	0	N_1u L=1 W=10
+Mc	vc	vc	0	0	N_1u L=10 W=10
+
+M1P	vopb	vp	vpp	vdd	P_1u L=1 W=20
+M2P	vomb	vm	vpp	vdd	P_1u L=1 W=20
+M3p	vpp	vbiasp	vdd	vdd	P_1u L=2 W=20
+M4n	vopb	vopb	0	0	N_1u L=1 W=10
+M5n	n2	vopb	0	0	N_1u L=1 W=10
+M6n	vomb	vomb	0	0	N_1u L=1 W=10
+M7n	n1	vomb	0	0	N_1u L=1 W=10
+
+M1D	vdp	vbiasp	vdd	vdd	P_1u L=1 W=20
+M2D	nd1	vom	vdp	vdd	P_1u L=1 W=20
+M3D	vdo	vop	vdp	vdd	P_1u L=1 W=20
+M4D	nd1	nd1	0	0	N_1u L=1 W=10
+M5D	vdo	nd1	0	0	N_1u L=1 W=10
+
+MIN	out	vdo	0	0	N_1u L=1 W=10
+MIP	out	vdo	vdd	vdd	P_1u L=1 W=20
+
+.subckt bias	vbiasn	vbiasp	VDD
+M1	Vbiasn	Vbiasn	0	0	N_1u L=2 W=10
+M2	Vbiasp	Vbiasn	Vr	0	N_1u L=2 W=40
+M3	Vbiasn 	Vbiasp	VDD	VDD	P_1u L=2 W=30
+M4	Vbiasp	Vbiasp	VDD	VDD	P_1u L=2 W=30
+
+Rbias	Vr	0	6.5k
+
+MSU1	Vsur	Vbiasn	0	0	N_1u L=2   W=10
+MSU2	Vsur	Vsur	VDD	VDD	P_1u L=100 W=10
+MSU3	Vbiasp	Vsur	Vbiasn	0	N_1u L=1   W=10
+.ends
+
+.include cmosedu_models.txt
+
+
+.param d = 1
+.param let = 20
+.param tfall = 500p trise = 100p  ; tau in exponent for pulse
+
+aseegen2 ct mon [ %id(vdd vbiasp) %id(vdd vop) %id(vdd vom) %id(vdd vopb) %id(vdd vpp) %id(vdd vomb) %id(vdd vdp) %id(vdd nd1)
++ %i(vbiasn) %i(x1.vr) %i(x1.vsur) %i(n1) %i(vss) %i(n2) %i(vc) %i(vdo) %i(out) ] seemod2
+.model seemod2 seegen (tdelay = 25n tperiod=19n tfall='tfall' trise='trise' let='let' cdepth='d' perlim=TRUE ctrlthres= {VCC/2})
+
+.control
+run
+rusage time
+set xbrushwidth=2
+plot mon
+plot out vp ct mon*5000+6
+.endc
+
+.end

examples/xspice/see/CMOSComparator/cmosedu_models.txt

@@ -0,0 +1,147 @@
+*
+* Long channel models from CMOS Circuit Design, Layout, and Simulation,
+* Level=3 models VDD=5V, see CMOSedu.com
+*                                                                   
+.MODEL N_1u NMOS LEVEL  = 3                  
++ TOX    = 200E-10         NSUB   = 1E17            GAMMA  = 0.5          
++ PHI    = 0.7             VTO    = 0.8             DELTA  = 3.0         
++ UO     = 650             ETA    = 3.0E-6          THETA  = 0.1          
++ KP     = 120E-6          VMAX   = 1E5             KAPPA  = 0.3                
++ RSH    = 0               NFS    = 1E12            TPG    = 1                  
++ XJ     = 500E-9          LD     = 100E-9                 
++ CGDO   = 200E-12         CGSO   = 200E-12         CGBO   = 1E-10              
++ CJ     = 400E-6          PB     = 1               MJ     = 0.5           
++ CJSW   = 300E-12         MJSW   = 0.5                                  
+*                                                                               
+.MODEL P_1u PMOS LEVEL  = 3                  
++ TOX    = 200E-10         NSUB   = 1E17            GAMMA  = 0.6          
++ PHI    = 0.7             VTO    = -0.9            DELTA  = 0.1          
++ UO     = 250             ETA    = 0               THETA  = 0.1         
++ KP     = 40E-6           VMAX   = 5E4             KAPPA  = 1         
++ RSH    = 0               NFS    = 1E12            TPG    = -1                 
++ XJ     = 500E-9          LD     = 100E-9               
++ CGDO   = 200E-12         CGSO   = 200E-12         CGBO   = 1E-10              
++ CJ     = 400E-6          PB     = 1               MJ     = 0.5                
++ CJSW   = 300E-12         MJSW   = 0.5   
+*
+*
+* Short channel models from CMOS Circuit Design, Layout, and Simulation,
+* 50nm BSIM4 models VDD=1V, see CMOSedu.com
+*
+.model  N_50n  nmos  level = 54
++binunit = 1            paramchk= 1            mobmod  = 0          
++capmod  = 2            igcmod  = 1            igbmod  = 1            geomod  = 0          
++diomod  = 1            rdsmod  = 0            rbodymod= 1            rgatemod= 1          
++permod  = 1            acnqsmod= 0            trnqsmod= 0          
++tnom    = 27           toxe    = 1.4e-009     toxp    = 7e-010       toxm    = 1.4e-009   
++epsrox  = 3.9          wint    = 5e-009       lint    = 1.2e-008   
++ll      = 0            wl      = 0            lln     = 1            wln     = 1          
++lw      = 0            ww      = 0            lwn     = 1            wwn     = 1          
++lwl     = 0            wwl     = 0            xpart   = 0            toxref  = 1.4e-009   
++vth0    = 0.22         k1      = 0.35         k2      = 0.05         k3      = 0          
++k3b     = 0            w0      = 2.5e-006     dvt0    = 2.8          dvt1    = 0.52       
++dvt2    = -0.032       dvt0w   = 0            dvt1w   = 0            dvt2w   = 0          
++dsub    = 2            minv    = 0.05         voffl   = 0            dvtp0   = 1e-007     
++dvtp1   = 0.05         lpe0    = 5.75e-008    lpeb    = 2.3e-010     xj      = 2e-008     
++ngate   = 5e+020       ndep    = 2.8e+018     nsd     = 1e+020       phin    = 0          
++cdsc    = 0.0002       cdscb   = 0            cdscd   = 0            cit     = 0          
++voff    = -0.15        nfactor = 1.2          eta0    = 0.15         etab    = 0          
++vfb     = -0.55        u0      = 0.032        ua      = 1.6e-010     ub      = 1.1e-017   
++uc      = -3e-011      vsat    = 1.1e+005     a0      = 2            ags     = 1e-020     
++a1      = 0            a2      = 1            b0      = -1e-020      b1      = 0          
++keta    = 0.04         dwg     = 0            dwb     = 0            pclm    = 0.18       
++pdiblc1 = 0.028        pdiblc2 = 0.022        pdiblcb = -0.005       drout   = 0.45       
++pvag    = 1e-020       delta   = 0.01         pscbe1  = 8.14e+008    pscbe2  = 1e-007     
++fprout  = 0.2          pdits   = 0.2          pditsd  = 0.23         pditsl  = 2.3e+006   
++rsh     = 3            rdsw    = 150          rsw     = 150          rdw     = 150        
++rdswmin = 0            rdwmin  = 0            rswmin  = 0            prwg    = 0          
++prwb    = 6.8e-011     wr      = 1            alpha0  = 0.074        alpha1  = 0.005      
++beta0   = 30           agidl   = 0.0002       bgidl   = 2.1e+009     cgidl   = 0.0002     
++egidl   = 0.8          
++aigbacc = 0.012        bigbacc = 0.0028       cigbacc = 0.002
++nigbacc = 1            aigbinv = 0.014        bigbinv = 0.004        cigbinv = 0.004
++eigbinv = 1.1          nigbinv = 3            aigc    = 0.017        bigc    = 0.0028
++cigc    = 0.002        aigsd   = 0.017        bigsd   = 0.0028       cigsd   = 0.002
++nigc    = 1            poxedge = 1            pigcd   = 1            ntox    = 1
++xrcrg1  = 12           xrcrg2  = 5          
++cgso    = 6.238e-010   cgdo    = 6.238e-010   cgbo    = 2.56e-011    cgdl    = 2.495e-10     
++cgsl    = 2.495e-10    ckappas = 0.02         ckappad = 0.02         acde    = 1          
++moin    = 15           noff    = 0.9          voffcv  = 0.02       
++kt1     = -0.21        kt1l    = 0.0           kt2     = -0.042        ute     = -1.5
++ua1     = 1e-009       ub1     = -3.5e-019     uc1     = 0             prt     = 0
++at      = 53000
++fnoimod = 1            tnoimod = 0          
++jss     = 0.0001       jsws    = 1e-011       jswgs   = 1e-010       njs     = 1          
++ijthsfwd= 0.01         ijthsrev= 0.001        bvs     = 10           xjbvs   = 1          
++jsd     = 0.0001       jswd    = 1e-011       jswgd   = 1e-010       njd     = 1          
++ijthdfwd= 0.01         ijthdrev= 0.001        bvd     = 10           xjbvd   = 1          
++pbs     = 1            cjs     = 0.0005       mjs     = 0.5          pbsws   = 1          
++cjsws   = 5e-010       mjsws   = 0.33         pbswgs  = 1            cjswgs  = 5e-010     
++mjswgs  = 0.33         pbd     = 1            cjd     = 0.0005       mjd     = 0.5        
++pbswd   = 1            cjswd   = 5e-010       mjswd   = 0.33         pbswgd  = 1          
++cjswgd  = 5e-010       mjswgd  = 0.33         tpb     = 0.005        tcj     = 0.001      
++tpbsw   = 0.005        tcjsw   = 0.001        tpbswg  = 0.005        tcjswg  = 0.001      
++xtis    = 3            xtid    = 3          
++dmcg    = 0e-006       dmci    = 0e-006       dmdg    = 0e-006       dmcgt   = 0e-007     
++dwj     = 0e-008     	xgw     = 0e-007       xgl     = 0e-008     
++rshg    = 0.4          gbmin   = 1e-010       rbpb    = 5            rbpd    = 15         
++rbps    = 15           rbdb    = 15           rbsb    = 15           ngcon   = 1
+*
+.model  P_50n  pmos  level = 54
++binunit = 1            paramchk= 1            mobmod  = 0          
++capmod  = 2            igcmod  = 1            igbmod  = 1            geomod  = 0          
++diomod  = 1            rdsmod  = 0            rbodymod= 1            rgatemod= 1          
++permod  = 1            acnqsmod= 0            trnqsmod= 0          
++tnom    = 27           toxe    = 1.4e-009     toxp    = 7e-010       toxm    = 1.4e-009   
++epsrox  = 3.9          wint    = 5e-009       lint    = 1.2e-008   
++ll      = 0            wl      = 0            lln     = 1            wln     = 1          
++lw      = 0            ww      = 0            lwn     = 1            wwn     = 1          
++lwl     = 0            wwl     = 0            xpart   = 0            toxref  = 1.4e-009   
++vth0    = -0.22        k1      = 0.39         k2      = 0.05         k3      = 0          
++k3b     = 0            w0      = 2.5e-006     dvt0    = 3.9          dvt1    = 0.635        
++dvt2    = -0.032       dvt0w   = 0            dvt1w   = 0            dvt2w   = 0          
++dsub    = 0.7          minv    = 0.05         voffl   = 0            dvtp0   = 0.5e-008     
++dvtp1   = 0.05         lpe0    = 5.75e-008    lpeb    = 2.3e-010     xj      = 2e-008     
++ngate   = 5e+020       ndep    = 2.8e+018     nsd     = 1e+020       phin    = 0          
++cdsc    = 0.000258     cdscb   = 0            cdscd   = 6.1e-008     cit     = 0          
++voff    = -0.15        nfactor = 2            eta0    = 0.15         etab    = 0          
++vfb     = 0.55         u0      = 0.0095       ua      = 1.6e-009     ub      = 8e-018     
++uc      = 4.6e-013     vsat    = 90000        a0      = 1.2          ags     = 1e-020     
++a1      = 0            a2      = 1            b0      = -1e-020      b1      = 0          
++keta    = -0.047       dwg     = 0            dwb     = 0            pclm    = 0.55       
++pdiblc1 = 0.03         pdiblc2 = 0.0055       pdiblcb = 3.4e-008     drout   = 0.56       
++pvag    = 1e-020       delta   = 0.014        pscbe1  = 8.14e+008    pscbe2  = 9.58e-007  
++fprout  = 0.2          pdits   = 0.2          pditsd  = 0.23         pditsl  = 2.3e+006   
++rsh     = 3            rdsw    = 250          rsw     = 160          rdw     = 160        
++rdswmin = 0            rdwmin  = 0            rswmin  = 0            prwg    = 3.22e-008  
++prwb    = 6.8e-011     wr      = 1            alpha0  = 0.074        alpha1  = 0.005      
++beta0   = 30           agidl   = 0.0002       bgidl   = 2.1e+009     cgidl   = 0.0002     
++egidl   = 0.8          
++aigbacc = 0.012        bigbacc = 0.0028       cigbacc = 0.002
++nigbacc = 1            aigbinv = 0.014        bigbinv = 0.004        cigbinv = 0.004
++eigbinv = 1.1          nigbinv = 3            aigc    = 0.69         bigc    = 0.0012
++cigc    = 0.0008       aigsd   = 0.0087       bigsd   = 0.0012       cigsd   = 0.0008
++nigc    = 1            poxedge = 1            pigcd   = 1            ntox    = 1
++xrcrg1  = 12           xrcrg2  = 5          
++cgso    = 7.43e-010    cgdo    = 7.43e-010    cgbo    = 2.56e-011    cgdl    = 1e-014     
++cgsl    = 1e-014       ckappas = 0.5          ckappad = 0.5          acde    = 1          
++moin    = 15           noff    = 0.9          voffcv  = 0.02       
++kt1     = -0.19        kt1l    = 0            kt2     = -0.052        ute     = -1.5
++ua1     = -1e-009      ub1     = 2e-018       uc1     = 0             prt     = 0
++at      = 33000
++fnoimod = 1            tnoimod = 0          
++jss     = 0.0001       jsws    = 1e-011       jswgs   = 1e-010       njs     = 1          
++ijthsfwd= 0.01         ijthsrev= 0.001        bvs     = 10           xjbvs   = 1          
++jsd     = 0.0001       jswd    = 1e-011       jswgd   = 1e-010       njd     = 1          
++ijthdfwd= 0.01         ijthdrev= 0.001        bvd     = 10           xjbvd   = 1          
++pbs     = 1            cjs     = 0.0005       mjs     = 0.5          pbsws   = 1          
++cjsws   = 5e-010       mjsws   = 0.33         pbswgs  = 1            cjswgs  = 5e-010     
++mjswgs  = 0.33         pbd     = 1            cjd     = 0.0005       mjd     = 0.5        
++pbswd   = 1            cjswd   = 5e-010       mjswd   = 0.33         pbswgd  = 1          
++cjswgd  = 5e-010       mjswgd  = 0.33         tpb     = 0.005        tcj     = 0.001      
++tpbsw   = 0.005        tcjsw   = 0.001        tpbswg  = 0.005        tcjswg  = 0.001      
++xtis    = 3            xtid    = 3          
++dmcg    = 0e-006       dmci    = 0e-006       dmdg    = 0e-006       dmcgt   = 0e-007     
++dwj     = 0e-008     	xgw     = 0e-007       xgl     = 0e-008     
++rshg    = 0.4          gbmin   = 1e-010       rbpb    = 5            rbpd    = 15         
++rbps    = 15           rbdb    = 15           rbsb    = 15           ngcon   = 1   

examples/xspice/see/CMOSOpAmp/CMOS-OP1.cir

@@ -0,0 +1,33 @@
+.title KiCad schematic
+.include "cmos_sub.mod"
+.include "seegen4.mod"
+V1 Vcc 0 DC 3.3 
+XU1 VGP2 VGP4P8 Vbias VSN4N8 seegen4
+XMN9 Vbias Vbias 0 0 NCH W=5u L=1.4u
+V5 in+ 0 DC 1.65 
+R1 out in- 100k
+R2 in in- 20k
+V4 in 0 DC 1.65 SIN( 1.65 100m 20k 0 0 0 ) AC 1
+XMN3 out Vbias 0 0 NCH W=17.4u L=1.4u
+C2 out 0 2p
+XMP2 out VGP2 Vcc Vcc PCH W=14.5u L=1.4u
+C1 VGP2 out 1.2p
+XMP4 VGP4P8 VGP4P8 Vcc Vcc PCH W=2.8u L=1.4u
+I1 Vcc Vbias 12u
+XMN4 VGP4P8 in- VSN4N8 0 NCH W=2.8u L=1.4u
+XMN8 VGP2 in+ VSN4N8 0 NCH W=2.8u L=1.4u
+XMN2 VSN4N8 Vbias 0 0 NCH W=5u L=1.4u
+XMP8 VGP2 VGP4P8 Vcc Vcc PCH W=2.8u L=1.4u
+
+.control
+set xbrushwidth=2
+
+tran 20n 2m
+plot v(VGP4P8) v(xu1.mon)*5000+3
+plot in out
+
+ac dec 10 1 1Meg
+plot db(out)
+.endc
+ 
+.end

examples/xspice/see/CMOSOpAmp/cmos_sub.mod

@@ -0,0 +1,13 @@
+* subcircuit model file
+
+.include modelcard.nmos
+.include modelcard.pmos
+
+.subckt NCH D G S B W=1 L=1
+MN1 D G S B N1 W={W} L={L} AS={3*L*W} AD={3*L*W} PS={6*L+W} PD={6*L+W}
+.ends
+
+
+.subckt PCH D G S B W=1 L=1
+MP1 D G S B P1 W={W} L={L} AS={3*L*W} AD={3*L*W} PS={6*L+W} PD={6*L+W}
+.ends

examples/xspice/see/CMOSOpAmp/modelcard.nmos

@@ -0,0 +1,46 @@
+*model = bsim3v3
+*Berkeley Spice Compatibility 
+*http://bsim.berkeley.edu/BSIM4/BSIM3/ftpv330.zip
+* Lmin= .35 Lmax= 20 Wmin= .6 Wmax= 20
+.model N1 NMOS
++Level=        8 
++version=3.3.0
++Tnom=27.0
++Acnqsmod=1 elm=3
++Capmod=3 
++Nch= 2.498E+17  Tox=9E-09 Xj=1.00000E-07
++Lint=9.36e-8 Wint=1.47e-7
++Lintnoi=1e-9
++Vth0= .6322    K1= .756  K2= -3.83e-2  K3= -2.612 
++Dvt0= 2.812  Dvt1= 0.462  Dvt2=-9.17e-2 
++Nlx= 3.52291E-08  W0= 1.163e-6 
++K3b= 2.233 
++Vsat= 86301.58  Ua= 6.47e-9  Ub= 4.23e-18  Uc=-4.706281E-11 
++Rdsw= 650  U0= 388.3203 wr=1
++A0= .3496967 Ags=.1    B0=0.546    B1= 1   
++Dwg = -6.0E-09 Dwb = -3.56E-09 Prwb = -.213
++Keta=-3.605872E-02  A1= 2.778747E-02  A2= .9 
++Voff=-6.735529E-02  NFactor= 1.139926  Cit= 1.622527E-04 
++Cdsc=-2.147181E-05   
++Cdscb= 0  Dvt0w =  0 Dvt1w =  0 Dvt2w =  0 
++Cdscd =  0 Prwg =  0 
++Eta0= 1.0281729E-02  Etab=-5.042203E-03 
++Dsub= .31871233 
++Pclm= 1.114846  Pdiblc1= 2.45357E-03  Pdiblc2= 6.406289E-03 
++Drout= .31871233  Pscbe1= 5000000  Pscbe2= 5E-09 Pdiblcb = -.234
++Pvag= 0 delta=0.01
++ Wl =  0 Ww = -1.420242E-09 Wwl =  0 
++ Wln =  0 Wwn =  .2613948 Ll =  1.300902E-10 
++ Lw =  0 Lwl =  0 Lln =  .316394 
++ Lwn =  0
++kt1=-.3  kt2=-.051 
++At= 22400 
++Ute=-1.48 
++Ua1= 3.31E-10  Ub1= 2.61E-19 Uc1= -3.42e-10 
++Kt1l=0  Kt1=-0.1 Prt=764.3
+
+
+
+
+
+

examples/xspice/see/CMOSOpAmp/modelcard.pmos

@@ -0,0 +1,38 @@
+*model = bsim3v3
+*Berkeley Spice Compatibility 
+*http://bsim.berkeley.edu/BSIM4/BSIM3/ftpv330.zip
+* Lmin= .35 Lmax= 20 Wmin= .6 Wmax= 20
+.model P1 PMOS
++Level=        8 
++version=3.3.0
++Tnom=27.0
++Acnqsmod=1 elm=3
++Nch= 3.533024E+17  Tox=9E-09 Xj=1.00000E-07
++Lint=6.23e-8 Wint=1.22e-7
++Lintnoi=1e-9
++Vth0=-.6732829 K1= .8362093  K2=-8.606622E-02  K3= 1.82 
++Dvt0= 1.903801  Dvt1= .5333922  Dvt2=-.1862677 
++Nlx= 1.28e-8  W0= 2.1e-6 
++K3b= -0.24 Prwg=-0.001 Prwb=-0.323 
++Vsat= 103503.2  Ua= 1.39995E-09  Ub= 1.e-19  Uc=-2.73e-11 
++ Rdsw= 460  U0= 138.7609 
++A0= .4716551 Ags=0.12 
++Keta=-1.871516E-03  A1= .3417965  A2= 0.83 
++Voff=-.074182  NFactor= 1.54389  Cit=-1.015667E-03 
++Cdsc= 8.937517E-04 
++Cdscb= 1.45e-4  Cdscd=1.04e-4
++ Dvt0w=0.232 Dvt1w=4.5e6 Dvt2w=-0.0023
++Eta0= 6.024776E-02  Etab=-4.64593E-03 
++Dsub= .23222404 
++Pclm= .989  Pdiblc1= 2.07418E-02  Pdiblc2= 1.33813E-3 
++Drout= .3222404  Pscbe1= 118000  Pscbe2= 1E-09 
++Pvag= 0 
++kt1= -0.25  kt2= -0.032 prt=64.5 
++At= 33000 
++Ute= -1.5 
++Ua1= 4.312e-9 Ub1= 6.65e-19  Uc1= 0 
++Kt1l=0
+
+
+
+

examples/xspice/see/CMOSOpAmp/seegen4.mod

@@ -0,0 +1,10 @@
+* SEE generator model
+.subckt seegen4 n1 n2 n3 n4
+.param tochar = 2e-13
+.param tfall = 500p trise=50p
+.param Inull = 'tochar/(tfall-trise)'
+* Eponential current source without control input
+* only NMOS nodes with reference GND (substrate).
+aseegen1 NULL mon [%i(n1) %i(n2) %i(n3) %i(n4)] seemod1
+.model seemod1 seegen (tdelay = 0.62m tperiod=0.01m inull='Inull' perlim=FALSE)
+.ends

examples/xspice/see/ihp_inverter_set.net

@@ -0,0 +1,45 @@
+* IHP Open PDK
+* simple inverter
+
+* Path to the PDK
+*.include "D:\Spice_general\skywater-pdk\libraries\sky130_fd_pr\latest\models\corners/tt.spice"
+.lib "D:\Spice_general\IHP-Open-PDK\ihp-sg13g2\libs.tech\ngspice\models\cornerMOSlv.lib" mos_tt
+*.include lib_out1.lib
+
+.param vdd = 1.2
+.param deltat=11n
+
+* the voltage sources: 
+Vdd vd gnd DC 'vdd'
+V1 in gnd pulse(0 'vdd' 0p 200p 100p 5n 10n)
+
+* Eponential current source
+Iset out 0 EXP(0 2.5m 'deltat' 10p 'deltat' 500p)
+*Cset out 0 10f
+
+Xnot1 in vdd vss out not1
+Vmeasvss vss 0 0
+Vmeasvdd vd vdd 0
+
+.subckt not1 a vdd vss z
+xm01   z a     vdd     vdd sg13_lv_pmos  l=0.15u  w=0.99u  as=0.26235p  ad=0.26235p  ps=2.51u   pd=2.51u
+xm02   z a     vss     vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+c3  a     vss   0.384f
+c2  z     vss   0.576f
+.ends
+
+* simulation command: 
+.tran 100ps 50ns ; 0 10p
+
+.options method=gear
+
+.control
+run
+rusage
+*set nolegend
+set xbrushwidth=3
+plot i(Vmeasvss) i(Vmeasvdd)
+plot in out
+.endc
+
+.end

examples/xspice/see/ihp_simple_sram_seegen.net

@@ -0,0 +1,61 @@
+* IHP Open PDK
+* simple SRAM cell, exponential current pulses
+
+* Path to the PDK
+*.include "D:\Spice_general\skywater-pdk\libraries\sky130_fd_pr\latest\models\corners/tt.spice"
+.lib "D:\Spice_general\IHP-Open-PDK\ihp-sg13g2\libs.tech\ngspice\models\cornerMOSlv.lib" mos_tt
+*.include lib_out1.lib
+
+.param vdd = 1.2
+.param deltat=11n deltat2=27n
+.param tochar = 1e-13
+.param talpha = 500p tbeta=10p
+.param Inull = 'tochar/(talpha-tbeta)'
+
+* the voltage sources: 
+Vdd vd gnd DC 'vdd'
+Vwl wl 0 0 PULSE 0 'vdd' 45n 1n 1n 7n 1
+Vbl bl 0 'vdd'
+Vbln bln 0 0
+
+*V1 in gnd pulse(0 'vdd' 0p 200p 100p 5n 10n)
+
+* Eponential current source without control input
+aseegen1 NULL mon [%id(n1 m1) %id(n2 m2) %id(n1 m1) %id(n2 m2)] seemod1
+.model seemod1 seegen (tdelay = 11n tperiod=25n inull='Inull')
+
+Xnot1 n1 vdd vss n2 not1
+Xnot2 n2 vdd vss n1 not1
+xmo02   n2 wl bl   vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+xmo01   n1 wl bln  vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+
+Vmeasvss vss 0 0
+Vmeasvdd vd vdd 0
+Vm1 m1 0 0
+Vm2 m2 0 0
+
+.subckt not1 a vdd vss z
+xm01   z a     vdd     vdd sg13_lv_pmos  l=0.15u  w=0.99u  as=0.26235p  ad=0.26235p  ps=2.51u   pd=2.51u
+xm02   z a     vss     vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+c3  a     vss   0.384f
+c2  z     vss   0.576f
+.ends
+
+* starting condition for SRAM cell
+.ic v(n2)=0 v(n1)='vdd'
+
+* simulation command: 
+.tran 100ps 100ns ; 0 10p
+
+.options method=gear
+
+.control
+run
+rusage
+*set nolegend
+set xbrushwidth=3
+plot i(Vmeasvss) i(Vmeasvdd)
+plot n1 n2+2 wl+4 i(vm1)*10000+6 i(vm2)*10000+8
+.endc
+
+.end

examples/xspice/see/ihp_simple_sram_seegen_ctrl.net

@@ -0,0 +1,60 @@
+* Simple SRAM cell in a subcircuit, double exponential current pulses
+* control volate
+* IHP Open PDK
+
+* Path to the PDK
+.lib "D:\Spice_general\IHP-Open-PDK\ihp-sg13g2\libs.tech\ngspice\models\cornerMOSlv.lib" mos_tt
+
+.param vdd = 1.2
+.param deltat=11n deltat2=25n
+.param tochar = 1e-13
+.param talpha = 500p tbeta=20p
+.param Inull = 'tochar/(talpha-tbeta)'
+
+* the voltage sources: 
+Vdd vd gnd DC 'vdd'
+Vwl wl 0 0 PULSE 0 'vdd' 50n 1n 1n 7n 1
+Vbl bl 0 'vdd'
+Vbln bln 0 0
+Vctrl ctrl 0 pulse (0 1 10n 1n 1n 1 1)
+
+* Exponential current source with control input
+aseegen1 ctrl mon [%id(n1 m1) %id(n2 m2) %id(n1 m1) %id(n2 m2)] seemod1
+.model seemod1 seegen (tdelay = 8n tperiod=25n)
+
+Xnot1 n1 vdd vss n2 not1
+Xnot2 n2 vdd vss n1 not1
+xmo02   n2 wl bl   vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+xmo01   n1 wl bln  vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+
+Vmeasvss vss 0 0
+Vmeasvdd vd vdd 0
+Vm1 m1 0 0
+Vm2 m2 0 0
+
+.subckt not1 a vdd vss z
+xm01   z a     vdd     vdd sg13_lv_pmos  l=0.15u  w=0.99u  as=0.26235p  ad=0.26235p  ps=2.51u   pd=2.51u
+xm02   z a     vss     vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+c3  a     vss   0.384f
+c2  z     vss   0.576f
+.ends
+
+* starting condition for SRAM cell
+.ic v(n2)=0 v(n1)='vdd'
+
+* simulation command: 
+.tran 100ps 120ns
+
+.options method=gear
+
+.control
+pre_osdi C:\Spice64\lib\ngspice\psp103_nqs.osdi
+run
+rusage
+*set nolegend
+set xbrushwidth=3
+plot i(Vmeasvss) i(Vmeasvdd)
+plot n1 n2+2 wl+4 i(vm1)*10000+6 i(vm2)*10000+8
+.endc
+
+.end

examples/xspice/see/ihp_simple_sram_seegen_subckt.net

@@ -0,0 +1,69 @@
+* Simple SRAM cell in a subcircuit, double exponential current pulses
+* IHP Open PDK
+
+* Path to the PDK
+.lib "D:\Spice_general\IHP-Open-PDK\ihp-sg13g2\libs.tech\ngspice\models\cornerMOSlv.lib" mos_tt
+
+.param vdd = 1.2
+.param deltat=11n deltat2=27n
+*.param tochar = 1e-13  ; tochar dependency on LET not yet defined
+.param tfall = 500p trise=20p  ; tau in exponent for pulse
+.param let = 11
+.param cdepth = 0.9
+*.param Inull = 'tochar/(tfall-trise)'
+
+* the voltage sources: 
+Vdd vd gnd DC 'vdd'
+Vwl wl 0 0 PULSE 0 'vdd' 45n 1n 1n 7n 1
+Vbl1 bl1 0 'vdd'
+Vbl2 bl2 0 0
+
+****  SEE generator without control input, double exponential current sources
+aseegen1 NULL mon [%id(xcell.n1 m1) %id(xcell.n2 m2) %id(xcell.n1 m1) %id(xcell.n2 m2)] seemod1
+.model seemod1 seegen (tdelay = 11n tperiod=25n let='let' cdepth='cdepth' tfall='tfall' trise='trise')
+* alternative syntax, if no current measurement required and reference nodes are GND
+*aseegen1 NULL mon [%i(xcell.n1) %i(xcell.n2) %i(xcell.n1) %i(xcell.n2)] seemod1
+
+**** the SRAM cell
+Xcell bl1 bl2 wl vdd vss srcell
+
+.subckt srcell bl1 bl2 wl vdd vss
+Xnot1 n1 vdd vss n2 not1
+Xnot2 n2 vdd vss n1 not1
+xmo02   n2 wl bl1  vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+xmo01   n1 wl bl2  vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+.ends
+
+**** Current measurements
+Vmeasvss vss 0 0
+Vmeasvdd vd vdd 0
+Vm1 m1 0 0
+Vm2 m2 0 0
+
+**** Inverter cell
+.subckt not1 a vdd vss z
+xm01   z a     vdd     vdd sg13_lv_pmos  l=0.15u  w=0.99u  as=0.26235p  ad=0.26235p  ps=2.51u   pd=2.51u
+xm02   z a     vss     vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+c3  a     vss   0.384f
+c2  z     vss   0.576f
+.ends
+
+* starting condition for SRAM cell
+.ic v(xcell.n2)=0 v(xcell.n1)='vdd'
+
+* simulation command: 
+.tran 100ps 120ns
+
+*.options method=gear
+
+.control
+pre_osdi C:\Spice64\lib\ngspice\psp103_nqs.osdi
+run
+rusage
+*set nolegend
+set xbrushwidth=3
+plot i(Vmeasvss) i(Vmeasvdd)
+plot xcell.n1 xcell.n2+2 wl+4 i(vm1)*10000+6 i(vm2)*10000+8
+.endc
+
+.end

examples/xspice/see/ihp_simple_sram_seegen_subckt_vary.net

@@ -0,0 +1,81 @@
+* Simple SRAM cell in a subcircuit, double exponential current pulses
+* total charge is varied.
+* IHP Open PDK
+
+* Path to the PDK
+.lib "D:\Spice_general\IHP-Open-PDK\ihp-sg13g2\libs.tech\ngspice\models\cornerMOSlv.lib" mos_tt
+
+.param vdd = 1.2
+*.param tochar = 1e-13  ; tochar dependency on LET not yet defined
+
+.param d = 1
+.param let = 8
+
+.param tochar = 1.035e-14 * let * d 
+.csparam let = 'let' ; send param value to .control section
+.param tfall = 500p trise = 100p  ; tau in exponent for pulse
+.param Inull = 'tochar/(tfall-trise)'
+
+* the voltage sources: 
+Vdd vd gnd DC 'vdd'
+Vwl wl 0 0 PULSE 0 'vdd' 45n 1n 1n 7n 1
+Vbl1 bl1 0 'vdd'
+Vbl2 bl2 0 0
+
+****  SEE generator without control input, double exponential current sources
+aseegen1 NULL mon [%id(xcell.n1 m1) %id(xcell.n2 m2) %id(xcell.n1 m1) %id(xcell.n2 m2)] seemod1
+.model seemod1 seegen (tdelay = 11n tperiod=25n tfall='tfall' trise='trise' let='let' cdepth='d')
+* alternative syntax, if no current measurement required and reference nodes are GND
+*aseegen1 NULL mon [%i(xcell.n1) %i(xcell.n2) %i(xcell.n1) %i(xcell.n2)] seemod1
+
+**** the SRAM cell
+Xcell bl1 bl2 wl vdd vss srcell
+
+.subckt srcell bl1 bl2 wl vdd vss
+Xnot1 n1 vdd vss n2 not1
+Xnot2 n2 vdd vss n1 not1
+xmo02   n2 wl bl1  vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+xmo01   n1 wl bl2  vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+.ends
+
+**** Current measurements
+Vmeasvss vss 0 0
+Vmeasvdd vd vdd 0
+Vm1 m1 0 0
+Vm2 m2 0 0
+
+**** Inverter cell
+.subckt not1 a vdd vss z
+xm01   z a     vdd     vdd sg13_lv_pmos  l=0.15u  w=0.99u  as=0.26235p  ad=0.26235p  ps=2.51u   pd=2.51u
+xm02   z a     vss     vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+c3  a     vss   0.384f
+c2  z     vss   0.576f
+.ends
+
+* starting condition for SRAM cell
+.ic v(xcell.n2)=0 v(xcell.n1)='vdd'
+
+* simulation command: 
+.tran 100ps 120ns
+
+*.options method=gear
+
+.options noinit
+
+.control
+pre_osdi C:\Spice64\lib\ngspice\psp103_nqs.osdi
+set xbrushwidth=3
+let newlet = let
+
+repeat 5
+  print newlet
+  run
+  plot xcell.n1 xcell.n2+2 wl+4 i(vm1)*10000+6 i(vm2)*10000+8 ylimit -1 10
+  let newlet = newlet + 1
+  alterparam let = $&newlet
+  reset
+end
+rusage
+.endc
+
+.end

examples/xspice/see/ihp_simple_sram_set.net

@@ -0,0 +1,64 @@
+* IHP Open PDK
+* simple SRAM cell, exponential current pulses
+
+* Path to the PDK
+*.include "D:\Spice_general\skywater-pdk\libraries\sky130_fd_pr\latest\models\corners/tt.spice"
+.lib "D:\Spice_general\IHP-Open-PDK\ihp-sg13g2\libs.tech\ngspice\models\cornerMOSlv.lib" mos_tt
+*.include lib_out1.lib
+
+.param vdd = 1.2
+.param deltat=11n deltat2=27n
+.param tochar = 1e-13
+.param talpha = 500p tbeta=10p
+.param Inull = 'tochar/(talpha-tbeta)'
+
+* the voltage sources: 
+Vdd vd gnd DC 'vdd'
+Vwl wl 0 0 PULSE 0 'vdd' 45n 1n 1n 7n 1
+Vbl bl 0 'vdd'
+Vbln bln 0 0
+
+*V1 in gnd pulse(0 'vdd' 0p 200p 100p 5n 10n)
+
+* Eponential current source
+Iset1 n1 m1 EXP(0 'Inull' 'deltat' 'tbeta' 'deltat' 'talpha')
+Iset2 n2 m2 EXP(0 'Inull' 'deltat2' 'tbeta' 'deltat2' 'talpha')
+Iset3 n1 m1 EXP(0 'Inull' 'deltat+50n' 'tbeta' 'deltat+50n' 'talpha')
+Iset4 n2 m2 EXP(0 'Inull' 'deltat2+50n' 'tbeta' 'deltat2+50n' 'talpha')
+*Cset out 0 10f
+
+Xnot1 n1 vdd vss n2 not1
+Xnot2 n2 vdd vss n1 not1
+xmo02   n2 wl bl   vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+xmo01   n1 wl bln  vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+
+Vmeasvss vss 0 0
+Vmeasvdd vd vdd 0
+Vm1 m1 0 0
+Vm2 m2 0 0
+
+.subckt not1 a vdd vss z
+xm01   z a     vdd     vdd sg13_lv_pmos  l=0.15u  w=0.99u  as=0.26235p  ad=0.26235p  ps=2.51u   pd=2.51u
+xm02   z a     vss     vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+c3  a     vss   0.384f
+c2  z     vss   0.576f
+.ends
+
+* starting condition for SRAM cell
+.ic v(n2)=0 v(n1)='vdd'
+
+* simulation command: 
+.tran 100ps 100ns ; 0 10p
+
+.options method=gear
+
+.control
+run
+rusage
+*set nolegend
+set xbrushwidth=3
+plot i(Vmeasvss) i(Vmeasvdd)
+plot n1 n2+2 wl+4 i(vm1)*10000+6 i(vm2)*10000+8
+.endc
+
+.end

examples/xspice/see/ihp_two_inverters_set.net

@@ -0,0 +1,47 @@
+* simple inverter, IHP Open PDK
+
+* Path to the PDK
+*.include "D:\Spice_general\skywater-pdk\libraries\sky130_fd_pr\latest\models\corners/tt.spice"
+.lib "D:\Spice_general\IHP-Open-PDK\ihp-sg13g2\libs.tech\ngspice\models\cornerMOSlv.lib" mos_tt
+*.include lib_out1.lib
+
+.param vdd = 1.2
+.param deltat=11n deltat2=27n
+
+* the voltage sources: 
+Vdd vd gnd DC 'vdd'
+V1 in gnd pulse(0 'vdd' 0p 200p 100p 5n 10.1n)
+
+* Eponential current source
+Iset1 out1 0 EXP(0 250u 'deltat' 10p 'deltat' 500p)
+Iset2 out1 0 EXP(0 250u 'deltat2' 10p 'deltat2' 500p)
+*Cset out 0 10f
+
+Xnot1 in vdd vss out1 not1
+Xnot2 out1 vdd vss out2 not1
+
+Vmeasvss vss 0 0
+Vmeasvdd vd vdd 0
+
+.subckt not1 a vdd vss z
+xm01   z a     vdd     vdd sg13_lv_pmos  l=0.15u  w=0.99u  as=0.26235p  ad=0.26235p  ps=2.51u   pd=2.51u
+xm02   z a     vss     vss sg13_lv_nmos  l=0.15u  w=0.495u as=0.131175p ad=0.131175p ps=1.52u   pd=1.52u
+c3  a     vss   0.384f
+c2  z     vss   0.576f
+.ends
+
+* simulation command: 
+.tran 100ps 50ns ; 0 10p
+
+.options method=gear
+
+.control
+run
+rusage
+*set nolegend
+set xbrushwidth=3
+plot i(Vmeasvss) i(Vmeasvdd)
+plot in out1+2 out2+4
+.endc
+
+.end

examples/xspice/see/repeat_loop_seegen.net

@@ -0,0 +1,41 @@
+* Repeat loop, double exponential current pulses
+
+.param let = 10.5 cdepth = 1.2
+.csparam let = 'let'
+.param tfall = 500p trise = 20p  ; tau in exponent for pulse
+
+R1 n1 0 1e4
+R2 n2 0 1e4
+R3 n3 0 1e4
+R4 n4 0 1e4
+
+
+****  SEE generator without control input, double exponential current sources
+aseegen1 NULL mon [%id(n1 0) %id(n2 0) %id(n3 0) %id(n4 0)] seemod1
+.model seemod1 seegen (tdelay = 11n tperiod=25n let='let' cdepth='cdepth' trise='trise' tfall='tfall')
+* alternative syntax, if no current measurement required and reference nodes are GND
+*aseegen1 NULL mon [%i(n1) %i(n2) %i(n3) %i(n4)] seemod1
+
+
+
+* simulation command: 
+.tran 100ps 120ns
+
+*.options method=gear
+
+.control
+set xbrushwidth=3
+*run
+*plot n1 n2+2 n3+4 n4+6
+let newlet = let
+repeat 10
+  run
+  plot n1 n2+2 n3+4 n4+6 ylimit -3 7
+  let newlet = newlet - 0.5
+  alterparam let = $&newlet
+  reset
+end
+rusage
+.endc
+
+.end

examples/xspice/see/seegen_cm1.cir

@@ -0,0 +1,22 @@
+Test of seegen code model
+
+aseegen1 NULL mon [%id(n1 p1) %id(n2 p2) %id(n3 p3)] seemod1
+.model seemod1 seegen (tdelay = 5n tperiod=4.5n)
+
+Rsee1 n1 0 1
+Vmeas1 p1 0 0
+
+Rsee2 n2 0 1
+Vmeas2 p2 0 0
+
+Rsee3 n3 0 1
+Vmeas3 p3 0 0
+
+.control
+tran 10p 35n
+rusage time
+set xbrushwidth=3
+plot i(Vmeas1) i(Vmeas2)+200u i(Vmeas3)+400u
+.endc
+
+.end

examples/xspice/see/set1.cir

@@ -0,0 +1,23 @@
+SET pulse test
+
+.param alpha = 100p beta = 500p deltat = 1n
+
+* Arbitrary currnt source with expression
+Bset1 1 0 I = ternary_fcn(TIME < 'deltat', 0, 2.5m * (exp(-(TIME-'deltat')/'alpha')-exp(-(TIME-'deltat')/'beta')))
+R1 1 11 1
+Vmeas 11 0 0
+
+* Eponential current source
+Iset 2 0 EXP(0 -2.5m 'deltat' 'alpha' 'deltat' 'beta')
+R2 2 22 1
+Vmeas2 22 0 0
+
+
+.control
+tran 1p 10n
+set xbrushwidth=2
+plot I(Vmeas)-I(Vmeas2)
+plot I(Vmeas) I(Vmeas2)
+.endc
+
+.end

examples/xspice/transmission_lines/cpline_ac.cir

@@ -0,0 +1,18 @@
+* Coupled lines SP
+
+V1 p1 0 dc 0 ac 1 portnum 1 z0 50
+V2 p2 0 dc 0 ac 1 portnum 2 z0 50
+V3 p3 0 dc 0 ac 1 portnum 3 z0 50
+V4 p4 0 dc 0 ac 1 portnum 4 z0 50
+
+A1 %hd(p1 0) %hd(p2 0) %hd(p3 0) %hd(p4 0) CPLINE1
+.MODEL CPLINE1 CPLINE(ze=84.48 zo=53.99 l=25e-3 ere=3.34 ero=2.829 ao=0 ae=0)
+
+.control
+
+sp lin 100 0.2e9 4.2e9
+
+plot abs(s_1_1) abs(s_3_1) abs(s_2_1) abs(s_4_1)
+plot abs(s_2_1)
+
+.endc

examples/xspice/transmission_lines/cpline_tran.cir

@@ -0,0 +1,23 @@
+* Coupled lines SP
+
+V1 1 0 PULSE(0 1 1n 10p 10p 980p)
+
+R2 p1 1 0.1
+
+R1 p4 0 50.0
+R3 p3 0 50.0
+R4 p2 0 50.0
+
+A1 %hd(p1 0) %hd(p2 0) %hd(p3 0) %hd(p4 0) %vd(p1 0) %vd(p2 0) %vd(p3 0) %vd(p4 0) CPLINE1
+.MODEL CPLINE1 CPLINE(ze=100 zo=50 l=100e-3 ere=1 ero=1 ao=0 ae=0)
+
+.control
+
+tran 10p 5n
+
+let v2 = -v(p2)
+let v3 = -v(p3)
+
+plot v(1) v(p2) v(p3) v(p4)
+
+.endc

examples/xspice/transmission_lines/cpmline_ac.cir

@@ -0,0 +1,18 @@
+* Coupled lines SP
+
+V1 p1 0 dc 0 ac 1 portnum 1 z0 50
+V2 p2 0 dc 0 ac 1 portnum 2 z0 50
+V3 p3 0 dc 0 ac 1 portnum 3 z0 50
+V4 p4 0 dc 0 ac 1 portnum 4 z0 50
+
+A1 %hd(p1 0) %hd(p2 0) %hd(p3 0) %hd(p4 0) %vd(p1 0) %vd(p2 0) %vd(p3 0) %vd(p4 0) CPMLIN1
+.MODEL CPMLIN1 CPMLIN(w=1e-3 l=20e-3 s=0.3e-3 er=9.8 h=1e-3 t=35e-6 tand=1e-3 rho=0.022e-6 d1=0.15e-6 model=0 disp=0)
+
+.control
+
+sp lin 100 0.2e9 4.2e9
+
+plot abs(s_1_1) abs(s_3_1) abs(s_2_1) abs(s_4_1)
+plot abs(s_3_1)
+
+.endc

examples/xspice/transmission_lines/mlin.cir

@@ -0,0 +1,22 @@
+* MLIN test
+
+V1 1 0 AC 1 DC 1
+R1 in 1 50.0
+R2 out 0 1000.1
+A1 %hd(in 0) %hd(out 0) %vd(in 0) %vd(out 0) MLIN1
+.MODEL MLIN1 MLIN(w=1e-3 l=10e-3 er=9.8 h=1e-3 t=35e-6 tand=1e-3 rho=0.022e-6 d=0.15e-6 model=0 disp=0)
+
+.control
+
+op
+print all
+
+ac LIN 200 1e9 12e9
+
+let z = v(in)/-i(v1)
+let y = imag(z)
+let r = real(z)
+plot abs(z) ylog
+plot y r
+
+.endc

examples/xspice/transmission_lines/mlin_tran.cir

@@ -0,0 +1,25 @@
+* MLIN test
+
+V1 1 4 PULSE(0 1 1n 10p 10p 980p)
+V3 4 0 DC 1
+R1 out 2 20.0
+V2 2 0 0
+R2 in 1 1m
+*R3 in ins 1e12
+*R4 out outs 1e12
+A1 %hd(in 0) %hd(out 0) %vd(in 0) %vd(out 0) MLIN1
+.MODEL MLIN1 MLIN(w=1e-3 l=50e-3 er=9.8 h=1e-3 t=35e-6 tand=1e-3 rho=0.022e-6 d1=0.15e-6 model=0 disp=0 tranmodel=1)
+*A1 %hd(in 0) %hd(out 0) %vd(in 0) %vd(out 0) TLIN1
+*.MODEL TLIN1 TLINE(l=100e-3 z=50.0 a=0.0)
+
+.control
+
+*op
+*print all
+
+tran 10p 5n
+
+plot v(in) v(out)
+plot -i(v1) i(V2)
+
+.endc

src/frontend/breakp.c

@@ -293,7 +293,11 @@ com_iplot(wordlist *wl)
         d = TMALLOC(struct dbcomm, 1);
         d->db_analysis = NULL;
         d->db_number = debugnumber++;
+#ifdef XSPICE
         d->db_iteration = event_auto_incr ? DB_AUTO_OFFSET : DB_NORMAL;
+#else
+        d->db_iteration = DB_NORMAL;
+#endif
         d->db_op = initial_steps;       // Field re-use
         d->db_value1 = window;          // Field re-use
 

src/frontend/com_measure2.c

@@ -64,7 +64,7 @@ is_arith_char2(char c)
     return c != '\0' && strchr("*/<>?:|&^!%\\", c);
 }
 
-static bool
+bool
 str_has_arith_char2(char* s)
 {
     if (*s == '+' || *s == '-')
@@ -717,7 +717,10 @@ measure_at(
                 value = get_value(meas, d, i); //d->v_compdata[i].cx_real;
             else
                 value = d->v_realdata[i];
-            svalue = dScale->v_realdata[i];
+            if (dScale->v_compdata) // .sp, s-param.
+                svalue = dScale->v_compdata[i].cx_real;
+            else // fft
+                svalue = dScale->v_realdata[i];
         } else {
             value = d->v_realdata[i];
             svalue = dScale->v_realdata[i];

src/frontend/inp.c

@@ -1779,7 +1779,7 @@ com_alterparam(wordlist *wl)
         /* alterparam subcktname pname=vpval
            Parameters from within subcircuit are no longer .param lines, but have been added to
            the .subckt line as pname=paval and to the x line as pval. pval in the x line takes
-           precedence when subciruit is called, so has to be replaced here.
+           precedence when subcircuit is called, so has to be replaced here.
            Find subcircuit with subcktname.
            After params: Count the number of parameters (notok) until parameter pname is found.
            When found, search for x-line with subcktname.

src/frontend/inpc_probe.c

@@ -332,7 +332,7 @@ void inp_probe(struct card* deck)
                     /* special for KiCad: add shunt resistor if thisnode contains 'unconnected' */
                     if (*instname == 'x' && strstr(thisnode, "unconnected")) {
                         /* nn makes the resistor name unique for a device with multiple unconnected nodes */
-                        char *rline = tprintf("R%s%d %s 0 1e15", thisnode, nn++, thisnode);
+                        char *rline = tprintf("r%s%d %s 0 1e15", thisnode, nn++, thisnode);
                         card = insert_new_line(card, rline, 0, card->linenum_orig, card->linesource);
                     }
                     char* nodesaves = tprintf("%s:%s#branch", instname, nodename);
@@ -398,7 +398,7 @@ void inp_probe(struct card* deck)
                         if (!strnode2) {
                         }
                         else {
-                            newline = tprintf("Ediff%d_nodes vd_%s:%s 0 %s %s 1", ee, strnode1, strnode2, strnode1, strnode2);
+                            newline = tprintf("ediff%d_nodes vd_%s:%s 0 %s %s 1", ee, strnode1, strnode2, strnode1, strnode2);
 
                             char* nodesaves = tprintf("vd_%s:%s", strnode1, strnode2);
                             allsaves = wl_cons(nodesaves, allsaves);
@@ -434,7 +434,7 @@ void inp_probe(struct card* deck)
                         tfree(strnode2);
                         continue;
                     }
-                    newline = tprintf("Ediff%d_%s vd_%s 0 %s %s 1", ee, instname1, instname1, strnode1, strnode2);
+                    newline = tprintf("ediff%d_%s vd_%s 0 %s %s 1", ee, instname1, instname1, strnode1, strnode2);
 
                     char* nodesaves = tprintf("vd_%s", instname1);
                     allsaves = wl_cons(nodesaves, allsaves);
@@ -590,7 +590,7 @@ void inp_probe(struct card* deck)
                             }
                             nodename2 = get_terminal_name(instname2, node2, instances);
                         }
-                        char *newline = tprintf("Ediff%d_%s_%s vd_%s:%s_%s:%s 0 %s %s 1", ee, instname1, instname2, instname1, nodename1, instname2, nodename2, strnode1, strnode2);
+                        char *newline = tprintf("ediff%d_%s_%s vd_%s:%s_%s:%s 0 %s %s 1", ee, instname1, instname2, instname1, nodename1, instname2, nodename2, strnode1, strnode2);
                         char* nodesaves = tprintf("vd_%s:%s_%s:%s", instname1, nodename1, instname2, nodename2);
                         allsaves = wl_cons(nodesaves, allsaves);
                         tmpcard1 = insert_new_line(tmpcard1, newline, 0, tmpcard1->linenum_orig, tmpcard1->linesource);
@@ -712,7 +712,7 @@ void inp_probe(struct card* deck)
                             }
                             nodename2 = get_terminal_name(instname1, node2, instances);
                         }
-                        char* newline = tprintf("Ediff%d_%s vd_%s:%s:%s 0 %s %s 1", ee, instname1, instname1, nodename1, nodename2, strnode1, strnode2);
+                        char* newline = tprintf("ediff%d_%s vd_%s:%s:%s 0 %s %s 1", ee, instname1, instname1, nodename1, nodename2, strnode1, strnode2);
                         char* nodesaves = tprintf("vd_%s:%s:%s", instname1, nodename1, nodename2);
                         allsaves = wl_cons(nodesaves, allsaves);
                         tmpcard1 = insert_new_line(tmpcard1, newline, 0, tmpcard1->linenum_orig, tmpcard1->linesource);
@@ -1335,22 +1335,22 @@ static int setallvsources(struct card *tmpcard, NGHASHPTR instances, char *instn
     DS_CREATE(Bpowersave, 200);
 
     if (power) {
-        /* For example: Bq1Vref q1Vref 0 V = 1/3*( */
+        /* For example: bq1vref q1vref 0 v = 1/3*( */
         char numbuf[3];
-        sadd(&BVrefline, "Bprobe_int_");
+        sadd(&BVrefline, "bprobe_int_");
         sadd(&BVrefline, instname);
-        sadd(&BVrefline, "Vref ");
+        sadd(&BVrefline, "vref ");
         sadd(&BVrefline, instname);
-        sadd(&BVrefline, "probe_int_Vref 0 V = 1/");
+        sadd(&BVrefline, "probe_int_vref 0 v = 1/");
         sadd(&BVrefline, itoa10(numnodes, numbuf));
         sadd(&BVrefline, "*(");
-        /* For example: Bq1power q1:power 0 V = */
-        sadd(&Bpowerline, "Bprobe_int_");
+        /* For example: bq1power q1:power 0 v = */
+        sadd(&Bpowerline, "bprobe_int_");
         sadd(&Bpowerline, instname);
         sadd(&Bpowerline, "power ");
         sadd(&Bpowerline, instname);
         cadd(&Bpowerline, ':');
-        sadd(&Bpowerline, "power 0 V = 0+"); /*FIXME 0+ required to suppress adding {} and numparam failure*/
+        sadd(&Bpowerline, "power 0 v = 0+"); /*FIXME 0+ required to suppress adding {} and numparam failure*/
         /* For example: q1:power */
         sadd(&Bpowersave, instname);
         cadd(&Bpowersave, ':');
@@ -1414,20 +1414,20 @@ static int setallvsources(struct card *tmpcard, NGHASHPTR instances, char *instn
         if (power) {
             /* For example V(1)+V(2)+V(3)*/
             if (nodenum == 1)
-               sadd(&BVrefline, "V(");
+               sadd(&BVrefline, "v(");
             else
-               sadd(&BVrefline, "+V(");
+               sadd(&BVrefline, "+v(");
             sadd(&BVrefline, newnode);
             cadd(&BVrefline, ')');
             /*For example: (V(node1)-V(q1probe_int_Vref))*node1#branch+(V(node2)-V(q1Vref))*node2#branch */
             if (nodenum == 1)
-               sadd(&Bpowerline, "(V(");
+               sadd(&Bpowerline, "(v(");
             else
-               sadd(&Bpowerline, "+(V(");
+               sadd(&Bpowerline, "+(v(");
             sadd(&Bpowerline, newnode);
-            sadd(&Bpowerline, ")-V(");
+            sadd(&Bpowerline, ")-v(");
             sadd(&Bpowerline, instname);
-            sadd(&Bpowerline, "probe_int_Vref))*i(vcurr_");
+            sadd(&Bpowerline, "probe_int_vref))*i(vcurr_");
             sadd(&Bpowerline, instname);
             sadd(&Bpowerline, ":probe_int_");
             sadd(&Bpowerline, nodename1);

src/frontend/inpcom.c

@@ -147,6 +147,7 @@ static void inp_compat(struct card *deck);
 static void inp_bsource_compat(struct card *deck);
 static bool inp_temper_compat(struct card *card);
 static void inp_meas_current(struct card *card);
+static void inp_meas_control(struct card *card);
 static void inp_dot_if(struct card *deck);
 static char *inp_modify_exp(char *expression);
 static struct func_temper *inp_new_func(char *funcname, char *funcbody,
@@ -1138,12 +1139,12 @@ struct card *inp_readall(FILE *fp, const char *dir_name, const char* file_name,
             inp_fix_agauss_in_param(working, statfcn[ii]);
 
         inp_fix_temper_in_param(working);
-
+//        tprint(working);
         inp_expand_macros_in_deck(NULL, working);
         inp_fix_param_values(working);
 
         inp_reorder_params(subckt_w_params, cc);
-//        tprint(working);
+
         /* Special handling for large PDKs: We need to know W and L of
            transistor subcircuits by checking their x invocation */
         inp_get_w_l_x(working);
@@ -1179,6 +1180,7 @@ struct card *inp_readall(FILE *fp, const char *dir_name, const char* file_name,
             inp_repair_dc_ps(working);
         }
         bool expr_w_temper = FALSE;
+
         if (!newcompat.s3) {
             /* Do all the compatibility stuff here */
             working = cc->nextcard;
@@ -1190,6 +1192,8 @@ struct card *inp_readall(FILE *fp, const char *dir_name, const char* file_name,
             inp_bsource_compat(working);
             inp_dot_if(working);
             expr_w_temper = inp_temper_compat(working);
+            /* check for expressions in meas command */
+            inp_meas_control(working);
         }
         if (expr_w_temper_p)
             *expr_w_temper_p = expr_w_temper;
@@ -3641,74 +3645,76 @@ static char *inp_fix_subckt(struct names *subckt_w_params, char *s)
     char *equal, *beg, *buffer, *ptr1, *ptr2, *new_str;
 
     equal = strchr(s, '=');
-    if (equal &&
-        (!strstr(s, "params:") || !isspace_c(s[-1]))) {
-        /* get subckt name (ptr1 will point to name) */
+    if (equal) {
+        char* paramstr = strstr(s, "params:");
+        if (!paramstr || !isspace_c(paramstr[-1])) {
 
-        ptr1 = skip_token(s);
-        for (ptr2 = ptr1; *ptr2 && !isspace_c(*ptr2) && !isquote(*ptr2);
+            /* get subckt name (ptr1 will point to name) */
+            ptr1 = skip_token(s);
+            for (ptr2 = ptr1; *ptr2 && !isspace_c(*ptr2) && !isquote(*ptr2);
                 ptr2++)
-            ;
+                ;
 
-        add_name(subckt_w_params, copy_substring(ptr1, ptr2));
+            add_name(subckt_w_params, copy_substring(ptr1, ptr2));
 
-        /* go to beginning of first parameter word  */
-        /* s    will contain only subckt definition */
-        /* beg  will point to start of param list   */
-        beg = skip_back_ws(equal, s);
-        beg = skip_back_non_ws(beg, s);
-        beg[-1] = '\0'; /* fixme can be < s */
+            /* go to beginning of first parameter word  */
+            /* s    will contain only subckt definition */
+            /* beg  will point to start of param list   */
+            beg = skip_back_ws(equal, s);
+            beg = skip_back_non_ws(beg, s);
+            beg[-1] = '\0'; /* fixme can be < s */
 
-        head = insert_new_line(NULL, NULL, 0, 0, "internal");
-        /* create list of parameters that need to get sorted */
-        first_param_card = c = NULL;
-        while ((ptr1 = strchr(beg, '=')) != NULL) {
-            ptr2 = skip_ws(ptr1 + 1);
-            ptr1 = skip_back_ws(ptr1, beg);
-            ptr1 = skip_back_non_ws(ptr1, beg);
-            /* ptr1 points to beginning of parameter */
+            head = insert_new_line(NULL, NULL, 0, 0, "internal");
+            /* create list of parameters that need to get sorted */
+            first_param_card = c = NULL;
+            while ((ptr1 = strchr(beg, '=')) != NULL) {
+                ptr2 = skip_ws(ptr1 + 1);
+                ptr1 = skip_back_ws(ptr1, beg);
+                ptr1 = skip_back_non_ws(ptr1, beg);
+                /* ptr1 points to beginning of parameter */
 
-            if (*ptr2 == '{')
-                ptr2 = inp_spawn_brace(ptr2);
-            else
-                ptr2 = skip_non_ws(ptr2);
+                if (*ptr2 == '{')
+                    ptr2 = inp_spawn_brace(ptr2);
+                else
+                    ptr2 = skip_non_ws(ptr2);
 
-            if (!ptr2) {
-                fprintf(stderr, "Error: Missing } in line %s\n", s);
-                controlled_exit(EXIT_FAILURE);
+                if (!ptr2) {
+                    fprintf(stderr, "Error: Missing } in line %s\n", s);
+                    controlled_exit(EXIT_FAILURE);
+                }
+
+                beg = ptr2;
+
+                c = insert_new_line(c, copy_substring(ptr1, ptr2), 0, 0, "internal");
+
+                if (!first_param_card)
+                    first_param_card = c;
             }
+            /* now sort parameters in order of dependencies */
+            inp_sort_params(first_param_card, head, NULL, NULL);
 
-            beg = ptr2;
+            /* create new ordered parameter string for subckt call */
+            new_str = NULL;
+            for (c = head->nextcard; c; c = c->nextcard)
+                if (new_str == NULL) {
+                    new_str = copy(c->line);
+                }
+                else {
+                    char* x = tprintf("%s %s", new_str, c->line);
+                    tfree(new_str);
+                    new_str = x;
+                }
 
-            c = insert_new_line(c, copy_substring(ptr1, ptr2), 0, 0, "internal");
+            line_free_x(head, TRUE);
 
-            if (!first_param_card)
-                first_param_card = c;
+            /* create buffer and insert params: */
+            buffer = tprintf("%s params: %s", s, new_str);
+
+            tfree(s);
+            tfree(new_str);
+
+            s = buffer;
         }
-        /* now sort parameters in order of dependencies */
-        inp_sort_params(first_param_card, head, NULL, NULL);
-
-        /* create new ordered parameter string for subckt call */
-        new_str = NULL;
-        for (c = head->nextcard; c; c = c->nextcard)
-            if (new_str == NULL) {
-                new_str = copy(c->line);
-            }
-            else {
-                char *x = tprintf("%s %s", new_str, c->line);
-                tfree(new_str);
-                new_str = x;
-            }
-
-        line_free_x(head, TRUE);
-
-        /* create buffer and insert params: */
-        buffer = tprintf("%s params: %s", s, new_str);
-
-        tfree(s);
-        tfree(new_str);
-
-        s = buffer;
     }
 
     return s;
@@ -7698,6 +7704,10 @@ void tprint(struct card *t)
     npr++;
     /*debug: print into file*/
     FILE *fd = fopen(outfile, "w");
+    if (!fd) {
+        fprintf(stderr, "Warning: cannot open debug output file tprint-outxx.txt\n");
+        return;
+    }
     for (tmp = t; tmp; tmp = tmp->nextcard)
         if (*(tmp->line) != '*')
             fprintf(fd, "%6d  %6d  %s\n", tmp->linenum_orig, tmp->linenum,
@@ -9047,7 +9057,8 @@ static void rem_mfg_from_models(struct card *deck)
                     }
             }
             start = search_plain_identifier(curr_line, "type");
-            if (start && start[4] == '=') {
+            /* still retain type=0, type=1, type=+1, or type=-1 */
+            if (start && start[4] == '=' && !isdigit_c(start[5]) && !((start[5] == '-' || start[5] == '+') && isdigit_c(start[6]))) {
                 end = nexttok(start);
                 if (*end == '\0')
                     *start = '\0';
@@ -9745,6 +9756,71 @@ int add_to_sourcepath(const char* filepath, const char* path)
     return 0;
 }
 
+/* if there is an expression in FIND ... WHEN etc in a .control section,
+   use a vector with this expression:
+   meas tran yeval2 FIND v(2) WHEN v(1)= 0.9*v(2)
+   will become
+   let vexprint1 = 0.9*v(2)
+   meas tran yeval2 FIND v(2) WHEN v(1)=vexprint1
+   unlet vint 
+*/
+static void inp_meas_control(struct card* card)
+{
+    int is_control = 0;
+    static int replaceno = 1;
+    struct card* prevcard;
+
+    for (; card; prevcard = card, card = card->nextcard) {
+
+        char* equal_ptr = NULL;
+        char* curr_line = card->line;
+        char* newcurrline = card->line;
+        int currlinenumber = card->linenum_orig;
+
+        /* only commands inside .control ... .endc */
+        if (ciprefix(".control", curr_line)) {
+            is_control++;
+            continue;
+        }
+        else if (ciprefix(".endc", curr_line)) {
+            is_control--;
+            continue;
+        }
+        else if (is_control < 1) {
+            continue;
+        }
+        curr_line = skip_ws(curr_line);
+        if (ciprefix("meas", curr_line) && (equal_ptr = find_assignment(curr_line)) != NULL) {
+            curr_line = equal_ptr + 1;
+            while (*curr_line != '\0' && equal_ptr) {
+                char* token = gettok(&curr_line);
+                if (str_has_arith_char(token)) {
+                    char* newtok = tprintf("=vexprint%d", replaceno++);
+                    char* begstr = copy_substring(newcurrline, equal_ptr);
+                    char* endstr = copy(curr_line);
+                    char* newline = tprintf("%s%s %s", begstr, newtok, endstr);
+                    char* letline = tprintf("let %s=%s", newtok + 1, token);
+                    char* unletline = tprintf("unlet %s", newtok + 1);
+                    tfree(newtok);
+                    tfree(begstr);
+                    tfree(endstr);
+                    prevcard = insert_new_line(prevcard, letline, 0, currlinenumber, card->linesource);
+                    card = prevcard->nextcard;
+                    tfree(card->line);
+                    card->line = newline;
+                    newcurrline = curr_line = card->line;
+                    card = insert_new_line(card, unletline, 0, currlinenumber, card->linesource);
+                }
+                tfree(token);
+                /* next equal sign in line */
+                equal_ptr = find_assignment(curr_line);
+                if (equal_ptr)
+                    curr_line = equal_ptr + 1;
+            }
+        }
+    }
+}
+
 
 #if defined(_WIN32)
 

src/frontend/plotting/graf.c

@@ -1329,10 +1329,10 @@ void gr_iplot(struct plot *plot)
     hit = 0;
     for (db = dbs; db; db = db->db_next) {
         if (db->db_type == DB_IPLOT || db->db_type == DB_IPLOTALL) {
-#ifdef XSPICE
             if (db->db_iteration > 0) {
-                double         event_node_offset = 0, event_node_spacing;
                 struct dvec   *v;
+#ifdef XSPICE
+                double         event_node_offset = 0, event_node_spacing;
 
                 /* First call: set up event nodes spacing. */
 
@@ -1348,7 +1348,7 @@ void gr_iplot(struct plot *plot)
                 } else {
                     event_node_spacing = 0;
                 }
-
+#endif
                 /* Find any XSPICE event nodes in the node
                  * list and set up plotting.  There is a parallel path
                  * for pushing new event values into their corresponding
@@ -1356,9 +1356,11 @@ void gr_iplot(struct plot *plot)
                  */
 
                 for (dc = db; dc; dc = dc->db_also) {
-                    struct  dbcomm *dd;
-                    char   *offp, save_sign;
-                    int     dup = 0;
+                    struct dbcomm *dd;
+                    int            dup = 0;
+#ifdef XSPICE
+                    char          *offp, save_sign;
+#endif
 
                     if (dc->db_nodename1 == NULL)
                         continue;
@@ -1374,6 +1376,7 @@ void gr_iplot(struct plot *plot)
                     if (dup)
                         continue;
 
+#ifdef XSPICE
                     /* Check for a nodename that is an expression. */
 
                     offp = strchr(dc->db_nodename1, '+');
@@ -1383,7 +1386,7 @@ void gr_iplot(struct plot *plot)
                         save_sign = *offp;
                         *offp = '\0';               // Trim to bare name.
                     }
-
+#endif
                     v = vec_fromplot(dc->db_nodename1, plot);
                     if (v) {
                         dc->db_nodename2 = (char *)v; // Save link to vector.
@@ -1393,6 +1396,7 @@ void gr_iplot(struct plot *plot)
                                 dc->db_nodename1, plot->pl_name);
                     }
 
+#ifdef XSPICE
                     if (v && (v->v_flags & VF_EVENT_NODE)) {
                         /* Ask event simulator to call back with new values. */
 
@@ -1443,10 +1447,11 @@ void gr_iplot(struct plot *plot)
                                 "Offset (%s) ignored for analog node %s\n",
                                 offp, dc->db_nodename1);
                     }
+#endif
                 }
                 db->db_iteration = 0;
             }
-#endif
+
             if (db->db_graphid) {
                 GRAPH *gr;
 

src/frontend/spiceif.c

@@ -55,6 +55,7 @@ CDHW*/
 #include "ngspice/iferrmsg.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/hash.h"
+#include "ngspice/devdefs.h"
 
 #include "circuits.h"
 #include "spiceif.h"
@@ -1621,6 +1622,10 @@ void com_snload(wordlist *wl)
     _foo(ckt->CKTstat, STATistics, 1);
     ckt->CKTstat->STATdevNum = NULL;
     _foo(ckt->CKTstat->STATdevNum, STATdevList, -1);
+    ckt->CKTstat->devCounts = NULL;
+    _foo(ckt->CKTstat->devCounts, size_t, DEVmaxnum + 1);
+    ckt->CKTstat->devTimes = NULL;
+    _foo(ckt->CKTstat->devTimes, double, DEVmaxnum + 1);
 
 #ifdef XSPICE
     _foo(ckt->evt, Evt_Ckt_Data_t, 1);
@@ -1776,6 +1781,8 @@ void com_snsave(wordlist *wl)
     /* Finally the stats */
     _foo(ckt->CKTstat, STATistics, 1);
     _foo(ckt->CKTstat->STATdevNum, STATdevList, 1);
+    _foo(ckt->CKTstat->devCounts, size_t, DEVmaxnum + 1);
+    _foo(ckt->CKTstat->devTimes, double, DEVmaxnum + 1);
 
 #ifdef XSPICE
     /* FIXME struct ckt->evt->data and others are not stored

src/frontend/subckt.c

@@ -583,18 +583,11 @@ doit(struct card *deck, wordlist *modnames) {
         scale = 1;
 
     error = 0;
-    /* Second pass: do the replacements.
-       Check if binning is used for .model inside of the subcircuit.
-       Reduce .model lines to the one with appropriate w and l.
-       (Inspired by Skywater PDK with excessive use of binning (161 bins)
-       in the subcircuit referencing a MOS device) */
+    /* Second pass: do the replacements. */
     do {                    /*  while (!error && numpasses-- && gotone)  */
         struct card *c = deck;
         struct card *prev_of_c = NULL;
-        bool foundmodel = FALSE;
-
         gotone = FALSE;
-
         for (; c; prev_of_c = c, c = c->nextcard) {
             if (ciprefix(invoke, c->line)) {  /* found reference to .subckt (i.e. component with refdes X)  */
 
@@ -604,13 +597,16 @@ doit(struct card *deck, wordlist *modnames) {
                 gotone = TRUE;
                 t = tofree = s = copy(c->line);       /*  s & t hold copy of component line  */
 
-                /* scname contains the refdes Xname */
+                /*  make scname point to first non-whitepace chars after refdes invocation
+                 * e.g. if invocation is Xreference, *scname = reference
+                 */
                 tofree2 = scname = gettok(&s);
+                /*scname += strlen(invoke);   */
                 while ((*scname == ' ') || (*scname == '\t') || (*scname == ':'))
                     scname++;
 
-                /*  Now set s to point to last non-space chars in the x line (i.e.
-                 *  the name of the model invoked)
+                /*  Now set s to point to last non-space chars in line (i.e.
+                 *   the name of the model invoked
                  */
                 while (*s)
                     s++;
@@ -621,47 +617,38 @@ doit(struct card *deck, wordlist *modnames) {
                     s--;
                 s++;
 
-                /* Iterate through .subckt list and look for .subckt name
-                   corresponding to the subckt name extracted from the x line */
+                /* iterate through .subckt list and look for .subckt name invoked */
                 for (sss = subs; sss; sss = sss->su_next)
                     if (eq(sss->su_name, s))
                         break;
 
-                /* At this point,
-                 * c is the card with the x line.
-                 * scname points to the netname of the x line involved.
-                 * s is the subckt name extracted from the x line.
-                 * sss points to the subcircuit referenced by the x line
-                 * sss->su_def is the contents of the subcircuit.
+
+                /* At this point, sss points to the .subckt invoked,
+                 * and scname points to the netnames
+                 * involved.
                  */
 
+
                 /* If no .subckt is found, don't complain -- this might be an
                  * instance of a subckt that is defined above at higher level.
                  */
                 if (sss) {
 //                    tprint(sss->su_def);
-
-                    /* copy of the contents between .subckt and .ends */
                     struct card *su_deck = inp_deckcopy(sss->su_def);
                     /* If we have modern PDKs, we have to reduce the amount of memory required.
                        We try to reduce the models to the one really used.
-                       Otherwise su_deck is full of unused binning models.
-                       c->w > 0 and c->l > 0 point to an x line with given w and l
-                       (typically a call to a MOS device). */
+                       Otherwise su_deck is full of unused binning models.*/
                     if ((newcompat.hs || newcompat.spe) && c->w > 0 && c->l > 0) {
                         /* extract wmin, wmax, lmin, lmax */
-                        struct card* enter_su_deck = su_deck;
+                        struct card* new_deck = su_deck;
                         struct card* prev = NULL;
                         while (su_deck) {
-                            /* find a .model line */
                             if (!ciprefix(".model", su_deck->line)) {
                                 prev = su_deck;
                                 su_deck = su_deck->nextcard;
                                     continue;
                             }
-                            /* check if line contains wmin, wmax, lmin, lmax
-                               if available, extract its values,
-                               if not, go to next line */
+
                             char* curr_line = su_deck->line;
                             float fwmin, fwmax, flmin, flmax;
                             char *wmin = strstr(curr_line, " wmin=");
@@ -729,39 +716,32 @@ doit(struct card *deck, wordlist *modnames) {
                                 su_deck = su_deck->nextcard;
                                 continue;
                             }
-                            /* check if x line's w and l are withing the limites of wmin, wmax, lmin, lmax */
+
                             float csl = (float)scale * c->l;
                             /* scale by nf */
                             float csw = (float)scale * c->w / c->nf;
                             /*fprintf(stdout, "Debug: nf = %f\n", c->nf);*/
                             if (csl >= flmin && csl < flmax && csw >= fwmin && csw < fwmax) {
-                                /* if within the limits, use the current .model card */
+                                /* use the current .model card */
                                 prev = su_deck;
                                 su_deck = su_deck->nextcard;
-                                foundmodel = TRUE;
                                 continue;
                             }
                             else {
-                                /* if not within the limits,
-                                   delete the .model line not fitting the device */
                                 struct card* tmpcard = su_deck->nextcard;
                                 line_free_x(prev->nextcard, FALSE);
                                 su_deck = prev->nextcard = tmpcard;
                             }
                         }
-                        /* go back to the first card of su_deck */
-                        su_deck = enter_su_deck;
+                        su_deck = new_deck;
                     }
 
-                    if (!foundmodel && (newcompat.hs || newcompat.spe) && c->w > 0 && c->l > 0) {
-                        fprintf(stderr, "\nError: Could not find a model\n"
-                            "    for device %s in transistor subcircuit %s\n", scname, sss->su_name);
-                        fprintf(stderr, "    with w = %.3g and l = %.3g\n\n", c->w, c->l);
+                    if (!su_deck) {
+                        fprintf(stderr, "\nError: Could not find a model for device %s in subcircuit %s\n",
+                            scname, sss->su_name);
                         controlled_exit(1);
                     }
 
-                    foundmodel = FALSE;
-
                     struct card *rest_of_c = c->nextcard;
 
                     /* Now we have to replace this line with the
@@ -802,8 +782,8 @@ doit(struct card *deck, wordlist *modnames) {
 
                 tfree(tofree);
                 tfree(tofree2);
-            } /* if (ciprefix(invoke, c->line)) */
-        }  /* for (; c; prev_of_c = c, c = c->nextcard) */
+            }
+        }
     } while (!error && numpasses-- && gotone);
 
 

src/include/cppduals/.appveyor.yml

@@ -3,9 +3,8 @@ clone_folder: c:\projects\cppduals
 clone_depth: 3
 
 image:
-#- Visual Studio 2013
-#- Visual Studio 2015
 - Visual Studio 2017
+#- Visual Studio 2022
 
 configuration:
 - Release
@@ -14,12 +13,10 @@ configuration:
 # Do not build feature branch with open Pull Requests
 skip_branch_with_pr: true
 
-# skip unsupported combinations
 init:
 - echo %APPVEYOR_BUILD_WORKER_IMAGE%
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set generator="Visual Studio 12 2013" )
-- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set generator="Visual Studio 14 2015" )
 - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( set generator="Visual Studio 15 2017" )
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2022" ( set generator="Visual Studio 17 2022" )
 - echo %generator%
 
 before_build:

src/include/cppduals/.gitlab-ci.yml

@@ -1,5 +1,4 @@
-#image: ubuntu:19.04
-image: fedora:30
+image: fedora:41
 
 variables:
   GIT_DEPTH: 3
@@ -9,79 +8,105 @@ stages:
 - build
 - test
 - cover
-- publish
-
-before_script:
-#- apt-get update --yes
-#- apt-get install --yes cmake g++ git doxygen lcov graphviz
-- dnf install -y gcc-c++ make cmake git doxygen lcov graphviz
+- pages
+- upload
+- release
 
 build:
   stage: build
-#  variables:
-#    CC: clang
-#    CXX: clang++
   script:
+  - dnf install -y gcc-c++ make cmake git doxygen lcov graphviz
   - echo $CXX
-  - cmake -Bbuild -H. -DCPPDUALS_TESTING=ON
+  - gcc -march=native -dM -E - </dev/null | grep -i sse
+  - cmake -Bbuild -H. -DCPPDUALS_TESTING=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
   - cmake --build build
-  - cmake -Bbuild-latest -H. -DCPPDUALS_TESTING=ON -DCPPDUALS_EIGEN_LATEST=ON
-  - cmake --build build-latest
   artifacts:
     expire_in: 1 week
     paths:
-    - build
-    - build-latest
+    - build/
+  only:
+  - merge_requests
+  - master
 
 test:
   stage: test
   script:
+  - dnf install -y gcc-c++ make cmake git doxygen lcov graphviz
   - cmake --build build --target test
-  - cmake --build build-latest --target test
   dependencies:
   - build
+  only:
+  - merge_requests
+  - master
 
 cover:
+  stage: cover
   script:
-  - cmake -Bbuild-cov -H. -DCODE_COVERAGE=ON -DCPPDUALS_TESTING=ON
+  - dnf install -y gcc-c++ make cmake git doxygen lcov graphviz
+  - cmake -Bbuild-cov -H. -DCPPDUALS_TESTING=ON -DCPPDUALS_CODE_COVERAGE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
   - cmake --build build-cov --target cov
   - cmake --build build-cov --target cov-html
-  coverage: '/Total:|\w*\d+\.\d+/'
+  coverage: "/Total:|\\w*\\d+\\.\\d+/"
   artifacts:
-    expire_in: 1 day
+    expire_in: 1 week
     paths:
-    - build-cov
+    - build-cov/
   only:
   - merge_requests
 
 pages:
   script:
-  - cmake -Bbuild -H. -DCODE_COVERAGE=ON -DCPPDUALS_TESTING=ON
-  - cmake --build build --target cppduals_docs
-  - cmake --build build --target cov-html
-  - mv build/docs public/
-  - mv build/coverage public/
-  coverage: '/Total:|\w*\d+\.\d+/'
+  - dnf install -y gcc-c++ make cmake git doxygen lcov graphviz
+  - cmake -Bbuild-cov -H. -DCODE_COVERAGE=ON -DCPPDUALS_TESTING=ON
+  - cmake --build build-cov --target cov-html
+  - cmake --build build-cov --target cppduals_docs
+  - mv build-cov/coverage public/
+  - mv build-cov/docs public/
+  coverage: "/Total:|\\w*\\d+\\.\\d+/"
   artifacts:
     paths:
-    - public
+    - public/
   only:
   - master
 
-publish:
-  stage: publish
-  dependencies:
-  - build
-  environment:
-    name: publish
-  only:
-  - /^v\d+\.\d+\.\d+$/
-  except:
-  - branches
-  before_script:
-  - dnf install -y python3-requests
+variables:
+  # Package version can only contain numbers (0-9), and dots (.).
+  # Must be in the format of X.Y.Z, i.e. should match /\A\d+\.\d+\.\d+\z/ regular expresion.
+  # See https://docs.gitlab.com/ee/user/packages/generic_packages/#publish-a-package-file
+  PACKAGE_VERSION: $CI_COMMIT_TAG
+  PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/release/${PACKAGE_VERSION}"
+  HEADER_ONLY_PACKAGE: "cppduals-h-${CI_COMMIT_TAG#v}.tgz"
+
+upload:
+  stage: upload
+  image: curlimages/curl:latest
+  rules:
+    - if: $CI_COMMIT_TAG
   script:
-#  - ln -s cppduals-h-${CI_BUILD_TAG#v} .
-#  - tar czvhf cppduals-h-${CI_BUILD_TAG#v}.tgz cppduals-h-${CI_BUILD_TAG#v}/duals cppduals-h-${CI_BUILD_TAG#v}/CMakeLists.txt
-  - tar czvf cppduals-h-${CI_BUILD_TAG#v}.tgz duals CMakeLists.txt
-  - ./doc/gitlab-release --message "Release ${CI_BUILD_TAG}" cppduals-h-${CI_BUILD_TAG#v}.tgz
+    - |
+      tar czvf ${HEADER_ONLY_PACKAGE} duals/
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
+        --upload-file ${HEADER_ONLY_PACKAGE} \
+                      ${PACKAGE_REGISTRY_URL}/${HEADER_ONLY_PACKAGE}
+
+release:
+  # Caution, as of 2021-02-02 these assets links require a login, see:
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/299384
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - |
+      release-cli create \
+        --name "Release $CI_COMMIT_TAG" \
+        --tag-name $CI_COMMIT_TAG \
+        --assets-link "{\"name\":\"${HEADER_ONLY_PACKAGE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${HEADER_ONLY_PACKAGE}\"}"
+
+sast:
+  variables:
+    SAST_DEFAULT_ANALYZERS: flawfinder
+  stage: test
+
+include:
+- template: Security/SAST.gitlab-ci.yml

src/include/cppduals/CMakeLists.txt

@@ -1,14 +1,17 @@
 #
 # CMake for cppduals
 #
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.14)
 project (cppduals
-  VERSION 0.3.1
+  VERSION 0.6.2
   LANGUAGES C CXX
   )
 include (GNUInstallDirs)
 
-set (CMAKE_CXX_STANDARD 11 CACHE STRING "Which C++ standard to test against.")
+if (NOT CMAKE_CXX_STANDARD)
+  set (CMAKE_CXX_STANDARD 17 CACHE STRING "Which C++ standard to test against.")
+endif()
+message (STATUS "CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -38,11 +41,11 @@ if (CPPDUALS_STANDALONE AND
   message (STATUS "No install prefix specified; using '${CMAKE_INSTALL_PREFIX}'")
 endif ()
 
-set_property (CACHE CMAKE_CXX_STANDARD PROPERTY STRINGS 11 14 17 20)
+#set_property (CACHE CMAKE_CXX_STANDARD PROPERTY STRINGS 11 14 17 20)
+set_property (CACHE CMAKE_CXX_STANDARD PROPERTY STRINGS 20)
 
 option (CPPDUALS_TESTING "Enable testing" OFF)
 option (CPPDUALS_BENCHMARK "Enable benchmarking" OFF)
-option (CPPDUALS_EIGEN_LATEST "Eigen latest" OFF)
 option (CPPDUALS_USE_LIBCXX "When testing use flags for libc++" OFF)
 set (EIGEN3_INCLUDE_DIRS "" CACHE PATH "Path to Eigen includes" )
 
@@ -91,7 +94,7 @@ add_library (cppduals::duals ALIAS cppduals_duals)
 #
 if (CPPDUALS_TESTING)
 
-  cmake_minimum_required (VERSION 3.10) # need gtest_discover_tests
+  cmake_minimum_required (VERSION 3.14) # need gtest_discover_tests
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/thirdparty")
 
   # generator name
@@ -109,7 +112,6 @@ if (CPPDUALS_TESTING)
                              "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
                              "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}"
                              "-DCPPDUALS_BENCHMARK=${CPPDUALS_BENCHMARK}"
-                             "-DCPPDUALS_EIGEN_LATEST=${CPPDUALS_EIGEN_LATEST}"
                              "-DCPPDUALS_USE_LIBCXX=${CPPDUALS_USE_LIBCXX}"
                              "${PROJECT_SOURCE_DIR}/thirdparty"
     RESULT_VARIABLE DEPS_CONFIG_RESULT
@@ -144,18 +146,27 @@ endif ()
 # Code Coverage Configuration
 #
 add_library (cppduals_coverage_config INTERFACE)
-option (CODE_COVERAGE "Enable coverage reporting" OFF)
-if (CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-  # Add required flags (GCC & LLVM/Clang)
-  target_compile_options (cppduals_coverage_config INTERFACE
-    -O0        # no optimization
-    -g         # generate debug info
-    --coverage # sets all required flags
+option (CPPDUALS_CODE_COVERAGE "Enable coverage reporting" OFF)
+if (CPPDUALS_CODE_COVERAGE AND NOT CPPDUALS_TESTING)
+  message(FATAL_ERROR "CPPDUALS_CODE_COVERAGE requires CPPDUALS_TESTING to be enabled")
+endif()
+if (CPPDUALS_CODE_COVERAGE)
+  if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    message(STATUS "Enabling coverage reporting")
+    # Add required flags (GCC & LLVM/Clang)
+    target_compile_options (cppduals_coverage_config INTERFACE
+      -O0        # no optimization
+      -g         # generate debug info
+      --coverage # sets all required flags
+      -fprofile-arcs 
+      -ftest-coverage
     )
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
-    target_link_options (cppduals_coverage_config INTERFACE --coverage)
-  else ()
-    target_link_libraries (cppduals_coverage_config INTERFACE --coverage)
+    target_link_options (cppduals_coverage_config INTERFACE 
+      --coverage
+    )
+  else()
+    # error out if coverage is enabled but compiler is not supported
+    message(FATAL_ERROR "Coverage reporting is disabled for unknown compilers.")
   endif ()
 endif ()
 
@@ -221,3 +232,8 @@ if (ETAGS)
     COMMAND ${ETAGS} --language=c++ --append `find ${PROJECT_BINARY_DIR}/thirdparty/eigenX/src/eigenX -type f`
     )
 endif (ETAGS)
+
+#
+# Packaging
+#
+include (CPack)

src/include/cppduals/README.md

@@ -96,25 +96,6 @@ to specify library dependencies:
   target_link_libraries (your_target PRIVATE cppduals::duals)
 ```
 
-Older versions of CMake can achieve a similar result using the ``ExternalProject``
-family of commands and modifying the global preprocessor search path:
-
-```cmake
-  include(ExternalProject)
-
-  # Have CMake download the library headers only
-  set (CPPDUALS_TAG v0.4.1)
-  set (CPPDUALS_MD5 7efe49496b8d0e3d3ffbcd3c68f542f3)
-  ExternalProject_Add (cppduals
-    URL https://gitlab.com/tesch1/cppduals/-/archive/${CPPDUALS_TAG}/cppduals-${CPPDUALS_TAG}.tar.bz2
-    URL_HASH MD5=${CPPDUALS_MD5}
-    CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" )
-
-  # Make include directory globally visible
-  ExternalProject_Get_Property (cppduals source_dir)
-  include_directories (${source_dir}/)
-```
-
 Alternatively, `cppduals` supports installation and discovery via the
 `find_package` utility. First, download and install the library to a
 location of your choosing:
@@ -299,6 +280,50 @@ thus licensed under [MPL-2](http://www.mozilla.org/MPL/2.0/FAQ.html) .
 ChangeLog
 =========
 
+v0.6.0
+======
+
+- target at least c++17.
+- tested with eigen 3.3.7 & 3.3.8.
+- rearrange how we're (illegally using/abusing) std:: by moving many implementation details
+  into duals::detail tricks - makes everything work with LIBCPP on osx now (as of Sequoia 15.2).
+- upgrade google test & benchmark libraries.
+- update to more modern cmake, at least 3.14 required now.
+- dont try to use Eigen's .exp() with duals, not supported.
+
+Known Issues
+- fmt library support is very out of date - should update to support std::format.
+- coverage is not working.
+- SSE/AVX not working - open to fixes but dont have a machine to test on at the moment.
+
+v0.5.4
+======
+
+- upgrade google test library
+
+v0.5.3
+======
+
+- fix some problem with pow()
+
+v0.5.2
+======
+
+- change optional libfmt print support to fmt 7.1.3 (from 6.x)
+- change default build standard to c++14.
+
+v0.5.1
+======
+
+- packaging cleanup
+
+v0.5.0
+======
+
+- added ARM NEON support.  tested on apple M1 - note apple's BLAS gemm
+  is ~2x faster than Eigen-generated matrix mul :(
+- fixed atan2 and pow
+
 v0.4.1
 ======
 
@@ -351,4 +376,4 @@ Todo
 - Add multi-variate differentiation capability.
 - Non-x86_64 (CUDA/AltiVec/HIP/NEON/...) vectorization.
 - Higher-order derivatives.
-
+- finish NEON (is why clang failing on osx?  or just make it faster!)

src/include/cppduals/duals/arch/SSE/Dual.h

@@ -10,6 +10,7 @@
 
 #ifndef EIGEN_DUAL_SSE_H
 #define EIGEN_DUAL_SSE_H
+#include <pmmintrin.h> // SSE3
 
 namespace Eigen {
 
@@ -150,17 +151,9 @@ template<> EIGEN_STRONG_INLINE void prefetch<duals::dual<float> >(const duals::d
 
 template<> EIGEN_STRONG_INLINE duals::dual<float>  pfirst<Packet2df>(const Packet2df& a)
 {
-  #if EIGEN_GNUC_AT_MOST(4,3)
-  // Workaround gcc 4.2 ICE - this is not performance wise ideal, but who cares...
-  // This workaround also fix invalid code generation with gcc 4.3
-  EIGEN_ALIGN16 duals::dual<float> res[2];
-  _mm_store_ps((float*)res, a.v);
-  return res[0];
-  #else
   duals::dual<float> res;
   _mm_storel_pi((__m64*)&res, a.v);
   return res;
-  #endif
 }
 
 template<> EIGEN_STRONG_INLINE Packet2df preverse(const Packet2df& a)

src/include/cppduals/duals/dual_eigen

@@ -141,7 +141,6 @@ namespace Eigen {
 template<typename T>
 struct NumTraits<duals::dual<T> > : GenericNumTraits<T>
 {
-  typedef typename NumTraits<T>::Real ReallyReal;
   typedef duals::dual<T> Real;
   typedef duals::dual<T> Literal;
   typedef duals::dual<T> Nested;
@@ -159,13 +158,13 @@ struct NumTraits<duals::dual<T> > : GenericNumTraits<T>
   EIGEN_DEVICE_FUNC
   static inline Real epsilon()        { return Real(NumTraits<T>::epsilon()); }
   EIGEN_DEVICE_FUNC
-  static inline ReallyReal dummy_precision()  { return NumTraits<T>::dummy_precision(); }
+  static inline Real dummy_precision()  { return NumTraits<T>::dummy_precision(); }
   EIGEN_DEVICE_FUNC
-  static inline ReallyReal highest()  { return NumTraits<T>::highest(); }
+  static inline Real highest()  { return NumTraits<T>::highest(); }
   EIGEN_DEVICE_FUNC
-  static inline ReallyReal lowest()   { return NumTraits<T>::lowest(); }
+  static inline Real lowest()   { return NumTraits<T>::lowest(); }
   EIGEN_DEVICE_FUNC
-  static inline ReallyReal digits10() { return NumTraits<T>::digits10(); }
+  static inline int digits10() { return NumTraits<T>::digits10(); }
 };
 
 #if !defined(CPPDUALS_NO_EIGEN_PROMOTION)
@@ -218,6 +217,20 @@ using duals::dconj;
 
 namespace internal {
 
+#if 0
+// For MatrixExponential.h to treat duals::dual<T> as a known type and compile it
+template<typename T> struct is_exp_known_type;
+template<typename MatrixType, typename T> struct matrix_exp_computeUV;
+template<typename T> struct is_exp_known_type<duals::dual<T>> : is_exp_known_type<T> {};
+template <typename MatrixType, typename T>
+struct matrix_exp_computeUV<MatrixType, duals::dual<T> > : matrix_exp_computeUV<MatrixType, T>
+{
+  typedef typename NumTraits<typename traits<MatrixType>::Scalar>::Real RealScalar;
+};
+#endif
+
+#if 1
+// this is used by the packet math for SSE to copy raw duals around.
 template<typename T>
 struct real_impl<duals::dual<T> >
 {
@@ -250,7 +263,44 @@ struct real_ref_retval<duals::dual<Scalar>>
 {
   typedef typename NumTraits<Scalar>::Real & type;
 };
+  
+#else ////
 
+template<typename T>
+struct real_impl<duals::dual<T> >
+{
+  typedef duals::dual<T> RealScalar;
+  EIGEN_DEVICE_FUNC
+  static inline RealScalar run(const duals::dual<T>& x)
+  {
+    return x;
+  }
+};
+
+template<typename Scalar>
+struct real_ref_impl<duals::dual<Scalar>>
+{
+  typedef typename NumTraits<duals::dual<Scalar> >::Real RealScalar;
+  EIGEN_DEVICE_FUNC
+  static inline RealScalar & run(duals::dual<Scalar> & x)
+  {
+    return reinterpret_cast<RealScalar*>(&x)[0];
+  }
+  EIGEN_DEVICE_FUNC
+  static inline const RealScalar & run(const duals::dual<Scalar> & x)
+  {
+    return reinterpret_cast<const RealScalar *>(&x)[0];
+  }
+};
+
+template<typename Scalar>
+struct real_ref_retval<duals::dual<Scalar>>
+{
+  typedef typename NumTraits<duals::dual<Scalar>>::Real & type;
+};
+
+#endif /// 0
+  
 template<typename T> struct scalar_random_op<duals::dual<T>>
 {
   EIGEN_EMPTY_STRUCT_CTOR(scalar_random_op)
@@ -384,7 +434,8 @@ template<typename RealScalar,bool Conj> struct dconj_helper<RealScalar, duals::d
 #elif defined(EIGEN_VECTORIZE_ALTIVEC) || defined(EIGEN_VECTORIZE_VSX)
 //  #include "duals/arch/AltiVec/Dual.h" // TODO
 #elif defined EIGEN_VECTORIZE_NEON
-//#include "duals/arch/NEON/Dual.h" // TODO
+  #include "duals/arch/NEON/Dual.h"
+  #include "duals/arch/NEON/ComplexDual.h"
 #elif defined EIGEN_VECTORIZE_ZVECTOR
 //  #include "duals/arch/ZVector/Dual.h" // TODO
 #endif

src/include/cppduals/tests/CMakeLists.txt

@@ -10,47 +10,53 @@
 # Public License v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# gtest_discover_tests requires 3.10
-cmake_minimum_required (VERSION 3.10)
-
-# Configure google-test as a downloadable library.
-include (GoogleTest)
+cmake_minimum_required (VERSION 3.14)
 
 if (WIN32)
   add_definitions (-D_USE_MATH_DEFINES)
 endif ()
 include_directories ("${CMAKE_SOURCE_DIR}")
 include_directories ("${DEPS_ROOT}/include")
-include_directories ("${EIGEN3_INCLUDE_DIRS}")
 #include_directories ("${MPFR_INCLUDES}")
-include_directories ("${EXPOKIT_INCLUDE_DIR}")
-
-set (IOFORMAT "IOFormat(FullPrecision, DontAlignCols, \", \", \"\\$<SEMICOLON>\\n\", \"\", \"\", \"[\", \"]\")")
-add_definitions (-DEIGEN_DEFAULT_IO_FORMAT=${IOFORMAT})
-#add_definitions (-DEIGEN_DEFAULT_IO_FORMAT=EIGEN_IO_FORMAT_OCTAVE)
 
 #
 # Correctness & Coverage
 #
-if (NOT MSVC)
-  set (OPT_FLAGS "-O2")
-  set (OPT_FLAGS "-O3;-msse3")
-  set (OPT_FLAGS "-O3;-mavx2;-mfma")
-  set (OPT_FLAGS "-O3;-march=native")
+message ("OSX_ARCHITECTURES: ${CMAKE_SYSTEM_PROCESSOR}")
+set (OSX_ARCHITECTURES "arm64;x86_64")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
+  set (X86 TRUE)
 else ()
-  set (OPT_FLAGS "/arch:IA32")
-  set (OPT_FLAGS "/arch:SSE")
-  set (OPT_FLAGS "/arch:SSE2")
-  set (OPT_FLAGS "/arch:AVX2")
+  set (X86 FALSE)
+endif ()
+
+# Set optimization flags only if coverage is not enabled
+if (NOT CPPDUALS_CODE_COVERAGE)
+  if (X86)
+    if (NOT MSVC)
+      set (OPT_FLAGS "-O3;-march=native")
+    else ()
+      set (OPT_FLAGS "/arch:AVX2")
+    endif ()
+  else ()
+    set (OPT_FLAGS "-O3")
+  endif ()
+else()
+  if (X86)
+    if (NOT MSVC)
+      set (OPT_FLAGS "-mavx2")
+    else ()
+      set (OPT_FLAGS "/arch:AVX2")
+    endif ()
+  else ()
+    set (OPT_FLAGS "")
+  endif ()
 endif ()
 
-#set (OPT_FLAGS "${OPT_FLAGS};-fsanitize=address;-fno-omit-frame-pointer")
 set (OPT_FLAGS "${OPT_FLAGS};-DCPPDUALS_VECTORIZE_CDUAL")
-#set (OPT_FLAGS "${OPT_FLAGS};-DCPPDUALS_DONT_VECTORIZE")
-#set (OPT_FLAGS "${OPT_FLAGS};-DEIGEN_DONT_VECTORIZE")
 
 set (ALL_TESTS
-  test_dual test_funcs test_eigen test_packets
+  test_dual test_cdual test_funcs test_eigen test_packets
   test_vectorize test_solve test_expm test_1 test_fmt
   example
   )
@@ -70,33 +76,30 @@ foreach (TEST_ ${ALL_TESTS})
 
     add_executable (${TEST} ${TEST_}.cpp)
     set (PHASE_FLAGS ${OPT_FLAGS} -DPHASE_${PHASE})
-    string (REPLACE ";" ", " L2 "${CMAKE_CXX_FLAGS}")
+    string (REPLACE ";" ", " L2 "${OPT_FLAGS};${CMAKE_CXX_FLAGS}")
     target_compile_options (${TEST} PUBLIC ${PHASE_FLAGS})
     target_compile_definitions (${TEST} PRIVATE "OPT_FLAGS=${L2}")
-    target_link_libraries (${TEST} gtest_main cppduals_coverage_config)
-    #target_link_libraries (${TEST} -lasan)
-    add_dependencies (${TEST} eigenX expokitX)
+    
+    # Link with coverage config first to ensure flags are used
+    target_link_libraries (${TEST} 
+      cppduals_coverage_config  # Link coverage first
+      gtest_main 
+      eigen 
+      expokit
+    )
+    
     gtest_discover_tests (${TEST} TEST_LIST ${TEST}_targets)
     set_tests_properties (${${TEST}_targets} PROPERTIES TIMEOUT 10)
-    # -ftest-coverage
   endforeach (PHASE)
 endforeach (TEST_)
 
 # special for fmt
-target_compile_features (test_fmt_1 PUBLIC cxx_std_14)
 target_link_libraries (test_fmt_1 fmt::fmt)
 
 if (CPPDUALS_BENCHMARK)
   #
   # Benchmarks
   #
-
-  message ("searching: ${DEPS_ROOT} for google benchmark libs")
-  find_library (BENCHMARK_LIBRARY benchmark PATHS ${DEPS_ROOT}/lib)
-  find_library (BENCHMARKM_LIBRARY benchmark_main PATHS ${DEPS_ROOT}/lib)
-  #find_library (PTHREAD_LIBRARY pthread)
-  message ("BENCHMARK_LIBRARY: ${BENCHMARK_LIBRARY}")
-  include_directories ("${BENCHMARK_INC_DIR}")
   if (Boost_FOUND AND NO)
     add_definitions (-DHAVE_BOOST=1)
     include_directories ("${Boost_INCLUDE_DIRS}")
@@ -110,11 +113,14 @@ if (CPPDUALS_BENCHMARK)
       set (BLA_STATIC OFF)
     endif (NOT BLA_STATIC)
     set (BLA_VENDOR OpenBLAS)
-  endif (NOT APPLE AND NOT BLA_VENDOR)
+  endif ()
   find_package (BLAS REQUIRED)
   #find_package (LAPACK REQUIRED)
   add_definitions (-DHAVE_BLAS)
   #add_definitions (-DEIGEN_USE_BLAS)
+  if (APPLE)
+    add_definitions (-DACCELERATE_NEW_LAPACK -DACCELERATE_LAPACK_ILP64)
+  endif ()
 
   # find lapacke.h cblas.h
   set (CBLAS_HINTS ${BLAS_DIR} ${LAPACK_DIR} /usr /usr/local /opt /opt/local)
@@ -124,18 +130,21 @@ if (CPPDUALS_BENCHMARK)
     /opt
     /opt/local
     /usr/local/opt
-    /System/Library/Frameworks)
+    /System/Library/Frameworks
+    ${BLAS_LIBRARIES}
+    )
 
   # Finds the include directories for lapacke.h
   find_path (LAPACKE_INCLUDE_DIRS
-    NAMES lapacke.h
+    REQUIRED
+    NAMES lapacke.h clapack.h
     HINTS ${CBLAS_HINTS}
     PATH_SUFFIXES
     include inc include/x86_64 include/x64
-    openblas/include
-#    Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Versions/Current/Headers
+    openblas/include openblas
+    Frameworks/vecLib.framework/Headers
     PATHS ${CBLAS_PATHS}
-    DOC "LAPACK(E) include header lapacke.h")
+    DOC "LAPACK(E) include header lapacke.h/clapack.h")
   mark_as_advanced (LAPACKE_INCLUDE_DIRS)
   if (LAPACKE_INCLUDE_DIRS)
     include_directories (${LAPACKE_INCLUDE_DIRS})
@@ -145,12 +154,13 @@ if (CPPDUALS_BENCHMARK)
 
   # Finds the include directories for cblas*.h
   find_path (CBLAS_INCLUDE_DIRS
+    REQUIRED
     NAMES cblas.h cblas_openblas.h cblas-openblas.h
     HINTS ${CBLAS_HINTS}
     PATH_SUFFIXES
     include inc include/x86_64 include/x64
-    openblas/include
-#    Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Versions/Current/Headers
+    openblas/include openblas
+    Frameworks/vecLib.framework/Headers
     PATHS ${CBLAS_PATHS}
     DOC "BLAS include header cblas.h")
   mark_as_advanced (CBLAS_INCLUDE_DIRS)
@@ -161,80 +171,168 @@ if (CPPDUALS_BENCHMARK)
       break()
     endif (EXISTS "${CBLAS_INCLUDE_DIRS}/${cblas}")
   endforeach (cblas)
-
   message ("Found BLAS    : ${BLAS_LIBRARIES}")
   message ("Found cBLAS   : ${CBLAS_INCLUDE_DIRS}")
   message ("Found lapacke : ${LAPACKE_INCLUDE_DIRS}")
 
-  set (OPT_FLAGS "")
+  set (BMK_FLAGS "")
   if (NOT MSVC)
-    #set (OPT_FLAGS "-O3;-mavx")
-    #set (OPT_FLAGS "-O3;-march=native;-fopenmp")
-    set (OPT_FLAGS "-O3;-msse3;-fopenmp")
-    set (OPT_FLAGS "-O3")
-    set (OPT_FLAGS "-O3;-msse3")
-    set (OPT_FLAGS "-O3;-march=native;-funroll-loops")
-    set (OPT_FLAGS "-O3;-msse3;-mavx2;-mfma")
-    set (OPT_FLAGS "-O3;-march=native")
-    #set (OPT_FLAGS "${OPT_FLAGS};-save-temps;-fverbose-asm")
+    #set (BMK_FLAGS "-O3;-mavx")
+    #set (BMK_FLAGS "-O3;-march=native;-fopenmp")
+    if (X86)
+      set (BMK_FLAGS "-msse3;-fopenmp")
+      set (BMK_FLAGS "-msse3")
+      set (BMK_FLAGS "-march=native;-funroll-loops")
+      set (BMK_FLAGS "-msse3;-mavx2;-mfma")
+    else ()
+      set (BMK_FLAGS "-march=native")
+    endif ()
+    #set (BMK_FLAGS "-O3;${BMK_FLAGS}")
+    #set (BMK_FLAGS "${BMK_FLAGS};-save-temps;-fverbose-asm")
   else ()
-    set (OPT_FLAGS "/arch:IA32")
-    set (OPT_FLAGS "/arch:SSE")
-    set (OPT_FLAGS "/arch:SSE2")
-    set (OPT_FLAGS "/arch:AVX2")
+    set (BMK_FLAGS "/arch:IA32")
+    set (BMK_FLAGS "/arch:SSE")
+    set (BMK_FLAGS "/arch:SSE2")
+    set (BMK_FLAGS "/arch:AVX2")
   endif ()
 
-  #set (OPT_FLAGS "${OPT_FLAGS};-DEIGEN_DONT_VECTORIZE")
-  #set (OPT_FLAGS "${OPT_FLAGS};-DCPPDUALS_DONT_VECTORIZE")
-  #set (OPT_FLAGS "${OPT_FLAGS};-DCPPDUALS_DONT_VECTORIZE_CDUAL")
+  #set (BMK_FLAGS "${BMK_FLAGS};-DEIGEN_DONT_VECTORIZE")
+  #set (BMK_FLAGS "${BMK_FLAGS};-DCPPDUALS_DONT_VECTORIZE")
+  #set (BMK_FLAGS "${BMK_FLAGS};-DCPPDUALS_DONT_VECTORIZE_CDUAL")
 
-  foreach (BENCH  bench_dual bench_eigen bench_gemm bench_example bench_fmt)
-    add_executable (${BENCH} ${BENCH}.cpp)
-    target_compile_options (${BENCH} PUBLIC ${OPT_FLAGS})
-    #set_target_properties (${BENCH} PROPERTIES LINK_FLAGS -fopenmp)
-    #target_link_options (${BENCH} PUBLIC ${OPT_FLAGS})
-    string (REPLACE ";" ", " L2 "${OPT_FLAGS} ${CMAKE_CXX_FLAGS}")
-    target_compile_definitions (${BENCH} PRIVATE "OPT_FLAGS=${L2}")
-    add_dependencies (${BENCH} benchmarkX eigenX expokitX)
-    target_link_libraries (${BENCH} ${BENCHMARK_LIBRARY} -lpthread ${BLAS_LIBRARIES})
-  endforeach (BENCH)
+  foreach (VECTORIZE YES NO)
+    foreach (BENCH  bench_dual bench_eigen bench_exp bench_gemm bench_example bench_fmt)
+      if (NOT VECTORIZE)
+        set (BENCHE ${BENCH})
+      else ()
+        set (BENCHE ${BENCH}_novec)
+      endif ()
+      add_executable (${BENCHE} ${BENCH}.cpp)
+      target_compile_options (${BENCHE} PUBLIC ${BMK_FLAGS})
+      if (NOT VECTORIZE)
+        target_compile_options (${BENCHE} PUBLIC "-DEIGEN_DONT_VECTORIZE")
+      endif()
+      #set_target_properties (${BENCH} PROPERTIES LINK_FLAGS -fopenmp)
+      #target_link_options (${BENCH} PUBLIC ${BMK_FLAGS})
+      string (REPLACE ";" ", " L2 "${BMK_FLAGS} ${CMAKE_CXX_FLAGS}")
+      target_compile_definitions (${BENCHE} PRIVATE "BMK_FLAGS=${L2}")
+      target_link_libraries (${BENCHE} benchmark::benchmark ${BLAS_LIBRARIES} eigen expokit)
+    endforeach ()
+  endforeach ()
 
   target_link_libraries (bench_fmt fmt::fmt)
+  target_link_libraries (bench_fmt_novec fmt::fmt)
 
 endif (CPPDUALS_BENCHMARK)
 
 add_executable (sandbox sandbox.cpp)
-add_dependencies (sandbox eigenX expokitX ) # mpfrX mprealX
-#target_compile_options (sandbox PUBLIC ${OPT_FLAGS})
+#target_compile_options (sandbox PUBLIC ${BMK_FLAGS})
 target_compile_options (sandbox PUBLIC -DCPPDUALS_VECTORIZE_CDUAL)
 if (MSVC)
-  target_compile_options (sandbox PUBLIC /arch:AVX2)
+  if (X86)
+    target_compile_options (sandbox PUBLIC /arch:AVX2)
+  endif ()
 else ()
-  target_compile_options (sandbox PUBLIC -O1 -msse3 -mavx2 -mfma)
+  if (X86)
+    target_compile_options (sandbox PUBLIC -O1 -msse3 -mavx2 -mfma)
+  else ()
+    target_compile_options (sandbox PUBLIC -O1 )  # -mfpu=neon
+  endif ()
 endif ()
 
 set_target_properties (sandbox PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-target_link_libraries (sandbox PUBLIC cppduals_coverage_config)
+target_link_libraries (sandbox PUBLIC cppduals_coverage_config eigen expokit)
 
 #
 # Generate coverage reports
 #
-if (CODE_COVERAGE)
-  add_custom_target (cov
-    DEPENDS ${ALL_TEST_BINS}
-    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target test
-    COMMAND $<TARGET_FILE:sandbox>
-    COMMAND lcov --capture --directory . --output-file coverage.info
-    COMMAND lcov --remove coverage.info '/usr/*' --output-file coverage.info
-    COMMAND lcov --remove coverage.info '*/thirdparty/*' --output-file coverage.info
-    COMMAND lcov --remove coverage.info '*/googletest/*' --output-file coverage.info
-    COMMAND lcov --list coverage.info
+if (CPPDUALS_CODE_COVERAGE)
+  # Find required tools
+  get_filename_component(CMAKE_CXX_COMPILER_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY)
+  set(GENHTML_PATH ${CMAKE_CXX_COMPILER_DIR}/genhtml)
+  if(NOT EXISTS ${GENHTML_PATH})
+    find_program(GENHTML_PATH genhtml REQUIRED)
+  endif()
+
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # Clang
+    # often in the same directory as clang - search there too
+    get_filename_component(CMAKE_CXX_COMPILER_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY)
+    set(LLVM_COV_PATH ${CMAKE_CXX_COMPILER_DIR}/llvm-cov)
+    set(LLVM_PROFDATA_PATH ${CMAKE_CXX_COMPILER_DIR}/llvm-profdata)
+    if(NOT EXISTS ${LLVM_COV_PATH})
+      find_program(LLVM_COV_PATH llvm-cov REQUIRED)
+    endif()
+    if(NOT EXISTS ${LLVM_PROFDATA_PATH})
+      find_program(LLVM_PROFDATA_PATH llvm-profdata REQUIRED)
+    endif()
+    
+    add_custom_target(cov
+      DEPENDS ${ALL_TEST_BINS}
+      COMMAND ${CMAKE_COMMAND} -E remove_directory coverage/profraw
+      COMMAND ${CMAKE_COMMAND} -E make_directory coverage/profraw
+      COMMAND ${CMAKE_COMMAND} --build . --target test "LLVM_PROFILE_FILE=coverage/profraw/%p.profraw"
+      COMMAND ${LLVM_PROFDATA_PATH} merge -sparse coverage/profraw/*.profraw -o coverage/coverage.profdata
+      COMMAND ${LLVM_COV_PATH} show
+        -instr-profile=coverage/coverage.profdata
+        -format=html -output-dir=coverage/html
+        -show-line-counts-or-regions
+        -show-instantiation-summary
+        ${ALL_TEST_BINS}
+      COMMAND ${LLVM_COV_PATH} report
+        -instr-profile=coverage/coverage.profdata
+        ${ALL_TEST_BINS}
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )
-  add_custom_target (cov-html
+  elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    # GCC
+    set(LCOV_PATH ${CMAKE_CXX_COMPILER_DIR}/lcov)
+    if(NOT EXISTS ${LCOV_PATH})
+      find_program(LCOV_PATH lcov REQUIRED)
+    endif()
+    # Extract GCC version number and use matching gcov version
+    execute_process(
+      COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+      OUTPUT_VARIABLE GCC_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    set(GCOV_PATH ${CMAKE_CXX_COMPILER_DIR}/gcov-${GCC_VERSION})
+    if(NOT EXISTS ${GCOV_PATH})
+      find_program(GCOV_PATH gcov-${GCC_VERSION} REQUIRED)
+    endif()
+  
+    add_custom_target(cov
+      DEPENDS ${ALL_TEST_BINS}
+      COMMAND ${CMAKE_COMMAND} -E make_directory coverage
+      COMMAND ${LCOV_PATH} --directory . --zerocounters
+      # Add initial capture before running tests
+      COMMAND ${LCOV_PATH} --directory . --capture --initial --gcov-tool ${GCOV_PATH} --output-file coverage/coverage.base --ignore-errors inconsistent
+      # Run tests and capture coverage data
+      COMMAND ctest --output-on-failure
+      COMMAND ${LCOV_PATH} --directory . --capture --gcov-tool ${GCOV_PATH} --output-file coverage/coverage.info --ignore-errors inconsistent
+      # Combine baseline and test coverage data
+      COMMAND ${LCOV_PATH} --add-tracefile coverage/coverage.base --add-tracefile coverage/coverage.info --gcov-tool ${GCOV_PATH} --output-file coverage/coverage.total
+      # Only look at the coverage of the tests and duals library
+      COMMAND ${LCOV_PATH} --extract coverage/coverage.total '*/tests/*' '*/duals/*' --gcov-tool ${GCOV_PATH} --output-file coverage/coverage.info
+      # Remove unwanted paths
+      #COMMAND ${LCOV_PATH} --remove coverage/coverage.total '/usr/*' --gcov-tool ${GCOV_PATH} --output-file coverage/coverage.info
+      #COMMAND ${LCOV_PATH} --remove coverage/coverage.info '*/thirdparty/*' --gcov-tool ${GCOV_PATH} --output-file coverage/coverage.info
+      #COMMAND ${LCOV_PATH} --remove coverage/coverage.info '*/googletest/*' --gcov-tool ${GCOV_PATH} --output-file coverage/coverage.info
+      # Add --ignore-errors empty to prevent failure on empty coverage data
+      COMMAND ${LCOV_PATH} --list coverage/coverage.info --ignore-errors empty --gcov-tool ${GCOV_PATH}
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+  else()
+    message(FATAL_ERROR "No coverage tool found for ${CMAKE_CXX_COMPILER_ID}")
+  endif()
+
+  add_custom_target(cov-html
     DEPENDS cov
-    COMMAND rm -rf ../coverage
-    COMMAND genhtml --ignore-errors source coverage.info --legend --title "make cov"
-    --output-directory=../coverage
-    COMMAND echo "output in coverage/index.html"
-    )
+    COMMAND ${CMAKE_COMMAND} -E remove_directory coverage/html
+    COMMAND ${GENHTML_PATH} --ignore-errors source coverage/coverage.info --legend --title "cppduals coverage"
+      --output-directory=coverage/html
+    COMMAND ${CMAKE_COMMAND} -E echo "Coverage report generated at coverage/html/index.html"
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  )
+
 endif ()

src/include/cppduals/tests/bench_eigen.cpp

@@ -11,13 +11,13 @@
 // (c)2019 Michael Tesch. tesch1@gmail.com
 //
 
+#include <duals/dual_eigen>
 #include <iostream>
 #include <fstream>
 #include <complex>
 #include <memory>
 
 #include "type_name.hpp"
-#include <duals/dual_eigen>
 #include <Eigen/Core>
 #include <Eigen/Dense>
 
@@ -31,67 +31,6 @@ using namespace duals;
 
 template< class T > struct type_identity { typedef T type; };
 
-namespace Eigen {
-namespace internal {
-template<typename T> struct is_exp_known_type;
-template<typename T> struct is_exp_known_type<std::complex<T>> : is_exp_known_type<T> {};
-#if 0
-template <typename RealScalar> struct MatrixExponentialScalingOp;
-template <typename RealScalar>
-struct MatrixExponentialScalingOp<duals::dual<RealScalar>>
-{
-  MatrixExponentialScalingOp(int squarings) : m_squarings(squarings) { }
-  inline const duals::dual<RealScalar> operator() (const duals::dual<RealScalar> & x) const
-  {
-    using std::ldexp;
-    return ldexp(x, -m_squarings);
-  }
-  typedef std::complex<duals::dual<RealScalar>> ComplexScalar;
-  inline const ComplexScalar operator() (const ComplexScalar& x) const
-  {
-    using std::ldexp;
-    return ComplexScalar(ldexp(x.real(), -m_squarings), ldexp(x.imag(), -m_squarings));
-  }
-
-  private:
-    int m_squarings;
-};
-#endif
-}}
-#include <unsupported/Eigen/MatrixFunctions>
-
-namespace Eigen {
-namespace internal {
-template <typename MatrixType, typename T>
-struct matrix_exp_computeUV<MatrixType, duals::dual<T> >
-{
-  typedef typename NumTraits<typename traits<MatrixType>::Scalar>::Real RealScalar;
-  template <typename ArgType>
-  static void run(const ArgType& arg, MatrixType& U, MatrixType& V, int& squarings)
-  {
-    using std::frexp;
-    using std::pow;
-    const RealScalar l1norm = arg.cwiseAbs().colwise().sum().maxCoeff();
-    squarings = 0;
-    if (l1norm < 1.495585217958292e-002) {
-      matrix_exp_pade3(arg, U, V);
-    } else if (l1norm < 2.539398330063230e-001) {
-      matrix_exp_pade5(arg, U, V);
-    } else if (l1norm < 9.504178996162932e-001) {
-      matrix_exp_pade7(arg, U, V);
-    } else if (l1norm < 2.097847961257068e+000) {
-      matrix_exp_pade9(arg, U, V);
-    } else {
-      const RealScalar maxnorm = 5.371920351148152;
-      frexp(l1norm / maxnorm, &squarings);
-      if (squarings < 0) squarings = 0;
-      MatrixType A = arg.unaryExpr(MatrixExponentialScalingOp<RealScalar>(squarings));
-      matrix_exp_pade13(A, U, V);
-    }
-  }
-};
-}}
-
 /* encode the type into an integer for benchmark output */
 template<typename Tp> struct type_num { /* should fail */ };
 template<> struct type_num<float>     { static constexpr int id = 1; };
@@ -271,87 +210,6 @@ template <class Rt, class U> void B_MatVec(benchmark::State& state) {
   state.SetComplexityN(state.range(0));
 }
 
-template <class Rt> void B_Expm(benchmark::State& state)
-{
-  int N = state.range(0);
-  //Rt S(1);
-  MatrixX<Rt> A = MatrixX<Rt>::Random(N, N);
-  MatrixX<Rt> B = MatrixX<Rt>::Zero(N, N);
-  //A = S * A / A.norm();
-
-  for (auto _ : state) {
-    B = A.exp();
-    benchmark::ClobberMemory();
-  }
-
-  state.counters["type"] = type_num<Rt>::id;
-  state.SetComplexityN(state.range(0));
-}
-
-template <class Rt> void B_ExpPadm(benchmark::State& state)
-{
-  int N = state.range(0);
-  //Rt S(1);
-  MatrixX<Rt> A = MatrixX<Rt>::Random(N, N);
-  MatrixX<Rt> B = MatrixX<Rt>::Zero(N, N);
-  //A = S * A / A.norm();
-
-  for (auto _ : state) {
-    B = eexpokit::padm(A);
-    benchmark::ClobberMemory();
-  }
-
-  state.counters["type"] = type_num<Rt>::id;
-  state.SetComplexityN(state.range(0));
-}
-
-template <class Rt> void B_ExpExpv(benchmark::State& state)
-{
-  int N = state.range(0);
-  //Rt S(1);
-  MatrixX<Rt> A = MatrixX<Rt>::Zero(N, N);
-  MatrixX<Rt> b = MatrixX<Rt>::Ones(N, 1);
-  MatrixX<Rt> c = MatrixX<Rt>::Zero(N, 1);
-  //A = S * A / A.norm();
-
-  // sparse random fill
-  for (int i = 0; i < 4*N; i++)
-    A((int)duals::randos::random(0.,N-1.),
-      (int)duals::randos::random(0.,N-1.)) = duals::randos::random2<Rt>();
-
-  for (auto _ : state) {
-    auto ret = eexpokit::expv(1,A,b);
-    if (ret.err > 1) {
-      std::ofstream f("fail.m");
-      f << "A=" << A.format(eexpokit::OctaveFmt) << "\n";
-      break;
-    }
-    // c = ret.w
-    benchmark::ClobberMemory();
-  }
-
-  state.counters["type"] = type_num<Rt>::id;
-  state.SetComplexityN(state.range(0));
-}
-
-template <class Rt> void B_ExpChbv(benchmark::State& state)
-{
-  int N = state.range(0);
-  //Rt S(1);
-  MatrixX<Rt> A = MatrixX<Rt>::Random(N, N);
-  MatrixX<Rt> b = MatrixX<Rt>::Zero(N, 1);
-  MatrixX<Rt> c = MatrixX<Rt>::Zero(N, 1);
-  //A = S * A / A.norm();
-
-  for (auto _ : state) {
-    c = eexpokit::chbv(A,b);
-    benchmark::ClobberMemory();
-  }
-
-  state.counters["type"] = type_num<Rt>::id;
-  state.SetComplexityN(state.range(0));
-}
-
 #define MAKE_BM_SIMPLE(TYPE1,TYPE2,NF)                                  \
   BENCHMARK_TEMPLATE(B_VecVecAdd, TYPE1,TYPE2) V_RANGE(4,NF);           \
   BENCHMARK_TEMPLATE(B_VecVecSub, TYPE1,TYPE2) V_RANGE(4,NF);           \
@@ -359,11 +217,7 @@ template <class Rt> void B_ExpChbv(benchmark::State& state)
   BENCHMARK_TEMPLATE(B_VecVecDiv, TYPE1,TYPE2) V_RANGE(4,NF);           \
   BENCHMARK_TEMPLATE(B_MatVec, TYPE1,TYPE2) V_RANGE(4,NF);              \
   BENCHMARK_TEMPLATE(B_MatMat, TYPE1,TYPE2) V_RANGE(1,NF);              \
-  BENCHMARK_TEMPLATE(B_MatDiv, TYPE1,TYPE2) V_RANGE(1,NF);              \
-  BENCHMARK_TEMPLATE(B_Expm, TYPE1) V_RANGE(1,NF);                      \
-  BENCHMARK_TEMPLATE(B_ExpPadm, TYPE1) V_RANGE(1,NF);                   \
-  BENCHMARK_TEMPLATE(B_ExpChbv, TYPE1) V_RANGE(1,NF);                   \
-  BENCHMARK_TEMPLATE(B_ExpExpv, TYPE1) V_RANGE(1,NF)
+  BENCHMARK_TEMPLATE(B_MatDiv, TYPE1,TYPE2) V_RANGE(1,NF)
 
 #define MAKE_BENCHMARKS(TYPE1,TYPE2,NF)                                 \
   MAKE_BM_SIMPLE(TYPE1,TYPE2,NF)
@@ -389,7 +243,7 @@ MAKE_BM_SIMPLE(cduald, cduald,4);
 int main(int argc, char** argv)
 {
 #ifndef EIGEN_VECTORIZE
-  static_assert(false, "no vectorization?");
+  //static_assert(false, "no vectorization?");
 #endif
   std::cout << "OPT_FLAGS=" << QUOTE(OPT_FLAGS) << "\n";
   std::cout << "INSTRUCTIONSET=" << Eigen::SimdInstructionSetsInUse() << "\n";

src/include/cppduals/tests/bench_gemm.cpp

@@ -6,12 +6,14 @@
 //
 // (c)2019 Michael Tesch. tesch1@gmail.com
 //
+#include <duals/dual>
+
 #if defined(__APPLE__) && defined(__clang__)
 #include <Accelerate/Accelerate.h>
 
 #else
 
-#ifdef EIGEN_LAPACKE
+#if defined(EIGEN_LAPACKE) || defined(__APPLE__)
 #include <Eigen/src/misc/lapacke.h>
 #else
 #include <lapacke.h>
@@ -24,13 +26,13 @@ extern "C" {
 }
 #endif // defined(__APPLE__) && defined(__clang__)
 
+#include <duals/dual_eigen>
 #include <iostream>
 #include <fstream>
 #include <complex>
 #include <memory>
 
 #include "type_name.hpp"
-#include <duals/dual_eigen>
 #include <Eigen/Core>
 #include <Eigen/Dense>
 
@@ -80,6 +82,59 @@ template <class T, class U> void B_MatMat(benchmark::State& state) {
   state.SetComplexityN(state.range(0));
 }
 
+// Helper templates to select correct BLAS routine
+template <typename U>
+struct blas_gemm;
+
+#define TRANSPOSE(X) ((X) ? CblasTrans : CblasNoTrans)
+
+template <>
+struct blas_gemm<float> {
+  static void call(bool tA, bool tB, int m, int n, int k, float alpha, float *A,
+                   int lda, float *B, int ldb, float beta, float *C, int ldc)
+  {
+    cblas_sgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB), m, n, k, alpha, A,
+                lda, B, ldb, beta, C, ldc);
+  }
+};
+
+template <>
+struct blas_gemm<double> {
+  static void call(bool tA, bool tB, int m, int n, int k, double alpha,
+                   double *A, int lda, double *B, int ldb, double beta,
+                   double *C, int ldc)
+  {
+    cblas_dgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB), m, n, k, alpha, A,
+                lda, B, ldb, beta, C, ldc);
+  }
+};
+
+template <>
+struct blas_gemm<std::complex<float>> {
+  static void call(bool tA, bool tB, int m, int n, int k,
+                   std::complex<float> alpha, std::complex<float> *A, int lda,
+                   std::complex<float> *B, int ldb, std::complex<float> beta,
+                   std::complex<float> *C, int ldc)
+  {
+    cblas_cgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB), m, n, k, &alpha, A,
+                lda, B, ldb, &beta, C, ldc);
+  }
+};
+
+template <>
+struct blas_gemm<std::complex<double>> {
+  static void call(bool tA, bool tB, int m, int n, int k,
+                   std::complex<double> alpha, std::complex<double> *A, int lda,
+                   std::complex<double> *B, int ldb, std::complex<double> beta,
+                   std::complex<double> *C, int ldc)
+  {
+    cblas_zgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB), m, n, k, &alpha, A,
+                lda, B, ldb, &beta, C, ldc);
+  }
+};
+
+#undef TRANSPOSE
+
 template <class T, typename std::enable_if<!duals::is_dual<T>::value>::type* = nullptr>
 void matrix_multiplcation(T *A, int Awidth, int Aheight,
                           T *B, int Bwidth, int Bheight,
@@ -99,31 +154,12 @@ void matrix_multiplcation(T *A, int Awidth, int Aheight,
   assert(A_width == B_height);
   int lda = tA ? m : k;
   int ldb = tB ? k : n;
-#define TRANSPOSE(X) ((X) ? CblasTrans : CblasNoTrans)
-  // http://www.netlib.org/lapack/explore-html/d7/d2b/dgemm_8f.html
-  if (!is_complex<T>::value) {
-    if (sizeof(T) == sizeof(float))
-      cblas_sgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB),
-                  m, n, k, 1.0, (float *)A, lda, (float *)B, ldb,
-                  std::real(beta), (float *)AB, n);
-    else
-      cblas_dgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB),
-                  m, n, k, 1.0, (double *)A, lda, (double *)B, ldb,
-                  std::real(beta), (double *)AB, n);
-  }
-  else {
-    std::complex<float> alphaf(1,0);
-    std::complex<double> alpha(1,0);
-    if (Eigen::NumTraits<T>::digits10() < 10)
-      cblas_cgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB),
-                  m, n, k, &alphaf, A, lda, B, ldb, &beta, AB, n);
-    else
-      cblas_zgemm(CblasColMajor, TRANSPOSE(tA), TRANSPOSE(tB),
-                  m, n, k, &alpha, A, lda, B, ldb, &beta, AB, n);
-  }
-#undef TRANSPOSE
+
+  // Call the appropriate BLAS routine based on type T
+  blas_gemm<T>::call(tA, tB, m, n, k, T(1), A, lda, B, ldb, beta, AB, n);
 }
 
+
 template <class T, typename std::enable_if<duals::is_dual<T>::value>::type* = nullptr>
 void matrix_multiplcation(T *A, int Awidth, int Aheight,
                           T *B, int Bwidth, int Bheight,
@@ -232,10 +268,10 @@ MAKE_BM_SIMPLE(cduald, cduald,4);
 int main(int argc, char** argv)
 {
 #ifndef EIGEN_VECTORIZE
-  static_assert(false, "no vectorization?");
+  //static_assert(false, "no vectorization?");
 #endif
 #ifndef NDEBUG
-  static_assert(false, "NDEBUG to benchmark?");
+  //static_assert(false, "NDEBUG to benchmark?");
 #endif
   std::cout << "OPT_FLAGS=" << QUOTE(OPT_FLAGS) << "\n";
   std::cout << "INSTRUCTIONSET=" << Eigen::SimdInstructionSetsInUse() << "\n";

src/include/cppduals/tests/sandbox.cpp

@@ -12,12 +12,12 @@
  * (c)2019 Michael Tesch. tesch1@gmail.com
  */
 
+#include <duals/dual_eigen>
 #include <math.h>
 #include <iostream>
 #include <iomanip>
 
 #include "type_name.hpp"
-#include <duals/dual_eigen>
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
 #include <unsupported/Eigen/MatrixFunctions>
@@ -60,13 +60,45 @@ template <class T>
 struct common_type<Rando<T>,T> { typedef Rando<T> type; };
 }
 
-#if 0
+#if EIGEN_ARCH_ARM64
 
 int main(int argc, char * argv[])
 {
   emtx<cduald,50> A,B,C;
   //emtx<complexd,50> A,B,C;
   C = A * B;
+
+  //
+  using namespace Eigen::internal;
+  float32x4_t a, b, v3;
+  float32x2_t f2;
+  float32x4x2_t yy;
+  float ff[] = {1., 2., 3., 4.};
+  duals::dual<double> x;
+  const uint64x2_t maskq = {0, (uint64_t)-1};
+  const uint64x2_t imaskq = {(uint64_t)-1, 0};
+
+  std::cout << "a:" << std::hex << maskq[0] << "\n";
+  std::cout << "b:" << maskq[1] << "\n";
+
+  std::cout << "v3=" << v3[0] << ", " << v3[1] << ", " << v3[2] << ", " << v3[3] << "\n";
+  std::cout << "f2=" << f2[0] << ", " << f2[1] << "\n";
+
+  std::cout << ff[0] << ", " << ff[1] << ", " << ff[2] << ", " << ff[3] << "\n";
+#ifdef __ARM_NEON
+  std::cout << "__ARM_NEON:" << __ARM_NEON << "\n";
+#endif
+#ifdef __ARM_NEON_FP
+  std::cout << "__ARM_NEON_FP:" << __ARM_NEON_FP << "\n";
+#endif
+#ifdef __ARM_ARCH
+  std::cout << "__ARM_ARCH:" << __ARM_ARCH << "\n";
+#endif
+#ifdef __ARM_BIG_ENDIAN
+  std::cout << "__ARM_BIG_ENDIAN:" << __ARM_BIG_ENDIAN << "\n";
+#endif
+
+  return 0;
 }
 
 #elif 0

src/include/cppduals/tests/test_1.cpp

@@ -81,9 +81,7 @@ expm4(const Eigen::EigenBase<DerivedA> & A_,
   R.setIdentity();
   R += B;
   ReturnT S = B;
-  int ni = 0;
   for (int ii = 2; ii < maxt; ii++) {
-    ni++;
     S = Real(1.0/ii) * S * B;
     R += S;
     auto Sn = S.norm();

src/include/cppduals/tests/test_dual.cpp

@@ -18,6 +18,7 @@
 
 #include <duals/dual>
 #include <complex>
+#include <iomanip>
 #include "gtest/gtest.h"
 
 using duals::dualf;
@@ -58,7 +59,7 @@ TEST(template_, dual_traits) {
   // depth
   EXPECT_EQ(dual_traits<float>::depth, 0);
   EXPECT_EQ(dual_traits<complexf>::depth, 0);
-  EXPECT_EQ(dual_traits<cdualf>::depth, 0);
+  EXPECT_EQ(dual_traits<cdualf>::depth, 1);
   EXPECT_EQ(dual_traits<dualf>::depth, 1);
   EXPECT_EQ(dual_traits<hyperdualf>::depth, 2);
 }
@@ -186,6 +187,8 @@ TEST(template_, common_type) {
   _EXPECT_TRUE(std::is_same<decltype(cd*cd), cdualf>);
   _EXPECT_TRUE(std::is_same<decltype(cd*d), cdualf>);
   _EXPECT_TRUE(std::is_same<decltype(d*cd), cdualf>);
+  _EXPECT_TRUE(std::is_same<decltype(cd*a), cdualf>);
+  _EXPECT_TRUE(std::is_same<decltype(a*cd), cdualf>);
 
   _EXPECT_TRUE(std::is_same<decltype(cd*1), cdualf>);
   _EXPECT_TRUE(std::is_same<decltype(1*cd), cdualf>);
@@ -328,6 +331,7 @@ TEST(members, rpart) {
   EXPECT_EQ(z.rpart(), 4);
   EXPECT_EQ(z.dpart(), 3);
 }
+
 TEST(members, dpart) {
   EXPECT_EQ(dpart(3), 0);
   dualf z(2,3);
@@ -555,6 +559,15 @@ TEST(comparison, ge) {
   EXPECT_FALSE(1 >= a);
 }
 
+#if 0
+TEST(simple_ops, add) {
+  // https://gitlab.com/tesch1/cppduals/-/issues/11
+  duals::dual<std::complex<double>> x;
+  x = x+std::complex<double>(1., 2.);
+  duals::dual<std::complex<double>> y = sqrt(x+std::complex<double>(1., 2.));
+}
+#endif
+
 TEST(compound_assign, same_type) {
   // OP=
   dualf x = 2 + 4_e;
@@ -977,25 +990,6 @@ TEST(non_class, random2) {
   EXPECT_NE(c2.dpart(), 0);
   EXPECT_NE(c1.rpart(), c2.rpart());
   EXPECT_NE(c1.dpart(), c2.dpart());
-
-  // cdualf
-  cdualf d1 = duals::randos::random2<cdualf>();
-  cdualf d2 = duals::randos::random2<cdualf>();
-  EXPECT_NE(d1.real().rpart(), 0);
-  EXPECT_NE(d1.real().dpart(), 0);
-  EXPECT_NE(d1.imag().rpart(), 0);
-  EXPECT_NE(d1.imag().dpart(), 0);
-
-  EXPECT_NE(d2.real().rpart(), 0);
-  EXPECT_NE(d2.real().dpart(), 0);
-  EXPECT_NE(d2.imag().rpart(), 0);
-  EXPECT_NE(d2.imag().dpart(), 0);
-
-  EXPECT_NE(d1.real().rpart(), d2.real().rpart());
-  EXPECT_NE(d1.real().dpart(), d2.real().dpart());
-
-  EXPECT_NE(d1.imag().rpart(), d2.imag().rpart());
-  EXPECT_NE(d1.imag().dpart(), d2.imag().dpart());
 }
 
 TEST(smoke, funcs) {
@@ -1097,6 +1091,17 @@ TEST(complex, mixing) {
   // complex<dual> * real -> complex<dual>
   // complex<real> * dual -> complex<dual> ?
 
+  // pow_dual_complex
+  B = pow(1_ef, C);
+  // pow_complex_dual
+  B = pow(C, 1_ef);
+
+  // pow_dual_dual
+  B = pow(1_ef, 2_ef);
+  // pow_dual_scalar
+  B = pow(1_ef, 2);
+  // pow_scalar_dual
+  B = pow(2, 1_ef);
 }
 
 int main(int argc, char **argv)

src/include/cppduals/tests/test_eigen.cpp

@@ -16,11 +16,12 @@
  * (c)2019 Michael Tesch. tesch1@gmail.com
  */
 
-#include "type_name.hpp"
 #include <duals/dual_eigen>
+#include "type_name.hpp"
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
 #include <Eigen/StdVector>
+
 #include <unsupported/Eigen/MatrixFunctions>
 //#include <unsupported/Eigen/AutoDiff>
 #include "eexpokit/padm.hpp"
@@ -39,10 +40,13 @@ using duals::is_complex;
 using duals::dual_traits;
 using namespace duals::literals;
 
-typedef std::complex<double> complexd;
+typedef long double ldouble;
 typedef std::complex<float> complexf;
-typedef std::complex<duald> cduald;
+typedef std::complex<double> complexd;
+typedef std::complex<long double> complexld;
 typedef std::complex<dualf> cdualf;
+typedef std::complex<duald> cduald;
+typedef std::complex<dualld> cdualld;
 
 template <class eT, int N=Eigen::Dynamic, int K = N> using emtx = Eigen::Matrix<eT, N, K>;
 template <class eT> using smtx = Eigen::SparseMatrix<eT>;
@@ -60,49 +64,6 @@ template <int N=2, int K = N> using ecdf = Eigen::Matrix<cdualf, N, K> ;
   EXPECT_NEAR(rpart(A), rpart(B),tol);             \
   EXPECT_NEAR(dpart(A), dpart(B),tol)
 
-/// Simple taylor series, truncated when |S| is "small enough"
-template <class DerivedA, typename ReturnT = typename DerivedA::PlainObject>
-ReturnT
-expm4(const Eigen::EigenBase<DerivedA> & A_,
-      typename DerivedA::RealScalar mn = std::numeric_limits<typename DerivedA::RealScalar>::epsilon() * 1000)
-{
-  //std::cerr << "do    PO:" << type_name<typename DerivedA::PlainObject>() << "\n";
-  typedef typename DerivedA::RealScalar Real;
-  using std::isfinite;
-  const DerivedA & A = A_.derived();
-  int maxt = std::numeric_limits<Real>::digits;
-  int s = log2(rpart(A.derived().norm())) + 1;
-  s = std::max(0, s);
-
-  auto B = A * pow(Real(2), -s);
-  ReturnT R(A.rows(), A.cols());
-  R.setIdentity();
-  R += B;
-  ReturnT S = B;
-  for (int ii = 2; ii < maxt; ii++) {
-    S = S * B * Real(1.0/ii);
-    R += S;
-    auto Sn = S.norm();
-    if (!isfinite(Sn)) {
-      std::cout << "expm() non-finite norm:" << Sn << " at " << ii << "\n";
-      std::cout << " |R| = " << R.norm() << " s=" << s << "\n"
-                << " |A| = " << rpart(A.real().norm()) << "\n"
-                << " |A/2^s|=" << rpart(A.real().norm()/pow(2,s)) << "\n";
-      break;
-    }
-    // converged yet?
-    if (Sn < mn)
-      break;
-    if (ii == maxt - 1) {
-      std::cout << "expm() didn't converge in " << maxt << " |S| = " << Sn << "\n";
-      throw std::invalid_argument("no converge");
-    }
-  }
-
-  for (; s; s--)
-    R = R * R;
-  return R;
-}
 
 TEST(Eigen, NumTraits) {
   //::testing::StaticAssertTypeEq<Eigen::NumTraits<duals::dual<float>>::Real, float>();
@@ -448,11 +409,12 @@ TEST(measure, norm) {
   b = 3;
   Rt d(1);
   MatrixD x;
-  x << d;
+  x.array() = d;
   MatrixD a = (MatrixD() << 1,2,3, 4,5+5_ef,6, 7,8,9).finished();
   //typename MatrixD::Index index;
 
   EXPECT_EQ(a.sum(), 45 + 5_ef);
+  EXPECT_EQ(x.sum(), 9);
   EXPECT_NEAR(rpart(a.norm()), 16.8819430161341337282, 1e-5);
   EXPECT_NEAR(rpart(a.mean()), 5, 1e-5);
   EXPECT_NEAR(dpart(a.mean()), 0.555555555555555, 1e-5);
@@ -510,31 +472,49 @@ TEST(dpart, matrix) {
   EXPECT_EQ((dpart(AA) - CC).norm(),0);
 }
 
-TEST(func, expm) {
-  typedef float T;
-  typedef dual<T> dualt;
-  typedef std::complex<dual<T>> cdualt;
-#define NN 3
-#define N2 6
-  emtx<dualt, NN> a,b;
-  a = emtx<dualt, NN>::Random();
-  a.array() += 1.1 + 2.2_ef;
-  a.setZero();
-  a = eexpokit::padm(a);
-  EXPECT_LT((a - emtx<dualt, NN>::Identity()).norm(), 1e-6) << "a=" << a << "\n";
-  a *= 1+2_e;
-  EXPECT_LT((a - emtx<dualt, NN>::Identity()).norm(), 1e-6) << "a=" << a << "\n";
+TEST(eigen, exp_typechecks) {
+  typedef emtx<dualf,3> Mat;
+  typedef emtx<duald,3> Matd;
+  EXPECT_FALSE(Eigen::internal::is_exp_known_type<typename Mat::Scalar>::value);
+  EXPECT_FALSE(Eigen::internal::is_exp_known_type<typename Matd::Scalar>::value);
 
-  emtx<cdualt, NN> c;
-  //b = a + 1_e * emtx<cdualf, 3>::Random();
-  c.setZero();
-  c = c.exp();
-  //c = expm4(c);
-  EXPECT_LT((c - emtx<cdualf, NN>::Identity()).norm(), 1e-6) << "b=" << b << "\n";
-  #undef NN
-  #undef N2
+  typedef emtx<cdualf,3> Matc;
+  typedef emtx<cduald,3> Matcd;
+  EXPECT_FALSE(Eigen::internal::is_exp_known_type<typename Matc::Scalar>::value);
+  EXPECT_FALSE(Eigen::internal::is_exp_known_type<typename Matcd::Scalar>::value);
 }
 
+const bool _exp = true;
+const bool _padm = false;
+
+#define TEST_EXP(SCALAR_T, SIDE, EXP_OR_PADM) \
+  TEST(func, exp_##SCALAR_T##_##SIDE##EXP_OR_PADM) { \
+    emtx<SCALAR_T, SIDE> a,b; \
+    a = emtx<SCALAR_T, SIDE>::Random(); \
+    a.setZero(); \
+    if (EXP_OR_PADM == _exp) a = a.exp(); \
+    else a = eexpokit::padm(a); \
+    EXPECT_LT((a - emtx<SCALAR_T, SIDE>::Identity()).norm(), 1e-6) << "a=" << a << "\n"; \
+}
+
+#define TEST_EXP_SIZES(SCALAR_T, EXP_OR_PADM) \
+  TEST_EXP(SCALAR_T, 3, EXP_OR_PADM) \
+  TEST_EXP(SCALAR_T, 4, EXP_OR_PADM) \
+  TEST_EXP(SCALAR_T, 17, EXP_OR_PADM)
+
+#define TEST_EXP_SIZES_EOP(SCALAR_T) \
+  TEST_EXP_SIZES(SCALAR_T, _padm) \
+  TEST_EXP_SIZES(SCALAR_T, _exp)
+
+// just make sure padm is working
+TEST_EXP_SIZES_EOP(float)
+TEST_EXP_SIZES_EOP(double)
+TEST_EXP_SIZES_EOP(ldouble)
+TEST_EXP_SIZES_EOP(complexf)
+TEST_EXP_SIZES_EOP(complexd)
+TEST_EXP_SIZES_EOP(complexld)
+
+/* testing engine */
 #define QUOTE(...) STRFY(__VA_ARGS__)
 #define STRFY(...) #__VA_ARGS__
 

src/include/cppduals/tests/test_expm.cpp

@@ -16,8 +16,8 @@
  * (c)2019 Michael Tesch. tesch1@gmail.com
  */
 
-#include "type_name.hpp"
 #include <duals/dual_eigen>
+#include "type_name.hpp"
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
 #include <Eigen/StdVector>
@@ -104,7 +104,7 @@ expm4(const Eigen::EigenBase<DerivedA> & A_,
   return R;
 }
 
-template <class T, int NN = 30, class DT = dual<T> >
+template <class T, int NN = 30, class DT = dual<T>, int N2 = 2*NN>
 void dexpm() {
   //typedef std::complex<float> T;
   //typedef std::complex<dual<T>> dualt;
@@ -167,8 +167,6 @@ void dexpm() {
                                      << "eA2=" << eA2.block(0,0,std::min(4,NN),std::min(4,NN)) << "\n";
   EXPECT_LT((dA1 - dA2).norm(), tol) << "dA1=" << dA1.block(0,0,std::min(4,NN),std::min(4,NN)) << "\n"
                                      << "dA2=" << dA2.block(0,0,std::min(4,NN),std::min(4,NN)) << "\n";
-#undef NN
-#undef N2
 }
 
 #if defined(PHASE_1)

src/include/cppduals/tests/test_fmt.cpp

@@ -14,6 +14,7 @@
  * (c)2019 Michael Tesch. tesch1@gmail.com
  */
 #include <fmt/format.h>
+//#include <fmt/std.h>
 #define CPPDUALS_LIBFMT
 #define CPPDUALS_LIBFMT_COMPLEX
 #include <duals/dual>
@@ -29,79 +30,131 @@ typedef std::complex<dualf> cdualf;
 using namespace duals::literals;
 using namespace std::complex_literals;
 
+TEST(libfmt, float_) {
+  std::string s = fmt::format("{:.1f}", 2.f);
+  EXPECT_EQ(s, "2.0");
+}
+TEST(libfmt, double_) {
+  std::string s = fmt::format("{:.1f}", 2.);
+  EXPECT_EQ(s, "2.0");
+}
 TEST(libfmt, complex_) {
-  std::string s = fmt::format("{}", 2.f + 3if);
+  std::string s = fmt::format("{:.1f}", 2.f + 3if);
   EXPECT_EQ(s, "(2.0+3.0if)");
+  s = fmt::format("{:.2f}", 2.f + 3if);
+  EXPECT_EQ(s, "(2.00+3.00if)");
 }
 TEST(libfmt, complex_el) {
   std::string s = fmt::format("{}", 2.l + 3il);
-  EXPECT_EQ(s, "(2.0+3.0il)");
+  EXPECT_EQ(s, "(2+3il)");
 }
 TEST(libfmt, complex_flags) {
   std::string s;
 
   s = fmt::format("{}", 2. + 3i);
-  EXPECT_EQ(s, "(2.0+3.0i)");
-
+  EXPECT_EQ(s, "(2+3i)");
+}
+TEST(libfmt, complex_flags_dollar) {
+  std::string s;
   s = fmt::format("{:$}", 2. + 3i);
-  EXPECT_EQ(s, "(2.0+3.0i)");
-
+  EXPECT_EQ(s, "(2+3i)");
+}
+TEST(libfmt, complex_flags_star) {
+  std::string s;
   s = fmt::format("{:*}", 2. + 3i);
+  EXPECT_EQ(s, "(2+3*i)");
+}
+TEST(libfmt, complex_flags_star_f) {
+  std::string s;
+  s = fmt::format("{:*.1f}", 2. + 3i);
   EXPECT_EQ(s, "(2.0+3.0*i)");
+}
+TEST(libfmt, complex_flags_comma) {
+  std::string s;
+  s = fmt::format("{:,.1f}", 2. + 3i);
+  EXPECT_EQ(s, "(2.0,3.0)");
 
   s = fmt::format("{:,}", 2. + 3i);
-  EXPECT_EQ(s, "(2.0,3.0)");
+  EXPECT_EQ(s, "(2,3)");
+}
+
+TEST(libfmt, complex_flags_a) {
+  std::string s;
 
   // + +
   s = fmt::format("{:$+}", 2. + 3i);
+  EXPECT_EQ(s, "(+2+3i)");
+
+  s = fmt::format("{:$+.1f}", 2. + 3i);
   EXPECT_EQ(s, "(+2.0+3.0i)");
 
   s = fmt::format("{:*+}", 2. + 3i);
-  EXPECT_EQ(s, "(+2.0+3.0*i)");
+  EXPECT_EQ(s, "(+2+3*i)");
 
   s = fmt::format("{:,+}", 2. + 3i);
-  EXPECT_EQ(s, "(+2.0,+3.0)");
+  EXPECT_EQ(s, "(+2,+3)");
+}
+
+TEST(libfmt, complex_flags_b) {
+  std::string s;
 
   // + -
   s = fmt::format("{:$+}", 2. - 3i);
-  EXPECT_EQ(s, "(+2.0-3.0i)");
+  EXPECT_EQ(s, "(+2-3i)");
 
   s = fmt::format("{:*+}", 2. - 3i);
-  EXPECT_EQ(s, "(+2.0-3.0*i)");
+  EXPECT_EQ(s, "(+2-3*i)");
 
   s = fmt::format("{:,+}", 2. - 3i);
+  EXPECT_EQ(s, "(+2,-3)");
+
+  s = fmt::format("{:,+.1f}", 2. - 3i);
   EXPECT_EQ(s, "(+2.0,-3.0)");
 
 }
+
 TEST(libfmt, complex_all_real)  {
   std::string s;
   s = fmt::format("{}", 2. + 0i);
+  EXPECT_EQ(s, "(2)");
+
+  s = fmt::format("{:.1f}", 2. + 0i);
   EXPECT_EQ(s, "(2.0)");
 
   s = fmt::format("{:*}", 2. + 0i);
-  EXPECT_EQ(s, "(2.0)");
+  EXPECT_EQ(s, "(2)");
 
   s = fmt::format("{:,}", 2. + 0i);
+  EXPECT_EQ(s, "(2,0)");
+  
+  s = fmt::format("{:,.1f}", 2. + 0i);
   EXPECT_EQ(s, "(2.0,0.0)");
 }
+
 TEST(libfmt, complex_all_imag)  {
   std::string s;
 
   s = fmt::format("{}", 0. + 3i);
+  EXPECT_EQ(s, "(3i)");
+
+  s = fmt::format("{:.1f}", 0. + 3i);
   EXPECT_EQ(s, "(3.0i)");
 
   s = fmt::format("{:*}", 0. + 3i);
-  EXPECT_EQ(s, "(3.0*i)");
+  EXPECT_EQ(s, "(3*i)");
 
   s = fmt::format("{:,}", 0. + 3i);
-  EXPECT_EQ(s, "(0.0,3.0)");
+  EXPECT_EQ(s, "(0,3)");
 }
 TEST(libfmt, complex_plus)  {
   std::string s = fmt::format("{:+}", 1. + 3i);
+  EXPECT_EQ(s, "(+1+3i)");
+
+  s = fmt::format("{:+.1f}", 1. + 3i);
   EXPECT_EQ(s, "(+1.0+3.0i)");
 
   s = fmt::format("{:+}", 1. - 3i);
-  EXPECT_EQ(s, "(+1.0-3.0i)");
+  EXPECT_EQ(s, "(+1-3i)");
 }
 TEST(libfmt, complex_g) {
   std::string s = fmt::format("{:g}", 2.f + 3if);
@@ -118,67 +171,102 @@ TEST(libfmt, complex_gel) {
 
 TEST(libfmt, dual_) {
   std::string s = fmt::format("{}", 2 + 3_ef);
+  EXPECT_EQ(s, "(2+3_ef)");
+
+  s = fmt::format("{:.1f}", 2 + 3_ef);
   EXPECT_EQ(s, "(2.0+3.0_ef)");
 }
 TEST(libfmt, dual_el) {
   std::string s = fmt::format("{}", 2 + 3_el);
+  EXPECT_EQ(s, "(2+3_el)");
+
+  s = fmt::format("{:.1f}", 2 + 3_el);
   EXPECT_EQ(s, "(2.0+3.0_el)");
 }
 TEST(libfmt, dual_flags) {
   std::string s;
 
   s = fmt::format("{}", 2. + 3_e);
-  EXPECT_EQ(s, "(2.0+3.0_e)");
+  EXPECT_EQ(s, "(2+3_e)");
 
   s = fmt::format("{:$}", 2. + 3_e);
+  EXPECT_EQ(s, "(2+3_e)");
+
+  s = fmt::format("{:$.1f}", 2. + 3_e);
   EXPECT_EQ(s, "(2.0+3.0_e)");
 
   s = fmt::format("{:*}", 2. + 3_e);
-  EXPECT_EQ(s, "(2.0+3.0*e)");
+  EXPECT_EQ(s, "(2+3*e)");
 
   s = fmt::format("{:,}", 2. + 3_e);
+  EXPECT_EQ(s, "(2,3)");
+
+  s = fmt::format("{:,.1f}", 2. + 3_e);
   EXPECT_EQ(s, "(2.0,3.0)");
 
   // + +
   s = fmt::format("{:$+}", 2. + 3_e);
-  EXPECT_EQ(s, "(+2.0+3.0_e)");
+  EXPECT_EQ(s, "(+2+3_e)");
 
   s = fmt::format("{:*+}", 2. + 3_e);
+  EXPECT_EQ(s, "(+2+3*e)");
+
+  s = fmt::format("{:*+.1f}", 2. + 3_e);
   EXPECT_EQ(s, "(+2.0+3.0*e)");
 
   s = fmt::format("{:,+}", 2. + 3_e);
-  EXPECT_EQ(s, "(+2.0,+3.0)");
+  EXPECT_EQ(s, "(+2,+3)");
 
   // + -
   s = fmt::format("{:$+}", 2. - 3_e);
-  EXPECT_EQ(s, "(+2.0-3.0_e)");
+  EXPECT_EQ(s, "(+2-3_e)");
 
   s = fmt::format("{:*+}", 2. - 3_e);
+  EXPECT_EQ(s, "(+2-3*e)");
+
+  s = fmt::format("{:*+.1f}", 2. - 3_e);
   EXPECT_EQ(s, "(+2.0-3.0*e)");
 
   s = fmt::format("{:,+}", 2. - 3_e);
-  EXPECT_EQ(s, "(+2.0,-3.0)");
+  EXPECT_EQ(s, "(+2,-3)");
+  s = fmt::format("{:,+}", 2. + 3_e);
+  EXPECT_EQ(s, "(+2,+3)");
 }
 TEST(libfmt, dual_all_real)  {
   std::string s;
 
   s = fmt::format("{}", 2 + 0_e);
-  EXPECT_EQ(s, "(2.0)");
+  EXPECT_EQ(s, "(2)");
   s = fmt::format("{:*}", 2 + 0_e);
-  EXPECT_EQ(s, "(2.0)");
+  EXPECT_EQ(s, "(2)");
   s = fmt::format("{:,}", 2 + 0_e);
-  EXPECT_EQ(s, "(2.0,0.0)");
+  EXPECT_EQ(s, "(2,0)");
 }
 TEST(libfmt, dual_all_dual)  {
   std::string s;
 
   s = fmt::format("a{}b", 0 + 3_e);
+  EXPECT_EQ(s, "a(3_e)b");
+  s = fmt::format("a{:.1f}b", 0 + 3_e);
   EXPECT_EQ(s, "a(3.0_e)b");
   s = fmt::format("a{:*}b", 0 + 3_e);
-  EXPECT_EQ(s, "a(3.0*e)b");
+  EXPECT_EQ(s, "a(3*e)b");
   s = fmt::format("a{:,}b", 0 + 3_e);
+  EXPECT_EQ(s, "a(0,3)b");
+  s = fmt::format("a{:,.1f}b", 0 + 3_e);
   EXPECT_EQ(s, "a(0.0,3.0)b");
 }
+
+TEST(libfmt, dual_plus)  {
+  std::string s = fmt::format("{:+}", 1. + 3_e);
+  EXPECT_EQ(s, "(+1+3_e)");
+
+  s = fmt::format("{:+.1f}", 1. + 3_e);
+  EXPECT_EQ(s, "(+1.0+3.0_e)");
+
+  s = fmt::format("{:+}", 1. - 3_e);
+  EXPECT_EQ(s, "(+1-3_e)");
+}
 TEST(libfmt, dual_g) {
   std::string s = fmt::format("{:g}", 2 + 3_ef);
   EXPECT_EQ(s, "(2+3_ef)");
@@ -194,6 +282,12 @@ TEST(libfmt, dual_gel) {
   std::string s = fmt::format("{:g}", 2 + 3_el);
   EXPECT_EQ(s, "(2+3_el)");
 }
+
+TEST(libfmt, dual_cd) {
+  std::string s = fmt::format("{}", cdualf(2 + 3_ef, 4 + 5_ef));
+  EXPECT_EQ(s, "((2+3_ef)+(4+5_ef)i)");
+}
+
 TEST(libfmt, dual_cgt) {
   std::string s = fmt::format("{:g}", cdualf(2 + 3_ef, 4 + 5_ef));
   EXPECT_EQ(s, "((2+3_ef)+(4+5_ef)i)");
@@ -208,6 +302,10 @@ TEST(libfmt, dual_cgts) {
   s = fmt::format("{:,*g}", cdualf(2 + 3_ef, 4 + 5_ef));
   EXPECT_EQ(s, "((2+3*ef),(4+5*ef))");
 
+  // nonsense but should still work
+  s = fmt::format("{:*,g}", cdualf(2 + 3_ef, 4 + 5_ef));
+  EXPECT_EQ(s, "((2,3)+(4,5)*i)");
+
   s = fmt::format("{:,,g}", cdualf(2 + 3_ef, 4 + 5_ef));
   EXPECT_EQ(s, "((2,3),(4,5))");
 }

src/include/cppduals/tests/test_funcs.cpp

@@ -32,25 +32,38 @@ typedef std::complex<double> complexd;
 // not verify precision.
 #define FD_CHECK(T, F, ...)                                             \
   TEST(func##_##T, F) {                                                 \
+    using std::isnan;                                                   \
     for (T x : __VA_ARGS__) {                                           \
       T prec = 100 * std::sqrt(std::numeric_limits<T>::epsilon());      \
-      T dd = dpart(F(x + dual<T>(0,1)));                                \
+      T dd = duals::dpart(F(x + dual<T>(0,1)));                         \
       /*T dx = std::numeric_limits<T>::epsilon() * (T)1000000;      */  \
       T dx = T(1)/ (1ull << (std::numeric_limits<T>::digits / 3));      \
       T fd = (F(x + dx) - F(x - dx)) / (2*dx);                          \
-      EXPECT_CNEAR(dd, fd, prec * std::abs(std::max(std::max(dd,fd),T(1)))) \
-        << "dd=" << dd << " fd=" << fd << " x=" << x << " dx=" << dx;   \
+      if (!isnan(dd) && !isnan(fd)) {                                   \
+        EXPECT_CNEAR(dd, fd,                                            \
+                     prec * std::abs(std::max(std::max(dd,fd),T(1))))   \
+          << "dd=" << dd << " fd=" << fd << " x=" << x << " dx=" << dx; \
+      }                                                                 \
     }                                                                   \
   }
 
+#define powL(x) pow(x,2)
+#define powR(x) pow(2,x)
+#define powLR(x) pow(x,x)
+
 FD_CHECK(double, exp, {-1,0,1})
-FD_CHECK(double, log, {1})
-//FD_CHECK(complexd, log, {-1,1}) TODO
-FD_CHECK(double, log10, {1})
-//FD_CHECK(complexd, log10, {-1,0,1}) TODO
+FD_CHECK(double, log, {1, 3})
+// FD_CHECK(complexd, log, {-1,1}) TODO
+FD_CHECK(double, log10, {1, 3})
+
+FD_CHECK(double, powL, {-3.,-1.,-0.4,0.,0.6,1.,2.5})
+FD_CHECK(double, powR, {-3.,-1.,-0.4,0.,0.6,1.,2.5})
+FD_CHECK(double, powLR, {-3.,-1.,-0.4,0.,0.6,1.,2.5})
+
+// FD_CHECK(complexd, log10, {-1,0,1}) TODO
 FD_CHECK(double, sqrt, {0.5,1.0})
 FD_CHECK(double, cbrt, {-10.,-0.01,0.01,1.0,10.})
-//FD_CHECK(complexd, sqrt, {0,1}) TODO
+// FD_CHECK(complexd, sqrt, {0,1}) TODO
 FD_CHECK(double, sin, {-1,0,1})
 FD_CHECK(double, cos, {-1,0,1})
 FD_CHECK(double, tan, {-1,0,1})
@@ -59,12 +72,27 @@ FD_CHECK(double, acos, {-.9,0.,.9})
 FD_CHECK(double, atan, {-10,-1,0,1,10})
 
 // TODO:
-//FD_CHECK(double, sinh, {0})
-//FD_CHECK(double, cosh, {0})
-//FD_CHECK(double, tanh, {0})
-//FD_CHECK(double, asinh, {0})
-//FD_CHECK(double, acosh, {0})
-//FD_CHECK(double, atanh, {0})
+#define atan2L(x) atan2(x,2)
+#define atan2R(x) atan2(2,x)
+#define atan2LR(x) atan2(x,x)
+FD_CHECK(double, atan2L, {-10.,-1.,0.,1.,10.})
+FD_CHECK(double, atan2R, {-10.,-1.,0.01,1.,10.})
+FD_CHECK(double, atan2LR, {-10.,-1.,0.01,1.,10.})
+
+#define hypot2LR(x) hypot(x,x)
+FD_CHECK(double, hypot2LR, {-10.,-1.,0.01,1.,10.})
+
+#define scalbnL(x) scalbn(x,2)
+FD_CHECK(double, scalbnL, {-10.,-1.,0.01,1.,10.})
+
+FD_CHECK(double, sinh, {-0.1, 0.1})
+FD_CHECK(double, cosh, {-0.1, 0.1})
+FD_CHECK(double, tanh, {-0.1, 0.1})
+FD_CHECK(double, asinh, {-0.1, 0.1})
+FD_CHECK(double, acosh, {-1.1, 1.1})
+FD_CHECK(double, atanh, {-0.1, 0.1})
+FD_CHECK(double, log1p, {-0.1, 0.1})
+FD_CHECK(double, expm1, {-0.1, 0.1})
 
 FD_CHECK(double, erf, {-1,0,1})
 FD_CHECK(double, erfc, {-1,0,1})
@@ -97,6 +125,8 @@ TEST(func, tgamma) {
   //EXPECT_EQ(tgamma(x).rpart(), 362880); "interestingly", compiling without optimization (-O0) causes this to fail
   EXPECT_NEAR(tgamma(x).rpart(), 362880, 362880 * 100 * std::numeric_limits<double>::epsilon());
 }
+
+// part selection functions
 TEST(func, rpart) {
   dualf x = 10 + 4_e;
   EXPECT_EQ(rpart(x), 10);
@@ -105,16 +135,258 @@ TEST(func, dpart) {
   dualf x = 2 + 4_e;
   EXPECT_EQ(dpart(x), 4);
 }
+
+// non-differentiable operations on the real part.
 TEST(func, abs) {
+  dualf x = -10 + 4_e;
+  EXPECT_EQ(abs(x), 10);
 }
-TEST(func, arg) {
+TEST(func, fabs) {
+  dualf x = -10 + 4_e;
+  EXPECT_EQ(fabs(x), 10);
+}
+TEST(func, fmax) {
+  dualf x = -10 + 4_e;
+  dualf y = 10 + 4_e;
+  EXPECT_EQ(fmax(x, y), 10);
+}
+TEST(func, fmin) {
+  dualf x = -10 + 4_e;
+  dualf y = 10 + 4_e;
+  EXPECT_EQ(fmin(x, y), -10);
+}
+TEST(func, frexp) {
+  dualf x = 6 + 4_e;
+  int exp = 0;
+  EXPECT_EQ(frexp(x, &exp), 0.75);
+  EXPECT_EQ(exp, 3);
+}
+TEST(func, ldexp) {
+  dualf x = 0.5 + 4_e;
+  int exp = 1;
+  EXPECT_EQ(ldexp(x, exp), 1);
+}
+TEST(func, trunc) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(trunc(x), 1);
+}
+TEST(func, floor) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(floor(x), 1);
+}
+TEST(func, ceil) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(ceil(x), 2);
+}
+TEST(func, round) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(round(x), 2);
+}
+// floating point functions
+TEST(func, fpclassify) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(fpclassify(x), FP_NORMAL);
+  EXPECT_EQ(fpclassify(std::numeric_limits<dualf>::infinity()), FP_INFINITE);
+  EXPECT_EQ(fpclassify(std::numeric_limits<dualf>::quiet_NaN()), FP_NAN);
+  if (std::numeric_limits<dualf>::has_denorm != std::denorm_absent) {
+    EXPECT_EQ(fpclassify(std::numeric_limits<dualf>::denorm_min()), FP_SUBNORMAL);
+  }
+  EXPECT_EQ(fpclassify(x+std::numeric_limits<dualf>::min()), FP_NORMAL);
+  EXPECT_EQ(fpclassify(2*std::numeric_limits<dualf>::max()), FP_INFINITE);
+  EXPECT_EQ(fpclassify(x+std::numeric_limits<dualf>::epsilon()), FP_NORMAL);
+}
+TEST(func, isfinite) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(isfinite(x), true);
+}
+TEST(func, isnormal) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(isnormal(x), true);
+}
+TEST(func, isinf) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(isinf(x), false);
+}
+TEST(func, isnan) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(isnan(x), false);
+}
+TEST(func, signbit) {
+  dualf x = 1.5 + 4_e;
+  EXPECT_EQ(signbit(x), false);
+}
+TEST(func, copysign) {
+  dualf x = 1.5 + 4_e;
+  dualf y = -1.3 + 2_e;
+  EXPECT_EQ(copysign(x, y), -1.5);
+}
+
+// Utility functions
+TEST(func, random) {
+  dualf x = random(0.001 + 0.001_e, 1 + 1_e);
+  EXPECT_GE(rpart(x), 0.001);
+  EXPECT_LE(rpart(x), 1);
+  EXPECT_GE(dpart(x), 0.001);
+  EXPECT_LE(dpart(x), 1);
+}
+
+TEST(func, random2) {
+  dualf x = duals::randos::random2(0.001 + 0.001_e, 1 + 1_e);
+  EXPECT_GE(rpart(x), 0.001);
+  EXPECT_LE(rpart(x), 1);
+  EXPECT_GE(dpart(x), 0.001);
+  EXPECT_LE(dpart(x), 1);
+}
+
+// more tests
+TEST(func, logb) {
+  dualf x = 4 + 1_e;
+  EXPECT_EQ(rpart(logb(.5 + 1_e)), -1.);
+  EXPECT_EQ(rpart(logb(1 + 1_e)), 0.);
+  EXPECT_EQ(rpart(logb(2 + 1_e)), 1.);
+  EXPECT_EQ(rpart(logb(3 + 1_e)), 1.);
+  EXPECT_EQ(rpart(logb(4 + 1_e)), 2.);
+  EXPECT_EQ(rpart(logb(x * x)), 4.);
+
+  EXPECT_EQ(dpart(logb(4 + 8_e)), std::numeric_limits<dualf>::infinity());
+  EXPECT_EQ(dpart(logb(4.01 + 8_e)), 0.);
+
+  EXPECT_EQ(dpart(logb(x * x)), std::numeric_limits<dualf>::infinity());
+  EXPECT_EQ(dpart(logb(3 * x)), 0.);
+  x += 0.01;
+  EXPECT_EQ(dpart(logb(3 * x)), 0.);
+  EXPECT_EQ(dpart(logb(x * x)), 0.);
+}
+
+TEST(func, pow) {
+  dualf x = pow(0 + 0_e, 0.);
+  EXPECT_EQ(rpart(x), 1);
+  EXPECT_EQ(dpart(x), 0);
+
+  dualf y = pow(0 + 0_e, 0. + 0_e);
+  EXPECT_EQ(rpart(y), 1);
+  EXPECT_EQ(dpart(y), 0);
+
+  dualf z = pow(0, 0. + 0_e);
+  EXPECT_EQ(rpart(z), 1);
+  EXPECT_EQ(dpart(z), 0);
+}
+TEST(func, pow_complex) {
+  std::complex<dualf> C(3+4_ef, 5+6_ef);
+  std::complex<dualf> x = std::pow(C, 2+1_ef);
+  std::complex<float> ref = std::complex<float>(std::pow(std::complex<float>(3,5), 2));
+  EXPECT_NEAR(rpart(x.real()), ref.real(), 1e-5);
+  EXPECT_NEAR(rpart(x.imag()), ref.imag(), 1e-6);
+  //EXPECT_EQ(dpart(x), std::pow(std::complex<float>(3, 5), 2) * (2+1_ef));
+}
+
+//----------------------------------------------------------------------
+// Test for pow_dual_complex(const dual<T>& realBase, const std::complex<dual<T>>& complexExponent)
+//----------------------------------------------------------------------
+TEST(func, PowDualComplexTest)
+{
+    // 1) Prepare inputs:
+    //    realBase = 2.0 (with zero derivative for this example)
+    duald realBase(2.0f);
+    
+    //    complexExponent = (1.5 + 0.7i),
+    //    each part a dual with .rpart() = 1.5 or 0.7, derivative 0
+    std::complex<duald> complexExponent(duald(1.5f), duald(0.7f));
+    
+    // 2) Call the function we want to test:
+    //    x^y  =>  pow_dual_complex(realBase, complexExponent)
+    std::complex<duald> result = std::pow(realBase, complexExponent);
+
+    // 3) Reference: use standard pow in double
+    double dblBase = 2.0;
+    std::complex<double> dblExponent(1.5, 0.7);
+    std::complex<double> reference = std::pow(dblBase, dblExponent);
+
+    // 4) Compare the .rpart() of the dual’s real/imag with reference
+    EXPECT_NEAR(result.real().rpart(), reference.real(), 1e-6);
+    EXPECT_NEAR(result.imag().rpart(), reference.imag(), 1e-6);
+}
+
+//----------------------------------------------------------------------
+// Test for pow_complex_dual(const std::complex<dual<T>>& complexBase, const dual<T>& realExponent)
+//----------------------------------------------------------------------
+TEST(func, PowComplexDualTest)
+{
+    // 1) Prepare inputs:
+    //    complexBase = (3 + 5i), each part dual with zero derivative
+    std::complex<duald> complexBase(duald(3.0f), duald(5.0f));
+
+    //    realExponent = 2.0 as a dual
+    duald realExponent(2.0f);
+
+    // 2) Call the function we want to test:
+    //    x^y => pow_complex_dual(complexBase, realExponent)
+    std::complex<duald> result = pow(complexBase, realExponent);
+
+    // 3) Reference: again, standard pow in double
+    std::complex<double> dblBase(3.0, 5.0);
+    double               dblExponent = 2.0;
+    std::complex<double> reference   = std::pow(dblBase, dblExponent);
+
+    // 4) Compare the .rpart() of the dual’s real/imag with reference
+    EXPECT_NEAR(result.real().rpart(), reference.real(), 1e-6);
+    EXPECT_NEAR(result.imag().rpart(), reference.imag(), 1e-6);
 }
 TEST(func, norm) {
+  // TODO
 }
 TEST(func, conj) {
+  // TODO
 }
 TEST(func, polar) {
+  // TODO
 }
+TEST(func, atan) {
+  EXPECT_EQ(rpart(atan(0 + 1_e)), atan(0));
+  EXPECT_EQ(dpart(atan(1_e)), 1);
+  EXPECT_EQ(dpart(atan(1 + 1_e)), 0.5);  // = 1 / (1 + x^2)
+  EXPECT_EQ(dpart(atan(-2 + 1_e)), 1. / 5.);  // = 1 / (1 + x^2)
+}
+TEST(func, atan2) {
+  // TODO
+  //EXPECT_EQ(dpart(atan2(1_e, 1)), 1);
+  //EXPECT_EQ(dpart(atan2(1 + 1_e, 1)), 0.5);
+  //EXPECT_EQ(dpart(atan2(-2 + 1_e, 1)), (1. / 5.));
+  duald y = 1 + 1_e;
+  duald x = 1 + 0_e;
+  auto z = atan2(y, x);
+  z = atan2(y, x);
+  EXPECT_EQ(rpart(z), atan2(rpart(y), rpart(x)));
+  EXPECT_EQ(dpart(z), 0.5);
+
+  y = -2 + 1_e;
+  x = 1 + 0_e;
+  z = atan2(y, x);
+  EXPECT_EQ(rpart(z), atan2(rpart(y), rpart(x)));
+  EXPECT_EQ(dpart(z), 1. / 5.);
+
+  y = 1 + 0_e;
+  x = -2 + 1_e;
+  z = atan2(y, x);
+  EXPECT_EQ(rpart(z), atan2(rpart(y), rpart(x)));
+  EXPECT_EQ(dpart(z), -1. / 5.);
+}
+TEST(func, atan2a) {
+  // TODO
+  duald y = 1 + 1_e;
+  EXPECT_EQ(rpart(atan2(y, 1)), atan2(rpart(y), 1));
+  EXPECT_EQ(rpart(atan2(y, 2)), atan2(rpart(y), 2));
+  EXPECT_EQ(dpart(atan2(y, 1)), 0.5);
+  y = 2 + 1_e;
+  EXPECT_EQ(dpart(atan2(y, -2)), -0.25);
+}
+TEST(func, atan2b) {
+  // TODO
+  duald x = 10 + 1_e;
+  EXPECT_EQ(rpart(atan2(2, x)), atan2(2, rpart(x)));
+  EXPECT_EQ(dpart(atan2(2, x)), -1./52);
+}
+
 
 struct pike_f1 {
   // function

src/include/cppduals/tests/test_packets.cpp

@@ -16,8 +16,8 @@
  * (c)2019 Michael Tesch. tesch1@gmail.com
  */
 
-#include "type_name.hpp"
 #include <duals/dual_eigen>
+#include "type_name.hpp"
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
 #include <Eigen/StdVector>
@@ -60,6 +60,7 @@ template <int N=2, int K = N> using ecdf = Eigen::Matrix<cdualf, N, K> ;
 
 #if !defined(CPPDUALS_DONT_VECTORIZE) && !defined(EIGEN_DONT_VECTORIZE)
 
+#ifdef EIGEN_VECTORIZE_SSE
 TEST(Packet1cdf, pload_pstore) {
   using namespace Eigen::internal;
   cdualf cd1 = cdualf(1+2_ef,3+4_ef);
@@ -68,6 +69,7 @@ TEST(Packet1cdf, pload_pstore) {
   pstore(&cd2, p1);
   EXPECT_DEQ(cd1, cd2);
 }
+#endif
 
 using duals::randos::random2;
 
@@ -89,11 +91,11 @@ using duals::randos::random2;
     pstore(cd3.data(), p3);                                             \
     for (int i = 0; i < N; i++) {                                       \
       EXPECT_DNEAR(cd3[i], cd1[i] op cd2[i], tol)                       \
-        << cd1[i] << ',' << cd2[i] << " fail at " << i;                 \
+        << cd1[i] << #op << cd2[i] << "=" << cd3[i] << "!=" << (cd1[i] op cd2[i]) << " fail at " << i << "/" << N; \
     }                                                                   \
   }
 
-#define GEN_PACKET_TEST_UN(PTYPE,pop,op) TEST(PTYPE,pop) {      \
+#define GEN_PACKET_TEST_UN(PTYPE,pop,op) TEST(PTYPE,pop) {              \
     using namespace Eigen::internal;                                    \
     typedef unpacket_traits<PTYPE>::type DTYPE;                         \
     const static int N = unpacket_traits<PTYPE>::size;                  \
@@ -112,7 +114,7 @@ using duals::randos::random2;
     }                                                                   \
   }
 
-#define GEN_PACKET_TEST_RD(PTYPE,pop,op) TEST(PTYPE,pop) {      \
+#define GEN_PACKET_TEST_RD(PTYPE,pop,op) TEST(PTYPE,pop) {              \
     using namespace Eigen::internal;                                    \
     typedef unpacket_traits<PTYPE>::type DTYPE;                         \
     const static int N = unpacket_traits<PTYPE>::size;                  \
@@ -131,7 +133,7 @@ using duals::randos::random2;
       << acc << " " << p2 << " fail.";                                  \
   }
 
-#define GEN_PACKET_TEST_REVERSE(PTYPE) TEST(PTYPE,preverse) {   \
+#define GEN_PACKET_TEST_REVERSE(PTYPE) TEST(PTYPE,preverse) {           \
     using namespace Eigen::internal;                                    \
     typedef unpacket_traits<PTYPE>::type DTYPE;                         \
     const static int N = unpacket_traits<PTYPE>::size;                  \
@@ -149,7 +151,7 @@ using duals::randos::random2;
     }                                                                   \
   }
 
-#define GEN_PACKET_TEST_FIRST(PTYPE) TEST(PTYPE,pfirst) {       \
+#define GEN_PACKET_TEST_FIRST(PTYPE) TEST(PTYPE,pfirst) {               \
     using namespace Eigen::internal;                                    \
     typedef unpacket_traits<PTYPE>::type DTYPE;                         \
     const static int N = unpacket_traits<PTYPE>::size;                  \
@@ -323,13 +325,11 @@ using duals::randos::random2;
   GEN_PACKET_TEST_UN(PTYPE,pconj,conj)
 
 // TODO:
-//pcplxflip
 //preduxp
 //pand
 //por
 //pxor
 //andnot
-//pbroadcast4
 //ploadquad (for packets w/ size==8)
 //pgather
 //pscatter
@@ -345,7 +345,7 @@ GEN_CPACKET_TESTS(Packet2cf)
 GEN_CPACKET_TESTS(Packet4cf)
 #endif
 
-#ifdef EIGEN_VECTORIZE_SSE
+#if defined(EIGEN_VECTORIZE_SSE) || defined(EIGEN_VECTORIZE_NEON)
 GEN_PACKET_TESTS(Packet2df)
 GEN_PACKET_TESTS(Packet1dd)
 GEN_CPACKET_TESTS(Packet1cdf)
@@ -368,20 +368,28 @@ TEST(compile, VECTORIZE) {
 #endif
 }
 TEST(compile, SSE) {
+#ifdef EIGEN_VECTORIZE_SSE
   EXPECT_TRUE(std::string(Eigen::SimdInstructionSetsInUse()).find("SSE") != std::string::npos)
-    << "Not using SSE instructions:" << Eigen::SimdInstructionSetsInUse();
-#ifndef EIGEN_VECTORIZE_SSE
-  EXPECT_TRUE(false)
-    << "Not using EIGEN_VECTORIZE_SSE:" << Eigen::SimdInstructionSetsInUse();
+#else
+  EXPECT_TRUE(true)
 #endif
+    << "Not using EIGEN_VECTORIZE_SSE:" << Eigen::SimdInstructionSetsInUse();
 }
 TEST(compile, AVX) {
+#ifdef EIGEN_VECTORIZE_AVX
   EXPECT_TRUE(std::string(Eigen::SimdInstructionSetsInUse()).find("AVX") != std::string::npos)
-    << "Not using AVX instructions:" << Eigen::SimdInstructionSetsInUse();
-#ifndef EIGEN_VECTORIZE_AVX
-  EXPECT_TRUE(false)
-    << "Not using EIGEN_VECTORIZE_AVX:" << Eigen::SimdInstructionSetsInUse();
+#else
+  EXPECT_TRUE(true)
 #endif
+    << "Not using EIGEN_VECTORIZE_AVX:" << Eigen::SimdInstructionSetsInUse();
+}
+TEST(compile, NEON) {
+#ifdef EIGEN_VECTORIZE_NEON
+  EXPECT_TRUE(std::string(Eigen::SimdInstructionSetsInUse()).find("NEON") != std::string::npos)
+#else
+  EXPECT_TRUE(true)
+#endif
+    << "Not using EIGEN_VECTORIZE_NEON:" << Eigen::SimdInstructionSetsInUse();
 }
 
 #define QUOTE(...) STRFY(__VA_ARGS__)

src/include/cppduals/tests/test_solve.cpp

@@ -16,8 +16,8 @@
  * (c)2019 Michael Tesch. tesch1@gmail.com
  */
 
-#include "type_name.hpp"
 #include <duals/dual_eigen>
+#include "type_name.hpp"
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
 #include <Eigen/StdVector>
@@ -78,7 +78,10 @@ void solveLu() {
   emtx<DT,NN> B = b + DT(0,1) * emtx<T,NN>::Random();
   emtx<DT,NN> C,D,E;
   C = A * B;
-  D = A.lu().solve(C);
+  // D = A.lu().solve(C);
+  // D = A.colPivHouseholderQr().solve(C);
+  // D = A.bdcSvd().solve(C);
+  D = A.fullPivLu().solve(C);
   EXPECT_LT(rpart(B - D).norm(), tol);
   EXPECT_LT(dpart(B - D).norm(), tol);
 }

src/include/cppduals/tests/test_vectorize.cpp

@@ -16,8 +16,8 @@
  * (c)2019 Michael Tesch. tesch1@gmail.com
  */
 
-#include "type_name.hpp"
 #include <duals/dual_eigen>
+#include "type_name.hpp"
 #include <Eigen/Dense>
 #include <Eigen/Sparse>
 #include <Eigen/StdVector>
@@ -52,7 +52,7 @@ template <int N=2, int K = N> using ecdf = Eigen::Matrix<cdualf, N, K> ;
 #define _EXPECT_FALSE(...) {typedef __VA_ARGS__ fal; EXPECT_FALSE(fal::value); static_assert(!fal::value, "sa"); }
 #define ASSERT_DEQ(A,B) ASSERT_EQ(rpart(A), rpart(B)); ASSERT_EQ(dpart(A), dpart(B))
 #define ASSERT_DNEAR(A,B,tol)                                   \
-  ASSERT_NEAR(abs(rpart((A) - (B))),0,abs(rpart(A))*(tol));     \
+  ASSERT_NEAR(abs(rpart((A) - (B))),0,abs(rpart(A))*(tol)) << "rpart " << A << " " << B << "\n";     \
   ASSERT_NEAR(abs(dpart((A) - (B))),0,abs(dpart(A))*(tol))
 #define EXPECT_DEQ(A,B) EXPECT_EQ(rpart(A), rpart(B)); EXPECT_EQ(dpart(A), dpart(B))
 #define EXPECT_DNE(A,B) EXPECT_NE(rpart(A), rpart(B)); EXPECT_NE(dpart(A), dpart(B))
@@ -117,9 +117,9 @@ void elemwise(int N) {
     ASSERT_DEQ(cca[i], Cca(i)) << "ca mismatch at " << i << "\n";
     ASSERT_DEQ(ccb[i], Ccb(i)) << "cb mismatch at " << i << "\n";
   }
-  ASSERT_DNEAR(sum, A.sum(), N*tol);
-  ASSERT_DNEAR(sum, A.sum(), N*tol);
+  ASSERT_DNEAR(sum, A.sum(), N*tol) << "sum mismatch at " << sum << " " << A.sum() << "\n";
 }
+#if defined(PHASE_1)
 
 TEST(Vector, full_even_dualf) { elemwise<dualf>(512); }
 TEST(Vector, full_even_duald) { elemwise<duald>(512); }
@@ -136,6 +136,7 @@ TEST(Vector, single_elem_cdualf) { elemwise<cdualf>(1); }
 TEST(Vector, two_elem_dualf) { elemwise<dualf>(2); }
 TEST(Vector, two_elem_duald) { elemwise<duald>(2); }
 TEST(Vector, two_elem_cdualf) { elemwise<cdualf>(2); }
+#endif
 
 #define DBOUT(X)
 #define MAKE_MULT_TEST(TYPE1, TYPE2, FIX, SIZE)                     \
@@ -308,20 +309,30 @@ TEST(flags, VECTORIZE) {
 #endif
 }
 TEST(flags, SSE) {
+#ifdef EIGEN_VECTORIZE_SSE
   EXPECT_TRUE(std::string(Eigen::SimdInstructionSetsInUse()).find("SSE") != std::string::npos)
-    << "Not using SSE instructions:" << Eigen::SimdInstructionSetsInUse();
-#ifndef EIGEN_VECTORIZE_SSE
-  EXPECT_TRUE(false)
+#else
+  EXPECT_TRUE(true)
+#endif
     << "Not using EIGEN_VECTORIZE_SSE:" << Eigen::SimdInstructionSetsInUse();
-#endif
 }
+
 TEST(flags, AVX) {
+#ifdef EIGEN_VECTORIZE_AVX
   EXPECT_TRUE(std::string(Eigen::SimdInstructionSetsInUse()).find("AVX") != std::string::npos)
-    << "Not using AVX instructions:" << Eigen::SimdInstructionSetsInUse();
-#ifndef EIGEN_VECTORIZE_AVX
-  EXPECT_TRUE(false)
-    << "Not using EIGEN_VECTORIZE_AVX:" << Eigen::SimdInstructionSetsInUse();
+#else
+  EXPECT_TRUE(true)
 #endif
+    << "Not using EIGEN_VECTORIZE_AVX:" << Eigen::SimdInstructionSetsInUse();
+}
+
+TEST(flags, NEON) {
+#ifdef EIGEN_VECTORIZE_NEON
+  EXPECT_TRUE(std::string(Eigen::SimdInstructionSetsInUse()).find("NEON") != std::string::npos)
+#else
+  EXPECT_TRUE(true)
+#endif
+    << "Not using EIGEN_VECTORIZE_NEON:" << Eigen::SimdInstructionSetsInUse();
 }
 
 #define QUOTE(...) STRFY(__VA_ARGS__)

src/include/cppduals/thirdparty/CMakeLists.txt

@@ -4,12 +4,19 @@
 # 3.10 adds support for "gtest_discover_tests" which enumerates the tests inside
 # of the code and adds them to ctest.
 #
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.14)
 project (cppduals_thirdparty)
 include (ExternalProject)
 
 get_directory_property (hasParent PARENT_DIRECTORY)
 
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.23)
+  cmake_policy (SET CMP0135 NEW)
+endif ()
+if (CMAKE_XCODE_BUILD_SYSTEM VERSION_GREATER_EQUAL 12)
+  cmake_policy (SET CMP0114 NEW)
+endif ()
+
 set (DEPS_ROOT "${CMAKE_BINARY_DIR}/root")
 if (hasParent)
   set (DEPS_ROOT "${CMAKE_BINARY_DIR}/thirdparty/root" PARENT_SCOPE)
@@ -21,98 +28,109 @@ else (NOT WIN32)
   set (DOWNLOAD_DIR "C:/Downloads")
 endif (NOT WIN32)
 
+include(FetchContent)
+
 #
-# Google test (https://github.com/google/googletest/blob/master/googletest/README.md)
-#
+# Google test
+# https://google.github.io/googletest/quickstart-cmake.html
 
-# Download and unpack googletest at configure time
-configure_file (CMakeLists-gt.txt.in googletest-download/CMakeLists.txt)
-execute_process (COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-  RESULT_VARIABLE result
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download)
-if (result)
-  message (FATAL_ERROR "CMake step for googletest failed: ${result}")
-endif ()
-execute_process (COMMAND ${CMAKE_COMMAND} --build .
-  RESULT_VARIABLE result
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download)
-if (result)
-  message (FATAL_ERROR "Build step for googletest failed: ${result}")
-endif ()
+# 
+# Configure google-test
+FetchContent_Declare(
+  googletest
+  URL https://github.com/google/googletest/archive/refs/tags/v1.15.2.zip
+  URL_HASH MD5=eb1c5c237d13ed12bf492d3997ca6b0d
+  DOWNLOAD_NAME googletest-v1.15.2.zip
+  DOWNLOAD_DIR "$ENV{HOME}/Downloads"
+)
 
-# Prevent overriding the parent project's compiler/linker
-# settings on Windows
-set (gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
 
-# Add googletest directly to our build. This defines
-# the gtest and gtest_main targets.
-add_subdirectory (
-  ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-  ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
-  EXCLUDE_FROM_ALL)
-
-# The gtest/gtest_main targets carry header search path
-# dependencies automatically when using CMake 2.8.11 or
-# later. Otherwise we have to add them here ourselves.
-if (CMAKE_VERSION VERSION_LESS 2.8.11)
-  include_directories ("${gtest_SOURCE_DIR}/include")
-endif ()
-
-# Can simply link against gtest or gtest_main as needed. Eg
-#add_executable (example example.cpp)
-#target_link_libraries (example gtest_main)
-#add_test (NAME example_test COMMAND example)
+# Enable testing
+include(GoogleTest)
 
 #
 # Eigen
 #
-if (CPPDUALS_EIGEN_LATEST)
-  set (EIGEN_URL http://bitbucket.org/eigen/eigen/get/default.tar.bz2)
-  #set (EIGEN_MD5 ffc83130dcd37b694c6cf7e905099af9)
+if (TRUE)
+  set (EIGEN_URL https://gitlab.com/libeigen/eigen/-/archive/3.3.8/eigen-3.3.8.tar.bz2)
+  set (EIGEN_MD5 432ef01499d514f4606343276afa0ec3)
+  set (EIGEN_MAX_CXX 17)
 else ()
-  set (EIGEN_URL http://bitbucket.org/eigen/eigen/get/3.3.7.tar.bz2)
-  set (EIGEN_MD5 05b1f7511c93980c385ebe11bd3c93fa)
+  set (EIGEN_URL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2)
+  set (EIGEN_MD5 b9e98a200d2455f06db9c661c5610496)
+  set (EIGEN_MAX_CXX 17)
 endif ()
-
+#
+# Eigen
+#
 ExternalProject_Add (eigenX
   PREFIX eigenX
   URL ${EIGEN_URL}
-  #URL_HASH MD5=${EIGEN_MD5}
+  URL_HASH MD5=${EIGEN_MD5}
   DOWNLOAD_DIR "$ENV{HOME}/Downloads"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
+  LOG_DOWNLOAD ON
   )
 ExternalProject_Get_Property (eigenX source_dir)
-if (hasParent AND NOT EIGEN3_INCLUDE_DIRS)
-  set (EIGEN3_INCLUDE_DIRS "${source_dir}" PARENT_SCOPE)
+if (true) # || hasParent
+  add_library (eigen INTERFACE IMPORTED GLOBAL)
+  add_dependencies (eigen eigenX)
+  set_property (TARGET eigen APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${source_dir}")
+  if (XCODE)
+    set (IOFORMAT "IOFormat\(FullPrecision, DontAlignCols, \", \", \"\\$<SEMICOLON>\\\\n\", \"\", \"\", \"[\", \"]\"\)")
+  else ()
+    set (IOFORMAT "IOFormat\(FullPrecision, DontAlignCols, \", \", \"\\$<SEMICOLON>\\n\", \"\", \"\", \"[\", \"]\"\)")
+  endif ()
+  #target_compile_definitions (eigen INTERFACE EIGEN_DEFAULT_IO_FORMAT=${IOFORMAT})
+  #target_compile_definitions (eigen INTERFACE EIGEN_DEFAULT_IO_FORMAT=EIGEN_IO_FORMAT_OCTAVE)
+  set_property (TARGET eigen APPEND PROPERTY
+    INTERFACE_COMPILE_DEFINITIONS EIGEN_DEFAULT_IO_FORMAT=${IOFORMAT})
+endif ()
+
+# if c++20, disable warning -Wdeprecated-enum-enum-conversion to eigen
+if (CMAKE_CXX_STANDARD GREATER_EQUAL 20)
+  target_compile_options (eigen INTERFACE -Wno-deprecated-enum-enum-conversion)
 endif ()
 
 #
-# Eigen-Expokit
+# expokit
 #
-set (EEX_SHA 72bf6e445d5ae84218dcbd74580720491e0074db  )
+#set (EEX_SHA  ee28baa3bf29561501e17e5c68c2e54c85daae19  ) newer? used by spindropsSDL. md5=cebd15f9b5068c0e327753244ff6d394
+set (EEX_SHA c157dec0057be6e183a1ea2a5de353fac7e5e3a7 )
+set (EEX_MD5 89484e51f706398284235b96bc805515 )
 ExternalProject_Add (expokitX
   PREFIX expokitX
-  URL https://gitlab.com/api/v4/projects/tesch1%2Feigen-expokit/repository/archive.tbz2?sha=${EEX_SHA}
-  #URL_HASH MD5=96b79de1d01547f6d658865b7caa02ee
+  URL https://gitlab.com/tesch1/eigen-expokit/-/archive/${EEX_SHA}/eigen-expokit.tar.bz2
+  URL_HASH MD5=${EEX_MD5}
+  DOWNLOAD_NAME eigen-expokit-${EEX_SHA}.tar.bz2
   DOWNLOAD_DIR "$ENV{HOME}/Downloads"
+  UPDATE_COMMAND ""
+  PATCH_COMMAND ""
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
+  LOG_DOWNLOAD ON
   )
 ExternalProject_Get_Property (expokitX source_dir)
 if (hasParent)
-  set (EXPOKIT_INCLUDE_DIR "${source_dir}" PARENT_SCOPE)
-endif()
+  add_library (expokit INTERFACE IMPORTED GLOBAL)
+  add_dependencies (expokit expokitX)
+  set_property (TARGET expokit APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${source_dir}")
+endif (hasParent)
+
 
 #
 # fmt
 #
 ExternalProject_Add (fmtX
   PREFIX fmtX
-  URL https://github.com/fmtlib/fmt/archive/6.1.1.tar.gz
-  URL_HASH MD5=acfb83d44afdca171ee26c597c931e7c
+  URL https://github.com/fmtlib/fmt/archive/11.1.4.tar.gz
+  URL_HASH MD5=10c2ae163accd3b82e6b8b4dff877645
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
@@ -121,7 +139,6 @@ ExternalProject_Add (fmtX
 ExternalProject_Get_Property (fmtX source_dir)
 ExternalProject_Get_Property (fmtX binary_dir)
 if (hasParent)
-  message (" FMT3_INCLUDE_DIRS: ${source_dir}")
   add_subdirectory (${source_dir} ${binary_dir} EXCLUDE_FROM_ALL)
 endif ()
 
@@ -131,19 +148,20 @@ if (CPPDUALS_BENCHMARK)
   #
   ExternalProject_Add (benchmarkX
     PREFIX benchmarkX
-    URL "http://github.com/google/benchmark/archive/v1.5.0.tar.gz"
-    URL_HASH MD5=eb1466370f3ae31e74557baa29729e9e
+    URL "http://github.com/google/benchmark/archive/v1.9.1.tar.gz"
+    URL_HASH MD5=92000ef8b4a7b1e9229972f8943070a7
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    CMAKE_ARGS --target install -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_USE_LIBCXX=${CPPDUALS_USE_LIBCXX}
-    "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
-    INSTALL_DIR "${DEPS_ROOT}"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
     )
   ExternalProject_Get_Property (benchmarkX source_dir)
-  ExternalProject_Get_Property (benchmarkX install_dir)
+  ExternalProject_Get_Property (benchmarkX binary_dir)
   if (hasParent)
-    set (BENCHMARK_SRC_DIR "${source_dir}" PARENT_SCOPE)
-    set (BENCHMARK_INC_DIR "${install_dir}/include" PARENT_SCOPE)
-    message (" BENCHMARK_SRC_DIR: ${BENCHMARK_SRC_DIR}")
+    # https://github.com/google/benchmark#requirements
+    set (BENCHMARK_ENABLE_GTEST_TESTS OFF)
+    set (BENCHMARK_USE_LIBCXX ${CPPDUALS_USE_LIBCXX})
+    add_subdirectory (${source_dir} ${binary_dir} EXCLUDE_FROM_ALL)
   endif()
 
   if (Boost_FOUND AND NO)
@@ -158,18 +176,6 @@ if (CPPDUALS_BENCHMARK)
       set (Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} PARENT_SCOPE)
     endif ()
 
-    # piranha
-    ExternalProject_Add (piranhaX PREFIX piranhaX
-      URL https://github.com/bluescarni/piranha/archive/v0.11.tar.gz
-      URL_HASH MD5=33482f719f6b8a6a5316f9bd148f5b10
-      DOWNLOAD_DIR "$ENV{HOME}/Downloads"
-      CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ""
-      )
-    ExternalProject_Get_Property (piranhaX source_dir)
-    if (hasParent)
-      set (PIRANHA_INCLUDE_DIR "${source_dir}/include" PARENT_SCOPE)
-    endif ()
-
     # AuDi
     ExternalProject_Add (audiX PREFIX audiX
       URL https://github.com/darioizzo/audi/archive/v1.6.5.tar.gz

src/include/ngspice/cmproto.h

@@ -99,6 +99,7 @@ double cm_netlist_get_l(void);
 
 void        cm_irreversible(unsigned int);
 const char *cm_get_node_name(const char *, unsigned int);
+const char *cm_get_neg_node_name(const char *, unsigned int);
 bool        cm_probe_node(unsigned int, unsigned int, void *);
 bool        cm_schedule_output(unsigned int, unsigned int, double, void *);
 

src/include/ngspice/dllitf.h

@@ -61,6 +61,7 @@ struct coreInfo_t {
 	double    ((*dllitf_cm_netlist_get_l)(void));
         void      ((*dllitf_cm_irreversible)(unsigned int));
     const char *  ((*dllitf_cm_get_node_name)(const char *, unsigned int));
+	const char* ((*dllitf_cm_get_neg_node_name)(const char*, unsigned int));
     bool          ((*dllitf_cm_probe_node)(unsigned int, unsigned int,
                                            void *));
         bool      ((*dllitf_cm_schedule_output)(unsigned int, unsigned int,

src/misc/misc_time.c

@@ -1,159 +1,159 @@
-/**********
-Copyright 1990 Regents of the University of California.  All rights reserved.
-**********/
-
-/*
- * Date and time utility functions
- */
-
-#include "ngspice/ngspice.h"
-#include <string.h>
-
-#if defined(HAS_WINGUI) || defined(__MINGW32__) || defined(_MSC_VER)
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#ifndef HAVE_GETTIMEOFDAY
-#include <winsock2.h>
-#include <stdint.h> // portable: uint64_t   MSVC: __int64
-
-/*/ MSVC defines this in winsock2.h!?
-typedef struct timeval {
-    long tv_sec;
-    long tv_usec;
-} timeval;
-*/
-int gettimeofday(struct timeval * tp, void * unused)
-{
-    NG_IGNORE(unused);
-    // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's
-    // This magic number is the number of 100 nanosecond intervals since January 1, 1601 (UTC)
-    // until 00:00:00 January 1, 1970
-    static const uint64_t EPOCH = ((uint64_t) 116444736000000000ULL);
-
-    SYSTEMTIME  system_time;
-    FILETIME    file_time;
-    uint64_t    time;
-
-    GetSystemTime( &system_time );
-    SystemTimeToFileTime( &system_time, &file_time );
-    time =  ((uint64_t)file_time.dwLowDateTime )      ;
-    time += ((uint64_t)file_time.dwHighDateTime) << 32;
-
-    tp->tv_sec  = (long) ((time - EPOCH) / 10000000L);
-    tp->tv_usec = (long) (system_time.wMilliseconds * 1000);
-    return 0;
-}
-#endif
-#endif
-
-#include "misc_time.h"
-
-#ifdef USE_OMP
-#include <omp.h>
-#endif
-
-/* Return the date. Return value is static data. */
-
-char *
-datestring(void)
-{
-
-#ifdef HAVE_LOCALTIME
-    static char tbuf[45];
-    struct tm *tp;
-    char *ap;
-    size_t i;
-
-    time_t tloc;
-    time(&tloc);
-    tp = localtime(&tloc);
-    ap = asctime(tp);
-    (void) sprintf(tbuf, "%.20s", ap);
-    (void) strcat(tbuf, ap + 19);
-    i = strlen(tbuf);
-    tbuf[i - 1] = '\0';
-    return (tbuf);
-
-#else
-
-    return ("today");
-
-#endif
-}
-
-/* return time interval in seconds and milliseconds */
-
-PerfTime timebegin;
-
-void timediff(PerfTime *now, PerfTime *begin, int *sec, int *msec)
-{
-
-    *msec = (int) now->milliseconds - (int) begin->milliseconds;
-    *sec = (int) now->seconds - (int) begin->seconds;
-    if (*msec < 0) {
-      *msec += 1000;
-      (*sec)--;
-    }
-    return;
-
-}
-
-/*
- * How many seconds have elapsed in running time.
- * This is the routine called in IFseconds
- */
-
-double
-seconds(void)
-{
-#ifdef USE_OMP
-    // Usage of OpenMP time function
-    return(omp_get_wtime() - timebegin.secs);
-#elif defined(HAVE_QUERYPERFORMANCECOUNTER)
-    // Windows (MSC and mingw) specific implementation
-    LARGE_INTEGER frequency, counter;
-    QueryPerformanceFrequency(&frequency);
-    QueryPerformanceCounter(&counter);
-    return ((double)counter.QuadPart / frequency.QuadPart - timebegin.secs);
-#elif defined(HAVE_CLOCK_GETTIME)
-    struct timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    return (ts.tv_sec + ts.tv_nsec / 1e9 - timebegin.secs);
-#elif defined(HAVE_GETTIMEOFDAY)
-    // Usage of gettimeofday
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (tv.tv_sec + tv.tv_usec / 1e6 - timebegin.secs);
-#elif defined(HAVE_FTIME)
-    // Usage of ftime
-    struct timeb tb;
-    PerfTime timenow;
-    int sec, msec;
-    ftime(&tb);
-    timenow.seconds = tb.time;
-    timenow.milliseconds = tb.millitm;
-    timediff(&timenow, &timebegin, &sec, &msec);
-    return(sec + (double) msec / 1000.0);
-#elif defined(HAVE_TIMES)
-    // Usage of times
-    struct tms tmsbuf;
-    clock_t ticks = times(&tmsbuf);
-    return((double) tmsbuf.tms_utime / HZ);
-#elif defined(HAVE_GETRUSAGE)
-    // Usage of getrusage
-    struct rusage ruse;
-    getrusage(RUSAGE_SELF, &ruse);
-    return ((double)ruse.ru_utime.tv_sec + (double) ruse.ru_utime.tv_usec / 1000000.0);
-#else
-    #error "No timer function available."
-#endif
-}
-
-void perf_timer_get_time(PerfTime *time)
-{
-    time->secs = seconds();
-    time->seconds = (int)time->secs;
-    time->milliseconds = (int)((time->secs - time->seconds) * 1000.0);
-
-}
+/**********
+Copyright 1990 Regents of the University of California.  All rights reserved.
+**********/
+
+/*
+ * Date and time utility functions
+ */
+
+#include "ngspice/ngspice.h"
+#include <string.h>
+
+#if defined(HAS_WINGUI) || defined(__MINGW32__) || defined(_MSC_VER)
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>
+#ifndef HAVE_GETTIMEOFDAY
+#include <winsock2.h>
+#include <stdint.h> // portable: uint64_t   MSVC: __int64
+
+/*/ MSVC defines this in winsock2.h!?
+typedef struct timeval {
+    long tv_sec;
+    long tv_usec;
+} timeval;
+*/
+int gettimeofday(struct timeval * tp, void * unused)
+{
+    NG_IGNORE(unused);
+    // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's
+    // This magic number is the number of 100 nanosecond intervals since January 1, 1601 (UTC)
+    // until 00:00:00 January 1, 1970
+    static const uint64_t EPOCH = ((uint64_t) 116444736000000000ULL);
+
+    SYSTEMTIME  system_time;
+    FILETIME    file_time;
+    uint64_t    time;
+
+    GetSystemTime( &system_time );
+    SystemTimeToFileTime( &system_time, &file_time );
+    time =  ((uint64_t)file_time.dwLowDateTime )      ;
+    time += ((uint64_t)file_time.dwHighDateTime) << 32;
+
+    tp->tv_sec  = (long) ((time - EPOCH) / 10000000L);
+    tp->tv_usec = (long) (system_time.wMilliseconds * 1000);
+    return 0;
+}
+#endif
+#endif
+
+#include "misc_time.h"
+
+#ifdef USE_OMP
+#include <omp.h>
+#endif
+
+/* Return the date. Return value is static data. */
+
+char *
+datestring(void)
+{
+
+#ifdef HAVE_LOCALTIME
+    static char tbuf[45];
+    struct tm *tp;
+    char *ap;
+    size_t i;
+
+    time_t tloc;
+    time(&tloc);
+    tp = localtime(&tloc);
+    ap = asctime(tp);
+    (void) sprintf(tbuf, "%.20s", ap);
+    (void) strcat(tbuf, ap + 19);
+    i = strlen(tbuf);
+    tbuf[i - 1] = '\0';
+    return (tbuf);
+
+#else
+
+    return ("today");
+
+#endif
+}
+
+/* return time interval in seconds and milliseconds */
+
+PerfTime timebegin;
+
+void timediff(PerfTime *now, PerfTime *begin, int *sec, int *msec)
+{
+
+    *msec = (int) now->milliseconds - (int) begin->milliseconds;
+    *sec = (int) now->seconds - (int) begin->seconds;
+    if (*msec < 0) {
+      *msec += 1000;
+      (*sec)--;
+    }
+    return;
+
+}
+
+/*
+ * How many seconds have elapsed in running time.
+ * This is the routine called in IFseconds
+ */
+
+double
+seconds(void)
+{
+#ifdef USE_OMP
+    // Usage of OpenMP time function
+    return(omp_get_wtime() - timebegin.secs);
+#elif defined(HAVE_QUERYPERFORMANCECOUNTER)
+    // Windows (MSC and mingw) specific implementation
+    LARGE_INTEGER frequency, counter;
+    QueryPerformanceFrequency(&frequency);
+    QueryPerformanceCounter(&counter);
+    return ((double)counter.QuadPart / frequency.QuadPart - timebegin.secs);
+#elif defined(HAVE_CLOCK_GETTIME)
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    return (ts.tv_sec + ts.tv_nsec / 1e9 - timebegin.secs);
+#elif defined(HAVE_GETTIMEOFDAY)
+    // Usage of gettimeofday
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (tv.tv_sec + tv.tv_usec / 1e6 - timebegin.secs);
+#elif defined(HAVE_FTIME)
+    // Usage of ftime
+    struct timeb tb;
+    PerfTime timenow;
+    int sec, msec;
+    ftime(&tb);
+    timenow.seconds = tb.time;
+    timenow.milliseconds = tb.millitm;
+    timediff(&timenow, &timebegin, &sec, &msec);
+    return(sec + (double) msec / 1000.0);
+#elif defined(HAVE_TIMES)
+    // Usage of times
+    struct tms tmsbuf;
+    clock_t ticks = times(&tmsbuf);
+    return((double) tmsbuf.tms_utime / HZ);
+#elif defined(HAVE_GETRUSAGE)
+    // Usage of getrusage
+    struct rusage ruse;
+    getrusage(RUSAGE_SELF, &ruse);
+    return ((double)ruse.ru_utime.tv_sec + (double) ruse.ru_utime.tv_usec / 1000000.0);
+#else
+    #error "No timer function available."
+#endif
+}
+
+void perf_timer_get_time(PerfTime *time)
+{
+    time->secs = seconds();
+    time->seconds = (int)time->secs;
+    time->milliseconds = (int)((time->secs - time->seconds) * 1000.0);
+
+}

src/osdi/osdiext.h

@@ -22,6 +22,7 @@ extern int OSDIparam(int, IFvalue *, GENinstance *, IFvalue *);
 extern int OSDIsetup(SMPmatrix *, GENmodel *, CKTcircuit *, int *);
 extern int OSDIunsetup(GENmodel *, CKTcircuit *);
 extern int OSDIask(CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
+extern int OSDImAsk(CKTcircuit *, GENmodel *, int, IFvalue *);
 extern int OSDIload(GENmodel *, CKTcircuit *);
 extern int OSDItemp(GENmodel *, CKTcircuit *);
 extern int OSDIacLoad(GENmodel *, CKTcircuit *);
@@ -39,5 +40,4 @@ extern int OSDIbindCSCComplex(GENmodel *inModel, CKTcircuit *ckt);
 /* extern int OSDIconvTest(GENmodel*,CKTcircuit*); */
 /* extern int OSDImDelete(GENmodel*); */
 /* extern int OSDIgetic(GENmodel*,CKTcircuit*); */
-/* extern int OSDImAsk(CKTcircuit*,GENmodel*,int,IFvalue*); */
 /* extern int OSDIsoaCheck(CKTcircuit *, GENmodel *); */

src/osdi/osdiinit.c

@@ -188,6 +188,7 @@ extern SPICEdev *osdi_create_spicedev(const OsdiRegistryEntry *entry) {
   OSDIinfo->DEVparam = OSDIparam;
   OSDIinfo->DEVmodParam = OSDImParam;
   OSDIinfo->DEVask = OSDIask;
+  OSDIinfo->DEVmodAsk = OSDImAsk;
   OSDIinfo->DEVsetup = OSDIsetup;
   OSDIinfo->DEVpzSetup = OSDIsetup;
   OSDIinfo->DEVtemperature = OSDItemp;

src/osdi/osdiparam.c

@@ -162,3 +162,21 @@ extern int OSDIask(CKTcircuit *ckt, GENinstance *instPtr, int id,
   void *src = descr->access(inst, model, (uint32_t)id, flags);
   return osdi_read_param(src, value, id, descr);
 }
+
+extern int OSDImAsk(CKTcircuit *ckt, GENmodel *modelPtr, int id,
+                   IFvalue *value) {
+
+  NG_IGNORE(ckt);
+
+  OsdiRegistryEntry *entry = osdi_reg_entry_model(modelPtr);
+  const OsdiDescriptor *descr = entry->descriptor;
+
+  void *model = osdi_model_data(modelPtr);
+
+  if (id >= (int)(descr->num_params)) {
+    return (E_BADPARM);
+  }
+
+  void *src = descr->access(NULL, model, (uint32_t)id, ACCESS_FLAG_READ);
+  return osdi_read_param(src, value, id, descr);
+}

src/spicelib/analysis/cktdltn.c

@@ -20,7 +20,7 @@ CKTdltNod(CKTcircuit* ckt, CKTnode* node)
 int
 CKTdltNNum(CKTcircuit* ckt, int num)
 {
-    CKTnode* n, * prev, * node, * sprev;
+    CKTnode* n, * prev, * node;
     int	error;
 
     if (!ckt->prev_CKTlastNode->number || num <= ckt->prev_CKTlastNode->number) {
@@ -30,12 +30,11 @@ CKTdltNNum(CKTcircuit* ckt, int num)
 
     prev = NULL;
     node = NULL;
-    sprev = NULL;
 
     for (n = ckt->CKTnodes; n; n = n->next) {
         if (n->number == num) {
             node = n;
-            sprev = prev;
+            break;
         }
         prev = n;
     }
@@ -45,14 +44,14 @@ CKTdltNNum(CKTcircuit* ckt, int num)
 
     ckt->CKTmaxEqNum -= 1;
 
-    if (!sprev) {
+    if (!prev) {
         ckt->CKTnodes = node->next;
     }
     else {
-        sprev->next = node->next;
+        prev->next = node->next;
     }
     if (node == ckt->CKTlastNode)
-        ckt->CKTlastNode = sprev;
+        ckt->CKTlastNode = prev;
 
     error = SPfrontEnd->IFdelUid(ckt, node->name, UID_SIGNAL);
     tfree(node);

src/spicelib/devices/bsim3/b3.c

@@ -30,6 +30,9 @@ IOP( "geo",    BSIM3_GEO,    IF_INTEGER, "ACM model drain/source connection"),
 IOP( "delvto", BSIM3_DELVTO, IF_REAL, "Zero bias threshold voltage variation"),
 IOP( "mulu0", BSIM3_MULU0, IF_REAL, "Low field mobility multiplier"),
 IP( "ic",   BSIM3_IC,     IF_REALVEC , "Vector of DS,GS,BS initial voltages"),
+IOP( "icvgs", BSIM3_IC_VGS, IF_REAL , "GS initial voltage"),
+IOP( "icvds", BSIM3_IC_VDS, IF_REAL , "DS initial voltage"),
+IOP( "icvbs", BSIM3_IC_VBS, IF_REAL , "BS initial voltage"),
 OP( "gmbs",  BSIM3_GMBS,  IF_REAL,    "Gmb"),
 OP( "gm",    BSIM3_GM,    IF_REAL,    "Gm"),
 OP( "gds",   BSIM3_GDS,   IF_REAL,    "Gds"),

src/spicelib/devices/bsim4/b4.c

@@ -1,31 +1,28 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
+
 #include "ngspice/ngspice.h"
 #include "ngspice/devdefs.h"
 #include "bsim4def.h"
@@ -57,11 +54,10 @@ IOP( "rbpb", BSIM4_RBPB,  IF_REAL   , "Body resistance"),
 IOP( "rbps", BSIM4_RBPS,  IF_REAL   , "Body resistance"),
 IOP( "rbpd", BSIM4_RBPD,  IF_REAL   , "Body resistance"),
 IOP( "delvto", BSIM4_DELVTO,  IF_REAL   , "Zero bias threshold voltage variation"),
-IOPR( "delvt0", BSIM4_DELVTO,  IF_REAL   , "Zero bias threshold voltage variation"),
-IOP( "mulu0", BSIM4_MULU0, IF_REAL, "Low field mobility multiplier"),
+IOPR("delvt0", BSIM4_DELVTO,  IF_REAL   , "Zero bias threshold voltage variation"),
 IOP( "xgw",  BSIM4_XGW, IF_REAL, "Distance from gate contact center to device edge"),
 IOP( "ngcon", BSIM4_NGCON, IF_REAL, "Number of gate contacts"),
-IOP( "wnflag", BSIM4_WNFLAG, IF_INTEGER, "W/NF device flag for bin selection"),
+
 
 IOP( "trnqsmod", BSIM4_TRNQSMOD, IF_INTEGER, "Transient NQS model selector"),
 IOP( "acnqsmod", BSIM4_ACNQSMOD, IF_INTEGER, "AC NQS model selector"),
@@ -69,6 +65,10 @@ IOP( "rbodymod", BSIM4_RBODYMOD, IF_INTEGER, "Distributed body R model selector"
 IOP( "rgatemod", BSIM4_RGATEMOD, IF_INTEGER, "Gate resistance model selector"),
 IOP( "geomod", BSIM4_GEOMOD, IF_INTEGER, "Geometry dependent parasitics model selector"),
 IOP( "rgeomod", BSIM4_RGEOMOD, IF_INTEGER, "S/D resistance and contact model selector"),
+
+IOP( "mult_i", BSIM4_MULT_I, IF_REAL, "Variability in current"),
+IOP( "mult_q", BSIM4_MULT_Q, IF_REAL, "Variability in charge"),
+IOP( "mult_fn", BSIM4_MULT_FN, IF_REAL, "Variability in flicker noise"),
 IP( "ic",  BSIM4_IC,     IF_REALVEC , "Vector of DS,GS,BS initial voltages"),
 OP( "gmbs",         BSIM4_GMBS,       IF_REAL,    "Gmb"),
 OP( "gm",           BSIM4_GM,         IF_REAL,    "Gm"),
@@ -138,7 +138,6 @@ IOP( "rbodymod", BSIM4_MOD_RBODYMOD, IF_INTEGER, "Distributed body R model selec
 IOP( "rgatemod", BSIM4_MOD_RGATEMOD, IF_INTEGER, "Gate R model selector"),
 IOP( "permod", BSIM4_MOD_PERMOD, IF_INTEGER, "Pd and Ps model selector"),
 IOP( "geomod", BSIM4_MOD_GEOMOD, IF_INTEGER, "Geometry dependent parasitics model selector"),
-IOP( "rgeomod", BSIM4_MOD_RGEOMOD, IF_INTEGER, "S/D resistance and contact model selector"),
 IOP( "fnoimod", BSIM4_MOD_FNOIMOD, IF_INTEGER, "Flicker noise model selector"),
 IOP( "tnoimod", BSIM4_MOD_TNOIMOD, IF_INTEGER, "Thermal noise model selector"),
 IOP( "mtrlmod", BSIM4_MOD_MTRLMOD, IF_INTEGER, "parameter for non-silicon substrate or metal gate selector"),
@@ -164,18 +163,19 @@ IOP( "toxref", BSIM4_MOD_TOXREF, IF_REAL, "Target tox value"),
 IOP( "dtox", BSIM4_MOD_DTOX, IF_REAL, "Defined as (toxe - toxp) "),
 IOP( "epsrox", BSIM4_MOD_EPSROX, IF_REAL, "Dielectric constant of the gate oxide relative to vacuum"),
 IOP( "cdsc", BSIM4_MOD_CDSC, IF_REAL, "Drain/Source and channel coupling capacitance"),
-IOP( "cdscb", BSIM4_MOD_CDSCB, IF_REAL, "Body-bias dependence of cdsc"), 
-IOP( "cdscd", BSIM4_MOD_CDSCD, IF_REAL, "Drain-bias dependence of cdsc"), 
+IOP( "cdscb", BSIM4_MOD_CDSCB, IF_REAL, "Body-bias dependence of cdsc"),
+IOP( "cdscd", BSIM4_MOD_CDSCD, IF_REAL, "Drain-bias dependence of cdsc"),
 IOP( "cit", BSIM4_MOD_CIT, IF_REAL, "Interface state capacitance"),
 IOP( "nfactor", BSIM4_MOD_NFACTOR, IF_REAL, "Subthreshold swing Coefficient"),
 IOP( "xj", BSIM4_MOD_XJ, IF_REAL, "Junction depth in meters"),
 IOP( "vsat", BSIM4_MOD_VSAT, IF_REAL, "Saturation velocity at tnom"),
 IOP( "at", BSIM4_MOD_AT, IF_REAL, "Temperature coefficient of vsat"),
-IOP( "a0", BSIM4_MOD_A0, IF_REAL, "Non-uniform depletion width effect coefficient."), 
-IOP( "ags", BSIM4_MOD_AGS, IF_REAL, "Gate bias  coefficient of Abulk."), 
+IOP( "a0", BSIM4_MOD_A0, IF_REAL, "Non-uniform depletion width effect coefficient."),
+IOP( "ags", BSIM4_MOD_AGS, IF_REAL, "Gate bias  coefficient of Abulk."),
 IOP( "a1", BSIM4_MOD_A1, IF_REAL, "Non-saturation effect coefficient"),
 IOP( "a2", BSIM4_MOD_A2, IF_REAL, "Non-saturation effect coefficient"),
 IOP( "keta", BSIM4_MOD_KETA, IF_REAL, "Body-bias coefficient of non-uniform depletion width effect."),
+IOP( "ketac", BSIM4_MOD_KETAC, IF_REAL, "Body-bias coefficient of non-uniform depletion width effect in dynamic evaluation."),
 IOP( "phig", BSIM4_MOD_PHIG, IF_REAL, "Work function of gate"),
 IOP( "epsrgate", BSIM4_MOD_EPSRGATE, IF_REAL, "Dielectric constant of gate relative to vacuum"),
 IOP( "easub",BSIM4_MOD_EASUB, IF_REAL, "Electron affinity of substrate"),
@@ -248,30 +248,30 @@ IOP( "cgbo", BSIM4_MOD_CGBO, IF_REAL, "Gate-bulk overlap capacitance per length"
 IOP( "xpart", BSIM4_MOD_XPART, IF_REAL, "Channel charge partitioning"),
 IOP( "delta", BSIM4_MOD_DELTA, IF_REAL, "Effective Vds parameter"),
 IOP( "rsh", BSIM4_MOD_RSH, IF_REAL, "Source-drain sheet resistance"),
-IOP( "rdsw", BSIM4_MOD_RDSW, IF_REAL, "Source-drain resistance per width"),    
+IOP( "rdsw", BSIM4_MOD_RDSW, IF_REAL, "Source-drain resistance per width"),
 IOP( "rdswmin", BSIM4_MOD_RDSWMIN, IF_REAL, "Source-drain resistance per width at high Vg"),
 IOP( "rsw", BSIM4_MOD_RSW, IF_REAL, "Source resistance per width"),
 IOP( "rdw", BSIM4_MOD_RDW, IF_REAL, "Drain resistance per width"),
 IOP( "rdwmin", BSIM4_MOD_RDWMIN, IF_REAL, "Drain resistance per width at high Vg"),
 IOP( "rswmin", BSIM4_MOD_RSWMIN, IF_REAL, "Source resistance per width at high Vg"),
 
-IOP( "prwg", BSIM4_MOD_PRWG, IF_REAL, "Gate-bias effect on parasitic resistance "),    
-IOP( "prwb", BSIM4_MOD_PRWB, IF_REAL, "Body-effect on parasitic resistance "),    
+IOP( "prwg", BSIM4_MOD_PRWG, IF_REAL, "Gate-bias effect on parasitic resistance "),
+IOP( "prwb", BSIM4_MOD_PRWB, IF_REAL, "Body-effect on parasitic resistance "),
 
-IOP( "prt", BSIM4_MOD_PRT, IF_REAL, "Temperature coefficient of parasitic resistance "),    
+IOP( "prt", BSIM4_MOD_PRT, IF_REAL, "Temperature coefficient of parasitic resistance "),
 IOP( "eta0", BSIM4_MOD_ETA0, IF_REAL, "Subthreshold region DIBL coefficient"),
 IOP( "etab", BSIM4_MOD_ETAB, IF_REAL, "Subthreshold region DIBL coefficient"),
 IOP( "pclm", BSIM4_MOD_PCLM, IF_REAL, "Channel length modulation Coefficient"),
-IOP( "pdiblc1", BSIM4_MOD_PDIBL1, IF_REAL, "Drain-induced barrier lowering coefficient"),   
-IOP( "pdiblc2", BSIM4_MOD_PDIBL2, IF_REAL, "Drain-induced barrier lowering coefficient"),   
-IOP( "pdiblcb", BSIM4_MOD_PDIBLB, IF_REAL, "Body-effect on drain-induced barrier lowering"),   
+IOP( "pdiblc1", BSIM4_MOD_PDIBL1, IF_REAL, "Drain-induced barrier lowering coefficient"),
+IOP( "pdiblc2", BSIM4_MOD_PDIBL2, IF_REAL, "Drain-induced barrier lowering coefficient"),
+IOP( "pdiblcb", BSIM4_MOD_PDIBLB, IF_REAL, "Body-effect on drain-induced barrier lowering"),
 IOP( "fprout", BSIM4_MOD_FPROUT, IF_REAL, "Rout degradation coefficient for pocket devices"),
 IOP( "pdits", BSIM4_MOD_PDITS, IF_REAL, "Coefficient for drain-induced Vth shifts"),
 IOP( "pditsl", BSIM4_MOD_PDITSL, IF_REAL, "Length dependence of drain-induced Vth shifts"),
 IOP( "pditsd", BSIM4_MOD_PDITSD, IF_REAL, "Vds dependence of drain-induced Vth shifts"),
-IOP( "pscbe1", BSIM4_MOD_PSCBE1, IF_REAL, "Substrate current body-effect coefficient"),   
-IOP( "pscbe2", BSIM4_MOD_PSCBE2, IF_REAL, "Substrate current body-effect coefficient"),   
-IOP( "pvag", BSIM4_MOD_PVAG, IF_REAL, "Gate dependence of output resistance parameter"),   
+IOP( "pscbe1", BSIM4_MOD_PSCBE1, IF_REAL, "Substrate current body-effect coefficient"),
+IOP( "pscbe2", BSIM4_MOD_PSCBE2, IF_REAL, "Substrate current body-effect coefficient"),
+IOP( "pvag", BSIM4_MOD_PVAG, IF_REAL, "Gate dependence of output resistance parameter"),
 
 IOP( "jss", BSIM4_MOD_JSS, IF_REAL, "Bottom source junction reverse saturation current density"),
 IOP( "jsws", BSIM4_MOD_JSWS, IF_REAL, "Isolation edge sidewall source junction reverse saturation current density"),
@@ -390,14 +390,14 @@ IOP( "beta0", BSIM4_MOD_BETA0, IF_REAL, "substrate current model parameter"),
 IOP( "agidl", BSIM4_MOD_AGIDL, IF_REAL, "Pre-exponential constant for GIDL"),
 IOP( "bgidl", BSIM4_MOD_BGIDL, IF_REAL, "Exponential constant for GIDL"),
 IOP( "cgidl", BSIM4_MOD_CGIDL, IF_REAL, "Parameter for body-bias dependence of GIDL"),
-IOP( "rgidl", BSIM4_MOD_RGIDL, IF_REAL, "GIDL vg parameter"),	/* v4.7 New GIDL/GISL */ 
+IOP( "rgidl", BSIM4_MOD_RGIDL, IF_REAL, "GIDL vg parameter"),   /* v4.7 New GIDL/GISL */
 IOP( "kgidl", BSIM4_MOD_KGIDL, IF_REAL, "GIDL vb parameter"),   /* v4.7 New GIDL/GISL */
 IOP( "fgidl", BSIM4_MOD_FGIDL, IF_REAL, "GIDL vb parameter"),   /* v4.7 New GIDL/GISL */
 IOP( "egidl", BSIM4_MOD_EGIDL, IF_REAL, "Fitting parameter for Bandbending"),
 IOP( "agisl", BSIM4_MOD_AGISL, IF_REAL, "Pre-exponential constant for GISL"),
 IOP( "bgisl", BSIM4_MOD_BGISL, IF_REAL, "Exponential constant for GISL"),
 IOP( "cgisl", BSIM4_MOD_CGISL, IF_REAL, "Parameter for body-bias dependence of GISL"),
-IOP( "rgisl", BSIM4_MOD_RGISL, IF_REAL, "GISL vg parameter"),	/* v4.7 New GIDL/GISL */ 
+IOP( "rgisl", BSIM4_MOD_RGISL, IF_REAL, "GISL vg parameter"),   /* v4.7 New GIDL/GISL */
 IOP( "kgisl", BSIM4_MOD_KGISL, IF_REAL, "GISL vb parameter"),   /* v4.7 New GIDL/GISL */
 IOP( "fgisl", BSIM4_MOD_FGISL, IF_REAL, "GISL vb parameter"),   /* v4.7 New GIDL/GISL */
 IOP( "egisl", BSIM4_MOD_EGISL, IF_REAL, "Fitting parameter for Bandbending"),
@@ -442,7 +442,7 @@ IOP( "jtssws", BSIM4_MOD_JTSSWS, IF_REAL, "Source STI sidewall trap-assisted sat
 IOP( "jtsswd", BSIM4_MOD_JTSSWD, IF_REAL, "Drain STI sidewall trap-assisted saturation current density"),
 IOP( "jtsswgs", BSIM4_MOD_JTSSWGS, IF_REAL, "Source gate-edge sidewall trap-assisted saturation current density"),
 IOP( "jtsswgd", BSIM4_MOD_JTSSWGD, IF_REAL, "Drain gate-edge sidewall trap-assisted saturation current density"),
-IOP( "jtweff", BSIM4_MOD_JTWEFF, IF_REAL, "TAT current width dependence"),
+IOP( "jtweff", BSIM4_MOD_JTWEFF, IF_REAL, "TAT current width dependance"),
 IOP( "njts", BSIM4_MOD_NJTS, IF_REAL, "Non-ideality factor for bottom junction"),
 IOP( "njtssw", BSIM4_MOD_NJTSSW, IF_REAL, "Non-ideality factor for STI sidewall junction"),
 IOP( "njtsswg", BSIM4_MOD_NJTSSWG, IF_REAL, "Non-ideality factor for gate-edge sidewall junction"),
@@ -514,11 +514,12 @@ IOP( "lnfactor", BSIM4_MOD_LNFACTOR, IF_REAL, "Length dependence of nfactor"),
 IOP( "lxj", BSIM4_MOD_LXJ, IF_REAL, "Length dependence of xj"),
 IOP( "lvsat", BSIM4_MOD_LVSAT, IF_REAL, "Length dependence of vsat"),
 IOP( "lat", BSIM4_MOD_LAT, IF_REAL, "Length dependence of at"),
-IOP( "la0", BSIM4_MOD_LA0, IF_REAL, "Length dependence of a0"), 
-IOP( "lags", BSIM4_MOD_LAGS, IF_REAL, "Length dependence of ags"), 
+IOP( "la0", BSIM4_MOD_LA0, IF_REAL, "Length dependence of a0"),
+IOP( "lags", BSIM4_MOD_LAGS, IF_REAL, "Length dependence of ags"),
 IOP( "la1", BSIM4_MOD_LA1, IF_REAL, "Length dependence of a1"),
 IOP( "la2", BSIM4_MOD_LA2, IF_REAL, "Length dependence of a2"),
 IOP( "lketa", BSIM4_MOD_LKETA, IF_REAL, "Length dependence of keta"),
+IOP( "lketac", BSIM4_MOD_LKETAC, IF_REAL, "Length dependence of ketac"),
 IOP( "lnsub", BSIM4_MOD_LNSUB, IF_REAL, "Length dependence of nsub"),
 IOP( "lndep",  BSIM4_MOD_LNDEP, IF_REAL, "Length dependence of ndep"),
 IOP( "lnsd",  BSIM4_MOD_LNSD, IF_REAL, "Length dependence of nsd"),
@@ -553,8 +554,8 @@ IOP( "ldvt1w", BSIM4_MOD_LDVT1W, IF_REAL, "Length dependence of dvt1w"),
 IOP( "ldvt2w", BSIM4_MOD_LDVT2W, IF_REAL, "Length dependence of dvt2w"),
 IOP( "ldrout", BSIM4_MOD_LDROUT, IF_REAL, "Length dependence of drout"),
 IOP( "ldsub", BSIM4_MOD_LDSUB, IF_REAL, "Length dependence of dsub"),
-IOP( "lvth0", BSIM4_MOD_LVTH0, IF_REAL,"Length dependence of vth0"),
-IOPR("lvtho", BSIM4_MOD_LVTH0, IF_REAL,"Length dependence of vtho"),
+IOP( "lvth0", BSIM4_MOD_LVTH0, IF_REAL,"Length dependence of vto"),
+IOPR("lvtho", BSIM4_MOD_LVTH0, IF_REAL,"Length dependence of vto"),
 IOP( "lua",  BSIM4_MOD_LUA, IF_REAL, "Length dependence of ua"),
 IOP( "lua1", BSIM4_MOD_LUA1, IF_REAL, "Length dependence of ua1"),
 IOP( "lub", BSIM4_MOD_LUB, IF_REAL, "Length dependence of ub"),
@@ -572,26 +573,26 @@ IOP( "lvoff", BSIM4_MOD_LVOFF, IF_REAL, "Length dependence of voff"),
 IOP( "lminv", BSIM4_MOD_LMINV, IF_REAL, "Length dependence of minv"),
 IOP( "lminvcv", BSIM4_MOD_LMINVCV, IF_REAL, "Length dependence of minvcv"),
 IOP( "ldelta", BSIM4_MOD_LDELTA, IF_REAL, "Length dependence of delta"),
-IOP( "lrdsw", BSIM4_MOD_LRDSW,  IF_REAL, "Length dependence of rdsw "),    
+IOP( "lrdsw", BSIM4_MOD_LRDSW,  IF_REAL, "Length dependence of rdsw "),
 IOP( "lrsw", BSIM4_MOD_LRSW, IF_REAL, "Length dependence of rsw"),
 IOP( "lrdw", BSIM4_MOD_LRDW, IF_REAL, "Length dependence of rdw"),
 
-IOP( "lprwg", BSIM4_MOD_LPRWG,  IF_REAL, "Length dependence of prwg "),    
-IOP( "lprwb", BSIM4_MOD_LPRWB,  IF_REAL, "Length dependence of prwb "),    
+IOP( "lprwg", BSIM4_MOD_LPRWG,  IF_REAL, "Length dependence of prwg "),
+IOP( "lprwb", BSIM4_MOD_LPRWB,  IF_REAL, "Length dependence of prwb "),
 
-IOP( "lprt", BSIM4_MOD_LPRT, IF_REAL, "Length dependence of prt "),    
-IOP( "leta0", BSIM4_MOD_LETA0, IF_REAL, "Length dependence of eta0"),   
-IOP( "letab", BSIM4_MOD_LETAB, IF_REAL, "Length dependence of etab"),   
-IOP( "lpclm", BSIM4_MOD_LPCLM, IF_REAL, "Length dependence of pclm"),   
-IOP( "lpdiblc1", BSIM4_MOD_LPDIBL1, IF_REAL, "Length dependence of pdiblc1"),   
-IOP( "lpdiblc2", BSIM4_MOD_LPDIBL2, IF_REAL, "Length dependence of pdiblc2"),   
-IOP( "lpdiblcb", BSIM4_MOD_LPDIBLB, IF_REAL, "Length dependence of pdiblcb"),   
+IOP( "lprt", BSIM4_MOD_LPRT, IF_REAL, "Length dependence of prt "),
+IOP( "leta0", BSIM4_MOD_LETA0, IF_REAL, "Length dependence of eta0"),
+IOP( "letab", BSIM4_MOD_LETAB, IF_REAL, "Length dependence of etab"),
+IOP( "lpclm", BSIM4_MOD_LPCLM, IF_REAL, "Length dependence of pclm"),
+IOP( "lpdiblc1", BSIM4_MOD_LPDIBL1, IF_REAL, "Length dependence of pdiblc1"),
+IOP( "lpdiblc2", BSIM4_MOD_LPDIBL2, IF_REAL, "Length dependence of pdiblc2"),
+IOP( "lpdiblcb", BSIM4_MOD_LPDIBLB, IF_REAL, "Length dependence of pdiblcb"),
 IOP( "lfprout", BSIM4_MOD_LFPROUT, IF_REAL, "Length dependence of pdiblcb"),
 IOP( "lpdits", BSIM4_MOD_LPDITS, IF_REAL, "Length dependence of pdits"),
 IOP( "lpditsd", BSIM4_MOD_LPDITSD, IF_REAL, "Length dependence of pditsd"),
-IOP( "lpscbe1",  BSIM4_MOD_LPSCBE1, IF_REAL, "Length dependence of pscbe1"),   
-IOP( "lpscbe2",  BSIM4_MOD_LPSCBE2, IF_REAL, "Length dependence of pscbe2"),   
-IOP( "lpvag", BSIM4_MOD_LPVAG, IF_REAL, "Length dependence of pvag"),   
+IOP( "lpscbe1",  BSIM4_MOD_LPSCBE1, IF_REAL, "Length dependence of pscbe1"),
+IOP( "lpscbe2",  BSIM4_MOD_LPSCBE2, IF_REAL, "Length dependence of pscbe2"),
+IOP( "lpvag", BSIM4_MOD_LPVAG, IF_REAL, "Length dependence of pvag"),
 IOP( "lwr",  BSIM4_MOD_LWR, IF_REAL, "Length dependence of wr"),
 IOP( "ldwg", BSIM4_MOD_LDWG, IF_REAL, "Length dependence of dwg"),
 IOP( "ldwb", BSIM4_MOD_LDWB, IF_REAL, "Length dependence of dwb"),
@@ -611,16 +612,16 @@ IOP( "lbeta0", BSIM4_MOD_LBETA0, IF_REAL, "Length dependence of beta0"),
 IOP( "lagidl", BSIM4_MOD_LAGIDL, IF_REAL, "Length dependence of agidl"),
 IOP( "lbgidl", BSIM4_MOD_LBGIDL, IF_REAL, "Length dependence of bgidl"),
 IOP( "lcgidl", BSIM4_MOD_LCGIDL, IF_REAL, "Length dependence of cgidl"),
-IOP( "lrgidl", BSIM4_MOD_LRGIDL, IF_REAL, "Length dependence of rgidl"),	/* v4.7 New GIDL/GISL */
-IOP( "lkgidl", BSIM4_MOD_LKGIDL, IF_REAL, "Length dependence of kgidl"),	/* v4.7 New GIDL/GISL */
-IOP( "lfgidl", BSIM4_MOD_LFGIDL, IF_REAL, "Length dependence of fgidl"),	/* v4.7 New GIDL/GISL */
+IOP( "lrgidl", BSIM4_MOD_LRGIDL, IF_REAL, "Length dependence of rgidl"),    /* v4.7 New GIDL/GISL */
+IOP( "lkgidl", BSIM4_MOD_LKGIDL, IF_REAL, "Length dependence of kgidl"),    /* v4.7 New GIDL/GISL */
+IOP( "lfgidl", BSIM4_MOD_LFGIDL, IF_REAL, "Length dependence of fgidl"),    /* v4.7 New GIDL/GISL */
 IOP( "legidl", BSIM4_MOD_LEGIDL, IF_REAL, "Length dependence of egidl"),
 IOP( "lagisl", BSIM4_MOD_LAGISL, IF_REAL, "Length dependence of agisl"),
 IOP( "lbgisl", BSIM4_MOD_LBGISL, IF_REAL, "Length dependence of bgisl"),
 IOP( "lcgisl", BSIM4_MOD_LCGISL, IF_REAL, "Length dependence of cgisl"),
-IOP( "lrgisl", BSIM4_MOD_LRGISL, IF_REAL, "Length dependence of rgisl"),	/* v4.7 New GIDL/GISL */
-IOP( "lkgisl", BSIM4_MOD_LKGISL, IF_REAL, "Length dependence of kgisl"),	/* v4.7 New GIDL/GISL */
-IOP( "lfgisl", BSIM4_MOD_LFGISL, IF_REAL, "Length dependence of fgisl"),	/* v4.7 New GIDL/GISL */
+IOP( "lrgisl", BSIM4_MOD_LRGISL, IF_REAL, "Length dependence of rgisl"),    /* v4.7 New GIDL/GISL */
+IOP( "lkgisl", BSIM4_MOD_LKGISL, IF_REAL, "Length dependence of kgisl"),    /* v4.7 New GIDL/GISL */
+IOP( "lfgisl", BSIM4_MOD_LFGISL, IF_REAL, "Length dependence of fgisl"),    /* v4.7 New GIDL/GISL */
 IOP( "legisl", BSIM4_MOD_LEGISL, IF_REAL, "Length dependence of egisl"),
 IOP( "laigc", BSIM4_MOD_LAIGC, IF_REAL, "Length dependence of aigc"),
 IOP( "lbigc", BSIM4_MOD_LBIGC, IF_REAL, "Length dependence of bigc"),
@@ -669,18 +670,19 @@ IOP( "lteta0",     BSIM4_MOD_LTETA0,     IF_REAL, "Length dependence of teta0"),
 IOP( "ltvoffcv",     BSIM4_MOD_LTVOFFCV,     IF_REAL, "Length dependence of tvoffcv"),  /* v4.7 Tanvir*/
 
 IOP( "wcdsc",  BSIM4_MOD_WCDSC, IF_REAL, "Width dependence of cdsc"),
-IOP( "wcdscb", BSIM4_MOD_WCDSCB, IF_REAL, "Width dependence of cdscb"),  
-IOP( "wcdscd", BSIM4_MOD_WCDSCD, IF_REAL, "Width dependence of cdscd"),  
+IOP( "wcdscb", BSIM4_MOD_WCDSCB, IF_REAL, "Width dependence of cdscb"),
+IOP( "wcdscd", BSIM4_MOD_WCDSCD, IF_REAL, "Width dependence of cdscd"),
 IOP( "wcit",   BSIM4_MOD_WCIT,  IF_REAL, "Width dependence of cit"),
 IOP( "wnfactor", BSIM4_MOD_WNFACTOR, IF_REAL, "Width dependence of nfactor"),
 IOP( "wxj", BSIM4_MOD_WXJ, IF_REAL, "Width dependence of xj"),
 IOP( "wvsat", BSIM4_MOD_WVSAT, IF_REAL, "Width dependence of vsat"),
 IOP( "wat", BSIM4_MOD_WAT, IF_REAL, "Width dependence of at"),
-IOP( "wa0", BSIM4_MOD_WA0, IF_REAL, "Width dependence of a0"), 
-IOP( "wags", BSIM4_MOD_WAGS, IF_REAL, "Width dependence of ags"), 
+IOP( "wa0", BSIM4_MOD_WA0, IF_REAL, "Width dependence of a0"),
+IOP( "wags", BSIM4_MOD_WAGS, IF_REAL, "Width dependence of ags"),
 IOP( "wa1", BSIM4_MOD_WA1, IF_REAL, "Width dependence of a1"),
 IOP( "wa2", BSIM4_MOD_WA2, IF_REAL, "Width dependence of a2"),
 IOP( "wketa", BSIM4_MOD_WKETA, IF_REAL, "Width dependence of keta"),
+IOP( "wketac", BSIM4_MOD_WKETAC, IF_REAL, "Width dependence of ketac"),
 IOP( "wnsub", BSIM4_MOD_WNSUB, IF_REAL, "Width dependence of nsub"),
 IOP( "wndep",  BSIM4_MOD_WNDEP, IF_REAL, "Width dependence of ndep"),
 IOP( "wnsd",  BSIM4_MOD_WNSD, IF_REAL, "Width dependence of nsd"),
@@ -715,8 +717,8 @@ IOP( "wdvt1w", BSIM4_MOD_WDVT1W, IF_REAL, "Width dependence of dvt1w"),
 IOP( "wdvt2w", BSIM4_MOD_WDVT2W, IF_REAL, "Width dependence of dvt2w"),
 IOP( "wdrout", BSIM4_MOD_WDROUT, IF_REAL, "Width dependence of drout"),
 IOP( "wdsub", BSIM4_MOD_WDSUB, IF_REAL, "Width dependence of dsub"),
-IOP( "wvth0", BSIM4_MOD_WVTH0, IF_REAL,"Width dependence of vth0"),
-IOPR("wvtho", BSIM4_MOD_WVTH0, IF_REAL,"Width dependence of vtho"),
+IOP( "wvth0", BSIM4_MOD_WVTH0, IF_REAL,"Width dependence of vto"),
+IOPR("wvtho", BSIM4_MOD_WVTH0, IF_REAL,"Width dependence of vto"),
 IOP( "wua",  BSIM4_MOD_WUA, IF_REAL, "Width dependence of ua"),
 IOP( "wua1", BSIM4_MOD_WUA1, IF_REAL, "Width dependence of ua1"),
 IOP( "wub", BSIM4_MOD_WUB, IF_REAL, "Width dependence of ub"),
@@ -742,18 +744,18 @@ IOP( "wprwg", BSIM4_MOD_WPRWG,  IF_REAL, "Width dependence of prwg "),
 IOP( "wprwb", BSIM4_MOD_WPRWB,  IF_REAL, "Width dependence of prwb "),
 
 IOP( "wprt", BSIM4_MOD_WPRT, IF_REAL, "Width dependence of prt"),
-IOP( "weta0", BSIM4_MOD_WETA0, IF_REAL, "Width dependence of eta0"),   
-IOP( "wetab", BSIM4_MOD_WETAB, IF_REAL, "Width dependence of etab"),   
-IOP( "wpclm", BSIM4_MOD_WPCLM, IF_REAL, "Width dependence of pclm"),   
-IOP( "wpdiblc1", BSIM4_MOD_WPDIBL1, IF_REAL, "Width dependence of pdiblc1"),   
-IOP( "wpdiblc2", BSIM4_MOD_WPDIBL2, IF_REAL, "Width dependence of pdiblc2"),   
-IOP( "wpdiblcb", BSIM4_MOD_WPDIBLB, IF_REAL, "Width dependence of pdiblcb"),   
+IOP( "weta0", BSIM4_MOD_WETA0, IF_REAL, "Width dependence of eta0"),
+IOP( "wetab", BSIM4_MOD_WETAB, IF_REAL, "Width dependence of etab"),
+IOP( "wpclm", BSIM4_MOD_WPCLM, IF_REAL, "Width dependence of pclm"),
+IOP( "wpdiblc1", BSIM4_MOD_WPDIBL1, IF_REAL, "Width dependence of pdiblc1"),
+IOP( "wpdiblc2", BSIM4_MOD_WPDIBL2, IF_REAL, "Width dependence of pdiblc2"),
+IOP( "wpdiblcb", BSIM4_MOD_WPDIBLB, IF_REAL, "Width dependence of pdiblcb"),
 IOP( "wfprout", BSIM4_MOD_WFPROUT, IF_REAL, "Width dependence of pdiblcb"),
 IOP( "wpdits", BSIM4_MOD_WPDITS, IF_REAL, "Width dependence of pdits"),
 IOP( "wpditsd", BSIM4_MOD_WPDITSD, IF_REAL, "Width dependence of pditsd"),
-IOP( "wpscbe1",  BSIM4_MOD_WPSCBE1, IF_REAL, "Width dependence of pscbe1"),   
-IOP( "wpscbe2",  BSIM4_MOD_WPSCBE2, IF_REAL, "Width dependence of pscbe2"),   
-IOP( "wpvag", BSIM4_MOD_WPVAG, IF_REAL, "Width dependence of pvag"),   
+IOP( "wpscbe1",  BSIM4_MOD_WPSCBE1, IF_REAL, "Width dependence of pscbe1"),
+IOP( "wpscbe2",  BSIM4_MOD_WPSCBE2, IF_REAL, "Width dependence of pscbe2"),
+IOP( "wpvag", BSIM4_MOD_WPVAG, IF_REAL, "Width dependence of pvag"),
 IOP( "wwr",  BSIM4_MOD_WWR, IF_REAL, "Width dependence of wr"),
 IOP( "wdwg", BSIM4_MOD_WDWG, IF_REAL, "Width dependence of dwg"),
 IOP( "wdwb", BSIM4_MOD_WDWB, IF_REAL, "Width dependence of dwb"),
@@ -773,16 +775,16 @@ IOP( "wbeta0", BSIM4_MOD_WBETA0, IF_REAL, "Width dependence of beta0"),
 IOP( "wagidl", BSIM4_MOD_WAGIDL, IF_REAL, "Width dependence of agidl"),
 IOP( "wbgidl", BSIM4_MOD_WBGIDL, IF_REAL, "Width dependence of bgidl"),
 IOP( "wcgidl", BSIM4_MOD_WCGIDL, IF_REAL, "Width dependence of cgidl"),
-IOP( "wrgidl", BSIM4_MOD_WRGIDL, IF_REAL, "Width dependence of rgidl"),		/* v4.7 New GIDL/GISL */
-IOP( "wkgidl", BSIM4_MOD_WKGIDL, IF_REAL, "Width dependence of kgidl"),		/* v4.7 New GIDL/GISL */
-IOP( "wfgidl", BSIM4_MOD_WFGIDL, IF_REAL, "Width dependence of fgidl"),		/* v4.7 New GIDL/GISL */
+IOP( "wrgidl", BSIM4_MOD_WRGIDL, IF_REAL, "Width dependence of rgidl"),     /* v4.7 New GIDL/GISL */
+IOP( "wkgidl", BSIM4_MOD_WKGIDL, IF_REAL, "Width dependence of kgidl"),     /* v4.7 New GIDL/GISL */
+IOP( "wfgidl", BSIM4_MOD_WFGIDL, IF_REAL, "Width dependence of fgidl"),     /* v4.7 New GIDL/GISL */
 IOP( "wegidl", BSIM4_MOD_WEGIDL, IF_REAL, "Width dependence of egidl"),
 IOP( "wagisl", BSIM4_MOD_WAGISL, IF_REAL, "Width dependence of agisl"),
 IOP( "wbgisl", BSIM4_MOD_WBGISL, IF_REAL, "Width dependence of bgisl"),
 IOP( "wcgisl", BSIM4_MOD_WCGISL, IF_REAL, "Width dependence of cgisl"),
-IOP( "wrgisl", BSIM4_MOD_WRGISL, IF_REAL, "Width dependence of rgisl"),		/* v4.7 New GIDL/GISL */
-IOP( "wkgisl", BSIM4_MOD_WKGISL, IF_REAL, "Width dependence of kgisl"),		/* v4.7 New GIDL/GISL */
-IOP( "wfgisl", BSIM4_MOD_WFGISL, IF_REAL, "Width dependence of fgisl"),		/* v4.7 New GIDL/GISL */
+IOP( "wrgisl", BSIM4_MOD_WRGISL, IF_REAL, "Width dependence of rgisl"),     /* v4.7 New GIDL/GISL */
+IOP( "wkgisl", BSIM4_MOD_WKGISL, IF_REAL, "Width dependence of kgisl"),     /* v4.7 New GIDL/GISL */
+IOP( "wfgisl", BSIM4_MOD_WFGISL, IF_REAL, "Width dependence of fgisl"),     /* v4.7 New GIDL/GISL */
 IOP( "wegisl", BSIM4_MOD_WEGISL, IF_REAL, "Width dependence of egisl"),
 IOP( "waigc", BSIM4_MOD_WAIGC, IF_REAL, "Width dependence of aigc"),
 IOP( "wbigc", BSIM4_MOD_WBIGC, IF_REAL, "Width dependence of bigc"),
@@ -830,18 +832,19 @@ IOP( "wteta0",     BSIM4_MOD_WTETA0,     IF_REAL, "Width dependence of teta0"),
 IOP( "wtvoffcv",     BSIM4_MOD_WTVOFFCV,     IF_REAL, "Width dependence of tvoffcv"),  /* v4.7 Tanvir*/
 
 IOP( "pcdsc",  BSIM4_MOD_PCDSC, IF_REAL, "Cross-term dependence of cdsc"),
-IOP( "pcdscb", BSIM4_MOD_PCDSCB, IF_REAL, "Cross-term dependence of cdscb"), 
+IOP( "pcdscb", BSIM4_MOD_PCDSCB, IF_REAL, "Cross-term dependence of cdscb"),
 IOP( "pcdscd", BSIM4_MOD_PCDSCD, IF_REAL, "Cross-term dependence of cdscd"),
 IOP( "pcit",   BSIM4_MOD_PCIT,  IF_REAL, "Cross-term dependence of cit"),
 IOP( "pnfactor", BSIM4_MOD_PNFACTOR, IF_REAL, "Cross-term dependence of nfactor"),
 IOP( "pxj", BSIM4_MOD_PXJ, IF_REAL, "Cross-term dependence of xj"),
 IOP( "pvsat", BSIM4_MOD_PVSAT, IF_REAL, "Cross-term dependence of vsat"),
 IOP( "pat", BSIM4_MOD_PAT, IF_REAL, "Cross-term dependence of at"),
-IOP( "pa0", BSIM4_MOD_PA0, IF_REAL, "Cross-term dependence of a0"), 
+IOP( "pa0", BSIM4_MOD_PA0, IF_REAL, "Cross-term dependence of a0"),
 IOP( "pags", BSIM4_MOD_PAGS, IF_REAL, "Cross-term dependence of ags"),
 IOP( "pa1", BSIM4_MOD_PA1, IF_REAL, "Cross-term dependence of a1"),
 IOP( "pa2", BSIM4_MOD_PA2, IF_REAL, "Cross-term dependence of a2"),
 IOP( "pketa", BSIM4_MOD_PKETA, IF_REAL, "Cross-term dependence of keta"),
+IOP( "pketac", BSIM4_MOD_PKETAC, IF_REAL, "Cross-term dependence of ketac"),
 IOP( "pnsub", BSIM4_MOD_PNSUB, IF_REAL, "Cross-term dependence of nsub"),
 IOP( "pndep",  BSIM4_MOD_PNDEP, IF_REAL, "Cross-term dependence of ndep"),
 IOP( "pnsd",  BSIM4_MOD_PNSD, IF_REAL, "Cross-term dependence of nsd"),
@@ -876,8 +879,8 @@ IOP( "pdvt1w", BSIM4_MOD_PDVT1W, IF_REAL, "Cross-term dependence of dvt1w"),
 IOP( "pdvt2w", BSIM4_MOD_PDVT2W, IF_REAL, "Cross-term dependence of dvt2w"),
 IOP( "pdrout", BSIM4_MOD_PDROUT, IF_REAL, "Cross-term dependence of drout"),
 IOP( "pdsub", BSIM4_MOD_PDSUB, IF_REAL, "Cross-term dependence of dsub"),
-IOP( "pvth0", BSIM4_MOD_PVTH0, IF_REAL,"Cross-term dependence of vth0"),
-IOPR("pvtho", BSIM4_MOD_PVTH0, IF_REAL,"Cross-term dependence of vtho"),
+IOP( "pvth0", BSIM4_MOD_PVTH0, IF_REAL,"Cross-term dependence of vto"),
+IOPR("pvtho", BSIM4_MOD_PVTH0, IF_REAL,"Cross-term dependence of vto"),
 IOP( "pua",  BSIM4_MOD_PUA, IF_REAL, "Cross-term dependence of ua"),
 IOP( "pua1", BSIM4_MOD_PUA1, IF_REAL, "Cross-term dependence of ua1"),
 IOP( "pub", BSIM4_MOD_PUB, IF_REAL, "Cross-term dependence of ub"),
@@ -895,12 +898,12 @@ IOP( "pvoff", BSIM4_MOD_PVOFF, IF_REAL, "Cross-term dependence of voff"),
 IOP( "pminv", BSIM4_MOD_PMINV, IF_REAL, "Cross-term dependence of minv"),
 IOP( "pminvcv", BSIM4_MOD_PMINVCV, IF_REAL, "Cross-term dependence of minvcv"),
 IOP( "pdelta", BSIM4_MOD_PDELTA, IF_REAL, "Cross-term dependence of delta"),
-IOP( "prdsw", BSIM4_MOD_PRDSW,  IF_REAL, "Cross-term dependence of rdsw "),    
+IOP( "prdsw", BSIM4_MOD_PRDSW,  IF_REAL, "Cross-term dependence of rdsw "),
 IOP( "prsw", BSIM4_MOD_PRSW, IF_REAL, "Cross-term dependence of rsw"),
 IOP( "prdw", BSIM4_MOD_PRDW, IF_REAL, "Cross-term dependence of rdw"),
 
-IOP( "pprwg", BSIM4_MOD_PPRWG,  IF_REAL, "Cross-term dependence of prwg "),    
-IOP( "pprwb", BSIM4_MOD_PPRWB,  IF_REAL, "Cross-term dependence of prwb "),    
+IOP( "pprwg", BSIM4_MOD_PPRWG,  IF_REAL, "Cross-term dependence of prwg "),
+IOP( "pprwb", BSIM4_MOD_PPRWB,  IF_REAL, "Cross-term dependence of prwb "),
 
 IOP( "pprt", BSIM4_MOD_PPRT, IF_REAL, "Cross-term dependence of prt "),
 IOP( "peta0", BSIM4_MOD_PETA0, IF_REAL, "Cross-term dependence of eta0"),
@@ -914,7 +917,7 @@ IOP( "ppdits", BSIM4_MOD_PPDITS, IF_REAL, "Cross-term dependence of pdits"),
 IOP( "ppditsd", BSIM4_MOD_PPDITSD, IF_REAL, "Cross-term dependence of pditsd"),
 IOP( "ppscbe1",  BSIM4_MOD_PPSCBE1, IF_REAL, "Cross-term dependence of pscbe1"),
 IOP( "ppscbe2",  BSIM4_MOD_PPSCBE2, IF_REAL, "Cross-term dependence of pscbe2"),
-IOP( "ppvag", BSIM4_MOD_PPVAG, IF_REAL, "Cross-term dependence of pvag"),   
+IOP( "ppvag", BSIM4_MOD_PPVAG, IF_REAL, "Cross-term dependence of pvag"),
 IOP( "pwr",  BSIM4_MOD_PWR, IF_REAL, "Cross-term dependence of wr"),
 IOP( "pdwg", BSIM4_MOD_PDWG, IF_REAL, "Cross-term dependence of dwg"),
 IOP( "pdwb", BSIM4_MOD_PDWB, IF_REAL, "Cross-term dependence of dwb"),
@@ -934,17 +937,17 @@ IOP( "pbeta0", BSIM4_MOD_PBETA0, IF_REAL, "Cross-term dependence of beta0"),
 IOP( "pagidl", BSIM4_MOD_PAGIDL, IF_REAL, "Cross-term dependence of agidl"),
 IOP( "pbgidl", BSIM4_MOD_PBGIDL, IF_REAL, "Cross-term dependence of bgidl"),
 IOP( "pcgidl", BSIM4_MOD_PCGIDL, IF_REAL, "Cross-term dependence of cgidl"),
-IOP( "prgidl", BSIM4_MOD_PRGIDL, IF_REAL, "Cross-term dependence of rgidl"),	/* v4.7 New GIDL/GISL */
-IOP( "pkgidl", BSIM4_MOD_PKGIDL, IF_REAL, "Cross-term dependence of kgidl"),	/* v4.7 New GIDL/GISL */
-IOP( "pfgidl", BSIM4_MOD_PFGIDL, IF_REAL, "Cross-term dependence of fgidl"),	/* v4.7 New GIDL/GISL */
+IOP( "prgidl", BSIM4_MOD_PRGIDL, IF_REAL, "Cross-term dependence of rgidl"),    /* v4.7 New GIDL/GISL */
+IOP( "pkgidl", BSIM4_MOD_PKGIDL, IF_REAL, "Cross-term dependence of kgidl"),    /* v4.7 New GIDL/GISL */
+IOP( "pfgidl", BSIM4_MOD_PFGIDL, IF_REAL, "Cross-term dependence of fgidl"),    /* v4.7 New GIDL/GISL */
 IOP( "pegidl", BSIM4_MOD_PEGIDL, IF_REAL, "Cross-term dependence of egidl"),
 IOP( "pagisl", BSIM4_MOD_PAGISL, IF_REAL, "Cross-term dependence of agisl"),
 IOP( "pbgisl", BSIM4_MOD_PBGISL, IF_REAL, "Cross-term dependence of bgisl"),
 IOP( "pcgisl", BSIM4_MOD_PCGISL, IF_REAL, "Cross-term dependence of cgisl"),
 IOP( "pegisl", BSIM4_MOD_PEGISL, IF_REAL, "Cross-term dependence of egisl"),
-IOP( "prgisl", BSIM4_MOD_PRGISL, IF_REAL, "Cross-term dependence of rgisl"),	/* v4.7 New GIDL/GISL */
-IOP( "pkgisl", BSIM4_MOD_PKGISL, IF_REAL, "Cross-term dependence of kgisl"),	/* v4.7 New GIDL/GISL */
-IOP( "pfgisl", BSIM4_MOD_PFGISL, IF_REAL, "Cross-term dependence of fgisl"),	/* v4.7 New GIDL/GISL */
+IOP( "prgisl", BSIM4_MOD_PRGISL, IF_REAL, "Cross-term dependence of rgisl"),    /* v4.7 New GIDL/GISL */
+IOP( "pkgisl", BSIM4_MOD_PKGISL, IF_REAL, "Cross-term dependence of kgisl"),    /* v4.7 New GIDL/GISL */
+IOP( "pfgisl", BSIM4_MOD_PFGISL, IF_REAL, "Cross-term dependence of fgisl"),    /* v4.7 New GIDL/GISL */
 IOP( "paigc", BSIM4_MOD_PAIGC, IF_REAL, "Cross-term dependence of aigc"),
 IOP( "pbigc", BSIM4_MOD_PBIGC, IF_REAL, "Cross-term dependence of bigc"),
 IOP( "pcigc", BSIM4_MOD_PCIGC, IF_REAL, "Cross-term dependence of cigc"),
@@ -1071,8 +1074,9 @@ char *BSIM4names[] = {
    "Charge"
 };
 
-int	BSIM4nSize = NUMELEMS(BSIM4names);
-int	BSIM4pTSize = NUMELEMS(BSIM4pTable);
-int	BSIM4mPTSize = NUMELEMS(BSIM4mPTable);
-int	BSIM4iSize = sizeof(BSIM4instance);
-int	BSIM4mSize = sizeof(BSIM4model);
+int BSIM4nSize = NUMELEMS(BSIM4names);
+int BSIM4pTSize = NUMELEMS(BSIM4pTable);
+int BSIM4mPTSize = NUMELEMS(BSIM4mPTable);
+int BSIM4iSize = sizeof(BSIM4instance);
+int BSIM4mSize = sizeof(BSIM4model);
+

src/spicelib/devices/bsim4/b4acld.c

@@ -1,38 +1,34 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
+
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "bsim4def.h"
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
 
-
 int
 BSIM4acLoad(
 GENmodel *inModel,
@@ -68,15 +64,13 @@ double FwdSumr, RevSumr, Gmr, Gmbsr;
 double FwdSumi, RevSumi, Gmi, Gmbsi;
 struct bsim4SizeDependParam *pParam;
 double ggidld, ggidlg, ggidlb, ggislg, ggislb, ggisls;
-
-double m;
+double m, mult_i, mult_q;
 
     omega = ckt->CKTomega;
     for (; model != NULL; model = BSIM4nextModel(model)) 
     {    for (here = BSIM4instances(model); here!= NULL;
               here = BSIM4nextInstance(here)) 
-         {
-              pParam = here->pParam;
+         {    pParam = here->pParam;
               capbd = here->BSIM4capbd;
               capbs = here->BSIM4capbs;
               cgso = here->BSIM4cgso;
@@ -106,7 +100,7 @@ double m;
                   Cdsr = here->BSIM4cdsb * T2;
                   Cdbr = -(Cddr + Cdgr + Cdsr);
 
-                  /* WDLiu: Cxyi mulitplied by jomega below, and actually to be of conductance */
+          /* WDLiu: Cxyi mulitplied by jomega below, and actually to be of conductance */
                   Cddi = here->BSIM4cddb * T3 * omega;
                   Cdgi = here->BSIM4cdgb * T3 * omega;
                   Cdsi = here->BSIM4cdsb * T3 * omega;
@@ -158,7 +152,7 @@ double m;
               }
 
 
-              if (here->BSIM4mode >= 0) 
+              if (here->BSIM4mode >= 0)
               {   Gmr = gmr;
                   Gmbsr = gmbsr;
                   FwdSumr = Gmr + Gmbsr;
@@ -236,16 +230,16 @@ double m;
                       xcgmdb = -cgdo * omega;
                       xcgmsb = -cgso * omega;
                       xcgmbb = -pParam->BSIM4cgbo * omega;
-    
+
                       xcdgmb = xcgmdb;
                       xcsgmb = xcgmsb;
                       xcbgmb = xcgmbb;
-    
+
                       xcggbr = Cggr * omega;
                       xcgdbr = Cgdr * omega;
                       xcgsbr = Cgsr * omega;
                       xcgbbr = -(xcggbr + xcgdbr + xcgsbr);
-    
+
                       xcdgbr = Cdgr * omega;
                       xcsgbr = Csgr * omega;
                       xcbgb = here->BSIM4cbgb * omega;
@@ -255,18 +249,18 @@ double m;
                       xcgdbr = (Cgdr - cgdo) * omega;
                       xcgsbr = (Cgsr - cgso) * omega;
                       xcgbbr = -(xcggbr + xcgdbr + xcgsbr);
-    
+
                       xcdgbr = (Cdgr - cgdo) * omega;
                       xcsgbr = (Csgr - cgso) * omega;
                       xcbgb = (here->BSIM4cbgb - pParam->BSIM4cgbo) * omega;
-    
+
                       xcdgmb = xcsgmb = xcbgmb = 0.0;
                   }
                   xcddbr = (Cddr + here->BSIM4capbd + cgdo) * omega;
                   xcdsbr = Cdsr * omega;
                   xcsdbr = Csdr * omega;
                   xcssbr = (here->BSIM4capbs + cgso + Cssr) * omega;
-    
+
                   if (!here->BSIM4rbodyMod)
                   {   xcdbbr = -(xcdgbr + xcddbr + xcdsbr + xcdgmb);
                       xcsbbr = -(xcsgbr + xcsdbr + xcssbr + xcsgmb);
@@ -278,11 +272,11 @@ double m;
                   else
                   {   xcdbbr = Cdbr * omega;
                       xcsbbr = -(xcsgbr + xcsdbr + xcssbr + xcsgmb)
-                             + here->BSIM4capbs * omega;
+                               + here->BSIM4capbs * omega;
 
                       xcbdb = here->BSIM4cbdb * omega;
                       xcbsb = here->BSIM4cbsb * omega;
-    
+
                       xcdbdb = -here->BSIM4capbd * omega;
                       xcsbsb = -here->BSIM4capbs * omega;
                   }
@@ -300,7 +294,7 @@ double m;
                   xcgdbi = Cgdi;
                   xcgsbi = Cgsi;
                   xcgbbi = Cgbi;
-              } 
+              }
               else /* Reverse mode */
               {   Gmr = -gmr;
                   Gmbsr = -gmbsr;
@@ -380,16 +374,16 @@ double m;
                       xcgmdb = -cgdo * omega;
                       xcgmsb = -cgso * omega;
                       xcgmbb = -pParam->BSIM4cgbo * omega;
-    
+
                       xcdgmb = xcgmdb;
                       xcsgmb = xcgmsb;
                       xcbgmb = xcgmbb;
-   
+
                       xcggbr = Cggr * omega;
                       xcgdbr = Cgsr * omega;
                       xcgsbr = Cgdr * omega;
                       xcgbbr = -(xcggbr + xcgdbr + xcgsbr);
-    
+
                       xcdgbr = Csgr * omega;
                       xcsgbr = Cdgr * omega;
                       xcbgb = here->BSIM4cbgb * omega;
@@ -399,18 +393,18 @@ double m;
                       xcgdbr = (Cgsr - cgdo) * omega;
                       xcgsbr = (Cgdr - cgso) * omega;
                       xcgbbr = -(xcggbr + xcgdbr + xcgsbr);
-    
+
                       xcdgbr = (Csgr - cgdo) * omega;
                       xcsgbr = (Cdgr - cgso) * omega;
                       xcbgb = (here->BSIM4cbgb - pParam->BSIM4cgbo) * omega;
-    
+
                       xcdgmb = xcsgmb = xcbgmb = 0.0;
                   }
                   xcddbr = (here->BSIM4capbd + cgdo + Cssr) * omega;
                   xcdsbr = Csdr * omega;
                   xcsdbr = Cdsr * omega;
                   xcssbr = (Cddr + here->BSIM4capbs + cgso) * omega;
-    
+
                   if (!here->BSIM4rbodyMod)
                   {   xcdbbr = -(xcdgbr + xcddbr + xcdsbr + xcdgmb);
                       xcsbbr = -(xcsgbr + xcsdbr + xcssbr + xcsgmb);
@@ -468,6 +462,8 @@ double m;
                * Loading AC matrix
                */
               m = here->BSIM4m;
+              mult_i = here->BSIM4mult_i;
+              mult_q = here->BSIM4mult_q;
 
               if (!model->BSIM4rdsMod)
               {   gdpr = here->BSIM4drainConductance;
@@ -486,122 +482,122 @@ double m;
               geltd = here->BSIM4grgeltd;
 
               if (here->BSIM4rgateMod == 1)
-              {   *(here->BSIM4GEgePtr) += m * geltd;
-                  *(here->BSIM4GPgePtr) -= m * geltd;
-                  *(here->BSIM4GEgpPtr) -= m * geltd;
+              {   *(here->BSIM4GEgePtr) += mult_i * geltd;
+                  *(here->BSIM4GPgePtr) -= mult_i * geltd;
+                  *(here->BSIM4GEgpPtr) -= mult_i * geltd;
 
-                  *(here->BSIM4GPgpPtr +1) += m * xcggbr;
-                  *(here->BSIM4GPgpPtr) += m * (geltd + xcggbi + gIgtotg);
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdbr;
-                  *(here->BSIM4GPdpPtr) += m * (xcgdbi + gIgtotd);
-                  *(here->BSIM4GPspPtr +1) += m * xcgsbr;
-                  *(here->BSIM4GPspPtr) += m * (xcgsbi + gIgtots);
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbbr;
-                  *(here->BSIM4GPbpPtr) += m * (xcgbbi + gIgtotb);
+                  *(here->BSIM4GPgpPtr +1) += mult_q * xcggbr;
+                  *(here->BSIM4GPgpPtr) += mult_i * (geltd + gIgtotg) + mult_q * xcggbi;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdbr;
+                  *(here->BSIM4GPdpPtr) += mult_q * xcgdbi + mult_i * gIgtotd;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsbr;
+                  *(here->BSIM4GPspPtr) += mult_q * xcgsbi + mult_i * gIgtots;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbbr;
+                  *(here->BSIM4GPbpPtr) += mult_q * xcgbbi + mult_i * gIgtotb;
               } /* WDLiu: gcrg already subtracted from all gcrgg below */
               else if (here->BSIM4rgateMod == 2)
-              {   *(here->BSIM4GEgePtr) += m * gcrg;
-                  *(here->BSIM4GEgpPtr) += m * gcrgg;
-                  *(here->BSIM4GEdpPtr) += m * gcrgd;
-                  *(here->BSIM4GEspPtr) += m * gcrgs;
-                  *(here->BSIM4GEbpPtr) += m * gcrgb;
+              {   *(here->BSIM4GEgePtr) += mult_i * gcrg;
+                  *(here->BSIM4GEgpPtr) += mult_i * gcrgg;
+                  *(here->BSIM4GEdpPtr) += mult_i * gcrgd;
+                  *(here->BSIM4GEspPtr) += mult_i * gcrgs;
+                  *(here->BSIM4GEbpPtr) += mult_i * gcrgb;
 
-                  *(here->BSIM4GPgePtr) -= m * gcrg;
-                  *(here->BSIM4GPgpPtr +1) += m * xcggbr;
-                  *(here->BSIM4GPgpPtr) -= m * (gcrgg - xcggbi - gIgtotg);
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdbr;
-                  *(here->BSIM4GPdpPtr) -= m * (gcrgd - xcgdbi - gIgtotd);
-                  *(here->BSIM4GPspPtr +1) += m * xcgsbr;
-                  *(here->BSIM4GPspPtr) -= m * (gcrgs - xcgsbi - gIgtots);
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbbr;
-                  *(here->BSIM4GPbpPtr) -= m * (gcrgb - xcgbbi - gIgtotb);
+                  *(here->BSIM4GPgePtr) -= mult_i * gcrg;
+                  *(here->BSIM4GPgpPtr +1) += mult_q * xcggbr;
+                  *(here->BSIM4GPgpPtr) -= mult_i * (gcrgg - gIgtotg) - mult_q * xcggbi;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdbr;
+                  *(here->BSIM4GPdpPtr) -= mult_i * (gcrgd - gIgtotd) - mult_q * xcgdbi;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsbr;
+                  *(here->BSIM4GPspPtr) -= mult_i * (gcrgs - gIgtots) - mult_q * xcgsbi;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbbr;
+                  *(here->BSIM4GPbpPtr) -= mult_i * (gcrgb - gIgtotb) - mult_q * xcgbbi;
               }
               else if (here->BSIM4rgateMod == 3)
-              {   *(here->BSIM4GEgePtr) += m * geltd;
-                  *(here->BSIM4GEgmPtr) -= m * geltd;
-                  *(here->BSIM4GMgePtr) -= m * geltd;
-                  *(here->BSIM4GMgmPtr) += m * (geltd + gcrg);
-                  *(here->BSIM4GMgmPtr +1) += m * xcgmgmb;
-   
-                  *(here->BSIM4GMdpPtr) += m * gcrgd;
-                  *(here->BSIM4GMdpPtr +1) += m * xcgmdb;
-                  *(here->BSIM4GMgpPtr) += m * gcrgg;
-                  *(here->BSIM4GMspPtr) += m * gcrgs;
-                  *(here->BSIM4GMspPtr +1) += m * xcgmsb;
-                  *(here->BSIM4GMbpPtr) += m * gcrgb;
-                  *(here->BSIM4GMbpPtr +1) += m * xcgmbb;
-   
-                  *(here->BSIM4DPgmPtr +1) += m * xcdgmb;
-                  *(here->BSIM4GPgmPtr) -= m * gcrg;
-                  *(here->BSIM4SPgmPtr +1) += m * xcsgmb;
-                  *(here->BSIM4BPgmPtr +1) += m * xcbgmb;
-   
-                  *(here->BSIM4GPgpPtr) -= m * (gcrgg - xcggbi - gIgtotg);
-                  *(here->BSIM4GPgpPtr +1) += m * xcggbr;
-                  *(here->BSIM4GPdpPtr) -= m * (gcrgd - xcgdbi - gIgtotd);
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdbr;
-                  *(here->BSIM4GPspPtr) -= m * (gcrgs - xcgsbi - gIgtots);
-                  *(here->BSIM4GPspPtr +1) += m * xcgsbr;
-                  *(here->BSIM4GPbpPtr) -= m * (gcrgb - xcgbbi - gIgtotb);
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbbr;
+              {   *(here->BSIM4GEgePtr) += mult_i * geltd;
+                  *(here->BSIM4GEgmPtr) -= mult_i * geltd;
+                  *(here->BSIM4GMgePtr) -= mult_i * geltd;
+                  *(here->BSIM4GMgmPtr) += mult_i * (geltd + gcrg);
+                  *(here->BSIM4GMgmPtr +1) += mult_q * xcgmgmb;
+
+                  *(here->BSIM4GMdpPtr) += mult_i * gcrgd;
+                  *(here->BSIM4GMdpPtr +1) += mult_q * xcgmdb;
+                  *(here->BSIM4GMgpPtr) += mult_i * gcrgg;
+                  *(here->BSIM4GMspPtr) += mult_i * gcrgs;
+                  *(here->BSIM4GMspPtr +1) += mult_q * xcgmsb;
+                  *(here->BSIM4GMbpPtr) += mult_i * gcrgb;
+                  *(here->BSIM4GMbpPtr +1) += mult_q * xcgmbb;
+
+                  *(here->BSIM4DPgmPtr +1) += mult_q * xcdgmb;
+                  *(here->BSIM4GPgmPtr) -= mult_i * gcrg;
+                  *(here->BSIM4SPgmPtr +1) += mult_q * xcsgmb;
+                  *(here->BSIM4BPgmPtr +1) += mult_q * xcbgmb;
+
+                  *(here->BSIM4GPgpPtr) -= mult_i * (gcrgg - gIgtotg) - mult_q * xcggbi;
+                  *(here->BSIM4GPgpPtr +1) += mult_q * xcggbr;
+                  *(here->BSIM4GPdpPtr) -= mult_i * (gcrgd - gIgtotd) - mult_q * xcgdbi;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdbr;
+                  *(here->BSIM4GPspPtr) -= mult_i * (gcrgs - gIgtots) - mult_q * xcgsbi;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsbr;
+                  *(here->BSIM4GPbpPtr) -= mult_i * (gcrgb - gIgtotb) - mult_q * xcgbbi;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbbr;
               }
               else
-              {   *(here->BSIM4GPgpPtr +1) += m * xcggbr;
-                  *(here->BSIM4GPgpPtr) += m * (xcggbi + gIgtotg);
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdbr;
-                  *(here->BSIM4GPdpPtr) += m * (xcgdbi + gIgtotd);
-                  *(here->BSIM4GPspPtr +1) += m * xcgsbr;
-                  *(here->BSIM4GPspPtr) += m * (xcgsbi + gIgtots);
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbbr;
-                  *(here->BSIM4GPbpPtr) += m * (xcgbbi + gIgtotb);
+              {   *(here->BSIM4GPgpPtr +1) += mult_q * xcggbr;
+                  *(here->BSIM4GPgpPtr) += mult_q * xcggbi + mult_i * gIgtotg;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdbr;
+                  *(here->BSIM4GPdpPtr) += mult_q * xcgdbi + mult_i * gIgtotd;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsbr;
+                  *(here->BSIM4GPspPtr) += mult_q * xcgsbi + mult_i * gIgtots;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbbr;
+                  *(here->BSIM4GPbpPtr) += mult_q * xcgbbi + mult_i * gIgtotb;
               }
 
               if (model->BSIM4rdsMod)
-              {   (*(here->BSIM4DgpPtr) += m * gdtotg);
-                  (*(here->BSIM4DspPtr) += m * gdtots);
-                  (*(here->BSIM4DbpPtr) += m * gdtotb);
-                  (*(here->BSIM4SdpPtr) += m * gstotd);
-                  (*(here->BSIM4SgpPtr) += m * gstotg);
-                  (*(here->BSIM4SbpPtr) += m * gstotb);
+              {   (*(here->BSIM4DgpPtr) += mult_i * gdtotg);
+                  (*(here->BSIM4DspPtr) += mult_i * gdtots);
+                  (*(here->BSIM4DbpPtr) += mult_i * gdtotb);
+                  (*(here->BSIM4SdpPtr) += mult_i * gstotd);
+                  (*(here->BSIM4SgpPtr) += mult_i * gstotg);
+                  (*(here->BSIM4SbpPtr) += mult_i * gstotb);
               }
 
-              *(here->BSIM4DPdpPtr +1) += m * (xcddbr + gdsi + RevSumi);
-              *(here->BSIM4DPdpPtr) += m * (gdpr + xcddbi + gdsr + here->BSIM4gbd 
-                                     - gdtotd + RevSumr + gbdpdp - gIdtotd);
-              *(here->BSIM4DPdPtr) -= m * (gdpr + gdtot);
-              *(here->BSIM4DPgpPtr +1) += m * (xcdgbr + Gmi);
-              *(here->BSIM4DPgpPtr) += m * (Gmr + xcdgbi - gdtotg + gbdpg - gIdtotg);
-              *(here->BSIM4DPspPtr +1) += m * (xcdsbr - gdsi - FwdSumi);
-              *(here->BSIM4DPspPtr) -= m * (gdsr - xcdsbi + FwdSumr + gdtots - gbdpsp + gIdtots);
-              *(here->BSIM4DPbpPtr +1) += m * (xcdbbr + Gmbsi);
-              *(here->BSIM4DPbpPtr) -= m * (gjbd + gdtotb - xcdbbi - Gmbsr - gbdpb + gIdtotb);
+              *(here->BSIM4DPdpPtr +1) += mult_q * xcddbr + mult_i * (gdsi + RevSumi);
+              *(here->BSIM4DPdpPtr) += + mult_i * (gdpr + gdsr + here->BSIM4gbd
+                     - gdtotd + RevSumr + gbdpdp - gIdtotd) + mult_q * xcddbi;
+              *(here->BSIM4DPdPtr) -= mult_i * (gdpr + gdtot);
+              *(here->BSIM4DPgpPtr +1) += mult_q * xcdgbr + mult_i * Gmi;
+              *(here->BSIM4DPgpPtr) += mult_i * (Gmr - gdtotg + gbdpg - gIdtotg) + mult_q * xcdgbi;
+              *(here->BSIM4DPspPtr +1) += mult_q * xcdsbr - mult_i * (gdsi + FwdSumi);
+              *(here->BSIM4DPspPtr) -= mult_i * (gdsr + FwdSumr + gdtots - gbdpsp + gIdtots) - mult_q * xcdsbi;
+              *(here->BSIM4DPbpPtr +1) += mult_q * xcdbbr + mult_i * Gmbsi;
+              *(here->BSIM4DPbpPtr) -= mult_i * (gjbd + gdtotb - Gmbsr - gbdpb + gIdtotb) - mult_q * xcdbbi;
 
-              *(here->BSIM4DdpPtr) -= m * (gdpr - gdtotd);
-              *(here->BSIM4DdPtr) += m * (gdpr + gdtot);
+              *(here->BSIM4DdpPtr) -= mult_i * (gdpr - gdtotd);
+              *(here->BSIM4DdPtr) += mult_i * (gdpr + gdtot);
 
-              *(here->BSIM4SPdpPtr +1) += m * (xcsdbr - gdsi - RevSumi);
-              *(here->BSIM4SPdpPtr) -= m * (gdsr - xcsdbi + gstotd + RevSumr - gbspdp + gIstotd);
-              *(here->BSIM4SPgpPtr +1) += m * (xcsgbr - Gmi);
-              *(here->BSIM4SPgpPtr) -= m * (Gmr - xcsgbi + gstotg - gbspg + gIstotg);
-              *(here->BSIM4SPspPtr +1) += m * (xcssbr + gdsi + FwdSumi);
-              *(here->BSIM4SPspPtr) += m * (gspr + xcssbi + gdsr + here->BSIM4gbs
-                                     - gstots + FwdSumr + gbspsp - gIstots);
-              *(here->BSIM4SPsPtr) -= m * (gspr + gstot);
-              *(here->BSIM4SPbpPtr +1) += m * (xcsbbr - Gmbsi);
-              *(here->BSIM4SPbpPtr) -= m * (gjbs + gstotb - xcsbbi + Gmbsr - gbspb + gIstotb);
+              *(here->BSIM4SPdpPtr +1) += mult_q * xcsdbr - mult_i * (gdsi + RevSumi);
+              *(here->BSIM4SPdpPtr) -= mult_i * (gdsr + gstotd + RevSumr - gbspdp + gIstotd) - mult_q * xcsdbi;
+              *(here->BSIM4SPgpPtr +1) += mult_q * xcsgbr - mult_i * Gmi;
+              *(here->BSIM4SPgpPtr) -= mult_i * (Gmr + gstotg - gbspg + gIstotg) - mult_q * xcsgbi;
+              *(here->BSIM4SPspPtr +1) += mult_q * xcssbr + mult_i * (gdsi + FwdSumi);
+              *(here->BSIM4SPspPtr) += mult_i * (gspr + gdsr + here->BSIM4gbs
+                     - gstots + FwdSumr + gbspsp - gIstots) + mult_q * xcssbi;
+              *(here->BSIM4SPsPtr) -= mult_i * (gspr + gstot);
+              *(here->BSIM4SPbpPtr +1) += mult_q * xcsbbr - mult_i * Gmbsi;
+              *(here->BSIM4SPbpPtr) -= mult_i * (gjbs + gstotb + Gmbsr - gbspb + gIstotb) - mult_q * xcsbbi;
 
-              *(here->BSIM4SspPtr) -= m * (gspr - gstots);
-              *(here->BSIM4SsPtr) += m * (gspr + gstot);
+              *(here->BSIM4SspPtr) -= mult_i * (gspr - gstots);
+              *(here->BSIM4SsPtr) += mult_i * (gspr + gstot);
 
-              *(here->BSIM4BPdpPtr +1) += m * xcbdb;
-              *(here->BSIM4BPdpPtr) -= m * (gjbd - gbbdp + gIbtotd);
-              *(here->BSIM4BPgpPtr +1) += m * xcbgb;
-              *(here->BSIM4BPgpPtr) -= m * (here->BSIM4gbgs + gIbtotg);
-              *(here->BSIM4BPspPtr +1) += m * xcbsb;
-              *(here->BSIM4BPspPtr) -= m * (gjbs - gbbsp + gIbtots);
-              *(here->BSIM4BPbpPtr +1) += m * xcbbb;
-              *(here->BSIM4BPbpPtr) += m * (gjbd + gjbs - here->BSIM4gbbs
-                                     - gIbtotb);
+              *(here->BSIM4BPdpPtr +1) += mult_q * xcbdb;
+              *(here->BSIM4BPdpPtr) -= mult_i * (gjbd - gbbdp + gIbtotd);
+              *(here->BSIM4BPgpPtr +1) += mult_q * xcbgb;
+              *(here->BSIM4BPgpPtr) -= mult_i * (here->BSIM4gbgs + gIbtotg);
+              *(here->BSIM4BPspPtr +1) += mult_q * xcbsb;
+              *(here->BSIM4BPspPtr) -= mult_i * (gjbs - gbbsp + gIbtots);
+              *(here->BSIM4BPbpPtr +1) += mult_q * xcbbb;
+              *(here->BSIM4BPbpPtr) += mult_i * (gjbd + gjbs - here->BSIM4gbbs
+                     - gIbtotb);
               ggidld = here->BSIM4ggidld;
               ggidlg = here->BSIM4ggidlg;
               ggidlb = here->BSIM4ggidlb;
@@ -610,67 +606,67 @@ double m;
               ggislb = here->BSIM4ggislb;
 
               /* stamp gidl */
-              (*(here->BSIM4DPdpPtr) += m * ggidld);
-              (*(here->BSIM4DPgpPtr) += m * ggidlg);
-              (*(here->BSIM4DPspPtr) -= m * ((ggidlg + ggidld) + ggidlb));
-              (*(here->BSIM4DPbpPtr) += m * ggidlb);
-              (*(here->BSIM4BPdpPtr) -= m * ggidld);
-              (*(here->BSIM4BPgpPtr) -= m * ggidlg);
-              (*(here->BSIM4BPspPtr) += m * ((ggidlg + ggidld) + ggidlb));
-              (*(here->BSIM4BPbpPtr) -= m * ggidlb);
+              (*(here->BSIM4DPdpPtr) += mult_i * ggidld);
+              (*(here->BSIM4DPgpPtr) += mult_i * ggidlg);
+              (*(here->BSIM4DPspPtr) -= mult_i * ((ggidlg + ggidld) + ggidlb));
+              (*(here->BSIM4DPbpPtr) += mult_i * ggidlb);
+              (*(here->BSIM4BPdpPtr) -= mult_i * ggidld);
+              (*(here->BSIM4BPgpPtr) -= mult_i * ggidlg);
+              (*(here->BSIM4BPspPtr) += mult_i * ((ggidlg + ggidld) + ggidlb));
+              (*(here->BSIM4BPbpPtr) -= mult_i * ggidlb);
                /* stamp gisl */
-              (*(here->BSIM4SPdpPtr) -= m * ((ggisls + ggislg) + ggislb));
-              (*(here->BSIM4SPgpPtr) += m * ggislg);
-              (*(here->BSIM4SPspPtr) += m * ggisls);
-              (*(here->BSIM4SPbpPtr) += m * ggislb);
-              (*(here->BSIM4BPdpPtr) += m * ((ggislg + ggisls) + ggislb));
-              (*(here->BSIM4BPgpPtr) -= m * ggislg);
-              (*(here->BSIM4BPspPtr) -= m * ggisls);
-              (*(here->BSIM4BPbpPtr) -= m * ggislb);
+              (*(here->BSIM4SPdpPtr) -= mult_i * ((ggisls + ggislg) + ggislb));
+              (*(here->BSIM4SPgpPtr) += mult_i * ggislg);
+              (*(here->BSIM4SPspPtr) += mult_i * ggisls);
+              (*(here->BSIM4SPbpPtr) += mult_i * ggislb);
+              (*(here->BSIM4BPdpPtr) += mult_i * ((ggislg + ggisls) + ggislb));
+              (*(here->BSIM4BPgpPtr) -= mult_i * ggislg);
+              (*(here->BSIM4BPspPtr) -= mult_i * ggisls);
+              (*(here->BSIM4BPbpPtr) -= mult_i * ggislb);
 
               if (here->BSIM4rbodyMod)
-              {   (*(here->BSIM4DPdbPtr +1) += m * xcdbdb);
-                  (*(here->BSIM4DPdbPtr) -= m * here->BSIM4gbd);
-                  (*(here->BSIM4SPsbPtr +1) += m * xcsbsb);
-                  (*(here->BSIM4SPsbPtr) -= m * here->BSIM4gbs);
+              {   (*(here->BSIM4DPdbPtr +1) += mult_q * xcdbdb);
+                  (*(here->BSIM4DPdbPtr) -= mult_i * here->BSIM4gbd);
+                  (*(here->BSIM4SPsbPtr +1) += mult_q * xcsbsb);
+                  (*(here->BSIM4SPsbPtr) -= mult_i * here->BSIM4gbs);
 
-                  (*(here->BSIM4DBdpPtr +1) += m * xcdbdb);
-                  (*(here->BSIM4DBdpPtr) -= m * here->BSIM4gbd);
-                  (*(here->BSIM4DBdbPtr +1) -= m * xcdbdb);
-                  (*(here->BSIM4DBdbPtr) += m * (here->BSIM4gbd + here->BSIM4grbpd 
+                  (*(here->BSIM4DBdpPtr +1) += mult_q * xcdbdb);
+                  (*(here->BSIM4DBdpPtr) -= mult_i * here->BSIM4gbd);
+                  (*(here->BSIM4DBdbPtr +1) -= mult_q * xcdbdb);
+                  (*(here->BSIM4DBdbPtr) += mult_i * (here->BSIM4gbd + here->BSIM4grbpd
                                           + here->BSIM4grbdb));
-                  (*(here->BSIM4DBbpPtr) -= m * here->BSIM4grbpd);
-                  (*(here->BSIM4DBbPtr) -= m * here->BSIM4grbdb);
+                  (*(here->BSIM4DBbpPtr) -= mult_i * here->BSIM4grbpd);
+                  (*(here->BSIM4DBbPtr) -= mult_i * here->BSIM4grbdb);
 
-                  (*(here->BSIM4BPdbPtr) -= m * here->BSIM4grbpd);
-                  (*(here->BSIM4BPbPtr) -= m * here->BSIM4grbpb);
-                  (*(here->BSIM4BPsbPtr) -= m * here->BSIM4grbps);
-                  (*(here->BSIM4BPbpPtr) += m * (here->BSIM4grbpd + here->BSIM4grbps 
-                                          + here->BSIM4grbpb));
-                  /* WDLiu: (-here->BSIM4gbbs) already added to BPbpPtr */
+                  (*(here->BSIM4BPdbPtr) -= mult_i * here->BSIM4grbpd);
+                  (*(here->BSIM4BPbPtr) -= mult_i * here->BSIM4grbpb);
+                  (*(here->BSIM4BPsbPtr) -= mult_i * here->BSIM4grbps);
+                  (*(here->BSIM4BPbpPtr) += mult_i * (here->BSIM4grbpd + here->BSIM4grbps
+                      + here->BSIM4grbpb));
+          /* WDLiu: (-here->BSIM4gbbs) already added to BPbpPtr */
 
-                  (*(here->BSIM4SBspPtr +1) += m * xcsbsb);
-                  (*(here->BSIM4SBspPtr) -= m * here->BSIM4gbs);
-                  (*(here->BSIM4SBbpPtr) -= m * here->BSIM4grbps);
-                  (*(here->BSIM4SBbPtr) -= m * here->BSIM4grbsb);
-                  (*(here->BSIM4SBsbPtr +1) -= m * xcsbsb);
-                  (*(here->BSIM4SBsbPtr) += m * (here->BSIM4gbs
-                                          + here->BSIM4grbps + here->BSIM4grbsb));
+                  (*(here->BSIM4SBspPtr +1) += mult_q * xcsbsb);
+                  (*(here->BSIM4SBspPtr) -= mult_i * here->BSIM4gbs);
+                  (*(here->BSIM4SBbpPtr) -= mult_i * here->BSIM4grbps);
+                  (*(here->BSIM4SBbPtr) -= mult_i * here->BSIM4grbsb);
+                  (*(here->BSIM4SBsbPtr +1) -= mult_q * xcsbsb);
+                  (*(here->BSIM4SBsbPtr) += mult_i * (here->BSIM4gbs
+                      + here->BSIM4grbps + here->BSIM4grbsb));
 
-                  (*(here->BSIM4BdbPtr) -= m * here->BSIM4grbdb);
-                  (*(here->BSIM4BbpPtr) -= m * here->BSIM4grbpb);
-                  (*(here->BSIM4BsbPtr) -= m * here->BSIM4grbsb);
-                  (*(here->BSIM4BbPtr) += m * (here->BSIM4grbsb + here->BSIM4grbdb
+                  (*(here->BSIM4BdbPtr) -= mult_i * here->BSIM4grbdb);
+                  (*(here->BSIM4BbpPtr) -= mult_i * here->BSIM4grbpb);
+                  (*(here->BSIM4BsbPtr) -= mult_i * here->BSIM4grbsb);
+                  (*(here->BSIM4BbPtr) += mult_i * (here->BSIM4grbsb + here->BSIM4grbdb
                                         + here->BSIM4grbpb));
               }
 
 
-           /*
-            * WDLiu: The internal charge node generated for transient NQS is not needed for
-            *        AC NQS. The following is not doing a real job, but we have to keep it;
-            *        otherwise a singular AC NQS matrix may occur if the transient NQS is on.
-            *        The charge node is isolated from the instance.
-            */
+       /*
+        * WDLiu: The internal charge node generated for transient NQS is not needed for
+        *        AC NQS. The following is not doing a real job, but we have to keep it;
+        *        otherwise a singular AC NQS matrix may occur if the transient NQS is on.
+        *        The charge node is isolated from the instance.
+        */
            if (here->BSIM4trnqsMod)
            {   (*(here->BSIM4QqPtr) += m * 1.0);
                (*(here->BSIM4QgpPtr) += 0.0);

src/spicelib/devices/bsim4/b4ask.c

@@ -1,31 +1,28 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
+
 #include "ngspice/ngspice.h"
 #include "ngspice/ifsim.h"
 #include "ngspice/cktdefs.h"
@@ -46,7 +43,7 @@ BSIM4instance *here = (BSIM4instance*)inst;
 
     NG_IGNORE(select);
 
-    switch(which) 
+    switch(which)
     {   case BSIM4_L:
             value->rValue = here->BSIM4l;
             return(OK);
@@ -56,6 +53,15 @@ BSIM4instance *here = (BSIM4instance*)inst;
         case BSIM4_M:
             value->rValue = here->BSIM4m;
             return(OK);
+        case BSIM4_MULT_I:
+            value->rValue = here->BSIM4mult_i;
+            return(OK);
+        case BSIM4_MULT_Q:
+            value->rValue = here->BSIM4mult_q;
+            return(OK);
+        case BSIM4_MULT_FN:
+            value->rValue = here->BSIM4mult_fn;
+            return(OK);
         case BSIM4_NF:
             value->rValue = here->BSIM4nf;
             return(OK);
@@ -123,12 +129,6 @@ BSIM4instance *here = (BSIM4instance*)inst;
         case BSIM4_DELVTO:
             value->rValue = here->BSIM4delvto;
             return(OK);
-        case BSIM4_MULU0:
-            value->rValue = here->BSIM4mulu0;
-            return(OK);
-        case BSIM4_WNFLAG:
-            value->iValue = here->BSIM4wnflag;
-            return(OK);
         case BSIM4_XGW:
             value->rValue = here->BSIM4xgw;
             return(OK);
@@ -197,11 +197,11 @@ BSIM4instance *here = (BSIM4instance*)inst;
             return(OK);
         case BSIM4_SOURCECONDUCT:
             value->rValue = here->BSIM4sourceConductance;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_DRAINCONDUCT:
             value->rValue = here->BSIM4drainConductance;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_VBD:
             value->rValue = *(ckt->CKTstate0 + here->BSIM4vbd);
@@ -216,204 +216,202 @@ BSIM4instance *here = (BSIM4instance*)inst;
             value->rValue = *(ckt->CKTstate0 + here->BSIM4vds);
             return(OK);
         case BSIM4_CD:
-            value->rValue = here->BSIM4cd; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4cd;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_CBS:
-            value->rValue = here->BSIM4cbs; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4cbs;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_CBD:
-            value->rValue = here->BSIM4cbd; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4cbd;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_CSUB:
-            value->rValue = here->BSIM4csub; 
-            value->rValue *= here->BSIM4m;
-            return(OK);
-        case BSIM4_QINV:
-            value->rValue = here-> BSIM4qinv; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4csub;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_IGIDL:
-            value->rValue = here->BSIM4Igidl; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4Igidl;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_IGISL:
-            value->rValue = here->BSIM4Igisl; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4Igisl;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_IGS:
-            value->rValue = here->BSIM4Igs; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4Igs;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_IGD:
-            value->rValue = here->BSIM4Igd; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4Igd;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_IGB:
-            value->rValue = here->BSIM4Igb; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4Igb;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_IGCS:
-            value->rValue = here->BSIM4Igcs; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4Igcs;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_IGCD:
-            value->rValue = here->BSIM4Igcd; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4Igcd;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_GM:
-            value->rValue = here->BSIM4gm; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4gm;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_GDS:
-            value->rValue = here->BSIM4gds; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4gds;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_GMBS:
-            value->rValue = here->BSIM4gmbs; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4gmbs;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_GBD:
-            value->rValue = here->BSIM4gbd; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4gbd;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_GBS:
-            value->rValue = here->BSIM4gbs; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4gbs;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
 /*        case BSIM4_QB:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4qb); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4qb);
             return(OK); */
         case BSIM4_CQB:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4cqb); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4cqb);
             return(OK);
 /*        case BSIM4_QG:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4qg); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4qg);
             return(OK); */
         case BSIM4_CQG:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4cqg); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4cqg);
             return(OK);
 /*        case BSIM4_QD:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4qd); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4qd);
             return(OK); */
         case BSIM4_CQD:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4cqd); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4cqd);
             return(OK);
 /*        case BSIM4_QS:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4qs); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4qs);
             return(OK); */
         case BSIM4_QB:
-            value->rValue = here->BSIM4qbulk; 
-            value->rValue *= here->BSIM4m;
-            return(OK); 
+            value->rValue = here->BSIM4qbulk;
+            value->rValue *= here->BSIM4mult_q;
+            return(OK);
         case BSIM4_QG:
-            value->rValue = here->BSIM4qgate; 
-            value->rValue *= here->BSIM4m;
-            return(OK); 
+            value->rValue = here->BSIM4qgate;
+            value->rValue *= here->BSIM4mult_q;
+            return(OK);
         case BSIM4_QS:
-            value->rValue = here->BSIM4qsrc; 
-            value->rValue *= here->BSIM4m;
-            return(OK); 
+            value->rValue = here->BSIM4qsrc;
+            value->rValue *= here->BSIM4mult_q;
+            return(OK);
         case BSIM4_QD:
-            value->rValue = here->BSIM4qdrn; 
-            value->rValue *= here->BSIM4m;
-            return(OK); 
+            value->rValue = here->BSIM4qdrn;
+            value->rValue *= here->BSIM4mult_q;
+            return(OK);
+        case BSIM4_QINV:
+            value->rValue = here->BSIM4qinv;
+            return(OK);
         case BSIM4_QDEF:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4qdef); 
-            return(OK); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4qdef);
+            return(OK);
         case BSIM4_GCRG:
             value->rValue = here->BSIM4gcrg;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_i;
             return(OK);
         case BSIM4_GTAU:
             value->rValue = here->BSIM4gtau;
-            value->rValue *= here->BSIM4m;
             return(OK);
         case BSIM4_CGGB:
-            value->rValue = here->BSIM4cggb; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4cggb;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CGDB:
             value->rValue = here->BSIM4cgdb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CGSB:
             value->rValue = here->BSIM4cgsb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CDGB:
-            value->rValue = here->BSIM4cdgb; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4cdgb;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CDDB:
-            value->rValue = here->BSIM4cddb; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4cddb;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CDSB:
-            value->rValue = here->BSIM4cdsb; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4cdsb;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CBGB:
             value->rValue = here->BSIM4cbgb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CBDB:
             value->rValue = here->BSIM4cbdb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CBSB:
             value->rValue = here->BSIM4cbsb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CSGB:
             value->rValue = here->BSIM4csgb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CSDB:
             value->rValue = here->BSIM4csdb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CSSB:
             value->rValue = here->BSIM4cssb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CGBB:
             value->rValue = here->BSIM4cgbb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CDBB:
             value->rValue = here->BSIM4cdbb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CSBB:
             value->rValue = here->BSIM4csbb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CBBB:
             value->rValue = here->BSIM4cbbb;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CAPBD:
-            value->rValue = here->BSIM4capbd; 
-            value->rValue *= here->BSIM4m;
+            value->rValue = here->BSIM4capbd;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_CAPBS:
             value->rValue = here->BSIM4capbs;
-            value->rValue *= here->BSIM4m;
+            value->rValue *= here->BSIM4mult_q;
             return(OK);
         case BSIM4_VON:
-            value->rValue = here->BSIM4von; 
+            value->rValue = here->BSIM4von;
             return(OK);
         case BSIM4_VDSAT:
-            value->rValue = here->BSIM4vdsat; 
+            value->rValue = here->BSIM4vdsat;
             return(OK);
         case BSIM4_QBS:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4qbs); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4qbs);
             return(OK);
         case BSIM4_QBD:
-            value->rValue = *(ckt->CKTstate0 + here->BSIM4qbd); 
+            value->rValue = *(ckt->CKTstate0 + here->BSIM4qbd);
             return(OK);
         case BSIM4_VGSTEFF:
             value->rValue = here->BSIM4Vgsteff;

src/spicelib/devices/bsim4/b4cvtest.c

@@ -1,31 +1,28 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
+
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "bsim4def.h"
@@ -35,7 +32,6 @@ under the License.
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
 
-
 int
 BSIM4convTest(
 GENmodel *inModel,
@@ -44,7 +40,7 @@ CKTcircuit *ckt)
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
 double delvbd, delvbs, delvds, delvgd, delvgs;
-double delvdbd, delvsbs; 
+double delvdbd, delvsbs;
 double delvbd_jct, delvbs_jct;
 double vds, vgs, vgd, vgdo, vbs, vbd;
 double vdbd, vdbs, vsbs;
@@ -57,8 +53,7 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
     for (; model != NULL; model = BSIM4nextModel(model))
     {    for (here = BSIM4instances(model); here != NULL ;
               here=BSIM4nextInstance(here)) 
-         {
-              vds = model->BSIM4type
+         {    vds = model->BSIM4type
                   * (*(ckt->CKTrhsOld + here->BSIM4dNodePrime)
                   - *(ckt->CKTrhsOld + here->BSIM4sNodePrime));
               vgs = model->BSIM4type
@@ -72,14 +67,14 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
                    - *(ckt->CKTrhsOld + here->BSIM4sNodePrime));
               vsbs = model->BSIM4type
                    * (*(ckt->CKTrhsOld + here->BSIM4sbNode)
-                   - *(ckt->CKTrhsOld + here->BSIM4sNodePrime));              
+                   - *(ckt->CKTrhsOld + here->BSIM4sNodePrime));
               vses = model->BSIM4type
                    * (*(ckt->CKTrhsOld + here->BSIM4sNode)
                    - *(ckt->CKTrhsOld + here->BSIM4sNodePrime));
               vdes = model->BSIM4type
                    * (*(ckt->CKTrhsOld + here->BSIM4dNode)
                    - *(ckt->CKTrhsOld + here->BSIM4sNodePrime));
-              
+
               vgdo = *(ckt->CKTstate0 + here->BSIM4vgs)
                     - *(ckt->CKTstate0 + here->BSIM4vds);
               vbd = vbs - vds;
@@ -125,11 +120,11 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
                          * delvds + here->BSIM4gIgbb * delvbs;
               }
               else
-               {   Idtot = here->BSIM4cd + here->BSIM4cbd - here->BSIM4Igidl; /* bugfix */
-                   cdhat = Idtot + here->BSIM4gbd * delvbd_jct + here->BSIM4gmbs 
-                         * delvbd + here->BSIM4gm * delvgd 
-                         - (here->BSIM4gds + here->BSIM4ggidls) * delvds 
-                         - here->BSIM4ggidlg * delvgs - here->BSIM4ggidlb * delvbs;
+              {   Idtot = here->BSIM4cd + here->BSIM4cbd - here->BSIM4Igidl; /* bugfix */
+                  cdhat = Idtot + here->BSIM4gbd * delvbd_jct + here->BSIM4gmbs
+                        * delvbd + here->BSIM4gm * delvgd
+                        - (here->BSIM4gds + here->BSIM4ggidls) * delvds
+                        - here->BSIM4ggidlg * delvgs - here->BSIM4ggidlb * delvbs;
 
                   Igstot = here->BSIM4Igs + here->BSIM4Igcd;
                   cgshat = Igstot + here->BSIM4gIgsg * delvgs + here->BSIM4gIgcdg * delvgd
@@ -176,7 +171,7 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
                       || (fabs(cdedhat - Idedtot) >= tol2))
                   {   ckt->CKTnoncon++;
                       return(OK);
-                  } 
+                  }
 
                   if ((fabs(cgshat - Igstot) >= tol3) || (fabs(cgdhat - Igdtot) >= tol4)
                       || (fabs(cgbhat - Igbtot) >= tol5))
@@ -194,15 +189,15 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
                             - here->BSIM4ggislg * delvgd - here->BSIM4ggislb* delvbd + here->BSIM4ggisls * delvds ;
                   }
                   else
-                  {   cbhat = Ibtot + here->BSIM4gbs * delvbs_jct + here->BSIM4gbd 
-                         * delvbd_jct - (here->BSIM4gbbs + here->BSIM4ggislb) * delvbd
-                         - (here->BSIM4gbgs + here->BSIM4ggislg) * delvgd
-                         + (here->BSIM4gbds + here->BSIM4ggisld - here->BSIM4ggidls) * delvds
-                         - here->BSIM4ggidlg * delvgs - here->BSIM4ggidlb * delvbs; 
+                  {   cbhat = Ibtot + here->BSIM4gbs * delvbs_jct + here->BSIM4gbd
+                                 * delvbd_jct - (here->BSIM4gbbs + here->BSIM4ggislb) * delvbd
+                                 - (here->BSIM4gbgs + here->BSIM4ggislg) * delvgd
+                                 + (here->BSIM4gbds + here->BSIM4ggisld - here->BSIM4ggidls) * delvds
+                                 - here->BSIM4ggidlg * delvgs - here->BSIM4ggidlb * delvbs;
                   }
-                  tol6 = ckt->CKTreltol * MAX(fabs(cbhat), 
-                        fabs(Ibtot)) + ckt->CKTabstol;
-                  if (fabs(cbhat - Ibtot) > tol6) 
+                  tol6 = ckt->CKTreltol * MAX(fabs(cbhat),
+                  fabs(Ibtot)) + ckt->CKTabstol;
+                  if (fabs(cbhat - Ibtot) > tol6)
                   {   ckt->CKTnoncon++;
                       return(OK);
                   }

src/spicelib/devices/bsim4/b4geo.c

@@ -1,35 +1,30 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
 #include "ngspice/ngspice.h"
 #include "bsim4def.h"
 
-
 static int
 BSIM4NumFingerDiff(
 double nf,
@@ -38,32 +33,30 @@ double *nuIntD, double *nuEndD, double *nuIntS, double *nuEndS)
 {
 int NF;
         NF = (int)nf;
-	if ((NF%2) != 0)
-	{   *nuEndD = *nuEndS = 1.0;
-	    *nuIntD = *nuIntS = 2.0 * MAX((nf - 1.0) / 2.0, 0.0);
-	}
-	else
-	{   if (minSD == 1) /* minimize # of source */
-	    {   *nuEndD = 2.0;
-		*nuIntD = 2.0 * MAX((nf / 2.0 - 1.0), 0.0);
-		*nuEndS = 0.0;
-		*nuIntS = nf;
-	    }
-	    else
-	    {   *nuEndD = 0.0;
+    if ((NF%2) != 0)
+    {   *nuEndD = *nuEndS = 1.0;
+        *nuIntD = *nuIntS = 2.0 * MAX((nf - 1.0) / 2.0, 0.0);
+    }
+    else
+    {   if (minSD == 1) /* minimize # of source */
+        {   *nuEndD = 2.0;
+        *nuIntD = 2.0 * MAX((nf / 2.0 - 1.0), 0.0);
+        *nuEndS = 0.0;
+        *nuIntS = nf;
+        }
+        else
+        {   *nuEndD = 0.0;
                 *nuIntD = nf;
                 *nuEndS = 2.0;
                 *nuIntS = 2.0 * MAX((nf / 2.0 - 1.0), 0.0);
-	    }
-	}
+        }
+    }
 return 0;
 }
 
-
 int
 BSIM4PAeffGeo(
-double nf,
-int geo, int minSD,
+double nf, int geo, int minSD,
 double Weffcj, double DMCG, double DMCI, double DMDG,
 double *Ps, double *Pd, double *As, double *Ad)
 {
@@ -72,29 +65,29 @@ double ADiso, ADsha, ADmer, ASiso, ASsha, ASmer;
 double PDiso, PDsha, PDmer, PSiso, PSsha, PSmer;
 double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
 
-	if (geo < 9) /* For geo = 9 and 10, the numbers of S/D diffusions already known */
-	BSIM4NumFingerDiff(nf, minSD, &nuIntD, &nuEndD, &nuIntS, &nuEndS);
+    if (geo < 9) /* For geo = 9 and 10, the numbers of S/D diffusions already known */
+    BSIM4NumFingerDiff(nf, minSD, &nuIntD, &nuEndD, &nuIntS, &nuEndS);
 
-	T0 = DMCG + DMCI;
-	T1 = DMCG + DMCG;
-	T2 = DMDG + DMDG;
+    T0 = DMCG + DMCI;
+    T1 = DMCG + DMCG;
+    T2 = DMDG + DMDG;
 
-	PSiso = PDiso = T0 + T0 + Weffcj;
-	PSsha = PDsha = T1;
-	PSmer = PDmer = T2;
+    PSiso = PDiso = T0 + T0 + Weffcj;
+    PSsha = PDsha = T1;
+    PSmer = PDmer = T2;
 
-	ASiso = ADiso = T0 * Weffcj;
-	ASsha = ADsha = DMCG * Weffcj;
-	ASmer = ADmer = DMDG * Weffcj;
+    ASiso = ADiso = T0 * Weffcj;
+    ASsha = ADsha = DMCG * Weffcj;
+    ASmer = ADmer = DMDG * Weffcj;
 
-	switch(geo)
-	{   case 0:
-		*Ps = nuEndS * PSiso + nuIntS * PSsha;
-		*Pd = nuEndD * PDiso + nuIntD * PDsha;
-		*As = nuEndS * ASiso + nuIntS * ASsha;
-		*Ad = nuEndD * ADiso + nuIntD * ADsha;
-		break;
-	    case 1:
+    switch(geo)
+    {   case 0:
+        *Ps = nuEndS * PSiso + nuIntS * PSsha;
+        *Pd = nuEndD * PDiso + nuIntD * PDsha;
+        *As = nuEndS * ASiso + nuIntS * ASsha;
+        *Ad = nuEndD * ADiso + nuIntD * ADsha;
+        break;
+        case 1:
                 *Ps = nuEndS * PSiso + nuIntS * PSsha;
                 *Pd = (nuEndD + nuIntD) * PDsha;
                 *As = nuEndS * ASiso + nuIntS * ASsha;
@@ -154,61 +147,59 @@ double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
                 *As = nf * ASsha;
                 *Ad = ADiso + (nf - 1.0) * ADsha;
                 break;
-	    default:
-		printf("Warning: Specified GEO = %d not matched\n", geo); 
-	}
+        default:
+        printf("Warning: Specified GEO = %d not matched\n", geo);
+    }
 return 0;
 }
 
 
 int
 BSIM4RdseffGeo(
-double nf,
-int geo, int rgeo, int minSD,
-double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
-int Type,
+double nf, int geo, int rgeo, int minSD,
+double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, int Type,
 double *Rtot)
 {
-double Rint=0.0, Rend = 0.0;
+double Rint = 0.0, Rend = 0.0;
 double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
 
         if (geo < 9) /* since geo = 9 and 10 only happen when nf = even */
         {   BSIM4NumFingerDiff(nf, minSD, &nuIntD, &nuEndD, &nuIntS, &nuEndS);
 
             /* Internal S/D resistance -- assume shared S or D and all wide contacts */
-	    if (Type == 1)
-	    {   if (nuIntS == 0.0)
-		    Rint = 0.0;
-	        else
-		    Rint = Rsh * DMCG / ( Weffcj * nuIntS); 
-	    }
-	    else
-	    {  if (nuIntD == 0.0)
+        if (Type == 1)
+        {   if (nuIntS == 0.0)
+            Rint = 0.0;
+            else
+            Rint = Rsh * DMCG / ( Weffcj * nuIntS);
+        }
+        else
+        {  if (nuIntD == 0.0)
                    Rint = 0.0;
-               else        
+               else
                    Rint = Rsh * DMCG / ( Weffcj * nuIntD);
-	    }
-	}
+        }
+    }
 
         /* End S/D resistance  -- geo dependent */
         switch(geo)
         {   case 0:
-		if (Type == 1) BSIM4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG,
-					      nuEndS, rgeo, 1, &Rend);
-		else           BSIM4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG,
-			     		      nuEndD, rgeo, 0, &Rend);
+        if (Type == 1) BSIM4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG,
+                          nuEndS, rgeo, 1, &Rend);
+        else           BSIM4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG,
+                              nuEndD, rgeo, 0, &Rend);
                 break;
             case 1:
                 if (Type == 1) BSIM4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG,
                                               nuEndS, rgeo, 1, &Rend);
                 else           BSIM4RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG,
-					      nuEndD, rgeo, 0, &Rend);
+                          nuEndD, rgeo, 0, &Rend);
                 break;
             case 2:
                 if (Type == 1) BSIM4RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG,
-					      nuEndS, rgeo, 1, &Rend);
+                          nuEndS, rgeo, 1, &Rend);
                 else           BSIM4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG,
-					      nuEndD, rgeo, 0, &Rend);
+                          nuEndD, rgeo, 0, &Rend);
                 break;
             case 3:
                 if (Type == 1) BSIM4RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG,
@@ -237,20 +228,20 @@ double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
                                               nuEndD, rgeo, 0, &Rend);
                 break;
             case 8:
-                Rend = Rsh * DMDG / Weffcj;	
+                Rend = Rsh * DMDG / Weffcj;
                 break;
             case 9: /* all wide contacts assumed for geo = 9 and 10 */
-		if (Type == 1)
-		{   Rend = 0.5 * Rsh * DMCG / Weffcj;
-		    if (nf == 2.0)
-		        Rint = 0.0;
-		    else
-		        Rint = Rsh * DMCG / (Weffcj * (nf - 2.0));
-		}
-		else
-		{   Rend = 0.0;
+        if (Type == 1)
+        {   Rend = 0.5 * Rsh * DMCG / Weffcj;
+            if (nf == 2.0)
+                Rint = 0.0;
+            else
+                Rint = Rsh * DMCG / (Weffcj * (nf - 2.0));
+        }
+        else
+        {   Rend = 0.0;
                     Rint = Rsh * DMCG / (Weffcj * nf);
-		}
+        }
                 break;
             case 10:
                 if (Type == 1)
@@ -269,14 +260,14 @@ double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
                 printf("Warning: Specified GEO = %d not matched\n", geo);
         }
 
-	if (Rint <= 0.0)
-	    *Rtot = Rend;
-	else if (Rend <= 0.0)
-	    *Rtot = Rint;
-	else
-	    *Rtot = Rint * Rend / (Rint + Rend);
+    if (Rint <= 0.0)
+        *Rtot = Rend;
+    else if (Rend <= 0.0)
+        *Rtot = Rint;
+    else
+        *Rtot = Rint * Rend / (Rint + Rend);
 if(*Rtot==0.0)
-	printf("Warning: Zero resistance returned from RdseffGeo\n");
+    printf("Warning: Zero resistance returned from RdseffGeo\n");
 return 0;
 }
 
@@ -284,38 +275,35 @@ return 0;
 int
 BSIM4RdsEndIso(
 double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
-double nuEnd,
-int rgeo, int Type,
-double *Rend)
-{	
-        NG_IGNORE(DMDG);
-
-	if (Type == 1)
-	{   switch(rgeo)
-            {	case 1:
-		case 2:
-		case 5:
-		    if (nuEnd == 0.0)
-		        *Rend = 0.0;
-		    else
+double nuEnd, int rgeo, int Type, double *Rend)
+{
+    NG_IGNORE(DMDG);
+    if (Type == 1)
+    {   switch(rgeo)
+            {   case 1:
+        case 2:
+        case 5:
+            if (nuEnd == 0.0)
+                *Rend = 0.0;
+            else
                         *Rend = Rsh * DMCG / (Weffcj * nuEnd);
-		    break;
+            break;
                 case 3:
                 case 4:
                 case 6:
-		    if ((DMCG + DMCI) == 0.0)
+            if ((DMCG + DMCI) == 0.0)
                          printf("(DMCG + DMCI) can not be equal to zero\n");
                     if ((nuEnd == 0.0)||((DMCG+DMCI)==0.0))
                         *Rend = 0.0;
                     else
                         *Rend = Rsh * Weffcj / (3.0 * nuEnd * (DMCG + DMCI));
                     break;
-		default:
-		    printf("Warning: Specified RGEO = %d not matched\n", rgeo);
+        default:
+            printf("Warning: Specified RGEO = %d not matched\n", rgeo);
             }
-	}
-	else
-	{  switch(rgeo)
+    }
+    else
+    {  switch(rgeo)
             {   case 1:
                 case 3:
                 case 7:
@@ -337,7 +325,7 @@ double *Rend)
                 default:
                     printf("Warning: Specified RGEO = %d not matched\n", rgeo);
             }
-	}
+    }
 return 0;
 }
 
@@ -345,9 +333,7 @@ return 0;
 int
 BSIM4RdsEndSha(
 double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG,
-double nuEnd,
-int rgeo, int Type,
-double *Rend)
+double nuEnd, int rgeo, int Type, double *Rend)
 {
         NG_IGNORE(DMCI);
         NG_IGNORE(DMDG);

src/spicelib/devices/bsim4/b4getic.c

@@ -1,20 +1,13 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   * 
    ******************************************************************************/
 
 /*
@@ -24,6 +17,9 @@ http://opensource.org/licenses/ECL-2.0
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc 
 */
 
 #include "ngspice/ngspice.h"
@@ -32,7 +28,6 @@ under the License.
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
 
-
 int
 BSIM4getic(
 GENmodel *inModel,
@@ -43,20 +38,20 @@ BSIM4instance *here;
 
     for (; model ; model = BSIM4nextModel(model)) 
     {    for (here = BSIM4instances(model); here; here = BSIM4nextInstance(here))
-          {
-              if (!here->BSIM4icVDSGiven) 
-              {   here->BSIM4icVDS = *(ckt->CKTrhs + here->BSIM4dNode) 
-                                   - *(ckt->CKTrhs + here->BSIM4sNode);
-              }
-              if (!here->BSIM4icVGSGiven) 
-              {   here->BSIM4icVGS = *(ckt->CKTrhs + here->BSIM4gNodeExt) 
-                                   - *(ckt->CKTrhs + here->BSIM4sNode);
-              }
-              if(!here->BSIM4icVBSGiven)
-              {  here->BSIM4icVBS = *(ckt->CKTrhs + here->BSIM4bNode)
-                                  - *(ckt->CKTrhs + here->BSIM4sNode);
-              }
-         }
+        {
+            if (!here->BSIM4icVDSGiven)
+            {   here->BSIM4icVDS = *(ckt->CKTrhs + here->BSIM4dNode)
+                     - *(ckt->CKTrhs + here->BSIM4sNode);
+            }
+            if (!here->BSIM4icVGSGiven)
+            {   here->BSIM4icVGS = *(ckt->CKTrhs + here->BSIM4gNodeExt)
+                     - *(ckt->CKTrhs + here->BSIM4sNode);
+            }
+            if(!here->BSIM4icVBSGiven)
+            {   here->BSIM4icVBS = *(ckt->CKTrhs + here->BSIM4bNode)
+                                - *(ckt->CKTrhs + here->BSIM4sNode);
+            }
+        }
     }
     return(OK);
 }

src/spicelib/devices/bsim4/b4mdel.c

@@ -1,29 +1,25 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
 #include "ngspice/ngspice.h"

src/spicelib/devices/bsim4/b4par.c

@@ -1,29 +1,25 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
 #include "ngspice/ngspice.h"
@@ -49,9 +45,9 @@ IFvalue *select)
     if (!cp_getvar("scale", CP_REAL, &scale, 0))
         scale = 1;
 
-    switch (param) {
-        case BSIM4_W:
-            here->BSIM4w = value->rValue * scale;
+    switch(param)
+    {   case BSIM4_W:
+	here->BSIM4w = value->rValue * scale;
             here->BSIM4wGiven = TRUE;
             break;
         case BSIM4_L:
@@ -62,6 +58,18 @@ IFvalue *select)
             here->BSIM4m = value->rValue;
             here->BSIM4mGiven = TRUE;
             break;
+        case BSIM4_MULT_I:
+            here->BSIM4mult_i = value->rValue;
+            here->BSIM4mult_iGiven = TRUE;
+            break;
+        case BSIM4_MULT_Q:
+            here->BSIM4mult_q = value->rValue;
+            here->BSIM4mult_qGiven = TRUE;
+            break;
+        case BSIM4_MULT_FN:
+            here->BSIM4mult_fn = value->rValue;
+            here->BSIM4mult_fnGiven = TRUE;
+            break;
         case BSIM4_NF:
             here->BSIM4nf = value->rValue;
             here->BSIM4nfGiven = TRUE;
@@ -149,14 +157,6 @@ IFvalue *select)
             here->BSIM4delvto = value->rValue;
             here->BSIM4delvtoGiven = TRUE;
             break;
-        case BSIM4_MULU0:
-            here->BSIM4mulu0 = value->rValue;
-            here->BSIM4mulu0Given = TRUE;
-            break;
-        case BSIM4_WNFLAG:
-            here->BSIM4wnflag = value->iValue;
-            here->BSIM4wnflagGiven = TRUE;
-            break;
         case BSIM4_XGW:
             here->BSIM4xgw = value->rValue;
             here->BSIM4xgwGiven = TRUE;
@@ -204,8 +204,8 @@ IFvalue *select)
         case BSIM4_IC:
             /* FALLTHROUGH added to suppress GCC warning due to
              * -Wimplicit-fallthrough flag */
-            switch (value->v.numValue) {
-                case 3:
+            switch(value->v.numValue)
+            {   case 3:
                     here->BSIM4icVBS = *(value->v.vec.rVec+2);
                     here->BSIM4icVBSGiven = TRUE;
                     /* FALLTHROUGH */

src/spicelib/devices/bsim4/b4pzld.c

@@ -1,31 +1,26 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
-*/
 
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
+*/
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/complex.h"
@@ -64,14 +59,12 @@ double T0=0.0, T1, CoxWL, qcheq, Cdg, Cdd, Cds, Csg, Csd, Css;
 double ScalingFactor = 1.0e-9;
 struct bsim4SizeDependParam *pParam;
 double ggidld, ggidlg, ggidlb, ggislg, ggislb, ggisls;
-
-double m;
+double m, mult_i, mult_q;
 
     for (; model != NULL; model = BSIM4nextModel(model))
     {    for (here = BSIM4instances(model); here!= NULL;
               here = BSIM4nextInstance(here))
-         {
-              pParam = here->pParam;
+     {    pParam = here->pParam;
               capbd = here->BSIM4capbd;
               capbs = here->BSIM4capbs;
               cgso = here->BSIM4cgso;
@@ -224,7 +217,7 @@ double m;
                       xcdgb = xcddb = xcdsb = xcdbb = 0.0;
                       xcsgb = xcsdb = xcssb = xcsbb = 0.0;
 
-                      xgtg = here->BSIM4gtg;
+              xgtg = here->BSIM4gtg;
                       xgtd = here->BSIM4gtd;
                       xgts = here->BSIM4gts;
                       xgtb = here->BSIM4gtb;
@@ -234,46 +227,46 @@ double m;
                       xcqsb = here->BSIM4cqsb;
                       xcqbb = here->BSIM4cqbb;
 
-                      CoxWL = model->BSIM4coxe * here->pParam->BSIM4weffCV
+              CoxWL = model->BSIM4coxe * here->pParam->BSIM4weffCV
                             * here->BSIM4nf * here->pParam->BSIM4leffCV;
-                      qcheq = -(here->BSIM4qgate + here->BSIM4qbulk);
-                      if (fabs(qcheq) <= 1.0e-5 * CoxWL)
-                      {   if (model->BSIM4xpart < 0.5)
-                          {   dxpart = 0.4;
-                          }
-                          else if (model->BSIM4xpart > 0.5)
-                          {   dxpart = 0.0;
-                          }
-                          else
-                          {   dxpart = 0.5;
-                          }
-                          ddxpart_dVd = ddxpart_dVg = ddxpart_dVb
-                                      = ddxpart_dVs = 0.0;
-                      }
-                      else
-                      {   dxpart = here->BSIM4qdrn / qcheq;
-                          Cdd = here->BSIM4cddb;
-                          Csd = -(here->BSIM4cgdb + here->BSIM4cddb
-                              + here->BSIM4cbdb);
-                          ddxpart_dVd = (Cdd - dxpart * (Cdd + Csd)) / qcheq;
-                          Cdg = here->BSIM4cdgb;
-                          Csg = -(here->BSIM4cggb + here->BSIM4cdgb
-                              + here->BSIM4cbgb);
-                          ddxpart_dVg = (Cdg - dxpart * (Cdg + Csg)) / qcheq;
+              qcheq = -(here->BSIM4qgate + here->BSIM4qbulk);
+              if (fabs(qcheq) <= 1.0e-5 * CoxWL)
+              {   if (model->BSIM4xpart < 0.5)
+                  {   dxpart = 0.4;
+                  }
+                  else if (model->BSIM4xpart > 0.5)
+                  {   dxpart = 0.0;
+                  }
+                  else
+                  {   dxpart = 0.5;
+                  }
+                  ddxpart_dVd = ddxpart_dVg = ddxpart_dVb
+                      = ddxpart_dVs = 0.0;
+              }
+              else
+              {   dxpart = here->BSIM4qdrn / qcheq;
+                  Cdd = here->BSIM4cddb;
+                  Csd = -(here->BSIM4cgdb + here->BSIM4cddb
+                  + here->BSIM4cbdb);
+                  ddxpart_dVd = (Cdd - dxpart * (Cdd + Csd)) / qcheq;
+                  Cdg = here->BSIM4cdgb;
+                  Csg = -(here->BSIM4cggb + here->BSIM4cdgb
+                  + here->BSIM4cbgb);
+                  ddxpart_dVg = (Cdg - dxpart * (Cdg + Csg)) / qcheq;
 
-                          Cds = here->BSIM4cdsb;
-                          Css = -(here->BSIM4cgsb + here->BSIM4cdsb
-                              + here->BSIM4cbsb);
-                          ddxpart_dVs = (Cds - dxpart * (Cds + Css)) / qcheq;
+                  Cds = here->BSIM4cdsb;
+                  Css = -(here->BSIM4cgsb + here->BSIM4cdsb
+                  + here->BSIM4cbsb);
+                  ddxpart_dVs = (Cds - dxpart * (Cds + Css)) / qcheq;
 
-                          ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg
-                                      + ddxpart_dVs);
-                      }
-                      sxpart = 1.0 - dxpart;
-                      dsxpart_dVd = -ddxpart_dVd;
-                      dsxpart_dVg = -ddxpart_dVg;
-                      dsxpart_dVs = -ddxpart_dVs;
-                      dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg + dsxpart_dVs);
+                  ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg
+                      + ddxpart_dVs);
+              }
+              sxpart = 1.0 - dxpart;
+              dsxpart_dVd = -ddxpart_dVd;
+              dsxpart_dVg = -ddxpart_dVg;
+              dsxpart_dVs = -ddxpart_dVs;
+              dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg + dsxpart_dVs);
                   }
               }
               else
@@ -432,47 +425,47 @@ double m;
                       xcqsb = here->BSIM4cqdb;
                       xcqbb = here->BSIM4cqbb;
 
-                      CoxWL = model->BSIM4coxe * here->pParam->BSIM4weffCV
+              CoxWL = model->BSIM4coxe * here->pParam->BSIM4weffCV
                             * here->BSIM4nf * here->pParam->BSIM4leffCV;
-                      qcheq = -(here->BSIM4qgate + here->BSIM4qbulk);
-                      if (fabs(qcheq) <= 1.0e-5 * CoxWL)
-                      {   if (model->BSIM4xpart < 0.5)
-                          {   sxpart = 0.4;
-                          }
-                          else if (model->BSIM4xpart > 0.5)
-                          {   sxpart = 0.0;
-                          }
-                          else
-                          {   sxpart = 0.5;
-                          }
-                          dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
-                                      = dsxpart_dVs = 0.0;
-                      }
-                      else
-                      {   sxpart = here->BSIM4qdrn / qcheq;
-                          Css = here->BSIM4cddb;
-                          Cds = -(here->BSIM4cgdb + here->BSIM4cddb
-                              + here->BSIM4cbdb);
-                          dsxpart_dVs = (Css - sxpart * (Css + Cds)) / qcheq;
-                          Csg = here->BSIM4cdgb;
-                          Cdg = -(here->BSIM4cggb + here->BSIM4cdgb
-                              + here->BSIM4cbgb);
-                          dsxpart_dVg = (Csg - sxpart * (Csg + Cdg)) / qcheq;
-
-                          Csd = here->BSIM4cdsb;
-                          Cdd = -(here->BSIM4cgsb + here->BSIM4cdsb
-                              + here->BSIM4cbsb);
-                          dsxpart_dVd = (Csd - sxpart * (Csd + Cdd)) / qcheq;
-
-                          dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg
-                                      + dsxpart_dVs);
-                      }
-                      dxpart = 1.0 - sxpart;
-                      ddxpart_dVd = -dsxpart_dVd;
-                      ddxpart_dVg = -dsxpart_dVg;
-                      ddxpart_dVs = -dsxpart_dVs;
-                      ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg + ddxpart_dVs);
+              qcheq = -(here->BSIM4qgate + here->BSIM4qbulk);
+              if (fabs(qcheq) <= 1.0e-5 * CoxWL)
+              {   if (model->BSIM4xpart < 0.5)
+                  {   sxpart = 0.4;
                   }
+                  else if (model->BSIM4xpart > 0.5)
+                  {   sxpart = 0.0;
+                  }
+                  else
+                  {   sxpart = 0.5;
+                  }
+                  dsxpart_dVd = dsxpart_dVg = dsxpart_dVb
+                      = dsxpart_dVs = 0.0;
+              }
+              else
+              {   sxpart = here->BSIM4qdrn / qcheq;
+                  Css = here->BSIM4cddb;
+                  Cds = -(here->BSIM4cgdb + here->BSIM4cddb
+                  + here->BSIM4cbdb);
+                  dsxpart_dVs = (Css - sxpart * (Css + Cds)) / qcheq;
+                  Csg = here->BSIM4cdgb;
+                  Cdg = -(here->BSIM4cggb + here->BSIM4cdgb
+                  + here->BSIM4cbgb);
+                  dsxpart_dVg = (Csg - sxpart * (Csg + Cdg)) / qcheq;
+
+                  Csd = here->BSIM4cdsb;
+                  Cdd = -(here->BSIM4cgsb + here->BSIM4cdsb
+                  + here->BSIM4cbsb);
+                  dsxpart_dVd = (Csd - sxpart * (Csd + Cdd)) / qcheq;
+
+                  dsxpart_dVb = -(dsxpart_dVd + dsxpart_dVg
+                      + dsxpart_dVs);
+              }
+              dxpart = 1.0 - sxpart;
+              ddxpart_dVd = -dsxpart_dVd;
+              ddxpart_dVg = -dsxpart_dVg;
+              ddxpart_dVs = -dsxpart_dVs;
+              ddxpart_dVb = -(ddxpart_dVd + ddxpart_dVg + ddxpart_dVs);
+              }
               }
 
               if (model->BSIM4rdsMod == 1)
@@ -501,6 +494,8 @@ double m;
                * Loading PZ matrix
                */
               m = here->BSIM4m;
+              mult_i = here->BSIM4mult_i;
+              mult_q = here->BSIM4mult_q;
 
               if (!model->BSIM4rdsMod)
               {   gdpr = here->BSIM4drainConductance;
@@ -519,165 +514,165 @@ double m;
               geltd = here->BSIM4grgeltd;
 
               if (here->BSIM4rgateMod == 1)
-              {   *(here->BSIM4GEgePtr) += m * geltd;
-                  *(here->BSIM4GPgePtr) -= m * geltd;
-                  *(here->BSIM4GEgpPtr) -= m * geltd;
+              {   *(here->BSIM4GEgePtr) += mult_i * geltd;
+                  *(here->BSIM4GPgePtr) -= mult_i * geltd;
+                  *(here->BSIM4GEgpPtr) -= mult_i * geltd;
 
-                  *(here->BSIM4GPgpPtr ) += m * xcggb * s->real;
-                  *(here->BSIM4GPgpPtr +1) += m * xcggb * s->imag;
-                  *(here->BSIM4GPgpPtr) += m * (geltd - xgtg + gIgtotg);
-                  *(here->BSIM4GPdpPtr ) += m * xcgdb * s->real;
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdb * s->imag;
-                  *(here->BSIM4GPdpPtr) -= m * (xgtd - gIgtotd);
-                  *(here->BSIM4GPspPtr ) += m * xcgsb * s->real;
-                  *(here->BSIM4GPspPtr +1) += m * xcgsb * s->imag;
-                  *(here->BSIM4GPspPtr) -= m * (xgts - gIgtots);
-                  *(here->BSIM4GPbpPtr ) += m * xcgbb * s->real;
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbb * s->imag;
-                  *(here->BSIM4GPbpPtr) -= m * (xgtb - gIgtotb);
+                  *(here->BSIM4GPgpPtr ) += mult_q * xcggb * s->real;
+                  *(here->BSIM4GPgpPtr +1) += mult_q * xcggb * s->imag;
+                  *(here->BSIM4GPgpPtr) += mult_i * (geltd + gIgtotg) - mult_q * xgtg;
+                  *(here->BSIM4GPdpPtr ) += mult_q * xcgdb * s->real;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdb * s->imag;
+                  *(here->BSIM4GPdpPtr) -= mult_q * xgtd - mult_i * gIgtotd;
+                  *(here->BSIM4GPspPtr ) += mult_q * xcgsb * s->real;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsb * s->imag;
+                  *(here->BSIM4GPspPtr) -= mult_q * xgts - mult_i * gIgtots;
+                  *(here->BSIM4GPbpPtr ) += mult_q * xcgbb * s->real;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbb * s->imag;
+                  *(here->BSIM4GPbpPtr) -= mult_q * xgtb - mult_i * gIgtotb;
               }
               else if (here->BSIM4rgateMod == 2)
-              {   *(here->BSIM4GEgePtr) += m * gcrg;
-                  *(here->BSIM4GEgpPtr) += m * gcrgg;
-                  *(here->BSIM4GEdpPtr) += m * gcrgd;
-                  *(here->BSIM4GEspPtr) += m * gcrgs;
-                  *(here->BSIM4GEbpPtr) += m * gcrgb;
+              {   *(here->BSIM4GEgePtr) += mult_i * gcrg;
+                  *(here->BSIM4GEgpPtr) += mult_i * gcrgg;
+                  *(here->BSIM4GEdpPtr) += mult_i * gcrgd;
+                  *(here->BSIM4GEspPtr) += mult_i * gcrgs;
+                  *(here->BSIM4GEbpPtr) += mult_i * gcrgb;
 
-                  *(here->BSIM4GPgePtr) -= m * gcrg;
-                  *(here->BSIM4GPgpPtr ) += m * xcggb * s->real;
-                  *(here->BSIM4GPgpPtr +1) += m * xcggb * s->imag;
-                  *(here->BSIM4GPgpPtr) -= m * (gcrgg + xgtg - gIgtotg);
-                  *(here->BSIM4GPdpPtr ) += m * xcgdb * s->real;
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdb * s->imag;
-                  *(here->BSIM4GPdpPtr) -= m * (gcrgd + xgtd - gIgtotd);
-                  *(here->BSIM4GPspPtr ) += m * xcgsb * s->real;
-                  *(here->BSIM4GPspPtr +1) += m * xcgsb * s->imag;
-                  *(here->BSIM4GPspPtr) -= m * (gcrgs + xgts - gIgtots);
-                  *(here->BSIM4GPbpPtr ) += m * xcgbb * s->real;
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbb * s->imag;
-                  *(here->BSIM4GPbpPtr) -= m * (gcrgb + xgtb - gIgtotb);
+                  *(here->BSIM4GPgePtr) -= mult_i * gcrg;
+                  *(here->BSIM4GPgpPtr ) += mult_q * xcggb * s->real;
+                  *(here->BSIM4GPgpPtr +1) += mult_q * xcggb * s->imag;
+                  *(here->BSIM4GPgpPtr) -= mult_i * (gcrgg - gIgtotg) + mult_q * xgtg;
+                  *(here->BSIM4GPdpPtr ) += mult_q * xcgdb * s->real;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdb * s->imag;
+                  *(here->BSIM4GPdpPtr) -= mult_i * (gcrgd - gIgtotd) + mult_q * xgtd;
+                  *(here->BSIM4GPspPtr ) += mult_q * xcgsb * s->real;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsb * s->imag;
+                  *(here->BSIM4GPspPtr) -= mult_i * (gcrgs - gIgtots) + mult_q * xgts;
+                  *(here->BSIM4GPbpPtr ) += mult_q * xcgbb * s->real;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbb * s->imag;
+                  *(here->BSIM4GPbpPtr) -= mult_i * (gcrgb - gIgtotb) + mult_q * xgtb;
               }
               else if (here->BSIM4rgateMod == 3)
-              {   *(here->BSIM4GEgePtr) += m * geltd;
-                  *(here->BSIM4GEgmPtr) -= m * geltd;
-                  *(here->BSIM4GMgePtr) -= m * geltd;
-                  *(here->BSIM4GMgmPtr) += m * (geltd + gcrg);
-                  *(here->BSIM4GMgmPtr ) += m * xcgmgmb * s->real;
-                  *(here->BSIM4GMgmPtr +1) += m * xcgmgmb * s->imag;
-  
-                  *(here->BSIM4GMdpPtr) += m * gcrgd;
-                  *(here->BSIM4GMdpPtr ) += m * xcgmdb * s->real;
-                  *(here->BSIM4GMdpPtr +1) += m * xcgmdb * s->imag;
-                  *(here->BSIM4GMgpPtr) += m * gcrgg;
-                  *(here->BSIM4GMspPtr) += m * gcrgs;
-                  *(here->BSIM4GMspPtr ) += m * xcgmsb * s->real;
-                  *(here->BSIM4GMspPtr +1) += m * xcgmsb * s->imag;
-                  *(here->BSIM4GMbpPtr) += m * gcrgb;
-                  *(here->BSIM4GMbpPtr ) += m * xcgmbb * s->real;
-                  *(here->BSIM4GMbpPtr +1) += m * xcgmbb * s->imag;
-  
-                  *(here->BSIM4DPgmPtr ) += m * xcdgmb * s->real;
-                  *(here->BSIM4DPgmPtr +1) += m * xcdgmb * s->imag;
-                  *(here->BSIM4GPgmPtr) -= m * gcrg;
-                  *(here->BSIM4SPgmPtr ) += m * xcsgmb * s->real;
-                  *(here->BSIM4SPgmPtr +1) += m * xcsgmb * s->imag;
-                  *(here->BSIM4BPgmPtr ) += m * xcbgmb * s->real;
-                  *(here->BSIM4BPgmPtr +1) += m * xcbgmb * s->imag;
-  
-                  *(here->BSIM4GPgpPtr) -= m * (gcrgg + xgtg - gIgtotg);
-                  *(here->BSIM4GPgpPtr ) += m * xcggb * s->real;
-                  *(here->BSIM4GPgpPtr +1) += m * xcggb * s->imag;
-                  *(here->BSIM4GPdpPtr) -= m * (gcrgd + xgtd - gIgtotd);
-                  *(here->BSIM4GPdpPtr ) += m * xcgdb * s->real;
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdb * s->imag;
-                  *(here->BSIM4GPspPtr) -= m * (gcrgs + xgts - gIgtots);
-                  *(here->BSIM4GPspPtr ) += m * xcgsb * s->real;
-                  *(here->BSIM4GPspPtr +1) += m * xcgsb * s->imag;
-                  *(here->BSIM4GPbpPtr) -= m * (gcrgb + xgtb - gIgtotb);
-                  *(here->BSIM4GPbpPtr ) += m * xcgbb * s->real;
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbb * s->imag;
+              {   *(here->BSIM4GEgePtr) += mult_i * geltd;
+                  *(here->BSIM4GEgmPtr) -= mult_i * geltd;
+                  *(here->BSIM4GMgePtr) -= mult_i * geltd;
+                  *(here->BSIM4GMgmPtr) += mult_i * (geltd + gcrg);
+                  *(here->BSIM4GMgmPtr ) += mult_q * xcgmgmb * s->real;
+                  *(here->BSIM4GMgmPtr +1) += mult_q * xcgmgmb * s->imag;
+
+                  *(here->BSIM4GMdpPtr) += mult_i * gcrgd;
+                  *(here->BSIM4GMdpPtr ) += mult_q * xcgmdb * s->real;
+                  *(here->BSIM4GMdpPtr +1) += mult_q * xcgmdb * s->imag;
+                  *(here->BSIM4GMgpPtr) += mult_i * gcrgg;
+                  *(here->BSIM4GMspPtr) += mult_i * gcrgs;
+                  *(here->BSIM4GMspPtr ) += mult_q * xcgmsb * s->real;
+                  *(here->BSIM4GMspPtr +1) += mult_q * xcgmsb * s->imag;
+                  *(here->BSIM4GMbpPtr) += mult_i * gcrgb;
+                  *(here->BSIM4GMbpPtr ) += mult_q * xcgmbb * s->real;
+                  *(here->BSIM4GMbpPtr +1) += mult_q * xcgmbb * s->imag;
+
+                  *(here->BSIM4DPgmPtr ) += mult_q * xcdgmb * s->real;
+                  *(here->BSIM4DPgmPtr +1) += mult_q * xcdgmb * s->imag;
+                  *(here->BSIM4GPgmPtr) -= mult_i * gcrg;
+                  *(here->BSIM4SPgmPtr ) += mult_q * xcsgmb * s->real;
+                  *(here->BSIM4SPgmPtr +1) += mult_q * xcsgmb * s->imag;
+                  *(here->BSIM4BPgmPtr ) += mult_q * xcbgmb * s->real;
+                  *(here->BSIM4BPgmPtr +1) += mult_q * xcbgmb * s->imag;
+
+                  *(here->BSIM4GPgpPtr) -= mult_i * (gcrgg - gIgtotg) + mult_q * xgtg;
+                  *(here->BSIM4GPgpPtr ) += mult_q * xcggb * s->real;
+                  *(here->BSIM4GPgpPtr +1) += mult_q * xcggb * s->imag;
+                  *(here->BSIM4GPdpPtr) -= mult_i * (gcrgd - gIgtotd) + mult_q * xgtd;
+                  *(here->BSIM4GPdpPtr ) += mult_q * xcgdb * s->real;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdb * s->imag;
+                  *(here->BSIM4GPspPtr) -= mult_i * (gcrgs - gIgtots) + mult_q * xgts;
+                  *(here->BSIM4GPspPtr ) += mult_q * xcgsb * s->real;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsb * s->imag;
+                  *(here->BSIM4GPbpPtr) -= mult_i * (gcrgb - gIgtotb) + mult_q * xgtb;
+                  *(here->BSIM4GPbpPtr ) += mult_q * xcgbb * s->real;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbb * s->imag;
               }
               else
-              {   *(here->BSIM4GPdpPtr ) += m * xcgdb * s->real;
-                  *(here->BSIM4GPdpPtr +1) += m * xcgdb * s->imag;
-                  *(here->BSIM4GPdpPtr) -= m * (xgtd - gIgtotd);
-                  *(here->BSIM4GPgpPtr ) += m * xcggb * s->real;
-                  *(here->BSIM4GPgpPtr +1) += m * xcggb * s->imag;
-                  *(here->BSIM4GPgpPtr) -= m * (xgtg - gIgtotg);
-                  *(here->BSIM4GPspPtr ) += m * xcgsb * s->real;
-                  *(here->BSIM4GPspPtr +1) += m * xcgsb * s->imag;
-                  *(here->BSIM4GPspPtr) -= m * (xgts - gIgtots);
-                  *(here->BSIM4GPbpPtr ) += m * xcgbb * s->real;
-                  *(here->BSIM4GPbpPtr +1) += m * xcgbb * s->imag;
-                  *(here->BSIM4GPbpPtr) -= m * (xgtb - gIgtotb);
+              {   *(here->BSIM4GPdpPtr ) += mult_q * xcgdb * s->real;
+                  *(here->BSIM4GPdpPtr +1) += mult_q * xcgdb * s->imag;
+                  *(here->BSIM4GPdpPtr) -= mult_q * xgtd - mult_i * gIgtotd;
+                  *(here->BSIM4GPgpPtr ) += mult_q * xcggb * s->real;
+                  *(here->BSIM4GPgpPtr +1) += mult_q * xcggb * s->imag;
+                  *(here->BSIM4GPgpPtr) -= mult_q * xgtg - mult_i * gIgtotg;
+                  *(here->BSIM4GPspPtr ) += mult_q * xcgsb * s->real;
+                  *(here->BSIM4GPspPtr +1) += mult_q * xcgsb * s->imag;
+                  *(here->BSIM4GPspPtr) -= mult_q * xgts - mult_i * gIgtots;
+                  *(here->BSIM4GPbpPtr ) += mult_q * xcgbb * s->real;
+                  *(here->BSIM4GPbpPtr +1) += mult_q * xcgbb * s->imag;
+                  *(here->BSIM4GPbpPtr) -= mult_q * xgtb - mult_i * gIgtotb;
               }
 
               if (model->BSIM4rdsMod)
-              {   (*(here->BSIM4DgpPtr) += m * gdtotg);
-                  (*(here->BSIM4DspPtr) += m * gdtots);
-                  (*(here->BSIM4DbpPtr) += m * gdtotb);
-                  (*(here->BSIM4SdpPtr) += m * gstotd);
-                  (*(here->BSIM4SgpPtr) += m * gstotg);
-                  (*(here->BSIM4SbpPtr) += m * gstotb);
+              {   (*(here->BSIM4DgpPtr) += mult_i * gdtotg);
+                  (*(here->BSIM4DspPtr) += mult_i * gdtots);
+                  (*(here->BSIM4DbpPtr) += mult_i * gdtotb);
+                  (*(here->BSIM4SdpPtr) += mult_i * gstotd);
+                  (*(here->BSIM4SgpPtr) += mult_i * gstotg);
+                  (*(here->BSIM4SbpPtr) += mult_i * gstotb);
               }
 
-              *(here->BSIM4DPdpPtr ) += m * xcddb * s->real;
-              *(here->BSIM4DPdpPtr +1) += m * xcddb * s->imag;
-              *(here->BSIM4DPdpPtr) += m * (gdpr + gds + here->BSIM4gbd
-                                     - gdtotd + RevSum + gbdpdp - gIdtotd
-                                     + dxpart * xgtd + T1 * ddxpart_dVd);
-              *(here->BSIM4DPdPtr) -= m * (gdpr + gdtot);
-              *(here->BSIM4DPgpPtr ) += m * xcdgb * s->real;
-              *(here->BSIM4DPgpPtr +1) += m * xcdgb * s->imag;
-              *(here->BSIM4DPgpPtr) += m * (Gm - gdtotg + gbdpg - gIdtotg
-                                     + T1 * ddxpart_dVg + dxpart * xgtg);
-              *(here->BSIM4DPspPtr ) += m * xcdsb * s->real;
-              *(here->BSIM4DPspPtr +1) += m * xcdsb * s->imag;
-              *(here->BSIM4DPspPtr) -= m * (gds + FwdSum + gdtots - gbdpsp + gIdtots
-                                     - T1 * ddxpart_dVs - dxpart * xgts);
-              *(here->BSIM4DPbpPtr ) += m * xcdbb * s->real;
-              *(here->BSIM4DPbpPtr +1) += m * xcdbb * s->imag;
-              *(here->BSIM4DPbpPtr) -= m * (gjbd + gdtotb - Gmbs - gbdpb + gIdtotb
-                                     - T1 * ddxpart_dVb - dxpart * xgtb);
+              *(here->BSIM4DPdpPtr ) += mult_q * xcddb * s->real;
+              *(here->BSIM4DPdpPtr +1) += mult_q * xcddb * s->imag;
+              *(here->BSIM4DPdpPtr) += mult_i * (gdpr + gds + here->BSIM4gbd
+                     - gdtotd + RevSum + gbdpdp - gIdtotd)
+                     + mult_q * (dxpart * xgtd + T1 * ddxpart_dVd);
+              *(here->BSIM4DPdPtr) -= mult_i * (gdpr + gdtot);
+              *(here->BSIM4DPgpPtr ) += mult_q * xcdgb * s->real;
+              *(here->BSIM4DPgpPtr +1) += mult_q * xcdgb * s->imag;
+              *(here->BSIM4DPgpPtr) += mult_i * (Gm - gdtotg + gbdpg - gIdtotg)
+                     + mult_q * (T1 * ddxpart_dVg + dxpart * xgtg);
+              *(here->BSIM4DPspPtr ) += mult_q * xcdsb * s->real;
+              *(here->BSIM4DPspPtr +1) += mult_q * xcdsb * s->imag;
+              *(here->BSIM4DPspPtr) -= mult_i * (gds + FwdSum + gdtots - gbdpsp + gIdtots)
+                     - mult_q * (T1 * ddxpart_dVs + dxpart * xgts);
+              *(here->BSIM4DPbpPtr ) += mult_q * xcdbb * s->real;
+              *(here->BSIM4DPbpPtr +1) += mult_q * xcdbb * s->imag;
+              *(here->BSIM4DPbpPtr) -= mult_i * (gjbd + gdtotb - Gmbs - gbdpb + gIdtotb)
+                     - mult_q * T1 * (ddxpart_dVb + dxpart * xgtb);
 
-              *(here->BSIM4DdpPtr) -= m * (gdpr - gdtotd);
-              *(here->BSIM4DdPtr) += m * (gdpr + gdtot);
+              *(here->BSIM4DdpPtr) -= mult_i * (gdpr - gdtotd);
+              *(here->BSIM4DdPtr) += mult_i * (gdpr + gdtot);
 
-              *(here->BSIM4SPdpPtr ) += m * xcsdb * s->real;
-              *(here->BSIM4SPdpPtr +1) += m * xcsdb * s->imag;
-              *(here->BSIM4SPdpPtr) -= m * (gds + gstotd + RevSum - gbspdp + gIstotd
-                                     - T1 * dsxpart_dVd - sxpart * xgtd);
-              *(here->BSIM4SPgpPtr ) += m * xcsgb * s->real;
-              *(here->BSIM4SPgpPtr +1) += m * xcsgb * s->imag;
-              *(here->BSIM4SPgpPtr) -= m * (Gm + gstotg - gbspg + gIstotg
-                                     - T1 * dsxpart_dVg - sxpart * xgtg);
-              *(here->BSIM4SPspPtr ) += m * xcssb * s->real;
-              *(here->BSIM4SPspPtr +1) += m * xcssb * s->imag;
-              *(here->BSIM4SPspPtr) += m * (gspr + gds + here->BSIM4gbs - gIstots
-                                     - gstots + FwdSum + gbspsp
-                                     + sxpart * xgts + T1 * dsxpart_dVs);
-              *(here->BSIM4SPsPtr) -= m * (gspr + gstot);
-              *(here->BSIM4SPbpPtr ) += m * xcsbb * s->real;
-              *(here->BSIM4SPbpPtr +1) += m * xcsbb * s->imag;
-              *(here->BSIM4SPbpPtr) -= m * (gjbs + gstotb + Gmbs - gbspb + gIstotb
-                                     - T1 * dsxpart_dVb - sxpart * xgtb);
+              *(here->BSIM4SPdpPtr ) += mult_q * xcsdb * s->real;
+              *(here->BSIM4SPdpPtr +1) += mult_q * xcsdb * s->imag;
+              *(here->BSIM4SPdpPtr) -= mult_i * (gds + gstotd + RevSum - gbspdp + gIstotd)
+                     - mult_q * (T1 * dsxpart_dVd + sxpart * xgtd);
+              *(here->BSIM4SPgpPtr ) += mult_q * xcsgb * s->real;
+              *(here->BSIM4SPgpPtr +1) += mult_q * xcsgb * s->imag;
+              *(here->BSIM4SPgpPtr) -= mult_i * (Gm + gstotg - gbspg + gIstotg)
+                     - mult_q * (T1 * dsxpart_dVg + sxpart * xgtg);
+              *(here->BSIM4SPspPtr ) += mult_q * xcssb * s->real;
+              *(here->BSIM4SPspPtr +1) += mult_q * xcssb * s->imag;
+              *(here->BSIM4SPspPtr) += mult_i * (gspr + gds + here->BSIM4gbs - gIstots
+                     - gstots + FwdSum + gbspsp)
+                     + mult_q * (sxpart * xgts + T1 * dsxpart_dVs);
+              *(here->BSIM4SPsPtr) -= mult_i * (gspr + gstot);
+              *(here->BSIM4SPbpPtr ) += mult_q * xcsbb * s->real;
+              *(here->BSIM4SPbpPtr +1) += mult_q * xcsbb * s->imag;
+              *(here->BSIM4SPbpPtr) -= mult_i * (gjbs + gstotb + Gmbs - gbspb + gIstotb)
+                     - mult_q * (T1 * dsxpart_dVb + sxpart * xgtb);
 
-              *(here->BSIM4SspPtr) -= m * (gspr - gstots);
-              *(here->BSIM4SsPtr) += m * (gspr + gstot);
+              *(here->BSIM4SspPtr) -= mult_i * (gspr - gstots);
+              *(here->BSIM4SsPtr) += mult_i * (gspr + gstot);
 
-              *(here->BSIM4BPdpPtr ) += m * xcbdb * s->real;
-              *(here->BSIM4BPdpPtr +1) += m * xcbdb * s->imag;
-              *(here->BSIM4BPdpPtr) -= m * (gjbd - gbbdp + gIbtotd);
-              *(here->BSIM4BPgpPtr ) += m * xcbgb * s->real;
-              *(here->BSIM4BPgpPtr +1) += m * xcbgb * s->imag;
-              *(here->BSIM4BPgpPtr) -= m * (here->BSIM4gbgs + gIbtotg);
-              *(here->BSIM4BPspPtr ) += m * xcbsb * s->real;
-              *(here->BSIM4BPspPtr +1) += m * xcbsb * s->imag;
-              *(here->BSIM4BPspPtr) -= m * (gjbs - gbbsp + gIbtots);
-              *(here->BSIM4BPbpPtr ) += m * xcbbb * s->real;
-              *(here->BSIM4BPbpPtr +1) += m * xcbbb * s->imag;
-              *(here->BSIM4BPbpPtr) += m * (gjbd + gjbs - here->BSIM4gbbs
-                                     - gIbtotb);
+              *(here->BSIM4BPdpPtr ) += mult_q * xcbdb * s->real;
+              *(here->BSIM4BPdpPtr +1) += mult_q * xcbdb * s->imag;
+              *(here->BSIM4BPdpPtr) -= mult_i * (gjbd - gbbdp + gIbtotd);
+              *(here->BSIM4BPgpPtr ) += mult_q * xcbgb * s->real;
+              *(here->BSIM4BPgpPtr +1) += mult_q * xcbgb * s->imag;
+              *(here->BSIM4BPgpPtr) -= mult_i * (here->BSIM4gbgs + gIbtotg);
+              *(here->BSIM4BPspPtr ) += mult_q * xcbsb * s->real;
+              *(here->BSIM4BPspPtr +1) += mult_q * xcbsb * s->imag;
+              *(here->BSIM4BPspPtr) -= mult_i * (gjbs - gbbsp + gIbtots);
+              *(here->BSIM4BPbpPtr ) += mult_q * xcbbb * s->real;
+              *(here->BSIM4BPbpPtr +1) += mult_q * xcbbb * s->imag;
+              *(here->BSIM4BPbpPtr) += mult_i * (gjbd + gjbs - here->BSIM4gbbs
+                     - gIbtotb);
               ggidld = here->BSIM4ggidld;
               ggidlg = here->BSIM4ggidlg;
               ggidlb = here->BSIM4ggidlb;
@@ -686,63 +681,63 @@ double m;
               ggislb = here->BSIM4ggislb;
 
               /* stamp gidl */
-              (*(here->BSIM4DPdpPtr) += m * ggidld);
-              (*(here->BSIM4DPgpPtr) += m * ggidlg);
-              (*(here->BSIM4DPspPtr) -= m * ((ggidlg + ggidld) + ggidlb));
-              (*(here->BSIM4DPbpPtr) += m * ggidlb);
-              (*(here->BSIM4BPdpPtr) -= m * ggidld);
-              (*(here->BSIM4BPgpPtr) -= m * ggidlg);
-              (*(here->BSIM4BPspPtr) += m * ((ggidlg + ggidld) + ggidlb));
-              (*(here->BSIM4BPbpPtr) -= m * ggidlb);
+              (*(here->BSIM4DPdpPtr) += mult_i * ggidld);
+              (*(here->BSIM4DPgpPtr) += mult_i * ggidlg);
+              (*(here->BSIM4DPspPtr) -= mult_i * ((ggidlg + ggidld) + ggidlb));
+              (*(here->BSIM4DPbpPtr) += mult_i * ggidlb);
+              (*(here->BSIM4BPdpPtr) -= mult_i * ggidld);
+              (*(here->BSIM4BPgpPtr) -= mult_i * ggidlg);
+              (*(here->BSIM4BPspPtr) += mult_i * ((ggidlg + ggidld) + ggidlb));
+              (*(here->BSIM4BPbpPtr) -= mult_i * ggidlb);
                /* stamp gisl */
-              (*(here->BSIM4SPdpPtr) -= m * ((ggisls + ggislg) + ggislb));
-              (*(here->BSIM4SPgpPtr) += m * ggislg);
-              (*(here->BSIM4SPspPtr) += m * ggisls);
-              (*(here->BSIM4SPbpPtr) += m * ggislb);
-              (*(here->BSIM4BPdpPtr) += m * ((ggislg + ggisls) + ggislb));
-              (*(here->BSIM4BPgpPtr) -= m * ggislg);
-              (*(here->BSIM4BPspPtr) -= m * ggisls);
-              (*(here->BSIM4BPbpPtr) -= m * ggislb);
+              (*(here->BSIM4SPdpPtr) -= mult_i * ((ggisls + ggislg) + ggislb));
+              (*(here->BSIM4SPgpPtr) += mult_i * ggislg);
+              (*(here->BSIM4SPspPtr) += mult_i * ggisls);
+              (*(here->BSIM4SPbpPtr) += mult_i * ggislb);
+              (*(here->BSIM4BPdpPtr) += mult_i * ((ggislg + ggisls) + ggislb));
+              (*(here->BSIM4BPgpPtr) -= mult_i * ggislg);
+              (*(here->BSIM4BPspPtr) -= mult_i * ggisls);
+              (*(here->BSIM4BPbpPtr) -= mult_i * ggislb);
 
               if (here->BSIM4rbodyMod)
-              {   (*(here->BSIM4DPdbPtr ) += m * xcdbdb * s->real);
-                  (*(here->BSIM4DPdbPtr +1) += m * xcdbdb * s->imag);
-                  (*(here->BSIM4DPdbPtr) -= m * here->BSIM4gbd);
-                  (*(here->BSIM4SPsbPtr ) += m * xcsbsb * s->real);
-                  (*(here->BSIM4SPsbPtr +1) += m * xcsbsb * s->imag);
-                  (*(here->BSIM4SPsbPtr) -= m * here->BSIM4gbs);
+              {   (*(here->BSIM4DPdbPtr ) += mult_q * xcdbdb * s->real);
+                  (*(here->BSIM4DPdbPtr +1) += mult_q * xcdbdb * s->imag);
+                  (*(here->BSIM4DPdbPtr) -= mult_i * here->BSIM4gbd);
+                  (*(here->BSIM4SPsbPtr ) += mult_q * xcsbsb * s->real);
+                  (*(here->BSIM4SPsbPtr +1) += mult_q * xcsbsb * s->imag);
+                  (*(here->BSIM4SPsbPtr) -= mult_i * here->BSIM4gbs);
 
-                  (*(here->BSIM4DBdpPtr ) += m * xcdbdb * s->real);
-                  (*(here->BSIM4DBdpPtr +1) += m * xcdbdb * s->imag);
-                  (*(here->BSIM4DBdpPtr) -= m * here->BSIM4gbd);
-                  (*(here->BSIM4DBdbPtr ) -= m * xcdbdb * s->real);
-                  (*(here->BSIM4DBdbPtr +1) -= m * xcdbdb * s->imag);
-                  (*(here->BSIM4DBdbPtr) += m * (here->BSIM4gbd + here->BSIM4grbpd
+                  (*(here->BSIM4DBdpPtr ) += mult_q * xcdbdb * s->real);
+                  (*(here->BSIM4DBdpPtr +1) += mult_q * xcdbdb * s->imag);
+                  (*(here->BSIM4DBdpPtr) -= mult_i * here->BSIM4gbd);
+                  (*(here->BSIM4DBdbPtr ) -= mult_q * xcdbdb * s->real);
+                  (*(here->BSIM4DBdbPtr +1) -= mult_q * xcdbdb * s->imag);
+                  (*(here->BSIM4DBdbPtr) += mult_i * (here->BSIM4gbd + here->BSIM4grbpd
                                           + here->BSIM4grbdb));
-                  (*(here->BSIM4DBbpPtr) -= m * here->BSIM4grbpd);
-                  (*(here->BSIM4DBbPtr) -= m * here->BSIM4grbdb);
+                  (*(here->BSIM4DBbpPtr) -= mult_i * here->BSIM4grbpd);
+                  (*(here->BSIM4DBbPtr) -= mult_i * here->BSIM4grbdb);
 
-                  (*(here->BSIM4BPdbPtr) -= m * here->BSIM4grbpd);
-                  (*(here->BSIM4BPbPtr) -= m * here->BSIM4grbpb);
-                  (*(here->BSIM4BPsbPtr) -= m * here->BSIM4grbps);
-                  (*(here->BSIM4BPbpPtr) += m * (here->BSIM4grbpd + here->BSIM4grbps
-                                          + here->BSIM4grbpb));
+                  (*(here->BSIM4BPdbPtr) -= mult_i * here->BSIM4grbpd);
+                  (*(here->BSIM4BPbPtr) -= mult_i * here->BSIM4grbpb);
+                  (*(here->BSIM4BPsbPtr) -= mult_i * here->BSIM4grbps);
+                  (*(here->BSIM4BPbpPtr) += mult_i * (here->BSIM4grbpd + here->BSIM4grbps
+                      + here->BSIM4grbpb));
                   /* WDL: (-here->BSIM4gbbs) already added to BPbpPtr */
 
-                  (*(here->BSIM4SBspPtr ) += m * xcsbsb * s->real);
-                  (*(here->BSIM4SBspPtr +1) += m * xcsbsb * s->imag);
-                  (*(here->BSIM4SBspPtr) -= m * here->BSIM4gbs);
-                  (*(here->BSIM4SBbpPtr) -= m * here->BSIM4grbps);
-                  (*(here->BSIM4SBbPtr) -= m * here->BSIM4grbsb);
-                  (*(here->BSIM4SBsbPtr ) -= m * xcsbsb * s->real);
-                  (*(here->BSIM4SBsbPtr +1) -= m * xcsbsb * s->imag);
-                  (*(here->BSIM4SBsbPtr) += m * (here->BSIM4gbs
-                                          + here->BSIM4grbps + here->BSIM4grbsb));
+                  (*(here->BSIM4SBspPtr ) += mult_q * xcsbsb * s->real);
+                  (*(here->BSIM4SBspPtr +1) += mult_q * xcsbsb * s->imag);
+                  (*(here->BSIM4SBspPtr) -= mult_i * here->BSIM4gbs);
+                  (*(here->BSIM4SBbpPtr) -= mult_i * here->BSIM4grbps);
+                  (*(here->BSIM4SBbPtr) -= mult_i * here->BSIM4grbsb);
+                  (*(here->BSIM4SBsbPtr ) -= mult_q * xcsbsb * s->real);
+                  (*(here->BSIM4SBsbPtr +1) -= mult_q * xcsbsb * s->imag);
+                  (*(here->BSIM4SBsbPtr) += mult_i * (here->BSIM4gbs
+                      + here->BSIM4grbps + here->BSIM4grbsb));
 
-                  (*(here->BSIM4BdbPtr) -= m * here->BSIM4grbdb);
-                  (*(here->BSIM4BbpPtr) -= m * here->BSIM4grbpb);
-                  (*(here->BSIM4BsbPtr) -= m * here->BSIM4grbsb);
-                  (*(here->BSIM4BbPtr) += m * (here->BSIM4grbsb + here->BSIM4grbdb
+                  (*(here->BSIM4BdbPtr) -= mult_i * here->BSIM4grbdb);
+                  (*(here->BSIM4BbpPtr) -= mult_i * here->BSIM4grbpb);
+                  (*(here->BSIM4BsbPtr) -= mult_i * here->BSIM4grbsb);
+                  (*(here->BSIM4BbPtr) += mult_i * (here->BSIM4grbsb + here->BSIM4grbdb
                                         + here->BSIM4grbpb));
               }
 

src/spicelib/devices/bsim4/b4trunc.c

@@ -1,29 +1,25 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
 #include "ngspice/ngspice.h"
@@ -32,7 +28,6 @@ under the License.
 #include "ngspice/sperror.h"
 #include "ngspice/suffix.h"
 
-
 int
 BSIM4trunc(
 GENmodel *inModel,
@@ -48,8 +43,8 @@ BSIM4instance *here;
 
     for (; model != NULL; model = BSIM4nextModel(model))
     {    for (here = BSIM4instances(model); here != NULL;
-	      here = BSIM4nextInstance(here))
-	      {
+           here = BSIM4nextInstance(here))
+     {
 #ifdef STEPDEBUG
             debugtemp = *timeStep;
 #endif /* STEPDEBUG */
@@ -61,12 +56,12 @@ BSIM4instance *here;
             if (here->BSIM4rbodyMod)
             {   CKTterr(here->BSIM4qbs,ckt,timeStep);
                 CKTterr(here->BSIM4qbd,ckt,timeStep);
-	          }
-	          if (here->BSIM4rgateMod == 3)
-		        CKTterr(here->BSIM4qgmid,ckt,timeStep);
+        }
+        if (here->BSIM4rgateMod == 3)
+        CKTterr(here->BSIM4qgmid,ckt,timeStep);
 #ifdef STEPDEBUG
             if(debugtemp != *timeStep)
-	          {  printf("device %s reduces step from %g to %g\n",
+        {  printf("device %s reduces step from %g to %g\n",
                        here->BSIM4name,debugtemp,*timeStep);
             }
 #endif /* STEPDEBUG */

src/spicelib/devices/bsim4/bsim4def.h

@@ -1,29 +1,25 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
 #ifndef BSIM4
@@ -95,6 +91,7 @@ typedef struct sBSIM4instance
 
     double BSIM4l;
     double BSIM4w;
+    double BSIM4m;
     double BSIM4drainArea;
     double BSIM4sourceArea;
     double BSIM4drainSquares;
@@ -103,7 +100,8 @@ typedef struct sBSIM4instance
     double BSIM4sourcePerimeter;
     double BSIM4sourceConductance;
     double BSIM4drainConductance;
-     /* stress effect instance param */
+
+    /* stress effect instance param */
     double BSIM4sa;
     double BSIM4sb;
     double BSIM4sd;
@@ -119,12 +117,11 @@ typedef struct sBSIM4instance
     double BSIM4rbpd;
 
     double BSIM4delvto;
-    double BSIM4mulu0;
-    int BSIM4wnflag;
     double BSIM4xgw;
     double BSIM4ngcon;
 
-     /* added here to account stress effect instance dependence */
+    /* added here to account stress effect instance dependence */
+
     double BSIM4u0temp;
     double BSIM4vsattemp;
     double BSIM4vth0;
@@ -142,9 +139,12 @@ typedef struct sBSIM4instance
     double BSIM4icVDS;
     double BSIM4icVGS;
     double BSIM4icVBS;
-    double BSIM4m;
+    double BSIM4mult_i;
+    double BSIM4mult_q;
+    double BSIM4mult_fn;
     double BSIM4nf;
     int BSIM4off;
+
     int BSIM4mode;
     int BSIM4trnqsMod;
     int BSIM4acnqsMod;
@@ -286,6 +286,9 @@ typedef struct sBSIM4instance
     unsigned BSIM4lGiven :1;
     unsigned BSIM4wGiven :1;
     unsigned BSIM4mGiven :1;
+    unsigned BSIM4mult_iGiven :1;
+    unsigned BSIM4mult_qGiven :1;
+    unsigned BSIM4mult_fnGiven :1;
     unsigned BSIM4nfGiven :1;
     unsigned BSIM4minGiven :1;
     unsigned BSIM4drainAreaGiven :1;
@@ -307,8 +310,6 @@ typedef struct sBSIM4instance
     unsigned BSIM4rbpdGiven   :1;
     unsigned BSIM4rbpsGiven   :1;
     unsigned BSIM4delvtoGiven   :1;
-    unsigned BSIM4mulu0Given   :1;
-    unsigned BSIM4wnflagGiven   :1;
     unsigned BSIM4xgwGiven   :1;
     unsigned BSIM4ngconGiven   :1;
     unsigned BSIM4icVDSGiven :1;
@@ -680,6 +681,7 @@ struct bsim4SizeDependParam
     double BSIM4a1;
     double BSIM4a2;
     double BSIM4keta;
+    double BSIM4ketac;
     double BSIM4nsub;
     double BSIM4ndep;
     double BSIM4nsd;
@@ -703,7 +705,7 @@ struct bsim4SizeDependParam
     double BSIM4w0;
     double BSIM4dvtp0;
     double BSIM4dvtp1;
-    double BSIM4dvtp2;	/* New DIBL/Rout */
+    double BSIM4dvtp2;  /* New DIBL/Rout */
     double BSIM4dvtp3;
     double BSIM4dvtp4;
     double BSIM4dvtp5;
@@ -730,14 +732,14 @@ struct bsim4SizeDependParam
     double BSIM4lp;
     double BSIM4u0;
     double BSIM4eu;
-  	double BSIM4ucs;
+    double BSIM4ucs;
     double BSIM4ute;
-	  double BSIM4ucste;
+    double BSIM4ucste;
     double BSIM4voff;
     double BSIM4tvoff;
-    double BSIM4tnfactor; 	/* v4.7 Temp dep of leakage current */
-    double BSIM4teta0;   	/* v4.7 temp dep of leakage current */
-    double BSIM4tvoffcv;	/* v4.7 temp dep of leakage current */
+    double BSIM4tnfactor;   /* v4.7 Temp dep of leakage current */
+    double BSIM4teta0;      /* v4.7 temp dep of leakage current */
+    double BSIM4tvoffcv;    /* v4.7 temp dep of leakage current */
     double BSIM4minv;
     double BSIM4minvcv;
     double BSIM4vfb;
@@ -872,7 +874,7 @@ struct bsim4SizeDependParam
     double BSIM4theta0vb0;
     double BSIM4thetaRout;
     double BSIM4mstar;
-	  double BSIM4VgsteffVth;
+    double BSIM4VgsteffVth;
     double BSIM4mstarcv;
     double BSIM4voffcbn;
     double BSIM4voffcbncv;
@@ -927,7 +929,6 @@ typedef struct sBSIM4model
     int    BSIM4rgateMod;
     int    BSIM4perMod;
     int    BSIM4geoMod;
-    int    BSIM4rgeoMod;
     int    BSIM4mtrlMod;
     int    BSIM4mtrlCompatMod; /* v4.7 */
     int    BSIM4gidlMod; /* v4.7 New GIDL/GISL */
@@ -936,12 +937,12 @@ typedef struct sBSIM4model
     int    BSIM4tempMod;
     int    BSIM4binUnit;
     int    BSIM4paramChk;
-    char   *BSIM4version;
+    char *BSIM4version;
     double BSIM4eot;
     double BSIM4vddeot;
-  	double BSIM4tempeot;
-  	double BSIM4leffeot;
-  	double BSIM4weffeot;
+    double BSIM4tempeot;
+    double BSIM4leffeot;
+    double BSIM4weffeot;
     double BSIM4ados;
     double BSIM4bdos;
     double BSIM4toxe;
@@ -962,6 +963,7 @@ typedef struct sBSIM4model
     double BSIM4a1;
     double BSIM4a2;
     double BSIM4keta;
+    double BSIM4ketac;
     double BSIM4nsub;
     double BSIM4phig;
     double BSIM4epsrgate;
@@ -990,7 +992,7 @@ typedef struct sBSIM4model
     double BSIM4w0;
     double BSIM4dvtp0;
     double BSIM4dvtp1;
-    double BSIM4dvtp2;	/* New DIBL/Rout */
+    double BSIM4dvtp2;  /* New DIBL/Rout */
     double BSIM4dvtp3;
     double BSIM4dvtp4;
     double BSIM4dvtp5;
@@ -1006,7 +1008,7 @@ typedef struct sBSIM4model
     double BSIM4dsub;
     double BSIM4vth0;
     double BSIM4eu;
-  	double BSIM4ucs;
+    double BSIM4ucs;
     double BSIM4ua;
     double BSIM4ua1;
     double BSIM4ub;
@@ -1019,12 +1021,12 @@ typedef struct sBSIM4model
     double BSIM4lp;
     double BSIM4u0;
     double BSIM4ute;
-  	double BSIM4ucste;
+    double BSIM4ucste;
     double BSIM4voff;
     double BSIM4tvoff;
-    double BSIM4tnfactor; 	/* v4.7 Temp dep of leakage current */
-    double BSIM4teta0;   	/* v4.7 temp dep of leakage current */
-    double BSIM4tvoffcv;	/* v4.7 temp dep of leakage current */
+    double BSIM4tnfactor;   /* v4.7 Temp dep of leakage current */
+    double BSIM4teta0;      /* v4.7 temp dep of leakage current */
+    double BSIM4tvoffcv;    /* v4.7 temp dep of leakage current */
     double BSIM4minv;
     double BSIM4minvcv;
     double BSIM4voffl;
@@ -1247,6 +1249,7 @@ typedef struct sBSIM4model
     double BSIM4la1;
     double BSIM4la2;
     double BSIM4lketa;
+    double BSIM4lketac;
     double BSIM4lnsub;
     double BSIM4lndep;
     double BSIM4lnsd;
@@ -1267,7 +1270,7 @@ typedef struct sBSIM4model
     double BSIM4lw0;
     double BSIM4ldvtp0;
     double BSIM4ldvtp1;
-    double BSIM4ldvtp2;        /* New DIBL/Rout */
+    double BSIM4ldvtp2; /* New DIBL/Rout */
     double BSIM4ldvtp3;
     double BSIM4ldvtp4;
     double BSIM4ldvtp5;
@@ -1299,9 +1302,9 @@ typedef struct sBSIM4model
     double BSIM4lucste;
     double BSIM4lvoff;
     double BSIM4ltvoff;
-    double BSIM4ltnfactor;         /* v4.7 Temp dep of leakage current */
-    double BSIM4lteta0;           /* v4.7 temp dep of leakage current */
-    double BSIM4ltvoffcv;        /* v4.7 temp dep of leakage current */
+    double BSIM4ltnfactor;  /* v4.7 Temp dep of leakage current */
+    double BSIM4lteta0;     /* v4.7 temp dep of leakage current */
+    double BSIM4ltvoffcv;   /* v4.7 temp dep of leakage current */
     double BSIM4lminv;
     double BSIM4lminvcv;
     double BSIM4ldelta;
@@ -1407,6 +1410,7 @@ typedef struct sBSIM4model
     double BSIM4wa1;
     double BSIM4wa2;
     double BSIM4wketa;
+    double BSIM4wketac;
     double BSIM4wnsub;
     double BSIM4wndep;
     double BSIM4wnsd;
@@ -1427,7 +1431,7 @@ typedef struct sBSIM4model
     double BSIM4ww0;
     double BSIM4wdvtp0;
     double BSIM4wdvtp1;
-    double BSIM4wdvtp2;        /* New DIBL/Rout */
+    double BSIM4wdvtp2; /* New DIBL/Rout */
     double BSIM4wdvtp3;
     double BSIM4wdvtp4;
     double BSIM4wdvtp5;
@@ -1459,9 +1463,9 @@ typedef struct sBSIM4model
     double BSIM4wucste;
     double BSIM4wvoff;
     double BSIM4wtvoff;
-    double BSIM4wtnfactor;         /* v4.7 Temp dep of leakage current */
-    double BSIM4wteta0;           /* v4.7 temp dep of leakage current */
-    double BSIM4wtvoffcv;        /* v4.7 temp dep of leakage current */
+    double BSIM4wtnfactor;  /* v4.7 Temp dep of leakage current */
+    double BSIM4wteta0;     /* v4.7 temp dep of leakage current */
+    double BSIM4wtvoffcv;   /* v4.7 temp dep of leakage current */
     double BSIM4wminv;
     double BSIM4wminvcv;
     double BSIM4wdelta;
@@ -1567,6 +1571,7 @@ typedef struct sBSIM4model
     double BSIM4pa1;
     double BSIM4pa2;
     double BSIM4pketa;
+    double BSIM4pketac;
     double BSIM4pnsub;
     double BSIM4pndep;
     double BSIM4pnsd;
@@ -1587,7 +1592,7 @@ typedef struct sBSIM4model
     double BSIM4pw0;
     double BSIM4pdvtp0;
     double BSIM4pdvtp1;
-    double BSIM4pdvtp2;        /* New DIBL/Rout */
+    double BSIM4pdvtp2; /* New DIBL/Rout */
     double BSIM4pdvtp3;
     double BSIM4pdvtp4;
     double BSIM4pdvtp5;
@@ -1619,9 +1624,9 @@ typedef struct sBSIM4model
     double BSIM4pucste;
     double BSIM4pvoff;
     double BSIM4ptvoff;
-    double BSIM4ptnfactor;         /* v4.7 Temp dep of leakage current */
-    double BSIM4pteta0;           /* v4.7 temp dep of leakage current */
-    double BSIM4ptvoffcv;        /* v4.7 temp dep of leakage current */
+    double BSIM4ptnfactor;  /* v4.7 Temp dep of leakage current */
+    double BSIM4pteta0;     /* v4.7 temp dep of leakage current */
+    double BSIM4ptvoffcv;   /* v4.7 temp dep of leakage current */
     double BSIM4pminv;
     double BSIM4pminvcv;
     double BSIM4pdelta;
@@ -1823,6 +1828,7 @@ typedef struct sBSIM4model
 
 /* Pre-calculated constants
  * move to size-dependent param */
+
     double BSIM4Eg0;
     double BSIM4vtm;
     double BSIM4vtm0;
@@ -1872,6 +1878,7 @@ typedef struct sBSIM4model
     double BSIM4vgbrMax;
     double BSIM4vbsrMax;
     double BSIM4vbdrMax;
+
     double BSIM4gidlclamp;
     double BSIM4idovvdsc;
     struct bsim4SizeDependParam *pSizeDependParamKnot;
@@ -1892,7 +1899,6 @@ typedef struct sBSIM4model
     unsigned  BSIM4rgateModGiven :1;
     unsigned  BSIM4perModGiven :1;
     unsigned  BSIM4geoModGiven :1;
-    unsigned  BSIM4rgeoModGiven :1;
     unsigned  BSIM4paramChkGiven :1;
     unsigned  BSIM4trnqsModGiven :1;
     unsigned  BSIM4acnqsModGiven :1;
@@ -1932,6 +1938,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4a1Given   :1;
     unsigned  BSIM4a2Given   :1;
     unsigned  BSIM4ketaGiven   :1;
+    unsigned  BSIM4ketacGiven   :1;
     unsigned  BSIM4nsubGiven   :1;
     unsigned  BSIM4phigGiven   :1;
     unsigned  BSIM4epsrgateGiven   :1;
@@ -1960,7 +1967,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4w0Given   :1;
     unsigned  BSIM4dvtp0Given :1;
     unsigned  BSIM4dvtp1Given :1;
-    unsigned  BSIM4dvtp2Given :1;        /* New DIBL/Rout */
+    unsigned  BSIM4dvtp2Given :1;   /* New DIBL/Rout */
     unsigned  BSIM4dvtp3Given :1;
     unsigned  BSIM4dvtp4Given :1;
     unsigned  BSIM4dvtp5Given :1;
@@ -1992,9 +1999,9 @@ typedef struct sBSIM4model
     unsigned  BSIM4ucsteGiven :1;
     unsigned  BSIM4voffGiven   :1;
     unsigned  BSIM4tvoffGiven   :1;
-    unsigned  BSIM4tnfactorGiven  :1;         /* v4.7 Temp dep of leakage current */
-    unsigned  BSIM4teta0Given   :1;           /* v4.7 temp dep of leakage current */
-    unsigned  BSIM4tvoffcvGiven   :1;        /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4tnfactorGiven  :1;   /* v4.7 Temp dep of leakage current */
+    unsigned  BSIM4teta0Given   :1;     /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4tvoffcvGiven   :1;   /* v4.7 temp dep of leakage current */
     unsigned  BSIM4vofflGiven  :1;
     unsigned  BSIM4voffcvlGiven  :1;
     unsigned  BSIM4minvGiven   :1;
@@ -2084,7 +2091,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4jtsswdGiven   :1;
     unsigned  BSIM4jtsswgsGiven   :1;
     unsigned  BSIM4jtsswgdGiven   :1;
-        unsigned  BSIM4jtweffGiven    :1;
+    unsigned  BSIM4jtweffGiven    :1;
     unsigned  BSIM4njtsGiven   :1;
     unsigned  BSIM4njtsswGiven   :1;
     unsigned  BSIM4njtsswgGiven   :1;
@@ -2217,6 +2224,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4la1Given   :1;
     unsigned  BSIM4la2Given   :1;
     unsigned  BSIM4lketaGiven   :1;
+    unsigned  BSIM4lketacGiven   :1;
     unsigned  BSIM4lnsubGiven   :1;
     unsigned  BSIM4lndepGiven   :1;
     unsigned  BSIM4lnsdGiven    :1;
@@ -2237,7 +2245,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4lw0Given   :1;
     unsigned  BSIM4ldvtp0Given :1;
     unsigned  BSIM4ldvtp1Given :1;
-    unsigned  BSIM4ldvtp2Given :1;        /* New DIBL/Rout */
+    unsigned  BSIM4ldvtp2Given :1;  /* New DIBL/Rout */
     unsigned  BSIM4ldvtp3Given :1;
     unsigned  BSIM4ldvtp4Given :1;
     unsigned  BSIM4ldvtp5Given :1;
@@ -2264,14 +2272,14 @@ typedef struct sBSIM4model
     unsigned  BSIM4llpGiven     :1;
     unsigned  BSIM4lu0Given   :1;
     unsigned  BSIM4leuGiven   :1;
-        unsigned  BSIM4lucsGiven   :1;
+    unsigned  BSIM4lucsGiven   :1;
     unsigned  BSIM4luteGiven   :1;
-        unsigned  BSIM4lucsteGiven  :1;
+    unsigned  BSIM4lucsteGiven  :1;
     unsigned  BSIM4lvoffGiven   :1;
     unsigned  BSIM4ltvoffGiven   :1;
-    unsigned  BSIM4ltnfactorGiven  :1;         /* v4.7 Temp dep of leakage current */
-    unsigned  BSIM4lteta0Given   :1;           /* v4.7 temp dep of leakage current */
-    unsigned  BSIM4ltvoffcvGiven   :1;        /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4ltnfactorGiven  :1;  /* v4.7 Temp dep of leakage current */
+    unsigned  BSIM4lteta0Given   :1;    /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4ltvoffcvGiven   :1;  /* v4.7 temp dep of leakage current */
     unsigned  BSIM4lminvGiven   :1;
     unsigned  BSIM4lminvcvGiven   :1;
     unsigned  BSIM4lrdswGiven   :1;
@@ -2377,6 +2385,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4wa1Given   :1;
     unsigned  BSIM4wa2Given   :1;
     unsigned  BSIM4wketaGiven   :1;
+    unsigned  BSIM4wketacGiven   :1;
     unsigned  BSIM4wnsubGiven   :1;
     unsigned  BSIM4wndepGiven   :1;
     unsigned  BSIM4wnsdGiven    :1;
@@ -2397,7 +2406,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4ww0Given   :1;
     unsigned  BSIM4wdvtp0Given :1;
     unsigned  BSIM4wdvtp1Given :1;
-    unsigned  BSIM4wdvtp2Given :1;        /* New DIBL/Rout */
+    unsigned  BSIM4wdvtp2Given :1;  /* New DIBL/Rout */
     unsigned  BSIM4wdvtp3Given :1;
     unsigned  BSIM4wdvtp4Given :1;
     unsigned  BSIM4wdvtp5Given :1;
@@ -2424,14 +2433,14 @@ typedef struct sBSIM4model
     unsigned  BSIM4wlpGiven     :1;
     unsigned  BSIM4wu0Given   :1;
     unsigned  BSIM4weuGiven   :1;
-        unsigned  BSIM4wucsGiven  :1;
+    unsigned  BSIM4wucsGiven  :1;
     unsigned  BSIM4wuteGiven   :1;
-        unsigned  BSIM4wucsteGiven  :1;
+    unsigned  BSIM4wucsteGiven  :1;
     unsigned  BSIM4wvoffGiven   :1;
     unsigned  BSIM4wtvoffGiven   :1;
-    unsigned  BSIM4wtnfactorGiven  :1;         /* v4.7 Temp dep of leakage current */
-    unsigned  BSIM4wteta0Given   :1;           /* v4.7 temp dep of leakage current */
-    unsigned  BSIM4wtvoffcvGiven   :1;        /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4wtnfactorGiven  :1;  /* v4.7 Temp dep of leakage current */
+    unsigned  BSIM4wteta0Given   :1;    /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4wtvoffcvGiven   :1;  /* v4.7 temp dep of leakage current */
     unsigned  BSIM4wminvGiven   :1;
     unsigned  BSIM4wminvcvGiven   :1;
     unsigned  BSIM4wrdswGiven   :1;
@@ -2537,6 +2546,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4pa1Given   :1;
     unsigned  BSIM4pa2Given   :1;
     unsigned  BSIM4pketaGiven   :1;
+    unsigned  BSIM4pketacGiven   :1;
     unsigned  BSIM4pnsubGiven   :1;
     unsigned  BSIM4pndepGiven   :1;
     unsigned  BSIM4pnsdGiven    :1;
@@ -2557,7 +2567,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4pw0Given   :1;
     unsigned  BSIM4pdvtp0Given :1;
     unsigned  BSIM4pdvtp1Given :1;
-    unsigned  BSIM4pdvtp2Given :1;        /* New DIBL/Rout */
+    unsigned  BSIM4pdvtp2Given :1;  /* New DIBL/Rout */
     unsigned  BSIM4pdvtp3Given :1;
     unsigned  BSIM4pdvtp4Given :1;
     unsigned  BSIM4pdvtp5Given :1;
@@ -2584,14 +2594,14 @@ typedef struct sBSIM4model
     unsigned  BSIM4plpGiven     :1;
     unsigned  BSIM4pu0Given   :1;
     unsigned  BSIM4peuGiven   :1;
-        unsigned  BSIM4pucsGiven   :1;
+    unsigned  BSIM4pucsGiven   :1;
     unsigned  BSIM4puteGiven   :1;
-        unsigned  BSIM4pucsteGiven  :1;
+    unsigned  BSIM4pucsteGiven  :1;
     unsigned  BSIM4pvoffGiven   :1;
     unsigned  BSIM4ptvoffGiven   :1;
-    unsigned  BSIM4ptnfactorGiven  :1;         /* v4.7 Temp dep of leakage current */
-    unsigned  BSIM4pteta0Given   :1;           /* v4.7 temp dep of leakage current */
-    unsigned  BSIM4ptvoffcvGiven   :1;        /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4ptnfactorGiven  :1;  /* v4.7 Temp dep of leakage current */
+    unsigned  BSIM4pteta0Given   :1;    /* v4.7 temp dep of leakage current */
+    unsigned  BSIM4ptvoffcvGiven   :1;  /* v4.7 temp dep of leakage current */
     unsigned  BSIM4pminvGiven   :1;
     unsigned  BSIM4pminvcvGiven   :1;
     unsigned  BSIM4prdswGiven   :1;
@@ -2705,7 +2715,7 @@ typedef struct sBSIM4model
     unsigned  BSIM4SbulkJctGateSideGradingCoeffGiven   :1;
     unsigned  BSIM4SunitLengthGateSidewallJctCapGiven   :1;
     unsigned  BSIM4SjctEmissionCoeffGiven :1;
-    unsigned  BSIM4SjctTempExponentGiven        :1;
+    unsigned  BSIM4SjctTempExponentGiven    :1;
 
     unsigned  BSIM4DjctSatCurDensityGiven   :1;
     unsigned  BSIM4DjctSidewallSatCurDensityGiven   :1;
@@ -2807,7 +2817,6 @@ typedef struct sBSIM4model
     unsigned  BSIM4pku0weGiven   :1;
     unsigned  BSIM4gidlclampGiven   :1;
     unsigned  BSIM4idovvdscGiven   :1;
-
 } BSIM4model;
 
 
@@ -2855,35 +2864,40 @@ typedef struct sBSIM4model
 #define BSIM4_SCC                 36
 #define BSIM4_SC                  37
 #define BSIM4_M                   38
-#define BSIM4_MULU0               39
-#define BSIM4_WNFLAG              40
+
+#define BSIM4_VGSTEFF             40
+#define BSIM4_VDSEFF              41
+#define BSIM4_CGSO                42
+#define BSIM4_CGDO                43
+#define BSIM4_CGBO                44
+#define BSIM4_WEFF                45
+#define BSIM4_LEFF                46
 
 /* Global parameters */
-#define BSIM4_MOD_TEMPEOT         65
-#define BSIM4_MOD_LEFFEOT         66
-#define BSIM4_MOD_WEFFEOT         67
-#define BSIM4_MOD_UCSTE           68
-#define BSIM4_MOD_LUCSTE          69
-#define BSIM4_MOD_WUCSTE          70
-#define BSIM4_MOD_PUCSTE          71
-#define BSIM4_MOD_UCS             72
-#define BSIM4_MOD_LUCS            73
-#define BSIM4_MOD_WUCS            74
-#define BSIM4_MOD_PUCS            75
-#define BSIM4_MOD_CVCHARGEMOD     76
-#define BSIM4_MOD_ADOS            77
-#define BSIM4_MOD_BDOS            78
-#define BSIM4_MOD_TEMPMOD         79
-#define BSIM4_MOD_MTRLMOD         80
-#define BSIM4_MOD_IGCMOD          81
-#define BSIM4_MOD_IGBMOD          82
-#define BSIM4_MOD_ACNQSMOD        83
-#define BSIM4_MOD_FNOIMOD         84
-#define BSIM4_MOD_RDSMOD          85
-#define BSIM4_MOD_DIOMOD          86
-#define BSIM4_MOD_PERMOD          87
-#define BSIM4_MOD_GEOMOD          88
-#define BSIM4_MOD_RGEOMOD         89
+#define BSIM4_MOD_TEMPEOT         66
+#define BSIM4_MOD_LEFFEOT         67
+#define BSIM4_MOD_WEFFEOT         68
+#define BSIM4_MOD_UCSTE           69
+#define BSIM4_MOD_LUCSTE          70
+#define BSIM4_MOD_WUCSTE          71
+#define BSIM4_MOD_PUCSTE          72
+#define BSIM4_MOD_UCS             73
+#define BSIM4_MOD_LUCS            74
+#define BSIM4_MOD_WUCS            75
+#define BSIM4_MOD_PUCS            76
+#define BSIM4_MOD_CVCHARGEMOD     77
+#define BSIM4_MOD_ADOS            78
+#define BSIM4_MOD_BDOS            79
+#define BSIM4_MOD_TEMPMOD         80
+#define BSIM4_MOD_MTRLMOD         81
+#define BSIM4_MOD_IGCMOD          82
+#define BSIM4_MOD_IGBMOD          83
+#define BSIM4_MOD_ACNQSMOD        84
+#define BSIM4_MOD_FNOIMOD         85
+#define BSIM4_MOD_RDSMOD          86
+#define BSIM4_MOD_DIOMOD          87
+#define BSIM4_MOD_PERMOD          88
+#define BSIM4_MOD_GEOMOD          89
 #define BSIM4_MOD_RGATEMOD        90
 #define BSIM4_MOD_RBODYMOD        91
 #define BSIM4_MOD_CAPMOD          92
@@ -3224,47 +3238,47 @@ typedef struct sBSIM4model
 #define BSIM4_MOD_LLP              442
 #define BSIM4_MOD_LMINVCV          443
 
-#define BSIM4_MOD_FGIDL            444                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_KGIDL            445                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_RGIDL            446                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_FGISL            447                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_KGISL            448                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_RGISL            449                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_LFGIDL           450                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_LKGIDL           451                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_LRGIDL           452                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_LFGISL           453                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_LKGISL           454                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_LRGISL           455                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_WFGIDL           456                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_WKGIDL           457                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_WRGIDL           458                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_WFGISL           459                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_WKGISL           460                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_WRGISL           461                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_PFGIDL           462                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_PKGIDL           463                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_PRGIDL           464                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_PFGISL           465                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_PKGISL           466                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_PRGISL           467                  /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_GIDLMOD          379                        /* v4.7 New GIDL/GISL*/
-#define BSIM4_MOD_DVTP2           468                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_DVTP3           469                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_DVTP4           470                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_DVTP5           471                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_LDVTP2          472                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_LDVTP3          473                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_LDVTP4          474                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_LDVTP5          475                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_WDVTP2          476                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_WDVTP3          477                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_WDVTP4          478                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_WDVTP5          479                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_PDVTP2          480                        /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_PDVTP3          298                         /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_PDVTP4          299                         /* v4.7 NEW DIBL/Rout*/
-#define BSIM4_MOD_PDVTP5          300                         /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_FGIDL            444          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_KGIDL            445          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_RGIDL            446          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_FGISL            447          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_KGISL            448          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_RGISL            449          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_LFGIDL           450          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_LKGIDL           451          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_LRGIDL           452          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_LFGISL           453          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_LKGISL           454          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_LRGISL           455          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_WFGIDL           456          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_WKGIDL           457          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_WRGIDL           458          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_WFGISL           459          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_WKGISL           460          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_WRGISL           461          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_PFGIDL           462          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_PKGIDL           463          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_PRGIDL           464          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_PFGISL           465          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_PKGISL           466          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_PRGISL           467          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_GIDLMOD          379          /* v4.7 New GIDL/GISL*/
+#define BSIM4_MOD_DVTP2           468           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_DVTP3           469           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_DVTP4           470           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_DVTP5           471           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_LDVTP2          472           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_LDVTP3          473           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_LDVTP4          474           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_LDVTP5          475           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_WDVTP2          476           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_WDVTP3          477           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_WDVTP4          478           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_WDVTP5          479           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_PDVTP2          480           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_PDVTP3          298           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_PDVTP4          299           /* v4.7 NEW DIBL/Rout*/
+#define BSIM4_MOD_PDVTP5          300           /* v4.7 NEW DIBL/Rout*/
 
 /* Width dependence */
 #define BSIM4_MOD_WCDSC            481
@@ -3550,11 +3564,11 @@ typedef struct sBSIM4model
 #define BSIM4_MOD_LKVTH0           808
 #define BSIM4_MOD_WKVTH0           809
 #define BSIM4_MOD_PKVTH0           810
-#define BSIM4_MOD_WLOD                   811
-#define BSIM4_MOD_STK2                   812
-#define BSIM4_MOD_LODK2                   813
-#define BSIM4_MOD_STETA0           814
-#define BSIM4_MOD_LODETA0           815
+#define BSIM4_MOD_WLOD         811
+#define BSIM4_MOD_STK2         812
+#define BSIM4_MOD_LODK2        813
+#define BSIM4_MOD_STETA0       814
+#define BSIM4_MOD_LODETA0      815
 
 #define BSIM4_MOD_WEB              816
 #define BSIM4_MOD_WEC              817
@@ -3643,29 +3657,29 @@ typedef struct sBSIM4model
 /* trap-assisted tunneling */
 
 #define BSIM4_MOD_JTSS             900
-#define BSIM4_MOD_JTSD                   901
-#define BSIM4_MOD_JTSSWS           902
-#define BSIM4_MOD_JTSSWD           903
-#define BSIM4_MOD_JTSSWGS           904
-#define BSIM4_MOD_JTSSWGD           905
-#define BSIM4_MOD_NJTS                    906
-#define BSIM4_MOD_NJTSSW           907
-#define BSIM4_MOD_NJTSSWG           908
-#define BSIM4_MOD_XTSS                   909
-#define BSIM4_MOD_XTSD                   910
-#define BSIM4_MOD_XTSSWS           911
-#define BSIM4_MOD_XTSSWD           912
-#define BSIM4_MOD_XTSSWGS           913
-#define BSIM4_MOD_XTSSWGD           914
-#define BSIM4_MOD_TNJTS                   915
-#define BSIM4_MOD_TNJTSSW           916
-#define BSIM4_MOD_TNJTSSWG           917
+#define BSIM4_MOD_JTSD         901
+#define BSIM4_MOD_JTSSWS       902
+#define BSIM4_MOD_JTSSWD       903
+#define BSIM4_MOD_JTSSWGS      904
+#define BSIM4_MOD_JTSSWGD      905
+#define BSIM4_MOD_NJTS         906
+#define BSIM4_MOD_NJTSSW       907
+#define BSIM4_MOD_NJTSSWG      908
+#define BSIM4_MOD_XTSS         909
+#define BSIM4_MOD_XTSD         910
+#define BSIM4_MOD_XTSSWS       911
+#define BSIM4_MOD_XTSSWD       912
+#define BSIM4_MOD_XTSSWGS      913
+#define BSIM4_MOD_XTSSWGD      914
+#define BSIM4_MOD_TNJTS        915
+#define BSIM4_MOD_TNJTSSW      916
+#define BSIM4_MOD_TNJTSSWG     917
 #define BSIM4_MOD_VTSS             918
-#define BSIM4_MOD_VTSD                   919
-#define BSIM4_MOD_VTSSWS           920
-#define BSIM4_MOD_VTSSWD           921
-#define BSIM4_MOD_VTSSWGS           922
-#define BSIM4_MOD_VTSSWGD           923
+#define BSIM4_MOD_VTSD         919
+#define BSIM4_MOD_VTSSWS       920
+#define BSIM4_MOD_VTSSWD       921
+#define BSIM4_MOD_VTSSWGS      922
+#define BSIM4_MOD_VTSSWGD      923
 #define BSIM4_MOD_PUD              924
 #define BSIM4_MOD_PUD1             925
 #define BSIM4_MOD_PUP              926
@@ -3722,9 +3736,9 @@ typedef struct sBSIM4model
 #define BSIM4_DRAINCONDUCT         991
 #define BSIM4_CBDB                 992
 #define BSIM4_CBSB                 993
-#define BSIM4_CSUB                   994
-#define BSIM4_QINV                   995
-#define BSIM4_IGIDL                   996
+#define BSIM4_CSUB         994
+#define BSIM4_QINV         995
+#define BSIM4_IGIDL        996
 #define BSIM4_CSGB                 997
 #define BSIM4_CSDB                 998
 #define BSIM4_CSSB                 999
@@ -3733,14 +3747,14 @@ typedef struct sBSIM4model
 #define BSIM4_CSBB                 1002
 #define BSIM4_CBBB                 1003
 #define BSIM4_QS                   1004
-#define BSIM4_IGISL                   1005
-#define BSIM4_IGS                   1006
-#define BSIM4_IGD                   1007
-#define BSIM4_IGB                   1008
-#define BSIM4_IGCS                   1009
-#define BSIM4_IGCD                   1010
-#define BSIM4_QDEF                   1011
-#define BSIM4_DELVT0                   1012
+#define BSIM4_IGISL        1005
+#define BSIM4_IGS          1006
+#define BSIM4_IGD          1007
+#define BSIM4_IGB          1008
+#define BSIM4_IGCS         1009
+#define BSIM4_IGCD         1010
+#define BSIM4_QDEF         1011
+#define BSIM4_DELVT0           1012
 #define BSIM4_GCRG                 1013
 #define BSIM4_GTAU                 1014
 
@@ -3753,13 +3767,13 @@ typedef struct sBSIM4model
 
 #define BSIM4_MOD_LKVTH0WE          1061
 #define BSIM4_MOD_LK2WE             1062
-#define BSIM4_MOD_LKU0WE                1063
+#define BSIM4_MOD_LKU0WE        1063
 #define BSIM4_MOD_WKVTH0WE          1064
 #define BSIM4_MOD_WK2WE             1065
-#define BSIM4_MOD_WKU0WE                1066
+#define BSIM4_MOD_WKU0WE        1066
 #define BSIM4_MOD_PKVTH0WE          1067
 #define BSIM4_MOD_PK2WE             1068
-#define BSIM4_MOD_PKU0WE                1069
+#define BSIM4_MOD_PKU0WE        1069
 
 #define BSIM4_MOD_RBPS0               1101
 #define BSIM4_MOD_RBPSL               1102
@@ -3843,26 +3857,35 @@ typedef struct sBSIM4model
 
 /* v4.7 temp dep of leakage current  */
 
-#define BSIM4_MOD_TNFACTOR          1256
-#define BSIM4_MOD_TETA0                    1257
-#define BSIM4_MOD_TVOFFCV           1258
-#define BSIM4_MOD_LTNFACTOR         1260
-#define BSIM4_MOD_LTETA0            1261
-#define BSIM4_MOD_LTVOFFCV          1262
-#define BSIM4_MOD_WTNFACTOR         1264
-#define BSIM4_MOD_WTETA0            1265
-#define BSIM4_MOD_WTVOFFCV          1266
-#define BSIM4_MOD_PTNFACTOR         1268
-#define BSIM4_MOD_PTETA0            1269
-#define BSIM4_MOD_PTVOFFCV          1270
+#define BSIM4_MOD_TNFACTOR            1256
+#define BSIM4_MOD_TETA0               1257
+#define BSIM4_MOD_TVOFFCV             1258
+#define BSIM4_MOD_LTNFACTOR           1260
+#define BSIM4_MOD_LTETA0              1261
+#define BSIM4_MOD_LTVOFFCV            1262
+#define BSIM4_MOD_WTNFACTOR           1264
+#define BSIM4_MOD_WTETA0              1265
+#define BSIM4_MOD_WTVOFFCV            1266
+#define BSIM4_MOD_PTNFACTOR           1268
+#define BSIM4_MOD_PTETA0              1269
+#define BSIM4_MOD_PTVOFFCV            1270
 
 /* tnoiMod=2 (v4.7) */
-#define BSIM4_MOD_TNOIC             1272
-#define BSIM4_MOD_RNOIC             1273
+#define BSIM4_MOD_TNOIC               1272
+#define BSIM4_MOD_RNOIC               1273
 /* smoothing for gidl clamp (C.K.Dabhi) */
-#define BSIM4_MOD_GIDLCLAMP         1274
+#define BSIM4_MOD_GIDLCLAMP           1274
 /* Tuning for noise parameter BSIM4IdovVds (C.K.Dabhi) - request cadence */
-#define BSIM4_MOD_IDOVVDSC          1275
+#define BSIM4_MOD_IDOVVDSC            1275
+
+/* for dynamic evaluate */
+#define BSIM4_MOD_KETAC               1276
+#define BSIM4_MOD_LKETAC              1277
+#define BSIM4_MOD_WKETAC              1278
+#define BSIM4_MOD_PKETAC              1279
+#define BSIM4_MULT_I                  1280
+#define BSIM4_MULT_Q                  1281
+#define BSIM4_MULT_FN                 1282
 
 #define BSIM4_MOD_VGS_MAX           1301
 #define BSIM4_MOD_VGD_MAX           1302
@@ -3876,14 +3899,6 @@ typedef struct sBSIM4model
 #define BSIM4_MOD_VBSR_MAX          1310
 #define BSIM4_MOD_VBDR_MAX          1311
 
-#define BSIM4_VGSTEFF               1400
-#define BSIM4_VDSEFF                1401
-#define BSIM4_CGSO                  1402
-#define BSIM4_CGDO                  1403
-#define BSIM4_CGBO                  1404
-#define BSIM4_WEFF                  1405
-#define BSIM4_LEFF                  1406
-
 #include "bsim4ext.h"
 
 extern void BSIM4evaluate(double,double,double,BSIM4instance*,BSIM4model*,
@@ -3898,3 +3913,4 @@ extern int BSIM4RdsEndIso(double, double, double, double, double, double, int, i
 extern int BSIM4RdsEndSha(double, double, double, double, double, double, int, int, double *);
 
 #endif /*BSIM4*/
+

src/spicelib/devices/bsim4/bsim4ext.h

@@ -1,29 +1,25 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
 extern int BSIM4acLoad(GENmodel *,CKTcircuit*);
@@ -38,7 +34,7 @@ extern void BSIM4mosCap(CKTcircuit*, double, double, double, double,
         double, double, double, double, double, double, double,
         double, double, double, double, double, double, double*,
         double*, double*, double*, double*, double*, double*, double*,
-        double*, double*, double*, double*, double*, double*, double*, 
+        double*, double*, double*, double*, double*, double*, double*,
         double*);
 extern int BSIM4param(int,IFvalue*,GENinstance*,IFvalue*);
 extern int BSIM4pzLoad(GENmodel*,CKTcircuit*,SPcomplex*);

src/spicelib/devices/bsim4/bsim4itf.h

@@ -1,29 +1,25 @@
 /* ******************************************************************************
-   *  BSIM4 4.8.2 released by Chetan Kumar Dabhi 01/01/2020                     *
+   *  BSIM4 4.8.3 released on 05/19/2025                                        *
    *  BSIM4 Model Equations                                                     *
    ******************************************************************************
 
    ******************************************************************************
-   *  Copyright (c) 2020 University of California                               *
+   *  Copyright (c) 2025 University of California                               *
    *                                                                            *
-   *  Project Director: Prof. Chenming Hu.                                      *
-   *  Current developers: Chetan Kumar Dabhi   (Ph.D. student, IIT Kanpur)      *
-   *                      Prof. Yogesh Chauhan (IIT Kanpur)                     *
-   *                      Dr. Pragya Kushwaha  (Postdoc, UC Berkeley)           *
-   *                      Dr. Avirup Dasgupta  (Postdoc, UC Berkeley)           *
-   *                      Ming-Yen Kao         (Ph.D. student, UC Berkeley)     *
-   *  Authors: Gary W. Ng, Weidong Liu, Xuemei Xi, Mohan Dunga, Wenwei Yang     *
-   *           Ali Niknejad, Chetan Kumar Dabhi, Yogesh Singh Chauhan,          *
-   *           Sayeef Salahuddin, Chenming Hu                                   * 
+   *  Project Directors: Prof. Sayeef Salahuddin and Prof. Chenming Hu          *
+   *  Developers list: https://www.bsim.berkeley.edu/models/bsim4/auth_bsim4/   *
    ******************************************************************************/
 
 /*
 Licensed under Educational Community License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a copy of the license at
 http://opensource.org/licenses/ECL-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations
 under the License.
+
+BSIM4 model is supported by the members of Silicon Integration Initiative's Compact Model Coalition. A link to the most recent version of this
+standard can be found at: http://www.si2.org/cmc
 */
 
 #ifndef DEV_BSIM4

src/spicelib/devices/jfet2/jfet2par.c

@@ -31,8 +31,8 @@ JFET2param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
             here->JFET2tempGiven = TRUE;
             break;
         case JFET2_DTEMP:
-            here->JFET2temp = value->rValue;
-            here->JFET2tempGiven = TRUE;
+            here->JFET2dtemp = value->rValue;
+            here->JFET2dtempGiven = TRUE;
             break;
         case JFET2_AREA:
             here->JFET2area = value->rValue;

src/spicelib/devices/mes/mes.c

@@ -12,7 +12,8 @@ Author: 1987 Thomas L. Quarles
 IFparm MESpTable[] = { /* parameters */ 
  OPU("off",  MES_OFF,    IF_FLAG   ,"Device initially off"),
  IOPU("area", MES_AREA,   IF_REAL   ,"Area factor"),
- IOPUR("m",   MES_AREA,   IF_REAL   ,"Parallel Multiplier"),
+ IOPUR("m",   MES_M,   IF_REAL   ,"Parallel Multiplier"),
+ IOPAU("ic",         MES_IC,             IF_REALVEC,"Initial VDS,VGS vector"),
  IOPAU("icvds",  MES_IC_VDS, IF_REAL   ,"Initial D-S voltage"),
  IOPAU("icvgs",  MES_IC_VGS, IF_REAL   ,"Initial G-S voltage"),
  OPU("dnode", MES_DRAINNODE, IF_INTEGER,"Number of drain node"),

src/spicelib/parser/inp2dot.c

@@ -288,8 +288,8 @@ dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
 
     NG_IGNORE(gnode);
 
-    /* .dc SRC1NAME Vstart1 Vstop1 Vinc1 [SRC2NAME Vstart2 */
-    /*        Vstop2 Vinc2 */
+    /* .dc SRC1NAME Vstart1 Vstop1 Vinc1 [SRC2NAME Vstart2 Vstop2 Vinc2]
+       Return 1 upon error because of bad syntax (missing tokens).*/
     which = ft_find_analysis("DC");
     if (which == -1) {
         LITERR("DC transfer curve analysis unsupported\n");
@@ -297,25 +297,43 @@ dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
     }
     IFC(newAnalysis, (ckt, which, "DC transfer characteristic", &foo, task));
     INPgetTok(&line, &name, 1);
+    if (*name == '\0')
+        return 1;
     INPinsert(&name, tab);
     ptemp.uValue = name;
     GCA(INPapName, (ckt, which, foo, "name1", &ptemp));
+    if (*line == '\0')
+        return 1;
     parm = INPgetValue(ckt, &line, IF_REAL, tab);	/* vstart1 */
     GCA(INPapName, (ckt, which, foo, "start1", parm));
+    if (*line == '\0')
+        return 1;
     parm = INPgetValue(ckt, &line, IF_REAL, tab);	/* vstop1 */
     GCA(INPapName, (ckt, which, foo, "stop1", parm));
+    if (*line == '\0')
+        return 1;
     parm = INPgetValue(ckt, &line, IF_REAL, tab);	/* vinc1 */
+        if (parm->rValue == 0)
+            return 1;
     GCA(INPapName, (ckt, which, foo, "step1", parm));
     if (*line) {
         INPgetTok(&line, &name, 1);
+        if (*line == '\0')
+            return 1;
         INPinsert(&name, tab);
         ptemp.uValue = name;
         GCA(INPapName, (ckt, which, foo, "name2", &ptemp));
         parm = INPgetValue(ckt, &line, IF_REAL, tab); /* vstart2 */
+        if (*line == '\0')
+            return 1;
         GCA(INPapName, (ckt, which, foo, "start2", parm));
         parm = INPgetValue(ckt, &line, IF_REAL, tab); /* vstop2 */
+        if (*line == '\0')
+            return 1;
         GCA(INPapName, (ckt, which, foo, "stop2", parm));
         parm = INPgetValue(ckt, &line, IF_REAL, tab); /* vinc2 */
+        if (parm->rValue == 0)
+            return 1;
         GCA(INPapName, (ckt, which, foo, "step2", parm));
     }
     return 0;
@@ -861,6 +879,9 @@ INP2dot(CKTcircuit *ckt, INPtables *tab, struct card *current, TSKtask *task, CK
         goto quit;
     } else if ((strcmp(token, ".dc") == 0)) {
         rtn = dot_dc(line, ckt, tab, current, task, gnode, foo);
+        if (rtn == 1) {
+            current->error = copy("Bad syntax! ");
+        }
         goto quit;
     } else if ((strcmp(token, ".tf") == 0)) {
         rtn = dot_tf(line, ckt, tab, current, task, gnode, foo);

src/spicelib/parser/inp2n.c

@@ -34,7 +34,7 @@ void INP2N(CKTcircuit *ckt, INPtables *tab, struct card *current) {
   GENmodel    *mdfast;    /* Pointer to the actual model. */
   IFdevice    *dev;
   CKTnode     *node;
-  char        *c, *token = NULL, *prev = NULL, *pprev = NULL;
+  char        *c, *token = NULL, *prev = NULL, *pprev = NULL, *eqp;
   int          i;
 
   line = current->line;
@@ -44,15 +44,16 @@ void INP2N(CKTcircuit *ckt, INPtables *tab, struct card *current) {
   /* Find the last non-parameter token in the line. */
 
   c = line;
-  for (i = 0; *c != '\0'; ++i) {
+  for (i = 0, eqp = NULL; *c != '\0'; ++i) {
       tfree(pprev);
       pprev = prev;
       prev = token;
       token = gettok_instance(&c);
-      if (strchr(token, '='))
+      eqp = strchr(token, '=');
+      if (eqp)
           break;
   }
-  if (*c) {
+  if (eqp) {
       tfree(token); // A parameter or starts with '='.
       if (*c == '=') {
           /* Now prev points to a parameter pprev is the model. */

src/spicelib/parser/inpgmod.c

@@ -292,7 +292,6 @@ INPgetModBin(CKTcircuit *ckt, char *name, INPmodel **model, INPtables *tab, char
 
     for (modtmp = modtab; modtmp; modtmp = modtmp->INPnextModel) {
 
-        /* exact: 1, with binning extension .[0-9]: 2*/
         if (model_name_match(name, modtmp->INPmodName) < 2)
             continue;
 
@@ -335,8 +334,8 @@ INPgetModBin(CKTcircuit *ckt, char *name, INPmodel **model, INPtables *tab, char
             *model = modtmp;
             return NULL;
         }
-        fprintf(stderr, "Warning: no model found for w=%.3e and l=%.3e\n", w, l);
     }
+
     return NULL;
 }
 

src/spinit.in

@@ -25,6 +25,7 @@ if $?xspice_enabled
 @XSPICEINIT@ codemodel @pkglibdir@/xtradev.cm
 @XSPICEINIT@ codemodel @pkglibdir@/xtraevt.cm
 @XSPICEINIT@ codemodel @pkglibdir@/table.cm
+@XSPICEINIT@ codemodel @pkglibdir@/tlines.cm
 
 end
 

src/xspice/cm/cm.c

@@ -40,6 +40,7 @@ INTERFACES
 
     cm_irreversible()
     cm_get_node_name()
+    cm_get_neg_node_name()
     cm_probe_node()
 
 REFERENCED FILES
@@ -852,6 +853,33 @@ const char *cm_get_node_name(const char *port_name, unsigned int index)
     return NULL;
 }
 
+/* Get the neg name of a circuit node connected to a port. */
+
+const char* cm_get_neg_node_name(const char* port_name, unsigned int index)
+{
+    MIFinstance* instance;
+    Mif_Conn_Data_t* conn;
+    Mif_Port_Data_t* port;
+    int               i;
+
+    instance = g_mif_info.instance;
+    for (i = 0; i < instance->num_conn; ++i) {
+        conn = instance->conn[i];
+        if (!strcmp(port_name, conn->name)) {
+            if (index >= (unsigned int)conn->size)
+                return NULL;
+            port = conn->port[index];
+            if (port->type == MIF_DIGITAL || port->type == MIF_USER_DEFINED) {
+                /* Event node, no name in port data. */
+                return NULL;
+            }
+            return port->neg_node_str;
+        }
+    }
+    return NULL;
+}
+
+
 /* Test the resolved value of a connected Digital/UDN node, given
  * an assumed value for a particular port.
  */

src/xspice/cm/cmexport.c

@@ -60,6 +60,7 @@ struct coreInfo_t  coreInfo =
   cm_netlist_get_l,
   cm_irreversible,
   cm_get_node_name,
+  cm_get_neg_node_name,
   cm_probe_node,
   cm_schedule_output,
   cp_getvar,

src/xspice/icm/GNUmakefile.in

@@ -7,11 +7,11 @@ include makedefs
 
 
 # The codemodels to make
-CMDIRS = spice2poly digital analog xtradev xtraevt table
+CMDIRS = spice2poly digital analog xtradev xtraevt table tlines
 
 
 #Invoke $(MAKE) for each of the CMDDIRS
-all: dstring.o # One common dstring object file for all code modules
+all: dstring.o msline_common.o tline_common.o# Common object files for all code modules
 	for cm in $(CMDIRS) ; do \
 		$(MAKE) cm=$$cm $$cm/$$cm.cm \
 		|| exit 1; \
@@ -36,6 +36,8 @@ uninstall:
 
 clean:
 	rm -f dstring.o
+	rm -f msline_common.o
+	rm -f tline_common.o
 	for cm in $(CMDIRS) ; do \
 		$(MAKE) cm=$$cm cm-clean \
 		|| exit 1; \
@@ -49,6 +51,12 @@ NGSRCBUILDDIR = $(CURDIR)/../..
 dstring.o: $(NGSRCDIR)/misc/dstring.c $(NGSRCDIR)/include/ngspice/dstring.h
 	$(CC) $(CFLAGS) -I$(NGSRCDIR)/include -I$(NGSRCBUILDDIR)/include -fPIC -o $@ -c $<
 
+msline_common.o: $(srcdir)/../tlines/msline_common.c $(srcdir)/../tlines/msline_common.h
+	$(CC) $(CFLAGS) -I$(srcdir)/../tlines -I$(NGSRCDIR)/include -I$(NGSRCBUILDDIR)/include -fPIC -o $@ -c $<
+
+tline_common.o: $(srcdir)/../tlines/tline_common.c $(srcdir)/../tlines/tline_common.h
+	$(CC) $(CFLAGS) -I$(srcdir)/../tlines -I$(NGSRCDIR)/include -I$(NGSRCBUILDDIR)/include -fPIC -o $@ -c $<
+
 ifdef cm
 
 ifeq ($(OS),Windows_NT)
@@ -70,6 +78,8 @@ cm-gens := \
 cm-objs := \
 	$(cm)/dlmain.o \
 	dstring.o \
+	tline_common.o \
+	msline_common.o \
 	$(modlst:%=$(cm)/%/cfunc.o) \
 	$(modlst:%=$(cm)/%/ifspec.o) \
 	$(udnlst:%=$(cm)/%/udnfunc.o)
@@ -160,11 +170,11 @@ $(cm)/dlmain.o : $(srcdir)/dlmain.c $(cm-descr)
 	$(do-deps)
 
 $(cm)/%/cfunc.o : $(cm)/%/cfunc.c
-	$(COMPILE) $(gen_pp) -I$(srcdir)/$(<D) -o $@ -c $<
+	$(COMPILE) $(gen_pp) -I$(srcdir)/$(<D) -I$(srcdir)/../tlines -o $@ -c $<
 	$(do-deps)
 
 $(cm)/%/ifspec.o : $(cm)/%/ifspec.c
-	$(COMPILE) $(gen_pp) -I$(srcdir)/$(<D) -o $@ -c $<
+	$(COMPILE) $(gen_pp) -I$(srcdir)/$(<D) -I$(srcdir)/../tlines -o $@ -c $<
 	$(do-deps)
 
 $(cm)/%/udnfunc.o : $(srcdir)/$(cm)/%/udnfunc.c

src/xspice/icm/dlmain.c

@@ -350,6 +350,10 @@ const char *cm_get_node_name(const char *port, unsigned int index) {
     return coreitf->dllitf_cm_get_node_name(port, index);
 }
 
+const char *cm_get_neg_node_name(const char *port, unsigned int index) {
+    return coreitf->dllitf_cm_get_neg_node_name(port, index);
+}
+
 bool cm_probe_node(unsigned int  conn_index,
                    unsigned int  port_index,
                    void         *value) {

src/xspice/icm/tlines/cpline/cfunc.mod

@@ -0,0 +1,188 @@
+/* ===========================================================================
+	FILE    cfunc.mod
+	Copyright 2025 Vadim Kuznetsov
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <complex.h>
+
+#include "msline_common.h"
+#include "tline_common.h"
+
+
+static void copy_complex(double complex s, Complex_t *d)
+{
+    d->real = creal(s);
+	d->imag = cimag(s);
+}
+
+//cpline_state_t *sim_points = NULL;
+
+static void cm_cpline_callback(ARGS, Mif_Callback_Reason_t reason);
+
+void cm_cpline (ARGS)
+{
+	Complex_t   z11, z12, z13, z14;
+
+	/* how to get properties of this component, e.g. L, W */
+	double l   = PARAM(l);
+	double ze  = PARAM(ze);
+	double zo  = PARAM(zo);
+	double ere = PARAM(ere);
+	double ero = PARAM(ero);
+	double ae  = PARAM(ae);
+	double ao  = PARAM(ao);
+	ae = pow(10, 0.05*ae);
+	ao = pow(10, 0.05*ao);
+
+	if(INIT) {
+        CALLBACK = cm_cpline_callback;
+        STATIC_VAR(sim_points_data) = NULL;
+	}
+
+	/* Compute the output */
+	if(ANALYSIS == DC) {
+
+		  double V1 = INPUT(p1s);
+		  double V2 = INPUT(p2s);
+		  double V3 = INPUT(p3s);
+		  double V4 = INPUT(p4s);
+		  double I1 = INPUT(p1);
+		  double I2 = INPUT(p2);
+		  double I3 = INPUT(p3);
+		  double I4 = INPUT(p4);
+
+		  double z = sqrt(ze*zo);
+
+		  double V2out = V1 + z*I1;
+		  double V1out = V2 + z*I2;
+		  OUTPUT(p1) = V1out + I1*z;
+		  OUTPUT(p2) = V2out + I2*z;
+
+		  double V3out = V4 + z*I4;
+		  double V4out = V3 + z*I3;
+		  OUTPUT(p3) = V3out + I3*z;
+		  OUTPUT(p4) = V4out + I4*z;
+
+		  cm_analog_auto_partial();
+	}
+	else if(ANALYSIS == AC) {
+		double o = RAD_FREQ;
+
+		double complex _Z11, _Z12, _Z13, _Z14;
+		double complex arg_e =  log(ae)*l/2.0 + I*o*l/C0*sqrt(ere);
+		double complex arg_o =  log(ao)*l/2.0 + I*o*l/C0*sqrt(ero);
+
+		_Z11 = zo / (2*ctanh(arg_o)) + ze / (2*ctanh(arg_e));
+		_Z12 = zo / (2*csinh(arg_o)) + ze / (2*csinh(arg_e));
+		_Z13 = ze / (2*csinh(arg_e)) - zo / (2*csinh(arg_o));
+		_Z14 = ze / (2*ctanh(arg_e)) - zo / (2*ctanh(arg_o));
+
+		copy_complex(_Z11,&z11);
+		copy_complex(_Z12,&z12);
+		copy_complex(_Z13,&z13);
+		copy_complex(_Z14,&z14);
+
+        AC_GAIN(p1,p1) = z11; AC_GAIN(p2,p2) = z11;
+        AC_GAIN(p3,p3) = z11; AC_GAIN(p4,p4) = z11;
+
+		AC_GAIN(p1,p2) = z12; AC_GAIN(p2,p1) = z12;
+        AC_GAIN(p3,p4) = z12; AC_GAIN(p4,p3) = z12;
+
+		AC_GAIN(p1,p3) = z13; AC_GAIN(p3,p1) = z13;
+        AC_GAIN(p2,p4) = z13; AC_GAIN(p4,p2) = z13;
+
+		AC_GAIN(p1,p4) = z14; AC_GAIN(p4,p1) = z14;
+        AC_GAIN(p2,p3) = z14; AC_GAIN(p3,p2) = z14;
+	}
+	else if(ANALYSIS == TRANSIENT) {
+		double t = TIME;
+		double Vp[PORT_NUM];
+		double Ip[PORT_NUM];
+
+		Vp[0] = INPUT(p1s);
+		Vp[1] = INPUT(p2s);
+		Vp[2] = INPUT(p3s);
+		Vp[3] = INPUT(p4s);
+		Ip[0] = INPUT(p1);
+		Ip[1] = INPUT(p2);
+		Ip[2] = INPUT(p3);
+		Ip[3] = INPUT(p4);
+		double delay = l/(C0);
+
+        void **sim_points = &(STATIC_VAR(sim_points_data));
+
+        cpline_state_t *last = get_cpline_last_state(*(cpline_state_t **)sim_points);
+        double last_time = 0;
+        if (last != NULL) last_time = last->time;
+
+		if (TIME < last_time) {
+			delete_cpline_last_state((cpline_state_t **)sim_points);
+		}
+		append_cpline_state((cpline_state_t **)sim_points, t, Vp, Ip, 1.2*delay);
+		if (t > delay) {
+			cpline_state_t *pp = find_cpline_state(*(cpline_state_t **)sim_points, t - delay);
+			if (pp != NULL) {
+
+				double J1e = 0.5*(Ip[3] + Ip[0]);
+				double J1o = 0.5*(Ip[0] - Ip[3]);
+				double J2e = 0.5*(Ip[1] + Ip[2]);
+				double J2o = 0.5*(Ip[1] - Ip[2]);
+
+
+				double J1et = 0.5*(pp->Ip[3] + pp->Ip[0]);
+				double J1ot = 0.5*(pp->Ip[0] - pp->Ip[3]);
+				double J2et = 0.5*(pp->Ip[1] + pp->Ip[2]);
+				double J2ot = 0.5*(pp->Ip[1] - pp->Ip[2]);
+
+
+				double V1et = 0.5*(pp->Vp[3] + pp->Vp[0]);
+				double V1ot = 0.5*(pp->Vp[0] - pp->Vp[3]);
+				double V2et = 0.5*(pp->Vp[1] + pp->Vp[2]);
+				double V2ot = 0.5*(pp->Vp[1] - pp->Vp[2]);
+
+				double V1e = ze*J1e + V2et + ze*J2et;
+				double V1o = zo*J1o + V2ot + zo*J2ot;
+				double V2e = ze*J2e + V1et + ze*J1et;
+				double V2o = zo*J2o + V1ot + zo*J1ot;
+
+				double V1 = V1o + V1e;
+				double V2 = V2o + V2e;
+				double V3 = V2e - V2o;
+				double V4 = V1e - V1o;
+
+				OUTPUT(p1) = V1;
+				OUTPUT(p2) = V2;
+				OUTPUT(p3) = V3;
+				OUTPUT(p4) = V4;
+			}
+			cm_analog_auto_partial();
+		} else {
+			cm_analog_auto_partial();
+		}
+	}
+}
+
+static void cm_cpline_callback(ARGS, Mif_Callback_Reason_t reason)
+{
+    switch (reason) {
+        case MIF_CB_DESTROY:
+            delete_cpline_states((cpline_state_t **)&(STATIC_VAR(sim_points_data)));
+            break;
+        default: break;
+    }
+}

src/xspice/icm/tlines/cpline/ifspec.ifs

@@ -0,0 +1,191 @@
+/* ===========================================================================
+ FILE    ifspec.ifs
+ Copyright 2025 Vadim Kuznetsov
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+/* Ports connection
+    4 --||||||-- 3
+
+    1 --||||||-- 2
+*/
+
+NAME_TABLE:
+
+Spice_Model_Name:      cpline
+C_Function_Name:       cm_cpline
+Description:           "Generic transmission line"
+
+
+PORT_TABLE:
+Port_Name:             p1
+Description:           "Terminals Line1"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p2
+Description:           "Terminals Line1"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p3
+Description:           "Terminals Line2"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p4
+Description:           "Terminals Line2"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p1s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p2s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p3s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p4s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+
+PARAMETER_TABLE:
+Parameter_Name:        l
+Description:           "length"
+Data_Type:             real
+Default_Value:         1.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        ze
+Description:           "characteristic impedance of even mode"
+Data_Type:             real
+Default_Value:         50.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        zo
+Description:           "characteristic impedance of odd mode"
+Data_Type:             real
+Default_Value:         50.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        ae
+Description:           "attenuation per length (dB) even mode"
+Data_Type:             real
+Default_Value:         0.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        ao
+Description:           "attenuation per length (dB) odd mode"
+Data_Type:             real
+Default_Value:         0.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        ere
+Description:           "dielectric constant even mode"
+Data_Type:             real
+Default_Value:         1.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        ero
+Description:           "dielectric constant odd mode"
+Data_Type:             real
+Default_Value:         1.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+STATIC_VAR_TABLE:
+
+Static_Var_Name:    sim_points_data
+Description:        "local static data"
+Data_Type:          pointer
+

src/xspice/icm/tlines/cpmlin/cfunc.mod

@@ -0,0 +1,541 @@
+/* ===========================================================================
+	FILE    cfunc.mod
+	Copyright 2025 Vadim Kuznetsov
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <complex.h>
+
+
+#include "msline_common.h"
+#include "tline_common.h"
+
+static double ae, ao, be, bo, ze, zo, ee, eo;
+
+static void copy_complex(double complex s, Complex_t *d)
+{
+	d->real = creal(s);
+	d->imag = cimag(s);
+}
+
+
+//static cpline_state_t *state = NULL;
+static void cm_cpmline_callback(ARGS, Mif_Callback_Reason_t reason);
+
+static void analyseQuasiStatic (double W, double h, double s,
+				   double t, double er,
+				   int SModel, double* Zle,
+				   double* Zlo, double* ErEffe,
+				   double* ErEffo);
+
+static void analyseDispersion (double W, double h, double s,
+				   double t, double er, double Zle,
+				   double Zlo, double ErEffe,
+				   double ErEffo, double frequency,
+				   int  DModel, double *ZleFreq,
+				   double  *ZloFreq,
+				   double  *ErEffeFreq,
+				   double  *ErEffoFreq);
+
+static void calcPropagation (double W, double s,
+								 double er, double h, double t, double tand, double rho, double D,
+								 int SModel, int DModel, double frequency)
+{
+
+	// quasi-static analysis
+	double Zle, ErEffe, Zlo, ErEffo;
+	analyseQuasiStatic (W, h, s, t, er, SModel, &Zle, &Zlo, &ErEffe, &ErEffo);
+
+	// analyse dispersion of Zl and Er
+	double ZleFreq, ErEffeFreq, ZloFreq, ErEffoFreq;
+	analyseDispersion (W, h, s, t, er, Zle, Zlo, ErEffe, ErEffo, frequency, DModel,
+					   &ZleFreq, &ZloFreq, &ErEffeFreq, &ErEffoFreq);
+
+	// analyse losses of line
+	double ace, aco, ade, ado;
+	analyseLoss (W, t, er, rho, D, tand, Zle, Zlo, ErEffe,
+						 frequency, HAMMERSTAD, &ace, &ade);
+	analyseLoss (W, t, er, rho, D, tand, Zlo, Zle, ErEffo,
+						 frequency, HAMMERSTAD, &aco, &ado);
+
+	// compute propagation constants for even and odd mode
+	double k0 = 2 * M_PI * frequency / C0;
+	ae = ace + ade;
+	ao = aco + ado;
+	be = sqrt (ErEffeFreq) * k0;
+	bo = sqrt (ErEffoFreq) * k0;
+	ze = ZleFreq;
+	zo = ZloFreq;
+	ee = ErEffeFreq;
+	eo = ErEffoFreq;
+}
+
+
+
+/* The function calculates the quasi-static dielectric constants and
+   characteristic impedances for the even and odd mode based upon the
+   given line and substrate properties for parallel coupled microstrip
+   lines. */
+static void analyseQuasiStatic (double W, double h, double s,
+				   double t, double er,
+				   int SModel, double* Zle,
+				   double* Zlo, double* ErEffe,
+				   double* ErEffo) {
+  // initialize default return values
+  *ErEffe = er; *ErEffo = er;
+  *Zlo = 42.2; *Zle = 55.7;
+
+  // normalized width and gap
+  double u = W / h;
+  double g = s / h;
+
+  // HAMMERSTAD and JENSEN
+  if (SModel == HAMMERSTAD) {
+    double Zl1, Fe, Fo, a, b, fo, Mu, Alpha, Beta, ErEff;
+    double Pe, Po, r, fo1, q, p, n, Psi, Phi, m, Theta;
+
+    // modifying equations for even mode
+    m = 0.2175 + pow (4.113 + pow (20.36 / g, 6.), -0.251) +
+      log (pow (g, 10.) / (1 + pow (g / 13.8, 10.))) / 323;
+    Alpha = 0.5 * exp (-g);
+    Psi = 1 + g / 1.45 + pow (g, 2.09) / 3.95;
+    Phi = 0.8645 * pow (u, 0.172);
+    Pe = Phi / (Psi * (Alpha * pow (u, m) + (1 - Alpha) * pow (u, -m)));
+    // TODO: is this ... Psi * (Alpha ... or ... Psi / (Alpha ... ?
+
+    // modifying equations for odd mode
+    n = (1 / 17.7 + exp (-6.424 - 0.76 * log (g) - pow (g / 0.23, 5.))) *
+      log ((10 + 68.3 * sqr (g)) / (1 + 32.5 * pow (g, 3.093)));
+    Beta = 0.2306 + log (pow (g, 10.) / (1 + pow (g / 3.73, 10.))) / 301.8 +
+      log (1 + 0.646 * pow (g, 1.175)) / 5.3;
+    Theta = 1.729 + 1.175 * log (1 + 0.627 / (g + 0.327 * pow (g, 2.17)));
+    Po = Pe - Theta / Psi * exp (Beta * pow (u, -n) * log (u));
+
+    // further modifying equations
+    r = 1 + 0.15 * (1 - exp (1 - sqr (er - 1) / 8.2) / (1 + pow (g, -6.)));
+    fo1 = 1 - exp (-0.179 * pow (g, 0.15) -
+		   0.328 * pow (g, r) / log (M_E + pow (g / 7, 2.8)));
+    q = exp (-1.366 - g);
+    p = exp (-0.745 * pow (g, 0.295)) / cosh (pow (g, 0.68));
+    fo = fo1 * exp (p * log (u) + q * sin (M_PI * log10 (u)));
+
+    Mu = g * exp (-g) + u * (20 + sqr (g)) / (10 + sqr (g));
+    Hammerstad_ab (Mu, er, &a, &b);
+    Fe = pow (1 + 10 / Mu, -a * b);
+    Hammerstad_ab (u, er, &a, &b);
+    Fo = fo * pow (1 + 10 / u, -a * b);
+
+    // finally compute effective dielectric constants and impedances
+    *ErEffe = (er + 1) / 2 + (er - 1) / 2 * Fe;
+    *ErEffo = (er + 1) / 2 + (er - 1) / 2 * Fo;
+
+    Hammerstad_er (u, er, a, b, &ErEff);  // single microstrip
+
+    // first variant
+    Zl1 = Z0 / (u + 1.98 * pow (u, 0.172));
+    Zl1 /= sqrt (ErEff);
+
+    // second variant
+    Hammerstad_zl (u, &Zl1);
+    Zl1 /= sqrt (ErEff);
+
+    *Zle = Zl1 / (1 - Zl1 * Pe / Z0);
+    *Zlo = Zl1 / (1 - Zl1 * Po / Z0);
+  }
+  // KIRSCHNING and JANSEN
+  else if (SModel == KIRSCHING) {
+    double a, b, ae, be, ao, bo, v, co, d, ErEff, Zl1;
+    double q1, q2, q3, q4, q5, q6, q7, q8, q9, q10;
+
+    // consider effect of finite strip thickness (JANSEN only)
+    double ue = u;
+    double uo = u;
+    if (t != 0 && s > 10 * (2 * t)) {
+      double dW = 0;
+      // SCHNEIDER, referred by JANSEN
+      if (u >= M_1_PI / 2 && M_1_PI / 2 > 2 * t / h)
+	dW = t * (1 + log (2 * h / t)) / M_PI;
+      else if (W > 2 * t)
+	dW = t * (1 + log (4 * M_PI * W / t)) / M_PI;
+      // JANSEN
+      double dt = 2 * t * h / s / er;
+      double We = W + dW * (1 - 0.5 * exp (-0.69 * dW / dt));
+      double Wo = We + dt;
+      ue = We / h;
+      uo = Wo / h;
+    }
+
+    // even relative dielectric constant
+    v = ue * (20 + sqr (g)) / (10 + sqr (g)) + g * exp (-g);
+    Hammerstad_ab (v, er, &ae, &be);
+    Hammerstad_er (v, er, ae, be, ErEffe);
+
+    // odd relative dielectric constant
+    Hammerstad_ab (uo, er, &a, &b);
+    Hammerstad_er (uo, er, a, b, &ErEff);
+    d = 0.593 + 0.694 * exp (-0.562 * uo);
+    bo = 0.747 * er / (0.15 + er);
+    co = bo - (bo - 0.207) * exp (-0.414 * uo);
+    ao = 0.7287 * (ErEff - (er + 1) / 2) * (1 - exp (-0.179 * uo));
+    *ErEffo = ((er + 1) / 2 + ao - ErEff) * exp (-co * pow (g, d)) + ErEff;
+
+    // characteristic impedance of single line
+    Hammerstad_zl (u, &Zl1);
+    Zl1 /= sqrt (ErEff);
+
+    // even characteristic impedance
+    q1 = 0.8695 * pow (ue, 0.194);
+    q2 = 1 + 0.7519 * g + 0.189 * pow (g, 2.31);
+    q3 = 0.1975 + pow (16.6 + pow (8.4 / g, 6.), -0.387) +
+      log (pow (g, 10.) / (1 + pow (g / 3.4, 10.))) / 241;
+    q4 = q1 / q2 * 2 /
+      (exp (-g) * pow (ue, q3) + (2 - exp (-g)) * pow (ue, -q3));
+    *Zle = sqrt (ErEff / *ErEffe) * Zl1 / (1 - Zl1 * sqrt (ErEff) * q4 / Z0);
+
+    // odd characteristic impedance
+    q5 = 1.794 + 1.14 * log (1 + 0.638 / (g + 0.517 * pow (g, 2.43)));
+    q6 = 0.2305 + log (pow (g, 10.) / (1 + pow (g / 5.8, 10.))) / 281.3 +
+      log (1 + 0.598 * pow (g, 1.154)) / 5.1;
+    q7 = (10 + 190 * sqr (g)) / (1 + 82.3 * cubic (g));
+    q8 = exp (-6.5 - 0.95 * log (g) - pow (g / 0.15, 5.));
+    q9 = log (q7) * (q8 + 1 / 16.5);
+    q10 = (q2 * q4 - q5 * exp (log (uo) * q6 * pow (uo, -q9))) / q2;
+    *Zlo = sqrt (ErEff / *ErEffo) * Zl1 / (1 - Zl1 * sqrt (ErEff) * q10 / Z0);
+  }
+}
+
+/* The function computes the dispersion effects on the dielectric
+   constants and characteristic impedances for the even and odd mode
+   of parallel coupled microstrip lines. */
+static void analyseDispersion (double W, double h, double s,
+				   double t, double er, double Zle,
+				   double Zlo, double ErEffe,
+				   double ErEffo, double frequency,
+				   int  DModel, double *ZleFreq,
+				   double  *ZloFreq,
+				   double  *ErEffeFreq,
+				   double  *ErEffoFreq) {
+
+  // initialize default return values
+  *ZleFreq = Zle;
+  *ErEffeFreq = ErEffe;
+  *ZloFreq = Zlo;
+  *ErEffoFreq = ErEffo;
+
+  // normalized width and gap
+  double u = W / h;
+  double g = s / h;
+  double ue, uo;
+  double B, dW, dt;
+
+  // compute u_odd, u_even
+  if (t > 0.0) {
+    if (u < 0.1592) {
+      B = 2 * M_PI * W;
+    } else {
+      B = h;
+    }
+    dW = t * (1.0 + log(2 * B / t)) / M_PI;
+    dt = t / (er * g);
+    ue = (W + dW * (1.0 - 0.5 * exp( -0.69 * dW / dt ))) / h;
+    uo = ue + dt / h;
+  } else {
+    ue = u;
+    uo = u;
+  }
+
+  // GETSINGER
+  if (DModel == GETSINGER) {
+    // even mode dispersion
+    Getsinger_disp (h, er, ErEffe, Zle / 2,
+			    frequency, ErEffeFreq, ZleFreq);
+    *ZleFreq *= 2;
+    // odd mode dispersion
+    Getsinger_disp (h, er, ErEffo, Zlo * 2,
+			    frequency, ErEffoFreq, ZloFreq);
+    *ZloFreq /= 2;
+  }
+  // KIRSCHNING and JANSEN
+  else if (DModel == DISP_KIRSCHING) {
+    double p1, p2, p3, p4, p5, p6, p7, Fe;
+    double fn = frequency * h * 1e-6;
+
+    // even relative dielectric constant dispersion
+    p1 = 0.27488 * (0.6315 + 0.525 / pow (1 + 0.0157 * fn, 20.)) * ue -
+      0.065683 * exp (-8.7513 * ue);
+    p2 = 0.33622 * (1 - exp (-0.03442 * er));
+    p3 = 0.0363 * exp (-4.6 * ue) * (1 - exp (- pow (fn / 38.7, 4.97)));
+    p4 = 1 + 2.751 * (1 - exp (- pow (er / 15.916, 8.)));
+    p5 = 0.334 * exp (-3.3 * cubic (er / 15)) + 0.746;
+    p6 = p5 * exp (- pow (fn / 18, 0.368));
+    p7 = 1 + 4.069 * p6 * pow (g, 0.479) *
+      exp (-1.347 * pow (g, 0.595) - 0.17 * pow (g, 2.5));
+    Fe = p1 * p2 * pow ((p3 * p4 + 0.1844 * p7) * fn, 1.5763);
+    *ErEffeFreq = er - (er - ErEffe) / (1 + Fe);
+
+    // odd relative dielectric constant dispersion
+    double p8, p9, p10, p11, p12, p13, p14, p15, Fo;
+    p1 = 0.27488 * (0.6315 + 0.525 / pow (1 + 0.0157 * fn, 20.)) * uo -
+      0.065683 * exp (-8.7513 * uo);
+    p3 = 0.0363 * exp (-4.6 * uo) * (1 - exp (- pow (fn / 38.7, 4.97)));
+    p8 = 0.7168 * (1 + 1.076 / (1 + 0.0576 * (er - 1)));
+    p9 = p8 - 0.7913 * (1 - exp (- pow (fn / 20, 1.424))) *
+      atan (2.481 * pow (er / 8, 0.946));
+    p10 = 0.242 * pow (er - 1, 0.55);
+    p11 = 0.6366 * (exp (-0.3401 * fn) - 1) *
+      atan (1.263 * pow (uo / 3, 1.629));
+    p12 = p9 + (1 - p9) / (1 + 1.183 * pow (uo, 1.376));
+    p13 = 1.695 * p10 / (0.414 + 1.605 * p10);
+    p14 = 0.8928 + 0.1072 * (1 - exp (-0.42 * pow (fn / 20, 3.215)));
+    p15 = fabs (1 - 0.8928 * (1 + p11) *
+		exp (-p13 * pow (g, 1.092)) * p12 / p14);
+    Fo = p1 * p2 * pow ((p3 * p4 + 0.1844) * fn * p15, 1.5763);
+    *ErEffoFreq = er - (er - ErEffo) / (1 + Fo);
+
+    // dispersion of even characteristic impedance
+    double t, q11, q12, q13, q14, q15, q16, q17, q18, q19, q20, q21;
+    q11 = 0.893 * (1 - 0.3 / (1 + 0.7 * (er - 1)));
+    t = pow (fn / 20, 4.91);
+    q12 = 2.121 * t / (1 + q11 * t) * exp (-2.87 * g) * pow (g, 0.902);
+    q13 = 1 + 0.038 * pow (er / 8, 5.1);
+    t = quadr (er / 15);
+    q14 = 1 + 1.203 * t / (1 + t);
+    q15 = 1.887 * exp (-1.5 * pow (g, 0.84)) * pow (g, q14) /
+      (1 + 0.41 * pow (fn / 15, 3.) *
+       pow (u, 2 / q13) / (0.125 + pow (u, 1.626 / q13)));
+    q16 = q15 * (1 + 9 / (1 + 0.403 * sqr (er - 1)));
+    q17 = 0.394 * (1 - exp (-1.47 * pow (u / 7, 0.672))) *
+      (1 - exp (-4.25 * pow (fn / 20, 1.87)));
+    q18 = 0.61 * (1 - exp (-2.31 * pow (u / 8, 1.593))) /
+      (1 + 6.544 * pow (g, 4.17));
+    q19 = 0.21 * quadr (g) / (1 + 0.18 * pow (g, 4.9)) / (1 + 0.1 * sqr (u)) /
+      (1 + pow (fn / 24, 3.));
+    q20 = q19 * (0.09 + 1 / (1 + 0.1 * pow (er - 1, 2.7)));
+    t = pow (u, 2.5);
+    q21 = fabs (1 - 42.54 * pow (g, 0.133) * exp (-0.812 * g) * t /
+		(1 + 0.033 * t));
+
+    double re, qe, pe, de, Ce, q0, ZlFreq, ErEffFreq;
+    Kirschning_er (u, fn, er, ErEffe, &ErEffFreq);
+    Kirschning_zl (u, fn, er, ErEffe, ErEffFreq, Zle, &q0, &ZlFreq);
+    re = pow (fn / 28.843, 12.);
+    qe = 0.016 + pow (0.0514 * er * q21, 4.524);
+    pe = 4.766 * exp (-3.228 * pow (u, 0.641));
+    t = pow (er - 1, 6.);
+    de = 5.086 * qe * re / (0.3838 + 0.386 * qe) *
+      exp (-22.2 * pow (u, 1.92)) / (1 + 1.2992 * re) * t / (1 + 10 * t);
+    Ce = 1 + 1.275 * (1 - exp (-0.004625 * pe * pow (er, 1.674) *
+	 pow (fn / 18.365, 2.745))) - q12 + q16 - q17 + q18 + q20;
+    *ZleFreq = Zle * pow ((0.9408 * pow (ErEffFreq, Ce) - 0.9603) /
+			 ((0.9408 - de) * pow (ErEffe, Ce) - 0.9603), q0);
+
+    // dispersion of odd characteristic impedance
+    double q22, q23, q24, q25, q26, q27, q28, q29;
+    Kirschning_er (u, fn, er, ErEffo, &ErEffFreq);
+    Kirschning_zl (u, fn, er, ErEffo, ErEffFreq, Zlo, &q0, &ZlFreq);
+    q29 = 15.16 / (1 + 0.196 * sqr (er - 1));
+    t = sqr (er - 1);
+    q25 = 0.3 * sqr (fn) / (10 + sqr (fn)) * (1 + 2.333 * t / (5 + t));
+    t = pow ((er - 1) / 13, 12.);
+    q26 = 30 - 22.2 * t / (1 + 3 * t) - q29;
+    t = pow (er - 1, 1.5);
+    q27 = 0.4 * pow (g, 0.84) * (1 + 2.5 * t / (5 + t));
+    t = pow (er - 1, 3.);
+    q28 = 0.149 * t / (94.5 + 0.038 * t);
+    q22 = 0.925 * pow (fn / q26, 1.536) / (1 + 0.3 * pow (fn / 30, 1.536));
+    q23 = 1 + 0.005 * fn * q27 / (1 + 0.812 * pow (fn / 15, 1.9)) /
+      (1 + 0.025 * sqr (u));
+    t = pow (u, 0.894);
+    q24 = 2.506 * q28 * t / (3.575 + t) *
+      pow ((1 + 1.3 * u) * fn / 99.25, 4.29);
+    *ZloFreq = ZlFreq + (Zlo * pow (*ErEffoFreq / ErEffo, q22) - ZlFreq * q23) /
+      (1 + q24 + pow (0.46 * g, 2.2) * q25);
+
+  }
+}
+
+void cm_cpmline (ARGS)
+{
+	Complex_t   z11, z12, z13, z14;
+
+	/* how to get properties of this component, e.g. L, W */
+	double W = PARAM(w);
+	double l = PARAM(l);
+	double s = PARAM(s);
+	int SModel = PARAM(model);
+	int DModel = PARAM(disp);
+    int TModel = PARAM(tranmodel);
+
+	/* how to get properties of the substrate, e.g. Er, H */
+	double er    = PARAM(er);
+	double h     = PARAM(h);
+	double t     = PARAM(t);
+	double tand  = PARAM(tand);
+	double rho   = PARAM(rho);
+	double D     = PARAM(d);
+
+    if(INIT) {
+        CALLBACK = cm_cpmline_callback;
+        STATIC_VAR(sim_points_data) = NULL;
+	}
+
+
+	/* Compute the output */
+	if(ANALYSIS == DC) {
+          calcPropagation(W,s,er,h,t,tand,rho,D,SModel,DModel,0);
+
+		  double V1 = INPUT(p1s);
+		  double V2 = INPUT(p2s);
+		  double V3 = INPUT(p3s);
+		  double V4 = INPUT(p4s);
+		  double I1 = INPUT(p1);
+		  double I2 = INPUT(p2);
+		  double I3 = INPUT(p3);
+		  double I4 = INPUT(p4);
+
+		  double z = sqrt(ze*zo);
+
+		  double V2out = V1 + z*I1;
+		  double V1out = V2 + z*I2;
+		  OUTPUT(p1) = V1out + I1*z;
+		  OUTPUT(p2) = V2out + I2*z;
+
+		  double V3out = V4 + z*I4;
+		  double V4out = V3 + z*I3;
+		  OUTPUT(p3) = V3out + I3*z;
+		  OUTPUT(p4) = V4out + I4*z;
+
+		  cm_analog_auto_partial();
+	}
+	else if(ANALYSIS == AC) {
+		double o = RAD_FREQ;
+        calcPropagation(W,s,er,h,t,tand,rho,D,SModel,DModel, o/(2*M_PI));
+		double complex _Z11, _Z12, _Z13, _Z14;
+		double complex ge =  ae + I*be;
+		double complex go =  ao + I*bo;
+
+		_Z11 = zo / (2*ctanh(go*l)) + ze / (2*ctanh(ge*l));
+		_Z12 = zo / (2*csinh(go*l)) + ze / (2*csinh(ge*l));
+		_Z13 = ze / (2*csinh(ge*l)) - zo / (2*csinh(go*l));
+		_Z14 = ze / (2*ctanh(ge*l)) - zo / (2*ctanh(go*l));
+
+		copy_complex(_Z11,&z11);
+		copy_complex(_Z12,&z12);
+		copy_complex(_Z13,&z13);
+		copy_complex(_Z14,&z14);
+
+        AC_GAIN(p1,p1) = z11; AC_GAIN(p2,p2) = z11;
+        AC_GAIN(p3,p3) = z11; AC_GAIN(p4,p4) = z11;
+
+		AC_GAIN(p1,p2) = z12; AC_GAIN(p2,p1) = z12;
+        AC_GAIN(p3,p4) = z12; AC_GAIN(p4,p3) = z12;
+
+		AC_GAIN(p1,p3) = z13; AC_GAIN(p3,p1) = z13;
+        AC_GAIN(p2,p4) = z13; AC_GAIN(p4,p2) = z13;
+
+		AC_GAIN(p1,p4) = z14; AC_GAIN(p4,p1) = z14;
+        AC_GAIN(p2,p3) = z14; AC_GAIN(p3,p2) = z14;
+	}
+	else if(ANALYSIS == TRANSIENT) {
+        calcPropagation(W,s,er,h,t,tand,rho,D,SModel,DModel,0);
+		double t = TIME;
+		double Vp[PORT_NUM];
+		double Ip[PORT_NUM];
+		double Vnew[PORT_NUM];
+		Vp[0] = INPUT(p1s);
+		Vp[1] = INPUT(p2s);
+		Vp[2] = INPUT(p3s);
+		Vp[3] = INPUT(p4s);
+		Ip[0] = INPUT(p1);
+		Ip[1] = INPUT(p2);
+		Ip[2] = INPUT(p3);
+		Ip[3] = INPUT(p4);
+		double delay = l/(C0);
+        void **sim_points = &(STATIC_VAR(sim_points_data));
+		if (TModel == TRAN_FULL) {
+			cpline_state_t *last = get_cpline_last_state(*(cpline_state_t **)sim_points);
+			double last_time = 0;
+			if (last != NULL) last_time = last->time;
+
+            if (TIME < last_time) {
+				delete_cpline_last_state((cpline_state_t **)sim_points);
+			}
+			append_cpline_state((cpline_state_t **)sim_points, t, Vp, Ip, 1.2*delay);
+		}
+        if (t > delay && TModel == TRAN_FULL) {
+			cpline_state_t *pp = find_cpline_state(*(cpline_state_t **)sim_points, t - delay);
+			if (pp != NULL) {
+
+				double J1e = 0.5*(Ip[3] + Ip[0]);
+				double J1o = 0.5*(Ip[0] - Ip[3]);
+				double J2e = 0.5*(Ip[1] + Ip[2]);
+				double J2o = 0.5*(Ip[1] - Ip[2]);
+
+
+				double J1et = 0.5*(pp->Ip[3] + pp->Ip[0]);
+				double J1ot = 0.5*(pp->Ip[0] - pp->Ip[3]);
+				double J2et = 0.5*(pp->Ip[1] + pp->Ip[2]);
+				double J2ot = 0.5*(pp->Ip[1] - pp->Ip[2]);
+
+
+				double V1et = 0.5*(pp->Vp[3] + pp->Vp[0]);
+				double V1ot = 0.5*(pp->Vp[0] - pp->Vp[3]);
+				double V2et = 0.5*(pp->Vp[1] + pp->Vp[2]);
+				double V2ot = 0.5*(pp->Vp[1] - pp->Vp[2]);
+
+				double V1e = ze*J1e + V2et + ze*J2et;
+				double V1o = zo*J1o + V2ot + zo*J2ot;
+				double V2e = ze*J2e + V1et + ze*J1et;
+				double V2o = zo*J2o + V1ot + zo*J1ot;
+
+				double V1 = V1o + V1e;
+				double V2 = V2o + V2e;
+				double V3 = V2e - V2o;
+				double V4 = V1e - V1o;
+
+				OUTPUT(p1) = V1;
+				OUTPUT(p2) = V2;
+				OUTPUT(p3) = V3;
+				OUTPUT(p4) = V4;
+			}
+			cm_analog_auto_partial();
+		} else {
+		    double z = sqrt(ze*zo);
+			double V2out = Vp[0] + z*Ip[0];
+			double V1out = Vp[1] + z*Ip[1];
+			OUTPUT(p1) = V1out + Ip[0]*z;
+			OUTPUT(p2) = V2out + Ip[1]*z;
+
+			double V3out = Vp[3] + z*Ip[3];
+			double V4out = Vp[2] + z*Ip[2];
+			OUTPUT(p3) = V3out + Ip[2]*z;
+			OUTPUT(p4) = V4out + Ip[3]*z;
+
+			cm_analog_auto_partial();
+		}
+	}
+}
+
+static void cm_cpmline_callback(ARGS, Mif_Callback_Reason_t reason)
+{
+    switch (reason) {
+        case MIF_CB_DESTROY:
+            delete_cpline_states((cpline_state_t **)&(STATIC_VAR(sim_points_data)));
+            break;
+        default: break;
+    }
+}

src/xspice/icm/tlines/cpmlin/ifspec.ifs

@@ -0,0 +1,241 @@
+/* ===========================================================================
+ FILE    ifspec.ifs
+ Copyright 2025 Vadim Kuznetsov
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+/* Ports connection
+    4 --||||||-- 3
+
+    1 --||||||-- 2
+*/
+
+NAME_TABLE:
+
+Spice_Model_Name:      cpmlin
+C_Function_Name:       cm_cpmline
+Description:           "Generic transmission line"
+
+
+PORT_TABLE:
+Port_Name:             p1
+Description:           "Terminals Line1"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p2
+Description:           "Terminals Line1"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p3
+Description:           "Terminals Line2"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p4
+Description:           "Terminals Line2"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p1s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p2s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p3s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             p4s
+Description:           "Sensing terminals line 1"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+
+PARAMETER_TABLE:
+Parameter_Name:        l
+Description:           "length"
+Data_Type:             real
+Default_Value:         1.0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        w
+Description:           "width"
+Data_Type:             real
+Default_Value:         1e-3
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        s
+Description:           "gap"
+Data_Type:             real
+Default_Value:         1e-3
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+
+PARAMETER_TABLE:
+Parameter_Name:        model
+Description:           "Model type"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        disp
+Description:           "Dispersion type"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        er
+Description:           "Substrate dielectric permittivity"
+Data_Type:             real
+Default_Value:         9.8
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        h
+Description:           "Substrate thickness"
+Data_Type:             real
+Default_Value:         1e-3
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        t
+Description:           "Metal strip thickness"
+Data_Type:             real
+Default_Value:         35e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        tand
+Description:           "Substrate dielectric loss"
+Data_Type:             real
+Default_Value:         2e-4
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        rho
+Description:           "Metal resistance"
+Data_Type:             real
+Default_Value:         0.022e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        d
+Description:           "RMS Substrate roughness"
+Data_Type:             real
+Default_Value:         0.15e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        tranmodel
+Description:           "TRAN model DC/FULL"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+STATIC_VAR_TABLE:
+
+Static_Var_Name:    sim_points_data
+Description:        "local static data"
+Data_Type:          pointer
+

src/xspice/icm/tlines/mlin/cfunc.mod

@@ -0,0 +1,166 @@
+/* ===========================================================================
+	FILE    cfunc.mod
+	Copyright 2025 Vadim Kuznetsov
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+#include <stdio.h>
+#include <math.h>
+#include <complex.h>
+
+#include "tline_common.h"
+
+#include "msline_common.h"
+
+//static tline_state_t *sim_points = NULL;
+
+static double zl, alpha, beta, ereff;
+
+static void cm_mline_callback(ARGS, Mif_Callback_Reason_t reason);
+
+static void calcPropagation (double W, int SModel, int DModel,
+                             double er, double h, double t, double tand, double rho, double D,
+                             double frequency) {
+
+	/* local variables */
+	double ac, ad;
+	double ZlEff, ErEff, WEff, ZlEffFreq, ErEffFreq;
+
+	// quasi-static effective dielectric constant of substrate + line and
+	// the impedance of the microstrip line
+	mslineAnalyseQuasiStatic (W, h, t, er, SModel, &ZlEff, &ErEff, &WEff);
+
+	// analyse dispersion of Zl and Er (use WEff here?)
+	mslineAnalyseDispersion (W, h, er, ZlEff, ErEff, frequency, DModel,
+			&ZlEffFreq, &ErEffFreq);
+
+	// analyse losses of line
+	analyseLoss (W, t, er, rho, D, tand, ZlEff, ZlEff, ErEff,
+			frequency, HAMMERSTAD, &ac, &ad);
+
+	// calculate propagation constants and reference impedance
+	zl    = ZlEffFreq;
+	ereff = ErEffFreq;
+	alpha = ac + ad;
+	beta  = sqrt (ErEffFreq) * 2 * M_PI * frequency / C0;
+}
+
+void cm_mlin (ARGS)
+{
+	Complex_t   z11, z21;
+    void **sim_points;
+
+
+	/* how to get properties of this component, e.g. L, W */
+	double W = PARAM(w);
+	double l = PARAM(l);
+	int SModel = PARAM(model);
+	int DModel = PARAM(disp);
+    int TModel = PARAM(tranmodel);
+
+	/* how to get properties of the substrate, e.g. Er, H */
+	double er    = PARAM(er);
+	double h     = PARAM(h);
+	double t     = PARAM(t);
+	double tand  = PARAM(tand);
+	double rho   = PARAM(rho);
+	double D     = PARAM(d);
+
+
+
+	/* Initialize/access instance specific storage for capacitor voltage */
+	if(INIT) {
+        CALLBACK = cm_mline_callback;
+        STATIC_VAR(sim_points_data) = NULL;
+	}
+
+	/* Compute the output */
+	if(ANALYSIS == DC) {
+
+		calcPropagation(W,SModel,DModel,er,h,t,tand,rho,D,0);
+	    double V1 = INPUT(V1sens);
+		double V2 = INPUT(V2sens);
+		double I1 = INPUT(port1);
+		double I2 = INPUT(port2);
+		double V2out = V1 + zl*I1;
+		double V1out = V2 + zl*I2;
+		OUTPUT(port1) = V1out + I1*zl;
+		OUTPUT(port2) = V2out + I2*zl;
+
+		cm_analog_auto_partial();
+	}
+	else if(ANALYSIS == AC) {
+	    double frequency = RAD_FREQ/(2.0*M_PI);
+		calcPropagation(W,SModel,DModel,er,h,t,tand,rho,D,frequency);
+
+		double complex g = alpha + beta*I;
+		double complex _Z11 = zl / ctanh(g*l);
+		double complex _Z21 = zl / csinh(g*l);
+
+		z11.real = creal(_Z11); z11.imag = cimag(_Z11);
+		z21.real = creal(_Z21); z21.imag = cimag(_Z21);
+
+		AC_GAIN(port1,port1) = z11; AC_GAIN(port2,port2) = z11;
+		AC_GAIN(port1,port2) = z21; AC_GAIN(port2,port1) = z21;
+	}
+	else if(ANALYSIS == TRANSIENT) {
+		calcPropagation(W,SModel,DModel,er,h,t,tand,rho,D,0);
+        sim_points = &(STATIC_VAR(sim_points_data));
+        double t = TIME;
+		double V1 = INPUT(V1sens);
+		double V2 = INPUT(V2sens);
+		double I1 = INPUT(port1);
+		double I2 = INPUT(port2);
+		double delay = l/(C0) * sqrt(ereff);
+		if (TModel == TRAN_FULL) {
+
+            tline_state_t *last = get_tline_last_state(*(tline_state_t **)sim_points);
+			double last_time = 0;
+			if (last != NULL) last_time = last->time;
+
+			if (TIME < last_time) {
+                //fprintf(stderr,"Rollbacki time=%g\n",TIME);
+				delete_tline_last_state((tline_state_t **)sim_points);
+			}
+			append_state((tline_state_t **)sim_points, t, V1, V2, I1, I2, 1.2*delay);
+		}
+		if (t > delay && TModel == TRAN_FULL) {
+			tline_state_t *pp = get_state(*(tline_state_t **)sim_points, t - delay);
+			if (pp != NULL) {
+				double V2out = pp->V1 + zl*(pp->I1);
+				double V1out = pp->V2 + zl*(pp->I2);
+				OUTPUT(port1) = V1out + I1*zl;
+				OUTPUT(port2) = V2out + I2*zl;
+			}
+			cm_analog_auto_partial();
+		} else {
+            double V2out = V1 + zl*I1;
+			double V1out = V2 + zl*I2;
+			OUTPUT(port1) = V1out + I1*zl;
+			OUTPUT(port2) = V2out + I2*zl;
+			cm_analog_auto_partial();
+		}
+
+	}
+}
+
+static void cm_mline_callback(ARGS, Mif_Callback_Reason_t reason)
+{
+    switch (reason) {
+        case MIF_CB_DESTROY:
+            delete_tline_states((tline_state_t **)&(STATIC_VAR(sim_points_data)));
+            break;
+        default: break;
+    }
+}
+

src/xspice/icm/tlines/mlin/ifspec.ifs

@@ -0,0 +1,186 @@
+/* ===========================================================================
+ FILE    ifspec.ifs
+ Copyright 2025 Vadim Kuznetsov
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+NAME_TABLE:
+
+Spice_Model_Name:      mlin
+C_Function_Name:       cm_mlin
+Description:           "Microstrip line"
+
+
+PORT_TABLE:
+Port_Name:             port1
+Description:           "Microstrip terminals"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             port2
+Description:           "Microstrip terminals"
+Direction:             inout
+Default_Type:          hd
+Allowed_Types:         [hd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             V1sens
+Description:           "Sensing terminals"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PORT_TABLE:
+Port_Name:             V2sens
+Description:           "Sensisng terminals"
+Direction:             in
+Default_Type:          vd
+Allowed_Types:         [vd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+
+PARAMETER_TABLE:
+Parameter_Name:        l
+Description:           "length"
+Data_Type:             real
+Default_Value:         1e-2
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        w
+Description:           "width"
+Data_Type:             real
+Default_Value:         1e-3
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        model
+Description:           "Model type"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        disp
+Description:           "Dispersion type"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        er
+Description:           "Substrate dielectric permittivity"
+Data_Type:             real
+Default_Value:         9.8
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        h
+Description:           "Substrate thickness"
+Data_Type:             real
+Default_Value:         1e-3
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        t
+Description:           "Metal strip thickness"
+Data_Type:             real
+Default_Value:         35e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        tand
+Description:           "Substrate dielectric loss"
+Data_Type:             real
+Default_Value:         2e-4
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        rho
+Description:           "Metal resistance"
+Data_Type:             real
+Default_Value:         0.022e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        d
+Description:           "RMS Substrate roughness"
+Data_Type:             real
+Default_Value:         0.15e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        tranmodel
+Description:           "TRAN model DC/FULL"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+STATIC_VAR_TABLE:
+
+Static_Var_Name:    sim_points_data
+Description:        "local static data"
+Data_Type:          pointer
+

src/xspice/icm/tlines/modpath.lst

@@ -0,0 +1,5 @@
+mlin
+tline
+cpline
+cpmlin
+msopen

src/xspice/icm/tlines/msopen/cfunc.mod

@@ -0,0 +1,120 @@
+/* ===========================================================================
+ FILE    cfunc.mod
+ Copyright 2025 Vadim Kuznetsov
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+
+#include <math.h>
+#include <complex.h>
+#include <stdio.h>
+
+
+#include "msline_common.h"
+#include "tline_common.h"
+
+
+#define MSOPEN_KIRSCHNING 0
+#define MSOPEN_HAMMERSTAD 1
+#define MSOPEN_ALEXOPOULOS 2
+
+
+// Returns the microstrip open end capacitance.
+static double calcCend (double frequency, double W,
+			      double h, double t, double er,
+			      int SModel, int DModel,
+			      int Model) {
+
+  double ZlEff, ErEff, WEff, ZlEffFreq, ErEffFreq;
+  mslineAnalyseQuasiStatic (W, h, t, er, SModel, &ZlEff, &ErEff, &WEff);
+  mslineAnalyseDispersion  (WEff, h, er, ZlEff, ErEff, frequency, DModel,
+			      &ZlEffFreq, &ErEffFreq);
+
+  W /= h;
+  double dl = 0;
+  /* Kirschning, Jansen and Koster */
+  if (Model == MSOPEN_KIRSCHNING) {
+    double Q6 = pow (ErEffFreq, 0.81);
+    double Q7 = pow (W, 0.8544);
+    double Q1 = 0.434907 *
+      (Q6 + 0.26) / (Q6 - 0.189) * (Q7 + 0.236) / (Q7 + 0.87);
+    double Q2 = pow (W, 0.371) / (2.358 * er + 1.0) + 1.0;
+    double Q3 = atan (0.084 * pow (W, 1.9413 / Q2)) *
+      0.5274 / pow (ErEffFreq, 0.9236) + 1.0;
+    double Q4 = 0.0377 * (6.0 - 5.0 * exp (0.036 * (1.0 - er))) *
+      atan (0.067 * pow (W, 1.456)) + 1.0;
+    double Q5 = 1.0 - 0.218 * exp (-7.5 * W);
+    dl = Q1 * Q3 * Q5 / Q4;
+  }
+  /* Hammerstad */
+  else if (Model == MSOPEN_HAMMERSTAD) {
+    dl = 0.102 * (W + 0.106) / (W + 0.264) *
+      (1.166 + (er + 1) / er * (0.9 + log (W + 2.475)));
+  }
+  return dl * h * sqrt (ErEffFreq) / C0 / ZlEffFreq;
+}
+
+
+void cm_msopen (ARGS)
+{
+    Complex_t   ac_gain;
+
+	/* how to get properties of this component, e.g. L, W */
+	double W = PARAM(w);
+	int SModel = PARAM(model);
+	int DModel = PARAM(disp);
+	int Model = PARAM(msopen_model);
+
+	/* how to get properties of the substrate, e.g. Er, H */
+	double er    = PARAM(er);
+	double h     = PARAM(h);
+	double t     = PARAM(t);
+
+
+    /* Compute the output */
+    if(ANALYSIS == AC) {
+		if (Model == MSOPEN_ALEXOPOULOS) {
+			double ZlEff, ErEff, WEff, ZlEffFreq, ErEffFreq;
+			mslineAnalyseQuasiStatic (W, h, t, er, SModel, &ZlEff, &ErEff, &WEff);
+			mslineAnalyseDispersion  (WEff, h, er, ZlEff, ErEff, RAD_FREQ/(2*M_PI), DModel,
+					&ZlEffFreq, &ErEffFreq);
+
+			if (fabs (er - 9.9) > 0.2) {
+				fprintf (stderr, "WARNING: Model for microstrip open end defined "
+						"for er = 9.9 (er = %g)\n", er);
+			}
+
+			double c1, c2, l2, r2;
+			c1 = (1.125 * tanh (1.358 * W / h) - 0.315) *
+				h / 2.54e-5 / 25 / ZlEffFreq * 1e-12;
+			c2 = (6.832 * tanh (0.0109 * W / h) + 0.919) *
+				h / 2.54e-5 / 25 / ZlEffFreq * 1e-12;
+			l2 = (0.008285 * tanh (0.5665 * W / h) + 0.0103) *
+				h / 2.54e-5 / 25 * ZlEffFreq * 1e-9;
+			r2 = (1.024 * tanh (2.025 * W / h)) * ZlEffFreq;
+			double complex d1 = 0 + I*c1 * RAD_FREQ;
+			double complex d2 = r2 + I*(l2 * RAD_FREQ - 1.0 / c2 / RAD_FREQ);
+			double complex y = d1 + 1.0/d2;
+
+            ac_gain.real = creal(y);
+			ac_gain.imag = cimag(y);
+			AC_GAIN(p1, p1) = ac_gain;
+		} else {
+			double Ce = calcCend(RAD_FREQ/(2*M_PI), W, h, t, er, SModel, DModel, Model);
+			ac_gain.real = 0.0;
+			ac_gain.imag = RAD_FREQ * Ce;
+			AC_GAIN(p1, p1) = ac_gain;
+		}
+	}
+}
+

src/xspice/icm/tlines/msopen/ifspec.ifs

@@ -0,0 +1,140 @@
+/* ===========================================================================
+ FILE    ifspec.ifs
+ Copyright 2025 Vadim Kuznetsov
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */
+
+NAME_TABLE:
+
+Spice_Model_Name:      msopen
+C_Function_Name:       cm_msopen
+Description:           "Microstrip open end"
+
+
+PORT_TABLE:
+
+Port_Name:             p1
+Description:           "terminals"
+Direction:             inout
+Default_Type:          gd
+Allowed_Types:         [gd]
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          no
+
+PARAMETER_TABLE:
+Parameter_Name:        w
+Description:           "width"
+Data_Type:             real
+Default_Value:         1e-3
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        model
+Description:           "Model type"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        disp
+Description:           "Dispersion type"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        msopen_model
+Description:           "MSOpen model"
+Data_Type:             int
+Default_Value:         0
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        er
+Description:           "Substrate dielectric permittivity"
+Data_Type:             real
+Default_Value:         9.8
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        h
+Description:           "Substrate thickness"
+Data_Type:             real
+Default_Value:         1e-3
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        t
+Description:           "Metal strip thickness"
+Data_Type:             real
+Default_Value:         35e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        tand
+Description:           "Substrate dielectric loss"
+Data_Type:             real
+Default_Value:         2e-4
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+PARAMETER_TABLE:
+Parameter_Name:        rho
+Description:           "Metal resistance"
+Data_Type:             real
+Default_Value:         0.022e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+PARAMETER_TABLE:
+Parameter_Name:        d
+Description:           "RMS Substrate roughness"
+Data_Type:             real
+Default_Value:         0.15e-6
+Limits:                -
+Vector:                no
+Vector_Bounds:         -
+Null_Allowed:          yes
+
+
+