[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: MSA-2643.cir
User: pcjc2
Date: 07/02/11 18:58:18
Modified: . Tag: noscreen MSA-2643.cir MSA-2643.sch Q1.cir
Q2.cir
Log:
Sync with trunc
Revision Changes Path
No revision
No revision
1.1.6.1 +99 -71 eda/geda/gaf/examples/RF_Amp/MSA-2643.cir
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MSA-2643.cir
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/examples/RF_Amp/MSA-2643.cir,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -b -r1.1 -r1.1.6.1
--- MSA-2643.cir 25 May 2003 19:03:32 -0000 1.1
+++ MSA-2643.cir 11 Feb 2007 23:58:17 -0000 1.1.6.1
@@ -1,84 +1,33 @@
+* gnetlist -v -g spice-sdb -o MSA-2643.cir MSA-2643.sch
*********************************************************
* Spice file generated by gnetlist *
-* spice-SDB version 3.30.2003 by SDB -- *
+* spice-sdb version 2.10.2007 by SDB -- *
* provides advanced spice netlisting capability. *
* Documentation at http://www.brorson.com/gEDA/SPICE/ *
*********************************************************
-Cpara2 0 7 0.155pF
-Cpara1 0 9 0.158pF
-L7 1 7 0.407nH
-L1 9 2 0.833nH
-L6 3 0 0.313nH
-L4 0 3 0.386nH
-.INCLUDE /home/sdb/RF_Amp/Simulation.cmd
-Cin Vin 9 47pF
-Cout 7 Vout 47pF
-Rc 6 8 50
-Lc 8 7 22nH
-RL 0 Vout 50
-Rth_in Vsource Vin 50
-Vin Vsource 0 dc 0 ac 1
-Vpwr 6 0 DC 5V
-C1 3 5 4pF
-X2 1 4 5 Q2_MSA26F
+*vvvvvvvv Included SPICE model from Q1.cir vvvvvvvv
*******************************
* Begin .SUBCKT model *
-* spice-SDB ver 3.30.2003 *
+* spice-sdb ver 2.10.2007 *
*******************************
-.SUBCKT Q2_MSA26F 6 4 5
-Re 5 2 0.443
-Rcx 1 6 1.716
-Rbx 4 3 0.463
-Ceox 5 3 2.417e-14F
-Ccox 4 1 6.598e-14F
-D2 3 2 DIODEM2_Q2
+.SUBCKT Q1_MSA26F 5 4 6
+*vvvvvvvv Included SPICE model from model/DiodeM1_Q1.mod vvvvvvvv
* This is a diode model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
-* Model entered 3.30.2003 by SDB
-.model DIODEM2_Q2 D(IS=1e-24 N=1.0029 CJO=9.023e-14
-+ VJ=0.8971 M=2.292e-1 FC=0.8 TNOM=21)
-D1 4 1 DIODEM1_Q2
-* This is a diode model used in the Agilent MSA-26 model
-* documented in 5980-2496E.pdf.
-* Model entered 3.30.2003 by SDB
-.model DIODEM1_Q2 D(IS=5.62e-17 N=1 CJO=9.676e-14
+* Model entered 3.31.2003 by SDB
+.model DIODEM1_Q1 D(IS=1.405e-17 N=1 CJO=2.281e-14
+ VJ=0.729 M=0.44 FC=0.8 TNOM=21)
-Q2 1 3 2 BJTM1_Q2
-* This is the BJT model used in the Agilent MSA-26 model
-* documented in 5980-2496E.pdf.
-* Model entered 3.30.2003 by SDB
-.model BJTM1_Q2 NPN(Bf=1e6 IKF=5.895e-1 ISE=2.838e-19 NE=1.006
-+ VAF=44 NF=1 TF=5.37e-12 XTF=20 VTF=0.8 ITF=8.872e-1 PTF=22
-+ XTB=0.7 BR=1 IKR=4.4e-2 NC=2 VAR=3.37 NR=1.005 TR=4e-9
-+ EG=1.17 IS=1.79e-17 XTI=3 TNOM=21 CJC=3.717e-14
-+ VJC=0.6775 MJC=0.3319 XCJC=4.398e-1 FC=0.8 CJE=3.217e-13
-+ VJE=0.9907 MJE=0.5063 RB=2.325 IRB=3.272e-4 RBM=2.5e-2 KF=1.026e-24)
-.ENDS Q2_MSA26F
-*******************************
-X1 1 2 4 Q1_MSA26F
-*******************************
-* Begin .SUBCKT model *
-* spice-SDB ver 3.30.2003 *
-*******************************
-.SUBCKT Q1_MSA26F 6 4 5
-Re 5 2 2.158
-Rcx 1 6 6.386
-Rbx 4 3 3.723
-Ceox 5 3 6.01e-15F
-Ccox 4 1 1.851e-14F
-D2 3 2 DIODEM2_Q1
+*^^^^^^^^ End of included SPICE model from model/DiodeM1_Q1.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/DiodeM2_Q1.mod vvvvvvvv
* This is a diode model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.31.2003 by SDB
.model DIODEM2_Q1 D(IS=1e-24 N=1.0029 CJO=2.452e-14
+ VJ=0.8971 M=0.2292 FC=0.8 TNOM=21)
-D1 4 1 DIODEM1_Q1
-* This is a diode model used in the Agilent MSA-26 model
-* documented in 5980-2496E.pdf.
-* Model entered 3.31.2003 by SDB
-.model DIODEM1_Q1 D(IS=1.405e-17 N=1 CJO=2.281e-14
-+ VJ=0.729 M=0.44 FC=0.8 TNOM=21)
-Q1 1 3 2 BJTM1_Q1
+*^^^^^^^^ End of included SPICE model from model/DiodeM2_Q1.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/BJTM1_Q1.mod vvvvvvvv
* This is the BJT model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.31.2003 by SDB
@@ -88,10 +37,89 @@
+ EG=1.17 IS=4.475e-18 XTI=3 TNOM=21 CJC=2.921e-14
+ VJC=0.6775 MJC=0.3319 XCJC=4.398e-1 FC=0.8 CJE=7.546e-14
+ VJE=0.9907 MJE=0.5063 RB=9.301 IRB=8.18e-5 RBM=0.1 KF=1.643e-23)
-.ENDS Q1_MSA26F
+*^^^^^^^^ End of included SPICE model from model/BJTM1_Q1.mod ^^^^^^^^
+*
+*============== Begin SPICE netlist of main design ============
+Rbx 4 3 3.723
+Rcx 1 6 6.386
+Ceox 5 3 6.01e-15F
+Q1 1 3 2 BJTM1_Q1
+Re 5 2 2.158
+D2 3 2 DIODEM2_Q1
+D1 4 1 DIODEM1_Q1
+Ccox 4 1 1.851e-14F
+.ends Q1_MSA26F
+*******************************
+*^^^^^^^^ End of included SPICE model from Q1.cir ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from Q2.cir vvvvvvvv
+*******************************
+* Begin .SUBCKT model *
+* spice-sdb ver 2.10.2007 *
+*******************************
+.SUBCKT Q2_MSA26F 5 4 6
+*vvvvvvvv Included SPICE model from model/DiodeM1_Q2.mod vvvvvvvv
+* This is a diode model used in the Agilent MSA-26 model
+* documented in 5980-2496E.pdf.
+* Model entered 3.30.2003 by SDB
+.model DIODEM1_Q2 D(IS=5.62e-17 N=1 CJO=9.676e-14
++ VJ=0.729 M=0.44 FC=0.8 TNOM=21)
+*^^^^^^^^ End of included SPICE model from model/DiodeM1_Q2.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/DiodeM2_Q2.mod vvvvvvvv
+* This is a diode model used in the Agilent MSA-26 model
+* documented in 5980-2496E.pdf.
+* Model entered 3.30.2003 by SDB
+.model DIODEM2_Q2 D(IS=1e-24 N=1.0029 CJO=9.023e-14
++ VJ=0.8971 M=2.292e-1 FC=0.8 TNOM=21)
+*^^^^^^^^ End of included SPICE model from model/DiodeM2_Q2.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/BJTM1_Q2.mod vvvvvvvv
+* This is the BJT model used in the Agilent MSA-26 model
+* documented in 5980-2496E.pdf.
+* Model entered 3.30.2003 by SDB
+.model BJTM1_Q2 NPN(Bf=1e6 IKF=5.895e-1 ISE=2.838e-19 NE=1.006
++ VAF=44 NF=1 TF=5.37e-12 XTF=20 VTF=0.8 ITF=8.872e-1 PTF=22
++ XTB=0.7 BR=1 IKR=4.4e-2 NC=2 VAR=3.37 NR=1.005 TR=4e-9
++ EG=1.17 IS=1.79e-17 XTI=3 TNOM=21 CJC=3.717e-14
++ VJC=0.6775 MJC=0.3319 XCJC=4.398e-1 FC=0.8 CJE=3.217e-13
++ VJE=0.9907 MJE=0.5063 RB=2.325 IRB=3.272e-4 RBM=2.5e-2 KF=1.026e-24)
+*^^^^^^^^ End of included SPICE model from model/BJTM1_Q2.mod ^^^^^^^^
+*
+*============== Begin SPICE netlist of main design ============
+Rbx 4 3 0.463
+Q2 1 3 2 BJTM1_Q2
+Rcx 1 6 1.716
+Ceox 5 3 2.417e-14F
+Re 5 2 0.443
+D2 3 2 DIODEM2_Q2
+D1 4 1 DIODEM1_Q2
+Ccox 4 1 6.598e-14F
+.ends Q2_MSA26F
*******************************
+*^^^^^^^^ End of included SPICE model from Q2.cir ^^^^^^^^
+*
+*============== Begin SPICE netlist of main design ============
+L4 0 3 0.386nH
+Cout 7 Vout 47pF
+Vpwr 6 0 DC 5V
+Cpara2 0 7 0.155pF
R4 3 5 5
+Cpara1 0 9 0.158pF
R3 3 4 250
+L1 9 2 0.833nH
+.INCLUDE ./Simulation.cmd
R2 3 2 660
+X2 1 4 5 Q2_MSA26F
R1 2 1 560
-.END
+X1 1 2 4 Q1_MSA26F
+Cin Vin 9 47pF
+C1 3 5 4pF
+L7 1 7 0.407nH
+Lc 8 7 22nH
+Vin Vsource 0 dc 0 ac 1
+L6 3 0 0.313nH
+Rc 6 8 50
+RL 0 Vout 50
+Rth_in Vsource Vin 50
+.end
1.5.6.1 +2 -6 eda/geda/gaf/examples/RF_Amp/MSA-2643.sch
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MSA-2643.sch
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/examples/RF_Amp/MSA-2643.sch,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -b -r1.5 -r1.5.6.1
--- MSA-2643.sch 19 Jan 2005 02:49:17 -0000 1.5
+++ MSA-2643.sch 11 Feb 2007 23:58:17 -0000 1.5.6.1
@@ -1,4 +1,4 @@
-v 20041228 1
+v 20061020 1
C 32300 54900 1 90 0 resistor-1.sym
{
T 32600 55700 5 10 1 1 180 0 1
@@ -35,8 +35,6 @@
model-name=Q1_MSA26F
T 34500 54200 5 10 1 1 0 0 1
file=Q1.cir
-T 33000 53700 5 10 0 1 0 0 1
-source=Q1.sch
}
C 35900 52900 1 0 0 Q_Model.sym
{
@@ -46,8 +44,6 @@
model-name=Q2_MSA26F
T 37400 53400 5 10 1 1 0 0 1
file=Q2.cir
-T 35900 52900 5 10 0 1 0 0 1
-source=Q2.sch
}
N 32200 54900 32200 53500 4
N 33100 54400 32200 54400 4
@@ -160,7 +156,7 @@
T 27500 58000 5 10 1 1 0 0 1
refdes=A1
T 27900 57700 5 10 1 1 0 0 1
-file=/home/sdb/RF_Amp/Simulation.cmd
+file=./Simulation.cmd
}
L 30000 57200 30000 50500 3 0 0 0 -1 -1
L 39500 57200 39500 50500 3 0 0 0 -1 -1
1.1.6.1 +25 -15 eda/geda/gaf/examples/RF_Amp/Q1.cir
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Q1.cir
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/examples/RF_Amp/Q1.cir,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -b -r1.1 -r1.1.6.1
--- Q1.cir 25 May 2003 19:03:32 -0000 1.1
+++ Q1.cir 11 Feb 2007 23:58:17 -0000 1.1.6.1
@@ -1,26 +1,25 @@
*******************************
* Begin .SUBCKT model *
-* spice-SDB ver 3.30.2003 *
+* spice-sdb ver 2.10.2007 *
*******************************
-.SUBCKT Q1_MSA26F 6 4 5
-Re 5 2 2.158
-Rcx 1 6 6.386
-Rbx 4 3 3.723
-Ceox 5 3 6.01e-15F
-Ccox 4 1 1.851e-14F
-D2 3 2 DIODEM2_Q1
+.SUBCKT Q1_MSA26F 5 4 6
+*vvvvvvvv Included SPICE model from model/DiodeM1_Q1.mod vvvvvvvv
* This is a diode model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.31.2003 by SDB
-.model DIODEM2_Q1 D(IS=1e-24 N=1.0029 CJO=2.452e-14
-+ VJ=0.8971 M=0.2292 FC=0.8 TNOM=21)
-D1 4 1 DIODEM1_Q1
+.model DIODEM1_Q1 D(IS=1.405e-17 N=1 CJO=2.281e-14
++ VJ=0.729 M=0.44 FC=0.8 TNOM=21)
+*^^^^^^^^ End of included SPICE model from model/DiodeM1_Q1.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/DiodeM2_Q1.mod vvvvvvvv
* This is a diode model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.31.2003 by SDB
-.model DIODEM1_Q1 D(IS=1.405e-17 N=1 CJO=2.281e-14
-+ VJ=0.729 M=0.44 FC=0.8 TNOM=21)
-Q1 1 3 2 BJTM1_Q1
+.model DIODEM2_Q1 D(IS=1e-24 N=1.0029 CJO=2.452e-14
++ VJ=0.8971 M=0.2292 FC=0.8 TNOM=21)
+*^^^^^^^^ End of included SPICE model from model/DiodeM2_Q1.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/BJTM1_Q1.mod vvvvvvvv
* This is the BJT model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.31.2003 by SDB
@@ -30,5 +29,16 @@
+ EG=1.17 IS=4.475e-18 XTI=3 TNOM=21 CJC=2.921e-14
+ VJC=0.6775 MJC=0.3319 XCJC=4.398e-1 FC=0.8 CJE=7.546e-14
+ VJE=0.9907 MJE=0.5063 RB=9.301 IRB=8.18e-5 RBM=0.1 KF=1.643e-23)
-.ENDS Q1_MSA26F
+*^^^^^^^^ End of included SPICE model from model/BJTM1_Q1.mod ^^^^^^^^
+*
+*============== Begin SPICE netlist of main design ============
+Rbx 4 3 3.723
+Rcx 1 6 6.386
+Ceox 5 3 6.01e-15F
+Q1 1 3 2 BJTM1_Q1
+Re 5 2 2.158
+D2 3 2 DIODEM2_Q1
+D1 4 1 DIODEM1_Q1
+Ccox 4 1 1.851e-14F
+.ends Q1_MSA26F
*******************************
1.1.6.1 +25 -15 eda/geda/gaf/examples/RF_Amp/Q2.cir
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Q2.cir
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/examples/RF_Amp/Q2.cir,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -b -r1.1 -r1.1.6.1
--- Q2.cir 25 May 2003 19:03:32 -0000 1.1
+++ Q2.cir 11 Feb 2007 23:58:17 -0000 1.1.6.1
@@ -1,26 +1,25 @@
*******************************
* Begin .SUBCKT model *
-* spice-SDB ver 3.30.2003 *
+* spice-sdb ver 2.10.2007 *
*******************************
-.SUBCKT Q2_MSA26F 6 4 5
-Re 5 2 0.443
-Rcx 1 6 1.716
-Rbx 4 3 0.463
-Ceox 5 3 2.417e-14F
-Ccox 4 1 6.598e-14F
-D2 3 2 DIODEM2_Q2
+.SUBCKT Q2_MSA26F 5 4 6
+*vvvvvvvv Included SPICE model from model/DiodeM1_Q2.mod vvvvvvvv
* This is a diode model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.30.2003 by SDB
-.model DIODEM2_Q2 D(IS=1e-24 N=1.0029 CJO=9.023e-14
-+ VJ=0.8971 M=2.292e-1 FC=0.8 TNOM=21)
-D1 4 1 DIODEM1_Q2
+.model DIODEM1_Q2 D(IS=5.62e-17 N=1 CJO=9.676e-14
++ VJ=0.729 M=0.44 FC=0.8 TNOM=21)
+*^^^^^^^^ End of included SPICE model from model/DiodeM1_Q2.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/DiodeM2_Q2.mod vvvvvvvv
* This is a diode model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.30.2003 by SDB
-.model DIODEM1_Q2 D(IS=5.62e-17 N=1 CJO=9.676e-14
-+ VJ=0.729 M=0.44 FC=0.8 TNOM=21)
-Q2 1 3 2 BJTM1_Q2
+.model DIODEM2_Q2 D(IS=1e-24 N=1.0029 CJO=9.023e-14
++ VJ=0.8971 M=2.292e-1 FC=0.8 TNOM=21)
+*^^^^^^^^ End of included SPICE model from model/DiodeM2_Q2.mod ^^^^^^^^
+*
+*vvvvvvvv Included SPICE model from model/BJTM1_Q2.mod vvvvvvvv
* This is the BJT model used in the Agilent MSA-26 model
* documented in 5980-2496E.pdf.
* Model entered 3.30.2003 by SDB
@@ -30,5 +29,16 @@
+ EG=1.17 IS=1.79e-17 XTI=3 TNOM=21 CJC=3.717e-14
+ VJC=0.6775 MJC=0.3319 XCJC=4.398e-1 FC=0.8 CJE=3.217e-13
+ VJE=0.9907 MJE=0.5063 RB=2.325 IRB=3.272e-4 RBM=2.5e-2 KF=1.026e-24)
-.ENDS Q2_MSA26F
+*^^^^^^^^ End of included SPICE model from model/BJTM1_Q2.mod ^^^^^^^^
+*
+*============== Begin SPICE netlist of main design ============
+Rbx 4 3 0.463
+Q2 1 3 2 BJTM1_Q2
+Rcx 1 6 1.716
+Ceox 5 3 2.417e-14F
+Re 5 2 0.443
+D2 3 2 DIODEM2_Q2
+D1 4 1 DIODEM1_Q2
+Ccox 4 1 6.598e-14F
+.ends Q2_MSA26F
*******************************
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs