removed outdated dependencies

13 files changed, 0 insertions, 1385 deletions

diff --git a/Windows/spice/examples/adms/ekv/ekv26_0u5.par b/Windows/spice/examples/adms/ekv/ekv26_0u5.par
deleted file mode 100644
index 0e6c7835..00000000
--- a/Windows/spice/examples/adms/ekv/ekv26_0u5.par
+++ /dev/null
@@ -1,155 +0,0 @@
-**********************************************************************
-*  EKV v2.6 parameters for 0.5um CMOS		C. EPFL-LEG, 1999
-*  ----------------------------------
-*
-*  ELDO (LEVEL = 44) / PSPICE (LEVEL = 5) example parameter set
-*  for the EKV v2.6 model is provided for NMOS and PMOS.
-*
-*
-*  IMPORTANT NOTES:
-*  ----------------
-*
-*  Parameters do not correspond to a particular technology but
-*  have reasonable values for standard 0.5um CMOS.
-*  Not intended for use in real design.
-*
-*  Includes all intrinsic model parameters. An example set for
-*  extrinsic model parameters is provided.
-*
-*  Geometry range:  W >= 0.8um, L >= 0.5um
-*  Voltage range:   |Vgb| < 3.3V, |Vdb| < 3.3V,  |Vsb| < 2V
-*  
-*  For use with either simulator, comment/uncomment respective lines.
-*  Use of extrinsic model parameters and models (series resistance,
-*  junction currents/capacitances) is in general simulator-dependent.
-*
-**********************************************************************
-
-*  EKV v2.6 NMOS
-*---------------
-.MODEL NCH NMOS
-+ LEVEL  = 44
-*** Setup Parameters
-*+ UPDATE = 2.6
-*+ XQC    = 0.4
-*** Process Related Model Parameters
-+ COX    = 3.45E-3
-+ XJ     = 0.15E-6
-*** Intrinsic Model Parameters
-+ VTO    = 0.6
-+ GAMMA  = 0.71
-+ PHI    = 0.97
-+ KP     = 150E-6
-+ E0     = 88.0E6
-+ UCRIT  = 4.5E6
-+ DL     = -0.05E-6
-+ DW     = -0.02E-6
-+ LAMBDA = 0.23
-+ LETA   = 0.28
-+ WETA   = 0.05
-+ Q0     = 280E-6
-+ LK     = 0.5E-6
-*** Substrate Current Parameters
-+ IBN    = 1.0
-+ IBA    = 200E6
-+ IBB    = 350E6
-*** Intrinsic Model Temperature Parameters
-+ TNOM   = 25.0
-+ TCV    = 1.5E-3
-+ BEX    = -1.5
-+ UCEX   = 1.7
-+ IBBT   = 0.0
-*** 1/f Noise Model Parameters
-+ KF     = 1E-27
-+ AF     = 1
-*** Short-Distance Matching Statistical Parameters (for MC simulation only)
-*+ AVTO   = 0		DEV = 10.0E-3	; ELDO v4.6 
-*+ AGAMMA = 0		DEV = 10.0E-3	; ELDO v4.6
-*+ AKP    = 0		DEV = 25.0E-3	; ELDO v4.6
-*** Series Resistance and Area Calulation Parameters
-*+ RLEV   = 3
-+ HDIF   = 0.9E-6
-+ RSH    = 510
-*** Junction Current Parameters
-*+ ALEV   = 3
-+ JS     = 8.0E-6
-+ JSW    = 1.5E-10
-+ XTI    = 0
-+ N      = 1.5
-*** Junction Capacitances Parameters
-+ CJ     = 8.0E-4
-+ CJSW   = 3.0E-10
-+ MJ     = 0.5
-+ MJSW   = 0.3
-+ PB     = 0.9
-+ PBSW   = 0.5
-+ FC     = 0.5
-*** Gate Overlap Capacitances
-+ CGSO   = 1.5E-10
-+ CGDO   = 1.5E-10
-+ CGBO   = 4.0E-10
-
-
-*  EKV v2.6 PMOS
-*---------------
-.MODEL PCH PMOS
-+ LEVEL  = 44
-*** Setup Parameters
-*+ UPDATE = 2.6
-*+ XQC    = 0.4
-*** Process Related Model Parameters
-+ COX    = 3.45E-3
-+ XJ     = 0.15E-6
-*** Intrinsic Model Parameters
-+ VTO    = -0.55
-+ GAMMA  = 0.69
-+ PHI    = 0.87
-+ KP     = 35.0E-6
-+ E0     = 51.0E6
-+ UCRIT  = 18.0E6
-+ DL     = -0.05E-6
-+ DW     = -0.03E-6
-+ LAMBDA = 1.1
-+ LETA   = 0.45
-+ WETA   = 0.0
-+ Q0     = 200E-6
-+ LK     = 0.6E-6
-*** Substrate Current Parameters
-+ IBN    = 1.0
-+ IBA    = 10E6
-+ IBB    = 300E6
-*** Intrinsic Model Temperature Parameters
-+ TNOM   = 25.0
-+ TCV    = -1.4E-3
-+ BEX    = -1.4
-+ UCEX   = 2.0
-+ IBBT   = 0.0
-*** 1/f Noise Model Parameters
-+ KF     = 1.0E-28
-+ AF     = 1
-*** Short-Distance Matching Statistical Parameters (for MC simulation only)
-*+ AVTO   = 0		DEV = 10.0E-3	; ELDO v4.6
-*+ AGAMMA = 0		DEV = 10.0E-3	; ELDO v4.6
-*+ AKP    = 0		DEV = 25.0E-3	; ELDO v4.6
-*** Series Resistance and Area Calulation Parameters
-*+ RLEV   = 3
-+ HDIF   = 0.9E-6
-+ RSH    = 990
-*** Junction Current Parameters
-*+ ALEV   = 3
-+ JS     = 4.0E-5
-+ JSW    = 7.0E-10
-+ XTI    = 0
-+ N      = 1.8
-*** Junction Capacitances Parameters
-+ CJ     = 8.0E-4
-+ CJSW   = 4.0E-10
-+ MJ     = 0.5
-+ MJSW   = 0.35
-+ PB     = 0.9
-+ PBSW   = 0.8
-+ FC     = 0.5
-*** Gate Overlap Capacitances
-+ CGSO   = 1.5E-10
-+ CGDO   = 1.5E-10
-+ CGBO   = 4.0E-10
diff --git a/Windows/spice/examples/adms/ekv/ekv_out.sp b/Windows/spice/examples/adms/ekv/ekv_out.sp
deleted file mode 100644
index f7a4ab76..00000000
--- a/Windows/spice/examples/adms/ekv/ekv_out.sp
+++ /dev/null
@@ -1,17 +0,0 @@
-EPFL-EKV version 2.6 nch
-
-.include ekv26_0u5.par
-
-vd  d 0 dc 0.1
-vg  g 0 dc 0.0
-vs  s 0 dc 0.0
-vb  b 0 dc 0.0
-m1  d g s b nch
-*
-* Transfer
-.control
-dc vd 0 5 0.01 vg 1 5 1
-plot abs(i(vd))
-.endc
-*
-.end
diff --git a/Windows/spice/examples/adms/ekv/ekv_tran.sp b/Windows/spice/examples/adms/ekv/ekv_tran.sp
deleted file mode 100644
index da3927b8..00000000
--- a/Windows/spice/examples/adms/ekv/ekv_tran.sp
+++ /dev/null
@@ -1,18 +0,0 @@
-EPFL-EKV version 2.6 nch
-
-.include ekv26_0u5.par
-
-*
-vd  d 0 dc 0.1
-vg  g 0 dc 0.0
-vs  s 0 dc 0.0
-vb  b 0 dc 0.0
-m1  d g s b nch
-*
-* Transfer
-.control
-dc vg 0 5 0.1 vb -5 0 1
-plot abs(i(vd))
-.endc
-*
-.end
diff --git a/Windows/spice/examples/adms/hicum0/hic0_gum.sp b/Windows/spice/examples/adms/hicum0/hic0_gum.sp
deleted file mode 100644
index 4d055f26..00000000
--- a/Windows/spice/examples/adms/hicum0/hic0_gum.sp
+++ /dev/null
@@ -1,17 +0,0 @@
-HICUM0 Gummel Test Ic=f(Vc,Vb)
-
-VB B 0 0.5
-VC C 0 1.0
-VS S 0 0.0
-X1 C B 0 S DT hicumL0V1p1_c_sbt
-
-.control
-dc vb 0.2 1.4 0.01
-run
-plot abs(i(vc)) abs(i(vb)) abs(i(vs)) ylimit 0.1e-12 100e-3 ylog
-plot abs(i(vc))/abs(i(vb)) vs abs(-i(vc)) xlog xlimit 1e-09 10e-3 ylimit 0 300
-.endc
-
-.include model-card-hicumL0V1p11.lib
-
-.end
diff --git a/Windows/spice/examples/adms/hicum0/hic0_out.sp b/Windows/spice/examples/adms/hicum0/hic0_out.sp
deleted file mode 100644
index aa14ed57..00000000
--- a/Windows/spice/examples/adms/hicum0/hic0_out.sp
+++ /dev/null
@@ -1,17 +0,0 @@
-HICUM0 Output Test Ic=f(Vc,Ib)
-
-IB 0 B 200n
-VC C 0 2.0
-VS S 0 0.0
-X1 C B 0 S DT hicumL0V1p1_c_slh
-
-.control
-dc vc 0.0 3.0 0.05 ib 10u 100u 10u
-run
-plot abs(i(vc))
-plot v(dt)
-.endc
-
-.include model-card-hicumL0V1p11.lib 
-
-.end
diff --git a/Windows/spice/examples/adms/hicum0/model-card-hicumL0V1p11.lib b/Windows/spice/examples/adms/hicum0/model-card-hicumL0V1p11.lib
deleted file mode 100644
index 0f536d48..00000000
--- a/Windows/spice/examples/adms/hicum0/model-card-hicumL0V1p11.lib
+++ /dev/null
@@ -1,251 +0,0 @@
-********************************************************************************
-********************************************************************************
-* HICUM Level0 Version 1.1 model cards for testing
-********************************************************************************
-********************************************************************************
-* 1D transistor: Isothermal Simulation and Temperature dependence
-********************************************************************************
-.subckt hicumL0V1p1_1D c b e s dt
-qhcm0 c b e s dt hic0_full
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 re=0.0 rcx=0.0 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=1.0e-20 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_1D
-********************************************************************************
-* 1D transistor: Electrothermal Simulation to test self-heating
-********************************************************************************
-.subckt hicumL0V1p1_1D_slh c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 re=0.0 rcx=0.0 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=1.0e-20 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=1000.0 cth=1.0e-10 
-+ tnom=27.0 dt=0.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_1D_slh
-********************************************************************************
-* 1D transistor: Isothermal Simulation with NQS Effect: future
-********************************************************************************
-.subckt hicumL0V1p1_1D_nqs c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 re=0.0 rcx=0.0 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=1.0e-20 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_1D_nqs
-********************************************************************************
-* 1D transistor: Isothermal Simulation to test collector current spreading
-********************************************************************************
-.subckt hicumL0V1p1_1D_ccs c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 re=0.0 rcx=0.0 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=1.0e-20 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_1D_ccs
-********************************************************************************
-* Internal transistor: Isothermal Simulation and Temperature dependence (Tunneling current at peripheral node:future)
-********************************************************************************
-.subckt hicumL0V1p1_i_tnp c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=0.0 fgeo=0.73 re=0.0 rcx=0.0 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=1.0e-20 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_i_tnp
-********************************************************************************
-* Internal transistor: Isothermal Simulation and Temperature dependence (Tunneling current at internal node:future)
-********************************************************************************
-.subckt hicumL0V1p1_i_tni c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=0.0 fgeo=0.73 re=0.0 rcx=0.0 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=1.0e-20 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_i_tni
-********************************************************************************
-* Complete transistor: Isothermal Simulation and Temperature dependence
-********************************************************************************
-.subckt hicumL0V1p1_c c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 re=12.534 rcx=9.165 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=5.4e-15 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_c
-********************************************************************************
-* Complete transistor: Electrothermal Simulation to test self-heating
-********************************************************************************
-.subckt hicumL0V1p1_c_slh c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 re=12.534 rcx=9.165 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=5.4e-15 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=1000.0 cth=1.0e-10 flsh=2
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_c_slh
-********************************************************************************
-* Complete transistor: Isothermal Simulation with NQS Effect: future
-********************************************************************************
-.subckt hicumL0V1p1_c_nqs c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 re=12.534 rcx=9.165 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=5.4e-15 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_c_nqs
-********************************************************************************
-* Complete transistor: Isothermal Simulation to test collector current spreading
-********************************************************************************
-.subckt hicumL0V1p1_c_ccs c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 re=12.534 rcx=9.165 iscs=0.0 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=5.4e-15 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=0.0 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0 
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_c_ccs
-********************************************************************************
-* Complete transistor: Isothermal Simulation with substrate diode
-********************************************************************************
-.subckt hicumL0V1p1_c_sbt c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 re=12.534 rcx=9.165 iscs=1.0e-17 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=5.4e-15 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=3.64e-14 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_c_sbt
-********************************************************************************
-* Complete transistor: Isothermal Simulation with substrate network: future
-********************************************************************************
-.subckt hicumL0V1p1_c_sbn c b e s dt
-qhcm0 c b e s dt hic0_full 
-.model hic0_full npn level=7 is=1.3525E-18 vef=8.0 iqf=3.0e-2 iqr=1e6
-+ iqfh=1e6 tfh=1e-8 ibes=1.16E-20 mbe=1.015 ires=1.16e-16 mre=2.0 ibcs=1.16e-20
-+ mbc=1.015 mcf=1.0 mcr=1 kavl=0.9488 eavl=11.96e10 alkav=0.825e-4
-+ aleav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 re=12.534 rcx=9.165 iscs=1.0e-17 msc=1.0
-+ cje0=8.11e-15 vde=0.95 ze=0.5 aje=1.8 cjci0=1.16e-15 vdci=0.8 zci=0.333 
-+ vptci=46 cjcx0=5.4e-15 vdcx=0.7 zcx=0.333 vptcx=100 fbc=0.1526 vr0e=1.6 vr0c=8.0
-+ cjs0=3.64e-14 vds=0.6 zs=0.447 vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12
-+ tef0=1.8e-12 gte=1.4 thcs=30.0e-12 ahc=0.75 tr=0.0 rci0=127.8 vlim=0.7 
-+ vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 kf=1.43e-8 af=2.0 vgb=1.17
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 
-+ zetarbx=0.206 zetarcx=0.223 zetare=0.0 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 rth=0.0 cth=0.0
-+ tnom=27.0 npn=1 pnp=0
-*+ dt=0.0
-.ends hicumL0V1p1_c_sbn
-********************************************************************************
-* Complete test transistor: default
-********************************************************************************
-.subckt hicumL0V11_default c b e s dt
-qhcm0 c b e s dt hic0_full
-.ends hicumL0V11_default
-********************************************************************************
diff --git a/Windows/spice/examples/adms/hicum2/hic2_gum.sp b/Windows/spice/examples/adms/hicum2/hic2_gum.sp
deleted file mode 100644
index be54a86e..00000000
--- a/Windows/spice/examples/adms/hicum2/hic2_gum.sp
+++ /dev/null
@@ -1,17 +0,0 @@
-HICUM2v2.2 Gummel Test Ic,b,s=f(Vc,Ib)
-
-VB B 0 0.5
-VC C 0 1.0
-VS S 0 0.0
-Q1 C B 0 S DT hicumL2V2p2_c_sbt
-
-.control
-dc vb 0.2 1.4 0.01
-run
-plot abs(i(vc)) abs(i(vb)) abs(i(vs)) ylog xlimit 0.3 1.6 ylimit 1e-12 0.1
-plot abs(i(vc))/abs(i(vb)) vs abs(-i(vc)) xlog xlimit 1e-09 10e-3 ylimit 0 120
-.endc
-
-.include model-card-hicumL2V2p21.lib
-
-.end
diff --git a/Windows/spice/examples/adms/hicum2/hic2_out.sp b/Windows/spice/examples/adms/hicum2/hic2_out.sp
deleted file mode 100644
index 5e034197..00000000
--- a/Windows/spice/examples/adms/hicum2/hic2_out.sp
+++ /dev/null
@@ -1,17 +0,0 @@
-HICUM2v2.2 Output Test Ic=f(Vc,Ib)
-
-IB 0 B 200n
-VC C 0 3.0
-VS S 0 0.0
-Q1 C B 0 S DT hicumL2V2p2_c_slh
-
-.control
-dc vc 0.0 2.0 0.05 ib 10u 50u 10u
-run
-plot abs(i(vc))
-plot v(dt)
-.endc
-
-.include model-card-hicumL2V2p21.lib
-
-.end
diff --git a/Windows/spice/examples/adms/hicum2/model-card-hicumL2V2p21.lib b/Windows/spice/examples/adms/hicum2/model-card-hicumL2V2p21.lib
deleted file mode 100644
index f5893d05..00000000
--- a/Windows/spice/examples/adms/hicum2/model-card-hicumL2V2p21.lib
+++ /dev/null
@@ -1,250 +0,0 @@
-********************************************************************************
-********************************************************************************
-* HICUM Level2 Version 2.2 model cards for testing
-********************************************************************************
-********************************************************************************
-* 1D transistor: Isothermal Simulation and Temperature dependence
-********************************************************************************
-.model hicumL2V2p2_1D npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=0.0
-+ mbep=1.015 ireps=0.0 mrep=2.0 mcf=1.0 tbhrec=0.0 ibcis=1.16e-20 mbci=1.015 ibcxs=0.0
-+ mbcx=1.03 ibets=0.0 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=0.0 rcx=0.0 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=1.0e-20 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=1.0e-20 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* 1D transistor: Electrothermal Simulation to test self-heating
-********************************************************************************
-.model hicumL2V2p2_1D_slh npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=0.0
-+ mbep=1.015 ireps=0.0 mrep=2.0 mcf=1.0 tbhrec=0.0 ibcis=1.16e-20 mbci=1.015 ibcxs=0.0
-+ mbcx=1.03 ibets=0.0 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=0.0 rcx=0.0 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=1.0e-20 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=1.0e-20 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=1.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* 1D transistor: Isothermal Simulation with NQS Effect: future
-********************************************************************************
-.model hicumL2V2p2_1D_nqs npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=0.0
-+ mbep=1.015 ireps=0.0 mrep=2.0 mcf=1.0 tbhrec=0.0 ibcis=1.16e-20 mbci=1.015 ibcxs=0.0
-+ mbcx=1.03 ibets=0.0 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=0.0 rcx=0.0 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=1.0e-20 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=1.0e-20 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 
-+ alqf=0.225 alit=0.45 flnqs=1.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* 1D transistor: Isothermal Simulation to test collector current spreading
-********************************************************************************
-.model hicumL2V2p2_1D_ccs npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=0.0
-+ mbep=1.015 ireps=0.0 mrep=2.0 mcf=1.0 tbhrec=0.0 ibcis=1.16e-20 mbci=1.015 ibcxs=0.0
-+ mbcx=1.03 ibets=0.0 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=0.0 rbx=0.0 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=0.0 rcx=0.0 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=1.0e-20 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=1.0e-20 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=3.765 latl=0.342 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Internal transistor (with Itun at peripheral node): Isothermal Simulation and Temperature dependence
-********************************************************************************
-.model hicumL2V2p2_i_tnp npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=0.0
-+ mbep=1.015 ireps=0.0 mrep=2.0 mcf=1.0 tbhrec=0.0 ibcis=1.16e-20 mbci=1.015 ibcxs=0.0
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=0.0 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=0.0 rcx=0.0 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=1.0e-20 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=1.0e-20 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Internal transistor (with Itun at internal node): Isothermal Simulation and Temperature dependence
-********************************************************************************
-.model hicumL2V2p2_i_tni npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=0.0
-+ mbep=1.015 ireps=0.0 mrep=2.0 mcf=1.0 tbhrec=0.0 ibcis=1.16e-20 mbci=1.015 ibcxs=0.0
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=0.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=0.0 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=0.0 rcx=0.0 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=1.0e-20 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=1.0e-20 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=0.0 cbcpar=0.0 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Complete transistor: Isothermal Simulation and Temperature dependence
-********************************************************************************
-.model hicumL2V2p2_c npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=3.72e-21
-+ mbep=1.015 ireps=1.0e-30 mrep=2.0 mcf=1.0 tbhrec=250.0 ibcis=1.16e-20 mbci=1.015 ibcxs=4.39e-20
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=12.534 rcx=9.165 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=2.07e-15 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=5.4e-15 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Complete transistor: Electrothermal Simulation to test self-heating
-********************************************************************************
-.model hicumL2V2p2_c_slh npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=3.72e-21
-+ mbep=1.015 ireps=1.0e-30 mrep=2.0 mcf=1.0 tbhrec=250.0 ibcis=1.16e-20 mbci=1.015 ibcxs=4.39e-20
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=12.534 rcx=9.165 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=2.07e-15 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=5.4e-15 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=2.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Complete transistor: Isothermal Simulation with NQS Effect: future
-********************************************************************************
-.model hicumL2V2p2_c_nqs npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=3.72e-21
-+ mbep=1.015 ireps=1.0e-30 mrep=2.0 mcf=1.0 tbhrec=250.0 ibcis=1.16e-20 mbci=1.015 ibcxs=4.39e-20
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=12.534 rcx=9.165 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=2.07e-15 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=5.4e-15 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 
-+ alqf=0.225 alit=0.45 flnqs=1.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Complete transistor: Isothermal Simulation to test collector current spreading
-********************************************************************************
-.model hicumL2V2p2_c_ccs npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=3.72e-21
-+ mbep=1.015 ireps=1.0e-30 mrep=2.0 mcf=1.0 tbhrec=250.0 ibcis=1.16e-20 mbci=1.015 ibcxs=4.39e-20
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=12.534 rcx=9.165 itss=0.0 msf=1.05 iscs=0.0 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=2.07e-15 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=5.4e-15 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=0.0 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=3.765 latl=0.342 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Complete transistor: Isothermal Simulation with substrate transistor
-********************************************************************************
-.model hicumL2V2p2_c_sbt npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=3.72e-21
-+ mbep=1.015 ireps=1.0e-30 mrep=2.0 mcf=1.0 tbhrec=250.0 ibcis=1.16e-20 mbci=1.015 ibcxs=4.39e-20
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=12.534 rcx=9.165 itss=1.0e-16 msf=1.05 iscs=1.0e-17 msc=1.0 tsf=1.05 rsu=0.0 
-+ csu=0.0 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=2.07e-15 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=5.4e-15 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=3.64e-14 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=1.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Complete transistor: Isothermal Simulation with substrate network
-********************************************************************************
-.model hicumL2V2p2_c_sbn npn level=8
-+ c10=3.76E-32 qp0=2.78e-14 ich=2.09e-2 hfe=1.0 hfc=1.0 hjei=1.0 
-+ hjci=1.0 tr=0.0 ibeis=1.16E-20 mbei=1.015 ireis=1.16e-16 mrei=2.0 ibeps=3.72e-21
-+ mbep=1.015 ireps=1.0e-30 mrep=2.0 mcf=1.0 tbhrec=250.0 ibcis=1.16e-20 mbci=1.015 ibcxs=4.39e-20
-+ mbcx=1.03 ibets=1.0e-20 abet=40.0 tunode=1.0 favl=1.186 qavl=11.1e-5 alfav=0.825e-4
-+ alqav=0.196e-3 rbi0=71.76 rbx=8.83 fgeo=0.73 fdqr0=0.2 fcrbi=0.0 flcomp=1
-+ fqi=1.0 re=12.534 rcx=9.165 itss=1.0e-16 msf=1.05 iscs=1.0e-17 msc=1.0 tsf=1.05 rsu=10.0 
-+ csu=2.1e-15 cjei0=8.11e-15 vdei=0.95 zei=0.5 ajei=1.8 cjep0=2.07e-15 vdep=1.05  
-+ zep=0.4 ajep=2.4 cjci0=1.16e-15 vdci=0.8 zci=0.333 vptci=46 cjcx0=5.4e-15 
-+ vdcx=0.7 zcx=0.333 vptcx=100 fbcpar=0.1526 fbepar=0.5 cjs0=3.64e-14 vds=0.6 zs=0.447 
-+ vpts=100 t0=4.75e-12 dt0h=2.1e-12 tbvl=4.0e-12 tef0=1.8e-12 gtfe=1.4 thcs=30.0e-12 
-+ ahc=0.75 fthc=0.6 rci0=127.8 vlim=0.7 vces=0.1 vpt=5 cbepar=1.13e-15 cbcpar=2.97e-15 
-+ alqf=0.225 alit=0.45 flnqs=0.0 kf=1.43e-8 af=2.0 latb=0.0 latl=0.0 vgb=1.17 
-+ alt0=0.0 kt0=0.0 zetaci=1.6 alvs=1.0e-3 alces=0.4e-3 zetarbi=0.588 zetarbx=0.206 
-+ zetarcx=0.223 zetare=0.0 zetacx=2.2 vge=1.1386 vgc=1.1143 vgs=1.15 f1vg=-1.02377e-4 
-+ f2vg=4.3215e-4 zetact=3.5 zetabet=4.0 flsh=0.0 rth=1000.0 cth=1.0e-10 tnom=27.0 dt=0.0
-
-********************************************************************************
-* Complete test transistor: default
-********************************************************************************
-.model hicumL2V2p2_default npn level=8
-
-********************************************************************************
diff --git a/Windows/spice/examples/adms/mextram/mex_gum.sp b/Windows/spice/examples/adms/mextram/mex_gum.sp
deleted file mode 100644
index 1f619bb1..00000000
--- a/Windows/spice/examples/adms/mextram/mex_gum.sp
+++ /dev/null
@@ -1,89 +0,0 @@
-MEXTRAM Gummel Test Ic,b,s=f(Vc,Ib)
-
-VB B 0 0.5
-VC C 0 2.0
-VS S 0 0.0
-Q1 C B 0 S DT BJTRF1
-
-.control
-dc vb 0.2 1.4 0.01
-run
-plot abs(i(vc)) abs(i(vb)) abs(i(vs)) ylog xlimit 0.3 1.4 ylimit 1e-12 100e-3
-plot abs(i(vc))/abs(i(vb)) vs abs(-i(vc)) xlog xlimit 1e-09 10e-3 ylimit 0 150
-.endc
-
-.model BJTRF1 NPN LEVEL=6
-+MULT=1.000E+00
-+TREF=25.000E+00
-+DTA=0.000E+00
-+EXMOD=1.000E+00
-+EXPHI=0.000E+00
-+EXAVL=1.000E+00
-+IS=23.571E-18
-+IK=231.660E-03
-+VER=2.100E+00
-+VEF=36.001E+00
-+BF=186.538E+00
-+IBF=1.140E-15
-+MLF=2.000E+00
-+XIBI=0.000E+00
-+BRI=9.231E+00
-+IBR=61.600E-15
-+VLR=400.000E-03
-+XEXT=648.148E-03
-+WAVL=1.064E-06
-+VAVL=3.330E+00
-+SFH=882.471E-03
-+RE=949.668E-03
-+RBC=27.769E+00
-+RBV=32.004E+00
-+RCBLX=1.0
-+RCBLI=1.0
-+RCC=18.026E+00
-+RCV=237.417E+00
-+SCRCV=882.839E+00
-+IHC=3.370E-03
-+AXI=300.000E-03
-+CJE=55.566E-15
-+VDE=900.000E-03
-+PE=500.000E-03
-+XCJE=52.478E-03
-+CJC=25.153E-15
-+VDC=660.000E-03
-+PC=450.000E-03
-+XP=310.000E-03
-+MC=500.000E-03
-+XCJC=122.100E-03
-+MTAU=1.000E+00
-+TAUE=6.200E-12
-+TAUB=977.273E-15
-+TEPI=7.980E-12
-+TAUR=64.400E-12
-+DEG=0.000E+00
-+XREC=0.000E+00
-+AQBO=701.246E-03
-+AE=308.246E-03
-+AB=846.000E-03
-+AEPI=2.500E+00
-+AEX=619.000E-03
-+AC=1.580E+00
-+DVGBF=52.000E-03
-+DVGBR=0.000E+00
-+VGB=1.197E+00
-+VGC=1.200E+00
-+VGJ=1.200E+00
-+DVGTE=1.202E+00
-+AF=2.350E+00
-+KF=47.298E-09
-+KFN=1.000E-09
-+ISS=18.480E-18
-+IKS=219.348E-06
-+CJS=146.628E-15
-+VDS=542.048E-03
-+PS=314.095E-03
-+VGS=1.221E+00
-+AS=1.580E+00
-+RTH=300
-+CTH=3E-09
-
-.end
diff --git a/Windows/spice/examples/adms/mextram/mex_out.sp b/Windows/spice/examples/adms/mextram/mex_out.sp
deleted file mode 100644
index 5c35cf22..00000000
--- a/Windows/spice/examples/adms/mextram/mex_out.sp
+++ /dev/null
@@ -1,88 +0,0 @@
-MEXTRAM Output Test Ic=f(Vc,Ib)
-
-IB 0 b 1u
-VC C 0 2.0
-VS S 0 0.0
-Q1 C B 0 S DT BJTRF1
-
-.control
-dc vc 0.0 6.0 0.05 ib 1u 8u 1u
-plot abs(i(vc)) xlabel Vce title Output-Characteristic
-plot v(dt) xlabel Vce ylabel grdC title Selfheating
-.endc
-
-.model BJTRF1 NPN LEVEL=6
-+MULT=1.000E+00
-+TREF=25.000E+00
-+DTA=0.000E+00
-+EXMOD=1.000E+00
-+EXPHI=0.000E+00
-+EXAVL=1.000E+00
-+IS=23.571E-18
-+IK=231.660E-03
-+VER=2.100E+00
-+VEF=36.001E+00
-+BF=186.538E+00
-+IBF=1.140E-15
-+MLF=2.000E+00
-+XIBI=0.000E+00
-+BRI=9.231E+00
-+IBR=61.600E-15
-+VLR=400.000E-03
-+XEXT=648.148E-03
-+WAVL=1.064E-06
-+VAVL=3.330E+00
-+SFH=882.471E-03
-+RE=949.668E-03
-+RBC=27.769E+00
-+RBV=32.004E+00
-+RCBLX=10.0
-+RCBLI=10.0
-+RCC=18.026E+00
-+RCV=237.417E+00
-+SCRCV=882.839E+00
-+IHC=3.370E-03
-+AXI=300.000E-03
-+CJE=55.566E-15
-+VDE=900.000E-03
-+PE=500.000E-03
-+XCJE=52.478E-03
-+CJC=25.153E-15
-+VDC=660.000E-03
-+PC=450.000E-03
-+XP=310.000E-03
-+MC=500.000E-03
-+XCJC=122.100E-03
-+MTAU=1.000E+00
-+TAUE=6.200E-12
-+TAUB=977.273E-15
-+TEPI=7.980E-12
-+TAUR=64.400E-12
-+DEG=0.000E+00
-+XREC=0.000E+00
-+AQBO=701.246E-03
-+AE=308.246E-03
-+AB=846.000E-03
-+AEPI=2.500E+00
-+AEX=619.000E-03
-+AC=1.580E+00
-+DVGBF=52.000E-03
-+DVGBR=0.000E+00
-+VGB=1.197E+00
-+VGC=1.200E+00
-+VGJ=1.200E+00
-+DVGTE=1.202E+00
-+AF=2.350E+00
-+KF=47.298E-09
-+KFN=1.000E-09
-+ISS=18.480E-18
-+IKS=219.348E-06
-+CJS=146.628E-15
-+VDS=542.048E-03
-+PS=314.095E-03
-+VGS=1.221E+00
-+AS=1.580E+00
-+RTH=300
-+CTH=3E-09
-
-.end
diff --git a/Windows/spice/examples/adms/psp/psp_out.sp b/Windows/spice/examples/adms/psp/psp_out.sp
deleted file mode 100644
index 60a7147f..00000000
--- a/Windows/spice/examples/adms/psp/psp_out.sp
+++ /dev/null
@@ -1,224 +0,0 @@
-psp nch output
-*
-vd  d 0 dc 0.1
-vg  g 0 dc 0.0
-vs  s 0 dc 0.0
-vb  b 0 dc 0.0
-m1  d g s b nch
-+l=1.0e-06
-+w=10.0e-06
-+sa=0.0e+00
-+sb=0.0e+00
-+absource=1.0e-12
-+lssource=1.0e-06
-+lgsource=1.0e-06
-+abdrain=1.0e-12
-+lsdrain=1.0e-06
-+lgdrain=1.0e-06
-+mult=1.0e+00
-*
-.option temp=21
-.control
-dc vd 0 3.5 0.05 vg 0.5 3 0.5
-plot abs(i(vd))
-plot abs(i(vb)) ylog ylimit 1e-12 1e-03
-.endc
-*
-.model nch nmos level=45
-+type=1.0e+00
-+tr=21.0e+00
-+swigate=0.0e+00
-+swimpact=1.0e+00
-+swgidl=0.0e+00
-+swjuncap=0.0e+00
-+lvaro=0.0e+00
-+lvarl=0.0e+00
-+lvarw=0.0e+00
-+lap=0.0e+00
-+wvaro=0.0e+00
-+wvarl=0.0e+00
-+wvarw=0.0e+00
-+wot=0.0e+00
-+vfbo=-1.0e+00
-+vfbl=0.0e+00
-+vfbw=0.0e+00
-+vfblw=0.0e+00
-+stvfbo=500.0e-06
-+stvfbl=0.0e+00
-+stvfbw=0.0e+00
-+stvfblw=0.0e+00
-+toxo=2.0e-09
-+nsubo=300.0e+21
-+nsubw=0.0e+00
-+wseg=10.0e-09
-+npck=1.0e+24
-+npckw=0.0e+00
-+wsegp=10.0e-09
-+lpck=10.0e-09
-+lpckw=0.0e+00
-+vnsubo=0.0e+00
-+nslpo=50.0e-03
-+dnsubo=0.0e+00
-+npo=100.0e+24
-+npl=0.0e+00
-+qmc=1.0e+00
-+cto=0.0e+00
-+ctl=0.0e+00
-+ctlexp=1.0e+00
-+ctw=0.0e+00
-+toxovo=2.0e-09
-+lov=0.0e+00
-+novo=50.0e+24
-+fol1=0.0e+00
-+fol2=0.0e+00
-+cfl=0.0e+00
-+cflexp=2.0e+00
-+cfw=0.0e+00
-+cfbo=0.0e+00
-+uo=50.0e-03
-+fbet1=0.0e+00
-+fbet1w=0.0e+00
-+lp1=10.0e-09
-+lp1w=0.0e+00
-+fbet2=0.0e+00
-+lp2=10.0e-09
-+betw1=0.0e+00
-+betw2=0.0e+00
-+wbet=1.0e-09
-+stbeto=1.0e+00
-+stbetl=0.0e+00
-+stbetw=0.0e+00
-+stbetlw=0.0e+00
-+mueo=500.0e-03
-+muew=0.0e+00
-+stmueo=0.0e+00
-+themuo=1.5e+00
-+stthemuo=1.5e+00
-+cso=0.0e+00
-+csw=0.0e+00
-+stcso=0.0e+00
-+xcoro=0.0e+00
-+xcorl=0.0e+00
-+xcorw=0.0e+00
-+xcorlw=0.0e+00
-+stxcoro=0.0e+00
-+rsw1=0.5e+03
-+rsw2=0.0e+00
-+strso=1.0e+00
-+rsbo=0.0e+00
-+rsgo=0.0e+00
-+thesato=0.0e+00
-+thesatl=50.0e-03
-+thesatlexp=1.0e+00
-+thesatw=0.0e+00
-+stthesato=1.0e+00
-+stthesatl=0.0e+00
-+stthesatw=0.0e+00
-+stthesatlw=0.0e+00
-+thesatbo=0.0e+00
-+thesatgo=0.0e+00
-+axo=18.0e+00
-+axl=400.0e-03
-+alpl=500.0e-06
-+alplexp=1.0e+00
-+alpw=0.0e+00
-+alp1l1=0.0e+00
-+alp1lexp=500.0e-03
-+alp1l2=0.0e+00
-+alp1w=0.0e+00
-+alp2l1=0.0e+00
-+alp2lexp=0.5e+00
-+alp2l2=0.0e+00
-+alp2w=0.0e+00
-+vpo=50.0e-03
-+a1o=1.0e+00
-+a1l=0.0e+00
-+a1w=0.0e+00
-+a2o=10.0e+00
-+sta2o=0.0e+00
-+a3o=1.0e+00
-+a3l=0.0e+00
-+a3w=0.0e+00
-+a4o=0.0e+00
-+a4w=0.0e+00
-+gcoo=0.0e+00
-+iginvlw=0.0e+00
-+igovw=0.0e+00
-+stigo=2.0e+00
-+gc2o=375.0e-03
-+gc3o=63.0e-03
-+chibo=3.1e+00
-+agidlw=0.0e+00
-+bgidlo=41.0e+00
-+stbgidlo=0.0e+00
-+cgidlo=0.0e+00
-+cgbovl=0.0e+00
-+cfrw=0.0e+00
-+nfalw=80.0e+21
-+nfblw=30.0e+06
-+nfclw=0.0e+00
-+saref=1.0e-06
-+sbref=1.0e-06
-+wlod=0.0e+00
-+kuo=0.0e+00
-+kvsat=0.0e+00
-+tkuo=0.0e+00
-+lkuo=0.0e+00
-+wkuo=0.0e+00
-+pkuo=0.0e+00
-+llodkuo=0.0e+00
-+wlodkuo=0.0e+00
-+kvtho=0.0e+00
-+lkvtho=0.0e+00
-+wkvtho=0.0e+00
-+pkvtho=0.0e+00
-+llodvth=0.0e+00
-+wlodvth=0.0e+00
-+stetao=0.0e+00
-+lodetao=1.0e+00
-+trj=21.0e+00
-+imax=1.0e+03
-+cjorbot=1.0e-03
-+cjorsti=1.0e-09
-+cjorgat=1.0e-09
-+vbirbot=1.0e+00
-+vbirsti=1.0e+00
-+vbirgat=1.0e+00
-+pbot=500.0e-03
-+psti=500.0e-03
-+pgat=500.0e-03
-+phigbot=1.16e+00
-+phigsti=1.16e+00
-+phiggat=1.16e+00
-+idsatrbot=1.0e-12
-+idsatrsti=1.0e-18
-+idsatrgat=1.0e-18
-+csrhbot=100.0e+00
-+csrhsti=100.0e-06
-+csrhgat=100.0e-06
-+xjunsti=100.0e-09
-+xjungat=100.0e-09
-+ctatbot=100.0e+00
-+ctatsti=100.0e-06
-+ctatgat=100.0e-06
-+mefftatbot=250.0e-03
-+mefftatsti=250.0e-03
-+mefftatgat=250.0e-03
-+cbbtbot=1.0e-12
-+cbbtsti=1.0e-18
-+cbbtgat=1.0e-18
-+fbbtrbot=1.0e+09
-+fbbtrsti=1.0e+09
-+fbbtrgat=1.0e+09
-+stfbbtbot=-1.0e-03
-+stfbbtsti=-1.0e-03
-+stfbbtgat=-1.0e-03
-+vbrbot=10.0e+00
-+vbrsti=10.0e+00
-+vbrgat=10.0e+00
-+pbrbot=4.0e+00
-+pbrsti=4.0e+00
-+pbrgat=4.0e+00
-+dta=0.0e+00
-
-.end
diff --git a/Windows/spice/examples/adms/psp/psp_tran.sp b/Windows/spice/examples/adms/psp/psp_tran.sp
deleted file mode 100644
index d11deef7..00000000
--- a/Windows/spice/examples/adms/psp/psp_tran.sp
+++ /dev/null
@@ -1,225 +0,0 @@
-psp nch transfer
-*
-vd  d 0 dc 0.1
-vg  g 0 dc 0.0
-vs  s 0 dc 0.0
-vb  b 0 dc 0.0
-m1  d g s b nch
-+l=1.0e-06
-+w=10.0e-06
-+sa=0.0e+00
-+sb=0.0e+00
-+absource=1.0e-12
-+lssource=1.0e-06
-+lgsource=1.0e-06
-+abdrain=1.0e-12
-+lsdrain=1.0e-06
-+lgdrain=1.0e-06
-+mult=1.0e+00
-*
-.option temp=21
-.control
-dc vg 0 3.5 0.02 vb -3 0 0.5
-plot abs(i(vd))
-dc vg 0 1.5 0.01 vb -3 0 0.5
-plot abs(i(vd)) ylog ylimit 1e-12 1e-03
-.endc
-*
-.model nch nmos level=45
-+type=1.0e+00
-+tr=21.0e+00
-+swigate=0.0e+00
-+swimpact=1.0e+00
-+swgidl=0.0e+00
-+swjuncap=0.0e+00
-+lvaro=0.0e+00
-+lvarl=0.0e+00
-+lvarw=0.0e+00
-+lap=0.0e+00
-+wvaro=0.0e+00
-+wvarl=0.0e+00
-+wvarw=0.0e+00
-+wot=0.0e+00
-+vfbo=-1.0e+00
-+vfbl=0.0e+00
-+vfbw=0.0e+00
-+vfblw=0.0e+00
-+stvfbo=500.0e-06
-+stvfbl=0.0e+00
-+stvfbw=0.0e+00
-+stvfblw=0.0e+00
-+toxo=2.0e-09
-+nsubo=300.0e+21
-+nsubw=0.0e+00
-+wseg=10.0e-09
-+npck=1.0e+24
-+npckw=0.0e+00
-+wsegp=10.0e-09
-+lpck=10.0e-09
-+lpckw=0.0e+00
-+vnsubo=0.0e+00
-+nslpo=50.0e-03
-+dnsubo=0.0e+00
-+npo=100.0e+24
-+npl=0.0e+00
-+qmc=1.0e+00
-+cto=0.0e+00
-+ctl=0.0e+00
-+ctlexp=1.0e+00
-+ctw=0.0e+00
-+toxovo=2.0e-09
-+lov=0.0e+00
-+novo=50.0e+24
-+fol1=0.0e+00
-+fol2=0.0e+00
-+cfl=0.0e+00
-+cflexp=2.0e+00
-+cfw=0.0e+00
-+cfbo=0.0e+00
-+uo=50.0e-03
-+fbet1=0.0e+00
-+fbet1w=0.0e+00
-+lp1=10.0e-09
-+lp1w=0.0e+00
-+fbet2=0.0e+00
-+lp2=10.0e-09
-+betw1=0.0e+00
-+betw2=0.0e+00
-+wbet=1.0e-09
-+stbeto=1.0e+00
-+stbetl=0.0e+00
-+stbetw=0.0e+00
-+stbetlw=0.0e+00
-+mueo=500.0e-03
-+muew=0.0e+00
-+stmueo=0.0e+00
-+themuo=1.5e+00
-+stthemuo=1.5e+00
-+cso=0.0e+00
-+csw=0.0e+00
-+stcso=0.0e+00
-+xcoro=0.0e+00
-+xcorl=0.0e+00
-+xcorw=0.0e+00
-+xcorlw=0.0e+00
-+stxcoro=0.0e+00
-+rsw1=2.5e+03
-+rsw2=0.0e+00
-+strso=1.0e+00
-+rsbo=0.0e+00
-+rsgo=0.0e+00
-+thesato=0.0e+00
-+thesatl=50.0e-03
-+thesatlexp=1.0e+00
-+thesatw=0.0e+00
-+stthesato=1.0e+00
-+stthesatl=0.0e+00
-+stthesatw=0.0e+00
-+stthesatlw=0.0e+00
-+thesatbo=0.0e+00
-+thesatgo=0.0e+00
-+axo=18.0e+00
-+axl=400.0e-03
-+alpl=500.0e-06
-+alplexp=1.0e+00
-+alpw=0.0e+00
-+alp1l1=0.0e+00
-+alp1lexp=500.0e-03
-+alp1l2=0.0e+00
-+alp1w=0.0e+00
-+alp2l1=0.0e+00
-+alp2lexp=0.5e+00
-+alp2l2=0.0e+00
-+alp2w=0.0e+00
-+vpo=50.0e-03
-+a1o=1.0e+00
-+a1l=0.0e+00
-+a1w=0.0e+00
-+a2o=10.0e+00
-+sta2o=0.0e+00
-+a3o=1.0e+00
-+a3l=0.0e+00
-+a3w=0.0e+00
-+a4o=0.0e+00
-+a4w=0.0e+00
-+gcoo=0.0e+00
-+iginvlw=0.0e+00
-+igovw=0.0e+00
-+stigo=2.0e+00
-+gc2o=375.0e-03
-+gc3o=63.0e-03
-+chibo=3.1e+00
-+agidlw=0.0e+00
-+bgidlo=41.0e+00
-+stbgidlo=0.0e+00
-+cgidlo=0.0e+00
-+cgbovl=0.0e+00
-+cfrw=0.0e+00
-+nfalw=80.0e+21
-+nfblw=30.0e+06
-+nfclw=0.0e+00
-+saref=1.0e-06
-+sbref=1.0e-06
-+wlod=0.0e+00
-+kuo=0.0e+00
-+kvsat=0.0e+00
-+tkuo=0.0e+00
-+lkuo=0.0e+00
-+wkuo=0.0e+00
-+pkuo=0.0e+00
-+llodkuo=0.0e+00
-+wlodkuo=0.0e+00
-+kvtho=0.0e+00
-+lkvtho=0.0e+00
-+wkvtho=0.0e+00
-+pkvtho=0.0e+00
-+llodvth=0.0e+00
-+wlodvth=0.0e+00
-+stetao=0.0e+00
-+lodetao=1.0e+00
-+trj=21.0e+00
-+imax=1.0e+03
-+cjorbot=1.0e-03
-+cjorsti=1.0e-09
-+cjorgat=1.0e-09
-+vbirbot=1.0e+00
-+vbirsti=1.0e+00
-+vbirgat=1.0e+00
-+pbot=500.0e-03
-+psti=500.0e-03
-+pgat=500.0e-03
-+phigbot=1.16e+00
-+phigsti=1.16e+00
-+phiggat=1.16e+00
-+idsatrbot=1.0e-12
-+idsatrsti=1.0e-18
-+idsatrgat=1.0e-18
-+csrhbot=100.0e+00
-+csrhsti=100.0e-06
-+csrhgat=100.0e-06
-+xjunsti=100.0e-09
-+xjungat=100.0e-09
-+ctatbot=100.0e+00
-+ctatsti=100.0e-06
-+ctatgat=100.0e-06
-+mefftatbot=250.0e-03
-+mefftatsti=250.0e-03
-+mefftatgat=250.0e-03
-+cbbtbot=1.0e-12
-+cbbtsti=1.0e-18
-+cbbtgat=1.0e-18
-+fbbtrbot=1.0e+09
-+fbbtrsti=1.0e+09
-+fbbtrgat=1.0e+09
-+stfbbtbot=-1.0e-03
-+stfbbtsti=-1.0e-03
-+stfbbtgat=-1.0e-03
-+vbrbot=10.0e+00
-+vbrsti=10.0e+00
-+vbrgat=10.0e+00
-+pbrbot=4.0e+00
-+pbrsti=4.0e+00
-+pbrgat=4.0e+00
-+dta=0.0e+00
-
-.end