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

polish saj's resume fix, use it for `acan' as well

This commit is contained in:
rlar 2011-07-24 17:20:46 +00:00
parent 6613127f7d
commit a3969da827
5 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2011-07-24 Robert Larice
* src/spicelib/analysis/acan.c ,
* src/spicelib/analysis/dctran.c ,
* src/spicelib/analysis/dctrcurv.c ,
* src/spicelib/analysis/noisean.c :
polish saj's resume fix, use it for `acan' as well
saj's fix was applied 2003-07-23 19:36
avoid (non)-usage of uninitialized variables
FIXME, get rid of the `evil' number `666', find a better solution
2011-07-24 Robert Larice 2011-07-24 Robert Larice
* src/spicelib/analysis/noisean.c : * src/spicelib/analysis/noisean.c :
bug fix, stepsize in `noisean' bug fix, stepsize in `noisean'

8
src/spicelib/analysis/acan.c
View File

@ -179,11 +179,9 @@ ACan(CKTcircuit *ckt, int restart)
} else { /* continue previous analysis */ } else { /* continue previous analysis */
freq = ((ACAN*)ckt->CKTcurJob)->ACsaveFreq; freq = ((ACAN*)ckt->CKTcurJob)->ACsaveFreq;
((ACAN*)ckt->CKTcurJob)->ACsaveFreq = 0; /* clear the 'old' frequency */ ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = 0; /* clear the 'old' frequency */
/* fix resume? saj*/ /* fix resume? saj, indeed !*/
error = SPfrontEnd->OUTpBeginPlot (ckt, error = SPfrontEnd->OUTpBeginPlot
ckt->CKTcurJob, (NULL, NULL, NULL, NULL, 0, 666, NULL, 666, &acPlot);
ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList,
IF_COMPLEX,&acPlot);
/* saj*/ /* saj*/
} }

13
src/spicelib/analysis/dctran.c
View File

@ -346,16 +346,9 @@ DCtran(CKTcircuit *ckt,
if(ckt->CKTminBreak==0) ckt->CKTminBreak=ckt->CKTmaxStep*5e-5; if(ckt->CKTminBreak==0) ckt->CKTminBreak=ckt->CKTmaxStep*5e-5;
firsttime=0; firsttime=0;
/* To get rawfile working saj*/ /* To get rawfile working saj*/
/* get namelist again */ error = SPfrontEnd->OUTpBeginPlot
error = CKTnames(ckt,&numNames,&nameList); (NULL, NULL, NULL, NULL, 0, 666, NULL, 666,
if(error) return(error); &(((TRANan*)ckt->CKTcurJob)->TRANplot));
/* get timeUiD again */
SPfrontEnd->IFnewUid (ckt, &timeUid, NULL,
"time", UID_OTHER, NULL);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,timeUid,IF_REAL,666,nameList,
666,&(((TRANan*)ckt->CKTcurJob)->TRANplot));/* magic 666 nums as flags */
tfree(nameList);
if(error) { if(error) {
fprintf(stderr, "Couldn't relink rawfile\n"); fprintf(stderr, "Couldn't relink rawfile\n");
return error; return error;

5
src/spicelib/analysis/dctrcurv.c
View File

@ -66,9 +66,8 @@ DCtrCurv(CKTcircuit *ckt, int restart)
/* continuing */ /* continuing */
i = cv->TRCVnestState; i = cv->TRCVnestState;
/* resume to work? saj*/ /* resume to work? saj*/
error = SPfrontEnd->OUTpBeginPlot (ckt, error = SPfrontEnd->OUTpBeginPlot
ckt->CKTcurJob, ckt->CKTcurJob->JOBname, (NULL, NULL, NULL, NULL, 0, 666, NULL, 666, &plot);
varUid,IF_REAL,666,nameList, 666,&plot);
goto resume; goto resume;
} }
ckt->CKTtime = 0; ckt->CKTtime = 0;

6
src/spicelib/analysis/noisean.c
View File

@ -166,10 +166,8 @@ NOISEan (CKTcircuit *ckt, int restart)
data->outNoiz = job->NsavOnoise; data->outNoiz = job->NsavOnoise;
data->inNoise = job->NsavInoise; data->inNoise = job->NsavInoise;
/* saj resume rawfile fix*/ /* saj resume rawfile fix*/
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, error = SPfrontEnd->OUTpBeginPlot
"Noise Spectral Density Curves - (V^2 or A^2)/Hz", (NULL, NULL, NULL, NULL, 0, 666, NULL, 666, &(data->NplotPtr));
freqUid,IF_REAL,666,data->namelist,666,
&(data->NplotPtr));
/*saj*/ /*saj*/
} }