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

devices/asrc, cleanup #7/9, use '[]' to access array elements

This commit is contained in:
rlar 2015-04-11 21:27:46 +02:00
parent 036a45f348
commit 39a25ba114
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/spicelib/devices/asrc/asrcconv.c
View File

@ -38,10 +38,10 @@ ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt)
for (i = 0; i < here->ASRCtree->numVars; i++) { for (i = 0; i < here->ASRCtree->numVars; i++) {
if (here->ASRCtree->varTypes[i] == IF_INSTANCE) { if (here->ASRCtree->varTypes[i] == IF_INSTANCE) {
branch = CKTfndBranch(ckt, here->ASRCtree->vars[i].uValue); branch = CKTfndBranch(ckt, here->ASRCtree->vars[i].uValue);
asrc_vals[i] = *(ckt->CKTrhsOld + branch); asrc_vals[i] = ckt->CKTrhsOld[branch];
} else { } else {
node_num = here->ASRCtree->vars[i].nValue->number; node_num = here->ASRCtree->vars[i].nValue->number;
asrc_vals[i] = *(ckt->CKTrhsOld + node_num); asrc_vals[i] = ckt->CKTrhsOld[node_num];
} }
} }

10
src/spicelib/devices/asrc/asrcload.c
View File

@ -62,10 +62,10 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt)
for (i = 0; i < here->ASRCtree->numVars; i++) for (i = 0; i < here->ASRCtree->numVars; i++)
if (here->ASRCtree->varTypes[i] == IF_INSTANCE) { if (here->ASRCtree->varTypes[i] == IF_INSTANCE) {
int branch = CKTfndBranch(ckt, here->ASRCtree->vars[i].uValue); int branch = CKTfndBranch(ckt, here->ASRCtree->vars[i].uValue);
asrc_vals[i] = *(ckt->CKTrhsOld + branch); asrc_vals[i] = ckt->CKTrhsOld[branch];
} else { } else {
int node_num = (here->ASRCtree->vars[i].nValue) -> number; int node_num = (here->ASRCtree->vars[i].nValue) -> number;
asrc_vals[i] = *(ckt->CKTrhsOld + node_num); asrc_vals[i] = ckt->CKTrhsOld[node_num];
} }
if (here->ASRCtree->IFeval(here->ASRCtree, ckt->CKTgmin, &rhs, asrc_vals, asrc_derivs) != OK) if (here->ASRCtree->IFeval(here->ASRCtree, ckt->CKTgmin, &rhs, asrc_vals, asrc_derivs) != OK)
@ -120,10 +120,10 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt)
/* Insert the RHS */ /* Insert the RHS */
if (here->ASRCtype == ASRC_VOLTAGE) { if (here->ASRCtype == ASRC_VOLTAGE) {
*(ckt->CKTrhs + (here->ASRCbranch)) += factor * rhs; ckt->CKTrhs[here->ASRCbranch] += factor * rhs;
} else { } else {
*(ckt->CKTrhs + (here->ASRCposNode)) -= factor * rhs; ckt->CKTrhs[here->ASRCposNode] -= factor * rhs;
*(ckt->CKTrhs + (here->ASRCnegNode)) += factor * rhs; ckt->CKTrhs[here->ASRCnegNode] += factor * rhs;
} }
/* Store the rhs for small signal analysis */ /* Store the rhs for small signal analysis */