Merge branch 'pre-master-47' of ssh://git.code.sf.net/p/ngspice/ngspice into pre-master-47
This commit is contained in:
commit
93c6b997ed
|
|
@ -85,7 +85,7 @@ BJTnoise(int mode, int operation, GENmodel*genmodel, CKTcircuit *ckt,
|
|||
case N_DENS:
|
||||
|
||||
if (inst->BJTtempGiven)
|
||||
dtemp = inst->BJTtemp - ckt->CKTtemp + (model->BJTtnom-CONSTCtoK);
|
||||
dtemp = inst->BJTtemp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->BJTdtemp;
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ DIOnoise(int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
|
|||
case N_DENS:
|
||||
|
||||
if (inst->DIOtempGiven)
|
||||
dtemp = inst->DIOtemp - ckt->CKTtemp + (model->DIOnomTemp-CONSTCtoK);
|
||||
dtemp = inst->DIOtemp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->DIOdtemp;
|
||||
|
||||
|
|
@ -135,6 +135,14 @@ DIOnoise(int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
|
|||
noizDens[DIOTOTNOIZ] += noizDens[DIORSSWNOIZ] +
|
||||
noizDens[DIOIDSWNOIZ] +
|
||||
noizDens[DIOFLSWNOIZ];
|
||||
} else {
|
||||
/* no sidewall model */
|
||||
noizDens[DIORSSWNOIZ] = 0.0;
|
||||
noizDens[DIOIDSWNOIZ] = 0.0;
|
||||
noizDens[DIOFLSWNOIZ] = 0.0;
|
||||
lnNdens[DIORSSWNOIZ] = log(N_MINLOG);
|
||||
lnNdens[DIOIDSWNOIZ] = log(N_MINLOG);
|
||||
lnNdens[DIOFLSWNOIZ] = log(N_MINLOG);
|
||||
}
|
||||
|
||||
lnNdens[DIOTOTNOIZ] =
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ HICUMnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata
|
|||
case N_DENS:
|
||||
|
||||
if (here->HICUMtempGiven)
|
||||
dtemp = here->HICUMtemp - ckt->CKTtemp + (model->HICUMtnom-CONSTCtoK);
|
||||
dtemp = here->HICUMtemp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = here->HICUMdtemp;
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ JFETnoise(int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d
|
|||
case N_DENS:
|
||||
|
||||
if (inst->JFETtempGiven)
|
||||
dtemp = inst->JFETtemp - ckt->CKTtemp + (model->JFETtnom-CONSTCtoK);
|
||||
dtemp = inst->JFETtemp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->JFETdtemp;
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ MOS1noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
|
|||
case N_DENS:
|
||||
|
||||
if (inst->MOS1tempGiven)
|
||||
dtemp = inst->MOS1temp - ckt->CKTtemp + (model->MOS1tnom-CONSTCtoK);
|
||||
dtemp = inst->MOS1temp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->MOS1dtemp;
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ MOS2noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
|
|||
case N_DENS:
|
||||
|
||||
if (inst->MOS2tempGiven)
|
||||
dtemp = inst->MOS2temp - ckt->CKTtemp + (model->MOS2tnom-CONSTCtoK);
|
||||
dtemp = inst->MOS2temp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->MOS2dtemp;
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ MOS3noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
|
|||
case N_DENS:
|
||||
|
||||
if (inst->MOS3tempGiven)
|
||||
dtemp = inst->MOS3temp - ckt->CKTtemp + (model->MOS3tnom-CONSTCtoK);
|
||||
dtemp = inst->MOS3temp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->MOS3dtemp;
|
||||
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ RESnoise(int mode, int operation, GENmodel*genmodel, CKTcircuit *ckt,
|
|||
case N_DENS:
|
||||
|
||||
if (inst->REStempGiven)
|
||||
dtemp = inst->REStemp - ckt->CKTtemp + (model->REStnom-CONSTCtoK);
|
||||
dtemp = inst->REStemp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->RESdtemp;
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *
|
|||
case N_DENS:
|
||||
|
||||
if (inst->VBICtempGiven)
|
||||
dtemp = inst->VBICtemp - ckt->CKTtemp + (model->VBICtnom-CONSTCtoK);
|
||||
dtemp = inst->VBICtemp - ckt->CKTtemp;
|
||||
else
|
||||
dtemp = inst->VBICdtemp;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue