Merge branch 'pre-master-43' of ssh://git.code.sf.net/p/ngspice/ngspice into pre-master-43
This commit is contained in:
commit
e4d86e6e86
|
|
@ -210,8 +210,6 @@ void DIOtempUpdate(DIOmodel *inModel, DIOinstance *here, double Temp, CKTcircuit
|
|||
here->DIOtDepSWCap=model->DIOdepletionSWcapCoeff*
|
||||
here->DIOtJctSWPot;
|
||||
/* and Vcrit */
|
||||
vte=model->DIOemissionCoeff*vt;
|
||||
|
||||
here->DIOtVcrit = vte * log(vte/(CONSTroot2*here->DIOtSatCur));
|
||||
|
||||
/* limit junction potential to max of 1/FC */
|
||||
|
|
|
|||
|
|
@ -128,10 +128,13 @@ MOS1noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
|
|||
/* linear region */
|
||||
alpha = 1.0 - (vds*inst->MOS1mode/(model->MOS1type*inst->MOS1vdsat));
|
||||
}
|
||||
}
|
||||
beta = inst->MOS1tTransconductance * inst->MOS1m *
|
||||
beta = inst->MOS1tTransconductance * inst->MOS1m *
|
||||
inst->MOS1w/(inst->MOS1l - 2 * model->MOS1latDiff);
|
||||
Sid = 2.0 / 3.0 * beta * vgst * (1.0+alpha+alpha*alpha) / (1.0+alpha) * model->MOS1gdsnoi;
|
||||
Sid = 2.0 / 3.0 * beta * vgst * (1.0+alpha+alpha*alpha) / (1.0+alpha) * model->MOS1gdsnoi;
|
||||
} else {
|
||||
/* subthreshold region */
|
||||
Sid = 0.0;
|
||||
}
|
||||
}
|
||||
|
||||
NevalSrcInstanceTemp( & noizDens[MOS1IDNOIZ], & lnNdens[MOS1IDNOIZ],
|
||||
|
|
|
|||
|
|
@ -117,10 +117,13 @@ MOS2noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
|
|||
/* linear region */
|
||||
alpha = 1.0 - (vds*inst->MOS2mode/(model->MOS2type*inst->MOS2vdsat));
|
||||
}
|
||||
}
|
||||
beta = inst->MOS2tTransconductance * inst->MOS2m *
|
||||
beta = inst->MOS2tTransconductance * inst->MOS2m *
|
||||
inst->MOS2w/(inst->MOS2l - 2 * model->MOS2latDiff);
|
||||
Sid = 2.0 / 3.0 * beta * vgst * (1.0+alpha+alpha*alpha) / (1.0+alpha) * model->MOS2gdsnoi;
|
||||
Sid = 2.0 / 3.0 * beta * vgst * (1.0+alpha+alpha*alpha) / (1.0+alpha) * model->MOS2gdsnoi;
|
||||
} else {
|
||||
/* subthreshold region */
|
||||
Sid = 0.0;
|
||||
}
|
||||
}
|
||||
|
||||
NevalSrcInstanceTemp( & noizDens[MOS2IDNOIZ], & lnNdens[MOS2IDNOIZ],
|
||||
|
|
|
|||
|
|
@ -117,10 +117,13 @@ MOS3noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
|
|||
/* linear region */
|
||||
alpha = 1.0 - (vds*inst->MOS3mode/(model->MOS3type*inst->MOS3vdsat));
|
||||
}
|
||||
}
|
||||
beta = inst->MOS3tTransconductance * inst->MOS3m *
|
||||
beta = inst->MOS3tTransconductance * inst->MOS3m *
|
||||
inst->MOS3w/(inst->MOS3l - 2 * model->MOS3latDiff);
|
||||
Sid = 2.0 / 3.0 * beta * vgst * (1.0+alpha+alpha*alpha) / (1.0+alpha) * model->MOS3gdsnoi;
|
||||
Sid = 2.0 / 3.0 * beta * vgst * (1.0+alpha+alpha*alpha) / (1.0+alpha) * model->MOS3gdsnoi;
|
||||
} else {
|
||||
/* subthreshold region */
|
||||
Sid = 0.0;
|
||||
}
|
||||
}
|
||||
|
||||
NevalSrcInstanceTemp( & noizDens[MOS3IDNOIZ], & lnNdens[MOS3IDNOIZ],
|
||||
|
|
|
|||
Loading…
Reference in New Issue