.options noacct added

17 years ago · 703b75e6ea
52 changed files with 69 additions and 62 deletions
--- a/tests/bsim3/Berkeley/3v0/ac_sim/gain-stage.cir
+++ b/tests/bsim3/Berkeley/3v0/ac_sim/gain-stage.cir
@ -7,10 +7,11 @@ Rload 3 vdd 25k
 Vdd vdd 0 5 
 Vin 1 0 1.44 ac .1

+.options noacct
 .ac dec 10 100 1000Meg 
 .print ac vdb(3)

-.model nmos nmos level=52
+.model nmos nmos level=8 version=3.0

 .end

--- a/tests/bsim3/Berkeley/3v0/ac_sim/op-amp.cir
+++ b/tests/bsim3/Berkeley/3v0/ac_sim/op-amp.cir
@ -23,11 +23,12 @@ vss vss 0 -5
 Vdd vdd 0 5 

 *AC analysis
+.options noacct
 .ac dec 10 100 100Meg 
 .print ac vdb(8)

-.model nmos nmos level=52
-.model pmos pmos level=52
+.model nmos nmos level=8 version=3.0
+.model pmos pmos level=8 version=3.0

 .end

--- a/tests/bsim3/Berkeley/3v0/dc_sim/test1.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test1.cir
@ -5,7 +5,7 @@ m1 2 1 0 0 n1 L=0.35u W=10.0u
 vgs 1 0 3.5 
 vds 2 0 3.5 

-
+.options noacct
 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 


--- a/tests/bsim3/Berkeley/3v0/dc_sim/test10.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test10.cir
@ -9,7 +9,7 @@ vds 2 0 -3.5

 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5

-.options Temp=100.0
+.options Temp=100.0 noacct
 .print dc v(1) i(vds)


--- a/tests/bsim3/Berkeley/3v0/dc_sim/test11.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test11.cir
@ -7,7 +7,7 @@ vgs 1 0 -3.5
 vds 2 0 -0.1
 vbs 3 0 0.0

-
+.options noacct
 .dc vgs 0 -3.5 -0.05 vds -0.1 -3.1 -1.

 .print dc v(2) i(vds)
--- a/tests/bsim3/Berkeley/3v0/dc_sim/test12.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test12.cir
@ -7,7 +7,7 @@ vgs 1 0 -3.5
 vds 2 0 -0.1
 vbs 3 0 0.0

-
+.options noacct
 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5

 .print dc v(2) i(vds)
--- a/tests/bsim3/Berkeley/3v0/dc_sim/test13.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test13.cir
@ -9,7 +9,7 @@ vbs 3 0 0.0


 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5
-.options Temp=-55.0
+.options Temp=-55.0 noacct

 .print dc v(2) i(vds)
 .include modelcard.pmos 
--- a/tests/bsim3/Berkeley/3v0/dc_sim/test14.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test14.cir
@ -9,7 +9,7 @@ vbs 3 0 0.0


 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5
-.options Temp=100.0
+.options Temp=100.0 noacct

 .print dc v(2) i(vds)

--- a/tests/bsim3/Berkeley/3v0/dc_sim/test2.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test2.cir
@ -7,7 +7,7 @@ vds 2 0 3.5


 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 
-.options Temp=-55.0
+.options Temp=-55.0 noacct

 .print dc v(1) i(vds)

--- a/tests/bsim3/Berkeley/3v0/dc_sim/test3.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test3.cir
@ -7,7 +7,7 @@ vds 2 0 3.5


 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 
-.options Temp=100.0
+.options Temp=100.0 noacct

 .print dc v(1) i(vds)

--- a/tests/bsim3/Berkeley/3v0/dc_sim/test4.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test4.cir
@ -6,7 +6,7 @@ m1 2 1 0 0 n1 L=0.35u W=10.0u
 vgs 1 0 3.5 
 vds 2 0 3.5 

-
+.options noacct
 .dc vgs 0 3.5 0.05 vds 0.1 3.1 1


--- a/tests/bsim3/Berkeley/3v0/dc_sim/test5.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test5.cir
@ -7,6 +7,7 @@ vgs 1 0 3.5
 vbs 3 0 0 
 vds 2 0 0.1

+.options noacct
 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5


--- a/tests/bsim3/Berkeley/3v0/dc_sim/test6.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test6.cir
@ -9,7 +9,7 @@ vds 2 0 0.1

 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5

-.options Temp=-55.0
+.options Temp=-55.0 noacct
 .print dc v(2) i(vds)

 .include modelcard.nmos 
--- a/tests/bsim3/Berkeley/3v0/dc_sim/test7.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test7.cir
@ -9,7 +9,7 @@ vds 2 0 0.1

 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5

-.options Temp=100.0
+.options Temp=100.0 noacct
 .print dc v(2) i(vds)
 .include modelcard.nmos 
 .end
--- a/tests/bsim3/Berkeley/3v0/dc_sim/test8.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test8.cir
@ -6,7 +6,7 @@ m1 2 1 0 0 p1 L=0.35u W=10.0u
 vgs 1 0 -3.5
 vds 2 0 -3.5

-
+.options noacct
 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5


--- a/tests/bsim3/Berkeley/3v0/dc_sim/test9.cir
+++ b/tests/bsim3/Berkeley/3v0/dc_sim/test9.cir
@ -9,7 +9,7 @@ vds 2 0 -3.5

 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5

-.options Temp=-55
+.options Temp=-55 noacct
 .print dc v(1) i(vds)


--- a/tests/bsim3/Berkeley/3v0/tran_sim/comparator.cir
+++ b/tests/bsim3/Berkeley/3v0/tran_sim/comparator.cir
@ -28,12 +28,12 @@ Vdd Vdd 0 5
 Va A 0  pulse 0 5 10ns .1ns .1ns 15ns 30ns
 Vb B 0 0

-.model nmos nmos level=52
-.model pmos pmos level=52
+.model nmos nmos level=8 version=3.0
+.model pmos pmos level=8 version=3.0

 * transient analysis
 .tran 1ns 60ns
-.option post
+.options noacct
 .print tran a b v(9) v(8) 

 .END
--- a/tests/bsim3/Berkeley/3v1/ac_sim/gain-stage.cir
+++ b/tests/bsim3/Berkeley/3v1/ac_sim/gain-stage.cir
@ -7,10 +7,11 @@ Rload 3 vdd 25k
 Vdd vdd 0 5 
 Vin 1 0 1.44 ac .1

+.options noacct
 .ac dec 10 100 1000Meg 
 .print ac vdb(3)

-.model nmos nmos level=50
+.model nmos nmos level=8 version=3.1

 .end

--- a/tests/bsim3/Berkeley/3v1/dc_sim/test1.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test1.cir
@ -5,7 +5,7 @@ m1 2 1 0 0 n1 L=0.35u W=10.0u
 vgs 1 0 3.5 
 vds 2 0 3.5 

-
+.options noacct
 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 


--- a/tests/bsim3/Berkeley/3v1/dc_sim/test10.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test10.cir
@ -9,7 +9,7 @@ vds 2 0 -3.5

 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5

-.options Temp=100.0
+.options Temp=100.0 noacct
 .print dc v(1) i(vds)


--- a/tests/bsim3/Berkeley/3v1/dc_sim/test11.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test11.cir
@ -7,7 +7,7 @@ vgs 1 0 -3.5
 vds 2 0 -0.1
 vbs 3 0 0.0

-
+.options noacct
 .dc vgs 0 -3.5 -0.05 vds -0.1 -3.1 -1.

 .print dc v(2) i(vds)
--- a/tests/bsim3/Berkeley/3v1/dc_sim/test12.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test12.cir
@ -7,7 +7,7 @@ vgs 1 0 -3.5
 vds 2 0 -0.1
 vbs 3 0 0.0

-
+.options noacct
 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5

 .print dc v(2) i(vds)
--- a/tests/bsim3/Berkeley/3v1/dc_sim/test13.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test13.cir
@ -9,7 +9,7 @@ vbs 3 0 0.0


 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5
-.options Temp=-55.0
+.options Temp=-55.0 noacct

 .print dc v(2) i(vds)
 .include modelcard.pmos 
--- a/tests/bsim3/Berkeley/3v1/dc_sim/test14.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test14.cir
@ -9,7 +9,7 @@ vbs 3 0 0.0


 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5
-.options Temp=100.0
+.options Temp=100.0 noacct

 .print dc v(2) i(vds)

--- a/tests/bsim3/Berkeley/3v1/dc_sim/test2.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test2.cir
@ -7,7 +7,7 @@ vds 2 0 3.5


 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 
-.options Temp=-55.0
+.options Temp=-55.0 noacct

 .print dc v(1) i(vds)

--- a/tests/bsim3/Berkeley/3v1/dc_sim/test3.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test3.cir
@ -7,7 +7,7 @@ vds 2 0 3.5


 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 
-.options Temp=100.0
+.options Temp=100.0 noacct

 .print dc v(1) i(vds)

--- a/tests/bsim3/Berkeley/3v1/dc_sim/test4.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test4.cir
@ -6,7 +6,7 @@ m1 2 1 0 0 n1 L=0.35u W=10.0u
 vgs 1 0 3.5 
 vds 2 0 3.5 

-
+.options noacct
 .dc vgs 0 3.5 0.05 vds 0.1 3.1 1


--- a/tests/bsim3/Berkeley/3v1/dc_sim/test5.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test5.cir
@ -7,6 +7,7 @@ vgs 1 0 3.5
 vbs 3 0 0 
 vds 2 0 0.1

+.options noacct
 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5


--- a/tests/bsim3/Berkeley/3v1/dc_sim/test6.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test6.cir
@ -9,7 +9,7 @@ vds 2 0 0.1

 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5

-.options Temp=-55.0
+.options Temp=-55.0 noacct
 .print dc v(2) i(vds)

 .include modelcard.nmos 
--- a/tests/bsim3/Berkeley/3v1/dc_sim/test7.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test7.cir
@ -9,7 +9,7 @@ vds 2 0 0.1

 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5

-.options Temp=100.0
+.options Temp=100.0 noacct
 .print dc v(2) i(vds)
 .include modelcard.nmos 
 .end
--- a/tests/bsim3/Berkeley/3v1/dc_sim/test8.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test8.cir
@ -6,7 +6,7 @@ m1 2 1 0 0 p1 L=0.35u W=10.0u
 vgs 1 0 -3.5
 vds 2 0 -3.5

-
+.options noacct
 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5


--- a/tests/bsim3/Berkeley/3v1/dc_sim/test9.cir
+++ b/tests/bsim3/Berkeley/3v1/dc_sim/test9.cir
@ -9,7 +9,7 @@ vds 2 0 -3.5

 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5

-.options Temp=-55
+.options Temp=-55 noacct
 .print dc v(1) i(vds)


--- a/tests/bsim3/Berkeley/3v1/tran_sim/comparator.cir
+++ b/tests/bsim3/Berkeley/3v1/tran_sim/comparator.cir
@ -28,12 +28,12 @@ Vdd Vdd 0 5
 Va A 0  pulse 0 5 10ns .1ns .1ns 15ns 30ns
 Vb B 0 0

-.model nmos nmos level=50
-.model pmos pmos level=50
+.model nmos nmos level=8 version=3.1
+.model pmos pmos level=8 version=3.1

 * transient analysis
 .tran 1ns 60ns
-.option post
+.options noacct
 .print tran a b v(9) v(8) 

 .END
--- a/tests/bsim3/Berkeley/3v1/tran_sim/one-shot.cir
+++ b/tests/bsim3/Berkeley/3v1/tran_sim/one-shot.cir
@ -34,12 +34,12 @@ M13 3 Lnot 0 0 NMOS w=1.8u l=1.2u
 Vcc vdd 0 5
 vin in 0 pulse 0 5 1ns .1ns .1ns .8ns 5ns

-.model nmos nmos level=50
-.model pmos pmos level=50
+.model nmos nmos level=8 version=3.1
+.model pmos pmos level=8 version=3.1

 .tran 1ns 10ns
 .print tran in out
-.option post
+.options noacct

 .END

--- a/tests/bsim3/Berkeley/3v2/ac_sim/gain-stage.cir
+++ b/tests/bsim3/Berkeley/3v2/ac_sim/gain-stage.cir
@ -7,10 +7,11 @@ Rload 3 vdd 25k
 Vdd vdd 0 5 
 Vin 1 0 1.44 ac .1

+.options noacct
 .ac dec 10 100 1000Meg 
 .print ac vdb(3)

-.model nmos nmos level=8
+.model nmos nmos level=8 version=3.2.2

 .end

--- a/tests/bsim3/Berkeley/3v2/ac_sim/op-amp.cir
+++ b/tests/bsim3/Berkeley/3v2/ac_sim/op-amp.cir
@ -23,11 +23,12 @@ vss vss 0 -5
 Vdd vdd 0 5 

 *AC analysis
+.options noacct
 .ac dec 10 100 100Meg 
 .print ac vdb(8)

-.model nmos nmos level=8
-.model pmos pmos level=8
+.model nmos nmos level=8 version=3.2.2
+.model pmos pmos level=8 version=3.2.2

 .end

--- a/tests/bsim3/Berkeley/3v2/dc_sim/test1.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test1.cir
@ -5,7 +5,7 @@ m1 2 1 0 0 n1 L=0.35u W=10.0u
 vgs 1 0 3.5 
 vds 2 0 3.5 

-
+.options noacct
 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 


--- a/tests/bsim3/Berkeley/3v2/dc_sim/test10.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test10.cir
@ -9,7 +9,7 @@ vds 2 0 -3.5

 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5

-.options Temp=100.0
+.options Temp=100.0 noacct
 .print dc v(1) i(vds)


--- a/tests/bsim3/Berkeley/3v2/dc_sim/test11.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test11.cir
@ -7,7 +7,7 @@ vgs 1 0 -3.5
 vds 2 0 -0.1
 vbs 3 0 0.0

-
+.options noacct
 .dc vgs 0 -3.5 -0.05 vds -0.1 -3.1 -1.

 .print dc v(2) i(vds)
--- a/tests/bsim3/Berkeley/3v2/dc_sim/test12.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test12.cir
@ -7,7 +7,7 @@ vgs 1 0 -3.5
 vds 2 0 -0.1
 vbs 3 0 0.0

-
+.options noacct
 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5

 .print dc v(2) i(vds)
--- a/tests/bsim3/Berkeley/3v2/dc_sim/test13.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test13.cir
@ -9,7 +9,7 @@ vbs 3 0 0.0


 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5
-.options Temp=-55.0
+.options Temp=-55.0 noacct

 .print dc v(2) i(vds)
 .include modelcard.pmos 
--- a/tests/bsim3/Berkeley/3v2/dc_sim/test14.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test14.cir
@ -9,7 +9,7 @@ vbs 3 0 0.0


 .dc vgs 0 -3.5 -0.05 vbs 0 3. 0.5
-.options Temp=100.0
+.options Temp=100.0 noacct

 .print dc v(2) i(vds)

--- a/tests/bsim3/Berkeley/3v2/dc_sim/test2.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test2.cir
@ -7,7 +7,7 @@ vds 2 0 3.5


 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 
-.options Temp=-55.0
+.options Temp=-55.0 noacct

 .print dc v(1) i(vds)

--- a/tests/bsim3/Berkeley/3v2/dc_sim/test3.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test3.cir
@ -7,7 +7,7 @@ vds 2 0 3.5


 .dc vds 0 3.5 0.05 vgs 0 3.5 0.5 
-.options Temp=100.0
+.options Temp=100.0 noacct

 .print dc v(1) i(vds)

--- a/tests/bsim3/Berkeley/3v2/dc_sim/test4.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test4.cir
@ -6,7 +6,7 @@ m1 2 1 0 0 n1 L=0.35u W=10.0u
 vgs 1 0 3.5 
 vds 2 0 3.5 

-
+.options noacct
 .dc vgs 0 3.5 0.05 vds 0.1 3.1 1


--- a/tests/bsim3/Berkeley/3v2/dc_sim/test5.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test5.cir
@ -9,7 +9,7 @@ vds 2 0 0.1

 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5

-
+.options noacct
 .print dc v(2) i(vds)

 .include  modelcard.nmos
--- a/tests/bsim3/Berkeley/3v2/dc_sim/test6.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test6.cir
@ -9,7 +9,7 @@ vds 2 0 0.1

 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5

-.options Temp=-55.0
+.options Temp=-55.0 noacct
 .print dc v(2) i(vds)

 .include modelcard.nmos 
--- a/tests/bsim3/Berkeley/3v2/dc_sim/test7.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test7.cir
@ -9,7 +9,7 @@ vds 2 0 0.1

 .dc vgs 0 3.5 0.05 vbs 0.0 -3. -0.5

-.options Temp=100.0
+.options Temp=100.0 noacct
 .print dc v(2) i(vds)
 .include modelcard.nmos 
 .end
--- a/tests/bsim3/Berkeley/3v2/dc_sim/test8.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test8.cir
@ -6,7 +6,7 @@ m1 2 1 0 0 p1 L=0.35u W=10.0u
 vgs 1 0 -3.5
 vds 2 0 -3.5

-
+.options noacct
 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5


--- a/tests/bsim3/Berkeley/3v2/dc_sim/test9.cir
+++ b/tests/bsim3/Berkeley/3v2/dc_sim/test9.cir
@ -9,7 +9,7 @@ vds 2 0 -3.5

 .dc vds 0 -3.5 -0.05 vgs 0 -3.5 -0.5

-.options Temp=-55
+.options Temp=-55 noacct
 .print dc v(1) i(vds)


--- a/tests/bsim3/Berkeley/3v2/tran_sim/comparator.cir
+++ b/tests/bsim3/Berkeley/3v2/tran_sim/comparator.cir
@ -28,12 +28,12 @@ Vdd Vdd 0 5
 Va A 0  pulse 0 5 10ns .1ns .1ns 15ns 30ns
 Vb B 0 0

-.model nmos nmos level=8
-.model pmos pmos level=8
+.model nmos nmos level=8 version=3.2.2
+.model pmos pmos level=8 version=3.2.2

 * transient analysis
 .tran 1ns 60ns
-.option post
+.options noacct
 .print tran a b v(9) v(8) 

 .END
--- a/tests/bsim3/Berkeley/3v2/tran_sim/one-shot.cir
+++ b/tests/bsim3/Berkeley/3v2/tran_sim/one-shot.cir
@ -34,12 +34,12 @@ M13 3 Lnot 0 0 NMOS w=1.8u l=1.2u
 Vcc vdd 0 5
 vin in 0 pulse 0 5 1ns .1ns .1ns .8ns 5ns

-.model nmos nmos level=8
-.model pmos pmos level=8
+.model nmos nmos level=8 version=3.2.2
+.model pmos pmos level=8 version=3.2.2

 .tran 1ns 10ns
 .print tran in out
-.option post
+.options noacct

 .END