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

cleanup, emphasise CKTrhs being an array 

when accessing slot [0]
This commit is contained in:
rlar 2018-01-29 17:48:17 +01:00
parent 560cb6e970
commit caf3115733
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/maths/ni/niaciter.c
View File

@ -69,12 +69,12 @@ retry:
ckt->CKTirhsSpare);
ckt->CKTstat->STATsolveTime += SPfrontEnd->IFseconds() - startTime;
*ckt->CKTrhs = 0;
*ckt->CKTrhsSpare = 0;
*ckt->CKTrhsOld = 0;
*ckt->CKTirhs = 0;
*ckt->CKTirhsSpare = 0;
*ckt->CKTirhsOld = 0;
ckt->CKTrhs[0] = 0;
ckt->CKTrhsSpare[0] = 0;
ckt->CKTrhsOld[0] = 0;
ckt->CKTirhs[0] = 0;
ckt->CKTirhsSpare[0] = 0;
ckt->CKTirhsOld[0] = 0;
SWAP(double *, ckt->CKTirhs, ckt->CKTirhsOld);

12
src/maths/ni/niditer.c
View File

@ -69,12 +69,12 @@ skip:
ckt->CKTirhs, ckt->CKTrhsSpare,
ckt->CKTirhsSpare);
*ckt->CKTrhs = 0;
*ckt->CKTrhsSpare = 0;
*ckt->CKTrhsOld = 0;
*ckt->CKTirhs = 0;
*ckt->CKTirhsSpare = 0;
*ckt->CKTirhsOld = 0;
ckt->CKTrhs[0] = 0;
ckt->CKTrhsSpare[0] = 0;
ckt->CKTrhsOld[0] = 0;
ckt->CKTirhs[0] = 0;
ckt->CKTirhsSpare[0] = 0;
ckt->CKTirhsOld[0] = 0;
SWAP(double *, ckt->CKTirhs, ckt->CKTirhsOld);

18
src/maths/ni/niiter.c
View File

@ -164,17 +164,17 @@ NIiter(CKTcircuit *ckt, int maxIter)
SPfrontEnd->IFseconds() - startTime;
#ifdef STEPDEBUG
/*XXXX*/
if (*ckt->CKTrhs != 0.0)
printf("NIiter: CKTrhs[0] = %g\n", *ckt->CKTrhs);
if (*ckt->CKTrhsSpare != 0.0)
printf("NIiter: CKTrhsSpare[0] = %g\n", *ckt->CKTrhsSpare);
if (*ckt->CKTrhsOld != 0.0)
printf("NIiter: CKTrhsOld[0] = %g\n", *ckt->CKTrhsOld);
if (ckt->CKTrhs[0] != 0.0)
printf("NIiter: CKTrhs[0] = %g\n", ckt->CKTrhs[0]);
if (ckt->CKTrhsSpare[0] != 0.0)
printf("NIiter: CKTrhsSpare[0] = %g\n", ckt->CKTrhsSpare[0]);
if (ckt->CKTrhsOld[0] != 0.0)
printf("NIiter: CKTrhsOld[0] = %g\n", ckt->CKTrhsOld[0]);
/*XXXX*/
#endif
*ckt->CKTrhs = 0;
*ckt->CKTrhsSpare = 0;
*ckt->CKTrhsOld = 0;
ckt->CKTrhs[0] = 0;
ckt->CKTrhsSpare[0] = 0;
ckt->CKTrhsOld[0] = 0;
if (iterno > maxIter) {
/* fprintf(stderr, "too many iterations without convergence: %d iter's (max iter == %d)\n",

5
src/maths/ni/niniter.c
View File

@ -33,6 +33,7 @@ NInzIter(CKTcircuit *ckt, int posDrive, int negDrive)
ckt->CKTrhs [negDrive] = -1.0;
SMPcaSolve(ckt->CKTmatrix, ckt->CKTrhs, ckt->CKTirhs, ckt->CKTrhsSpare,
ckt->CKTirhsSpare);
*ckt->CKTrhs = 0.0;
*ckt->CKTirhs = 0.0;
ckt->CKTrhs [0] = 0.0;
ckt->CKTirhs [0] = 0.0;
}