diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index 671f88da0..379430281 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -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; diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index 99f74dce5..fc3b1a48e 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -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*/ } diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index 74760dbbf..ef6b27c73 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -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; diff --git a/src/spicelib/analysis/dcop.c b/src/spicelib/analysis/dcop.c index 55c79d90e..1e33a6bfa 100644 --- a/src/spicelib/analysis/dcop.c +++ b/src/spicelib/analysis/dcop.c @@ -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); diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c index 1e64514d1..8568d6531 100644 --- a/src/spicelib/analysis/dcpss.c +++ b/src/spicelib/analysis/dcpss.c @@ -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) ; diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index e300a3278..4a1921766 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -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; diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index b847f1649..62033ad3d 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -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); diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c index b28564230..cf5b2603f 100644 --- a/src/spicelib/analysis/distoan.c +++ b/src/spicelib/analysis/distoan.c @@ -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, diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c index 9f3144035..af5711bfb 100644 --- a/src/spicelib/analysis/noisean.c +++ b/src/spicelib/analysis/noisean.c @@ -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); diff --git a/src/spicelib/analysis/pzan.c b/src/spicelib/analysis/pzan.c index 0e1655d09..eea10a609 100644 --- a/src/spicelib/analysis/pzan.c +++ b/src/spicelib/analysis/pzan.c @@ -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) { diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c index b1b2c7cda..757289865 100644 --- a/src/spicelib/analysis/tfanal.c +++ b/src/spicelib/analysis/tfanal.c @@ -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 */