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

bugfix: re-enable loading deck from circarray, if intfile

This commit is contained in:
Holger Vogt 2018-01-28 15:32:56 +01:00
parent 04059e5426
commit 7188605ef2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontend/inp.c
View File

@ -374,8 +374,9 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
char *dir_name = ngdirname(filename ? filename : ".");
startTime = seconds();
/* inp_source() called with fp: load from file */
if (fp) {
/* inp_source() called with fp: load from file, */
/* called with *fp == NULL and intfile: we want to load circuit from circarray */
if (fp || intfile) {
deck = inp_readall(fp, dir_name, comfile, intfile, &expr_w_temper);
/* files starting with *ng_script are user supplied command files */
@ -388,7 +389,7 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
mc_deck = inp_deckcopy_oc(deck);
}
}
/* inp_spsource() called with *fp == NULL: we want to reload circuit for MC simulation */
/* called with *fp == NULL and not intfile: we want to reload circuit from mc_deck */
else {
if (mc_deck)
deck = inp_deckcopy(mc_deck);