From 7d75ebcb814c9b3e9f0b7bac29619ff26a2d188c Mon Sep 17 00:00:00 2001 From: rlar Date: Tue, 13 Dec 2011 19:10:34 +0000 Subject: [PATCH] unify OUTpBeginPlot() invocation --- ChangeLog | 17 +++++++++++ src/frontend/outitf.c | 10 +++++-- src/frontend/outitf.h | 12 +++++--- src/frontend/spiceif.c | 9 +++--- src/include/ngspice/ifsim.h | 12 +++++--- src/spicelib/analysis/acan.c | 32 +++++++++++++-------- src/spicelib/analysis/cktsens.c | 9 +++--- src/spicelib/analysis/dcop.c | 8 ++++-- src/spicelib/analysis/dcpss.c | 26 +++++++++-------- src/spicelib/analysis/dctran.c | 17 ++++++----- src/spicelib/analysis/dctrcurv.c | 15 ++++++---- src/spicelib/analysis/distoan.c | 48 ++++++++++++++++++++------------ src/spicelib/analysis/noisean.c | 25 ++++++++++------- src/spicelib/analysis/pzan.c | 16 +++++++---- src/spicelib/analysis/tfanal.c | 8 ++++-- 15 files changed, 171 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee262d6f6..df3ce5c03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2011-12-13 Robert Larice + * src/frontend/outitf.c , + * src/frontend/outitf.h , + * src/frontend/spiceif.c , + * src/include/ngspice/ifsim.h , + * src/spicelib/analysis/acan.c , + * src/spicelib/analysis/cktsens.c , + * src/spicelib/analysis/dcop.c , + * src/spicelib/analysis/dcpss.c , + * src/spicelib/analysis/dctran.c , + * src/spicelib/analysis/dctrcurv.c , + * src/spicelib/analysis/distoan.c , + * src/spicelib/analysis/noisean.c , + * src/spicelib/analysis/pzan.c , + * src/spicelib/analysis/tfanal.c : + unify OUTpBeginPlot() invocation + 2011-12-13 Robert Larice * src/spicelib/analysis/pzan.c : unify OUTpBeginPlot() usage of ckt->CKTcurJob diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c index 5653eb543..65e133fe8 100644 --- a/src/frontend/outitf.c +++ b/src/frontend/outitf.c @@ -88,7 +88,10 @@ static bool shouldstop = FALSE; /* Tell simulator to stop next time it asks. */ /* The two "begin plot" routines share all their internals... */ int -OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr) +OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, + IFuid analName, + IFuid refName, int refType, + int numNames, IFuid *dataNames, int dataType, void **plotPtr) { char *name; @@ -109,7 +112,10 @@ if (ARCHme != 0) return(OK); } int -OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr) +OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, + IFuid analName, + IFuid refName, int refType, + int numNames, IFuid *dataNames, int dataType, void **plotPtr) { #ifdef PARALLEL_ARCH if (ARCHme != 0) return(OK); diff --git a/src/frontend/outitf.h b/src/frontend/outitf.h index 85434455e..994dd73a9 100644 --- a/src/frontend/outitf.h +++ b/src/frontend/outitf.h @@ -39,10 +39,14 @@ typedef struct runDesc { int windowCount; } runDesc; -int OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, - int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr); -int OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, - int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr); +int OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, + IFuid analName, + IFuid refName, int refType, + int numNames, IFuid *dataNames, int dataType, void **plotPtr); +int OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, + IFuid analName, + IFuid refName, int refType, + int numNames, IFuid *dataNames, int dataType, void **plotPtr); int OUTpData(void *plotPtr, IFvalue *refValue, IFvalue *valuePtr); int OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr); int OUTwData(void *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr); diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index 09a807599..1a7187f49 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -1550,10 +1550,11 @@ do {\ } 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; diff --git a/src/include/ngspice/ifsim.h b/src/include/ngspice/ifsim.h index dd2d02b19..4ea035753 100644 --- a/src/include/ngspice/ifsim.h +++ b/src/include/ngspice/ifsim.h @@ -439,13 +439,17 @@ struct IFfrontEnd { /* what time is it? */ int (*IFerror) (int, char *, IFuid *); /* output an error or warning message */ - int (*OUTpBeginPlot) (CKTcircuit *, JOB *, IFuid, IFuid, int, - int, IFuid *, int, void **); + int (*OUTpBeginPlot) (CKTcircuit *, JOB *, + IFuid, + IFuid, int, + int, IFuid *, int, void **); /* start pointwise output plot */ int (*OUTpData) (void *, IFvalue *, IFvalue *); /* data for pointwise plot */ - int (*OUTwBeginPlot) (CKTcircuit *, JOB *, IFuid, IFuid, int, - int, IFuid *, int, void **); + int (*OUTwBeginPlot) (CKTcircuit *, JOB *, + IFuid, + IFuid, int, + int, IFuid *, int, void **); /* start windowed output plot */ int (*OUTwReference) (void *, IFvalue *, void **); /* independent vector for windowed plot */ diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index 86cdbf538..e21113ec2 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -153,9 +153,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(); @@ -176,9 +178,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); @@ -187,10 +191,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); @@ -204,8 +209,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*/ } diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index c5e3d5e1b..7f4084bce 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -196,10 +196,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, (void **) &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; diff --git a/src/spicelib/analysis/dcop.c b/src/spicelib/analysis/dcop.c index df9d715a3..af78fceb2 100644 --- a/src/spicelib/analysis/dcop.c +++ b/src/spicelib/analysis/dcop.c @@ -45,9 +45,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); diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c index a837cc229..00246706d 100755 --- a/src/spicelib/analysis/dcpss.c +++ b/src/spicelib/analysis/dcpss.c @@ -207,10 +207,11 @@ DCpss(CKTcircuit *ckt, int restart) if(error) return(error); SPfrontEnd->IFnewUid (ckt, &timeUid, NULL, "time", UID_OTHER, NULL); - error = SPfrontEnd->OUTpBeginPlot (ckt, - ckt->CKTcurJob, - "Time Domain Periodic Steady State",timeUid,IF_REAL,numNames,nameList, - IF_REAL, &(job->PSSplot_td)); + error = SPfrontEnd->OUTpBeginPlot ( + ckt, ckt->CKTcurJob, + "Time Domain Periodic Steady State", + timeUid, IF_REAL, + numNames, nameList, IF_REAL, &(job->PSSplot_td)); tfree(nameList); if(error) return(error); @@ -353,9 +354,11 @@ DCpss(CKTcircuit *ckt, int restart) 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; @@ -783,10 +786,11 @@ nextTime: if (error) return (error); SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL); - error = SPfrontEnd->OUTpBeginPlot (ckt, - ckt->CKTcurJob, - "Frequency Domain Periodic Steady State",freqUid,IF_REAL,numNames,nameList, - IF_REAL, &(job->PSSplot_fd)); + error = SPfrontEnd->OUTpBeginPlot ( + ckt, ckt->CKTcurJob, + "Frequency Domain Periodic Steady State", + freqUid, IF_REAL, + numNames, nameList, IF_REAL, &(job->PSSplot_fd)); tfree(nameList); /* ************************* */ /* Fourier transform on data */ diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index 7b758eee3..337326fc1 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -172,10 +172,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); @@ -362,9 +363,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; diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index 7691d2b19..c303a7ba4 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -67,8 +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; @@ -215,9 +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); if(error) return(error); /* now have finished the initialization - can start doing hard part */ diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c index cf463ca35..2900026be 100644 --- a/src/spicelib/analysis/distoan.c +++ b/src/spicelib/analysis/distoan.c @@ -107,9 +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); @@ -516,9 +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); @@ -540,9 +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), @@ -562,9 +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), @@ -582,9 +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, @@ -603,9 +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, diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c index edcd1bd91..71cb61eed 100644 --- a/src/spicelib/analysis/noisean.c +++ b/src/spicelib/analysis/noisean.c @@ -132,10 +132,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) { @@ -166,8 +167,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*/ } @@ -275,10 +279,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); diff --git a/src/spicelib/analysis/pzan.c b/src/spicelib/analysis/pzan.c index 4cbbc0cec..cfb9a3c36 100644 --- a/src/spicelib/analysis/pzan.c +++ b/src/spicelib/analysis/pzan.c @@ -46,9 +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); @@ -148,9 +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) { diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c index 619676cf4..b4067ad74 100644 --- a/src/spicelib/analysis/tfanal.c +++ b/src/spicelib/analysis/tfanal.c @@ -113,9 +113,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 */