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

cleanup OUTpBeginPlot() invocations 

checked for object file invariance
This commit is contained in:
rlar 2013-07-14 15:11:00 +02:00
parent 40414ead49
commit 2f2da2bab2
11 changed files with 130 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontend/spiceif.c
View File

@ -1616,11 +1616,11 @@ void com_snload(wordlist *wl)
return;
}
SPfrontEnd->IFnewUid (ckt, &timeUid, NULL, "time", UID_OTHER, NULL);
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
timeUid, IF_REAL,
numNames, nameList, IF_REAL, &(((TRANan*)ckt->CKTcurJob)->TRANplot));
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
timeUid, IF_REAL,
numNames, nameList, IF_REAL,
&(((TRANan*)ckt->CKTcurJob)->TRANplot));
if (error) {
fprintf(cp_err, "error in CKTnames\n");
return;

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

@ -150,11 +150,11 @@ ACan(CKTcircuit *ckt, int restart)
* Moreover the begin plot has not even been done yet at this
* point...
*/
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
NULL, IF_REAL,
numNames, nameList, IF_REAL, &acPlot);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
NULL, IF_REAL,
numNames, nameList, IF_REAL,
&acPlot);
tfree(nameList);
ipc_send_dcop_prefix();
@ -175,11 +175,11 @@ ACan(CKTcircuit *ckt, int restart)
if (ckt->CKTkeepOpInfo) {
/* Dump operating point. */
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"AC Operating Point",
NULL, IF_REAL,
numNames, nameList, IF_REAL, &plot);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"AC Operating Point",
NULL, IF_REAL,
numNames, nameList, IF_REAL,
&plot);
if(error) return(error);
CKTdump(ckt, 0.0, plot);
SPfrontEnd->OUTendPlot (plot);
@ -188,11 +188,11 @@ ACan(CKTcircuit *ckt, int restart)
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
"frequency", UID_OTHER, NULL);
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX, &acPlot);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX,
&acPlot);
tfree(nameList);
if(error) return(error);
@ -206,11 +206,11 @@ ACan(CKTcircuit *ckt, int restart)
freq = job->ACsaveFreq;
job->ACsaveFreq = 0; /* clear the 'old' frequency */
/* fix resume? saj, indeed !*/
error = SPfrontEnd->OUTpBeginPlot (
NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666, &acPlot);
error = SPfrontEnd->OUTpBeginPlot (NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666,
&acPlot);
/* saj*/
}

10
src/spicelib/analysis/cktsens.c
View File

@ -197,11 +197,11 @@ int sens_sens(CKTcircuit *ckt, int restart)
"frequency", UID_OTHER, NULL);
}
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
freq_name, IF_REAL,
num_vars, output_names, type, &sen_data);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
freq_name, IF_REAL,
num_vars, output_names, type,
&sen_data);
if (error)
return error;

10
src/spicelib/analysis/dcop.c
View File

@ -50,11 +50,11 @@ DCop(CKTcircuit *ckt, int notused)
error = CKTnames(ckt,&numNames,&nameList);
if(error) return(error);
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
NULL, IF_REAL,
numNames, nameList, IF_REAL, &plot);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
NULL, IF_REAL,
numNames, nameList, IF_REAL,
&plot);
tfree(nameList); /* va: nameList not used any longer, it was a memory leak */
if(error) return(error);

27
src/spicelib/analysis/dcpss.c
View File

@ -239,11 +239,11 @@ DCpss(CKTcircuit *ckt,
if(error) return(error);
SPfrontEnd->IFnewUid (ckt, &timeUid, NULL,
"time", UID_OTHER, NULL);
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"Time Domain Periodic Steady State Analysis",
timeUid, IF_REAL,
numNames, nameList, IF_REAL, &(job->PSSplot_td));
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"Time Domain Periodic Steady State Analysis",
timeUid, IF_REAL,
numNames, nameList, IF_REAL,
&(job->PSSplot_td));
tfree(nameList);
if(error) return(error);
@ -406,11 +406,11 @@ DCpss(CKTcircuit *ckt,
if(ckt->CKTminBreak==0) ckt->CKTminBreak=ckt->CKTmaxStep*5e-5;
firsttime=0;
/* To get rawfile working saj*/
error = SPfrontEnd->OUTpBeginPlot (
NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666, &(job->PSSplot_td));
error = SPfrontEnd->OUTpBeginPlot (NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666,
&(job->PSSplot_td));
if(error) {
fprintf(stderr, "Couldn't relink rawfile\n");
return error;
@ -1039,8 +1039,11 @@ DCpss(CKTcircuit *ckt,
if (error)
return (error) ;
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL) ;
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "Frequency Domain Periodic Steady State Analysis",
freqUid, IF_REAL, numNames, nameList, IF_REAL, &(job->PSSplot_fd)) ;
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"Frequency Domain Periodic Steady State Analysis",
freqUid, IF_REAL,
numNames, nameList, IF_REAL,
&(job->PSSplot_fd)) ;
tfree (nameList) ;
SPfrontEnd->OUTattributes (job->PSSplot_fd, NULL, PLOT_COMB, NULL) ;

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

@ -156,11 +156,11 @@ DCtran(CKTcircuit *ckt,
if(error) return(error);
SPfrontEnd->IFnewUid (ckt, &timeUid, NULL,
"time", UID_OTHER, NULL);
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
timeUid, IF_REAL,
numNames, nameList, IF_REAL, &(job->TRANplot));
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
timeUid, IF_REAL,
numNames, nameList, IF_REAL,
&(job->TRANplot));
tfree(nameList);
if(error) return(error);
@ -350,11 +350,11 @@ DCtran(CKTcircuit *ckt,
if(ckt->CKTminBreak==0) ckt->CKTminBreak=ckt->CKTmaxStep*5e-5;
firsttime=0;
/* To get rawfile working saj*/
error = SPfrontEnd->OUTpBeginPlot (
NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666, &(job->TRANplot));
error = SPfrontEnd->OUTpBeginPlot (NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666,
&(job->TRANplot));
if(error) {
fprintf(stderr, "Couldn't relink rawfile\n");
return error;

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

@ -67,11 +67,11 @@ DCtrCurv(CKTcircuit *ckt, int restart)
/* continuing */
i = job->TRCVnestState;
/* resume to work? saj*/
error = SPfrontEnd->OUTpBeginPlot (
NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666, &plot);
error = SPfrontEnd->OUTpBeginPlot (NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666,
&plot);
goto resume;
}
ckt->CKTtime = 0;
@ -218,11 +218,11 @@ found:;
} /* TEMP_CODE */
} /* rcode*/
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
varUid, IF_REAL,
numNames, nameList, IF_REAL, &plot);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
varUid, IF_REAL,
numNames, nameList, IF_REAL,
&plot);
tfree(nameList);
if(error) return(error);

60
src/spicelib/analysis/distoan.c
View File

@ -107,11 +107,11 @@ time1 = SPfrontEnd->IFseconds();
if (ckt->CKTkeepOpInfo) {
/* Dump operating point. */
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"Distortion Operating Point",
NULL, IF_REAL,
numNames, nameList, IF_REAL, &acPlot);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"Distortion Operating Point",
NULL, IF_REAL,
numNames, nameList, IF_REAL,
&acPlot);
if(error) return(error);
CKTdump(ckt, 0.0, acPlot);
SPfrontEnd->OUTendPlot (acPlot);
@ -518,11 +518,11 @@ time1 = SPfrontEnd->IFseconds();
if(error) return(error);
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
"frequency", UID_OTHER, NULL);
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"DISTORTION - 2nd harmonic",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX, &acPlot);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"DISTORTION - 2nd harmonic",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX,
&acPlot);
if (job->DstepType != LINEAR) {
SPfrontEnd->OUTattributes (acPlot, NULL,
OUT_SCALE_LOG, NULL);
@ -544,11 +544,11 @@ time1 = SPfrontEnd->IFseconds();
if(error) return(error);
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
"frequency", UID_OTHER, NULL);
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"DISTORTION - 3rd harmonic",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX, &acPlot);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"DISTORTION - 3rd harmonic",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX,
&acPlot);
for (i=0; i< displacement ; i++)
{
DkerProc(D_THRF1,job->r3H11stor[i],
@ -568,11 +568,11 @@ time1 = SPfrontEnd->IFseconds();
if(error) return(error);
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
"frequency", UID_OTHER, NULL);
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"DISTORTION - IM: f1+f2",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX, &acPlot);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"DISTORTION - IM: f1+f2",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX,
&acPlot);
for (i=0; i< displacement ; i++)
{
DkerProc(D_F1PF2,job->r2H12stor[i],
@ -590,11 +590,11 @@ time1 = SPfrontEnd->IFseconds();
if(error) return(error);
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
"frequency", UID_OTHER, NULL);
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"DISTORTION - IM: f1-f2",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX, &acPlot);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"DISTORTION - IM: f1-f2",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX,
&acPlot);
for (i=0; i< displacement ; i++)
{
DkerProc(D_F1MF2,
@ -613,11 +613,11 @@ time1 = SPfrontEnd->IFseconds();
if(error) return(error);
SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
"frequency", UID_OTHER, NULL);
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"DISTORTION - IM: 2f1-f2",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX, &acPlot);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"DISTORTION - IM: 2f1-f2",
freqUid, IF_REAL,
numNames, nameList, IF_COMPLEX,
&acPlot);
for (i=0; i< displacement ; i++)
{
DkerProc(D_2F1MF2,

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

@ -130,11 +130,11 @@ NOISEan (CKTcircuit *ckt, int restart)
* plot
*/
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"Noise Spectral Density Curves - (V^2 or A^2)/Hz",
freqUid, IF_REAL,
data->numPlots, data->namelist, IF_REAL, &(data->NplotPtr));
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"Noise Spectral Density Curves - (V^2 or A^2)/Hz",
freqUid, IF_REAL,
data->numPlots, data->namelist, IF_REAL,
&(data->NplotPtr));
if (error) return(error);
if (job->NstpType != LINEAR) {
@ -165,11 +165,11 @@ NOISEan (CKTcircuit *ckt, int restart)
data->outNoiz = job->NsavOnoise;
data->inNoise = job->NsavInoise;
/* saj resume rawfile fix*/
error = SPfrontEnd->OUTpBeginPlot (
NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666, &(data->NplotPtr));
error = SPfrontEnd->OUTpBeginPlot (NULL, NULL,
NULL,
NULL, 0,
666, NULL, 666,
&(data->NplotPtr));
/*saj*/
}
@ -277,11 +277,11 @@ NOISEan (CKTcircuit *ckt, int restart)
if (error) return(error);
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"Integrated Noise - V^2 or A^2",
NULL, 0,
data->numPlots, data->namelist, IF_REAL, &(data->NplotPtr));
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"Integrated Noise - V^2 or A^2",
NULL, 0,
data->numPlots, data->namelist, IF_REAL,
&(data->NplotPtr));
error = CKTnoise(ckt,INT_NOIZ,N_CALC,data);
if (error) return(error);

20
src/spicelib/analysis/pzan.c
View File

@ -46,11 +46,11 @@ PZan(CKTcircuit *ckt, int reset)
/* Dump operating point. */
error = CKTnames(ckt,&numNames,&nameList);
if(error) return(error);
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
"Distortion Operating Point",
NULL, IF_REAL,
numNames, nameList, IF_REAL, &plot);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
"Distortion Operating Point",
NULL, IF_REAL,
numNames, nameList, IF_REAL,
&plot);
if(error) return(error);
CKTdump(ckt, 0.0, plot);
SPfrontEnd->OUTendPlot (plot);
@ -150,11 +150,11 @@ PZpost(CKTcircuit *ckt)
name, UID_OTHER, NULL);
}
SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
NULL, 0,
job->PZnPoles + job->PZnZeros, namelist, IF_COMPLEX, &pzPlotPtr);
SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
ckt->CKTcurJob->JOBname,
NULL, 0,
job->PZnPoles + job->PZnZeros, namelist, IF_COMPLEX,
&pzPlotPtr);
j = 0;
if (job->PZnPoles > 0) {

10
src/spicelib/analysis/tfanal.c
View File

@ -110,11 +110,11 @@ TFanal(CKTcircuit *ckt, int restart)
name, UID_OTHER, NULL);
}
error = SPfrontEnd->OUTpBeginPlot (
ckt, ckt->CKTcurJob,
job->JOBname,
NULL, 0,
3, uids, IF_REAL, &plotptr);
error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
job->JOBname,
NULL, 0,
3, uids, IF_REAL,
&plotptr);
if(error) return(error);
/*find transfer function */