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