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

Merge branch 'pre-master' of ssh://git.code.sf.net/p/ngspice/ngspice into beta_jdm

This commit is contained in:
Jim Monte 2019-11-28 23:25:17 -05:00
parent 75cbbfa1a5 9a77d22444
commit 4523a30404
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/plotting/gnuplot.c
View File

@ -94,6 +94,8 @@ ft_gnuplot(double *xlims, double *ylims, char *filename, char *title, char *xlab
terminal_type = 4;
if (cieq(terminal, "eps/quit"))
terminal_type = 5;
if (cieq(terminal, "xterm"))
terminal_type = 6;
}
if (!cp_getvar("xbrushwidth", CP_NUM, &linewidth, 0))
@ -342,8 +344,10 @@ ft_gnuplot(double *xlims, double *ylims, char *filename, char *title, char *xlab
fprintf(cp_out, "writing plot to file %s.eps\n", filename);
(void) sprintf(buf, "gnuplot %s", filename_plt);
}
else
else if (terminal_type == 6)
(void) sprintf(buf, "xterm -e gnuplot %s - &", filename_plt);
else
(void) sprintf(buf, "gnuplot -p %s - &", filename_plt);
#endif
err = system(buf);

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

@ -140,7 +140,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
}
}
if (!strcmp(job->TRCVvName[i], "temp")) {
if (cieq(job->TRCVvName[i], "temp")) {
job->TRCVvSave[i] = ckt->CKTtemp; /* Saves the old circuit temperature */
job->TRCVvType[i] = TEMP_CODE; /* Set the sweep type code */
ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK; /* Set the new circuit temp */

5
src/spicelib/devices/vsrc/vsrcask.c
View File

@ -92,7 +92,10 @@ VSRCask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *
strcpy(errMsg,msg);
return(E_ASKCURRENT);
} else {
value->rValue = *(ckt->CKTrhsOld+here->VSRCbranch);
if (ckt->CKTrhsOld)
value->rValue = *(ckt->CKTrhsOld + here->VSRCbranch);
else
value->rValue = 0.;
}
return(OK);
case VSRC_POWER: