luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

devices/res, bug fix, extend ac-resistance to the pz analysis

This commit is contained in:
rlar 2015-04-14 19:36:02 +02:00
parent b6b76ad035
commit 0b4bcf31f4
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/spicelib/devices/res/resload.c
View File

@ -47,7 +47,7 @@ int
RESacload(GENmodel *inModel, CKTcircuit *ckt)
{
RESmodel *model = (RESmodel *)inModel;
double m;
double g;
NG_IGNORE(ckt);
@ -59,19 +59,15 @@ RESacload(GENmodel *inModel, CKTcircuit *ckt)
for (here = model->RESinstances; here != NULL ;
here = here->RESnextInstance) {
m = (here->RESm);
if (here->RESacresGiven)
g = here->RESm * here->RESacConduct;
else
g = here->RESm * here->RESconduct;
if(here->RESacresGiven) {
*(here->RESposPosptr) += m * here->RESacConduct;
*(here->RESnegNegptr) += m * here->RESacConduct;
*(here->RESposNegptr) -= m * here->RESacConduct;
*(here->RESnegPosptr) -= m * here->RESacConduct;
} else {
*(here->RESposPosptr) += m * here->RESconduct;
*(here->RESnegNegptr) += m * here->RESconduct;
*(here->RESposNegptr) -= m * here->RESconduct;
*(here->RESnegPosptr) -= m * here->RESconduct;
}
*(here->RESposPosptr) += g;
*(here->RESnegNegptr) += g;
*(here->RESposNegptr) -= g;
*(here->RESnegPosptr) -= g;
}
}
return(OK);

17
src/spicelib/devices/res/respzld.c
View File

@ -21,7 +21,7 @@ RESpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
{
RESmodel *model = (RESmodel *)inModel;
RESinstance *here;
double m;
double g;
NG_IGNORE(s);
NG_IGNORE(ckt);
@ -33,12 +33,15 @@ RESpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
for (here = model->RESinstances; here != NULL ;
here=here->RESnextInstance) {
m = here->RESm;
*(here->RESposPosptr) += m * here->RESconduct;
*(here->RESnegNegptr) += m * here->RESconduct;
*(here->RESposNegptr) -= m * here->RESconduct;
*(here->RESnegPosptr) -= m * here->RESconduct;
if (here->RESacresGiven)
g = here->RESm * here->RESacConduct;
else
g = here->RESm * here->RESconduct;
*(here->RESposPosptr) += g;
*(here->RESnegNegptr) += g;
*(here->RESposNegptr) -= g;
*(here->RESnegPosptr) -= g;
}
}
return(OK);