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

inp.c: do not run all 'save' commands upfront, 

but cumulative when they appear in the .control section
This commit is contained in:
h_vogt 2013-03-05 21:58:00 +01:00
parent 0e0fc4807f
commit 8ec5bacc3a
1 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/frontend/inp.c
View File

@ -49,7 +49,6 @@ Author: 1985 Wayne A. Christopher
static char *upper(register char *string); static char *upper(register char *string);
static bool doedit(char *filename); static bool doedit(char *filename);
static struct line *com_options = NULL; static struct line *com_options = NULL;
static wordlist *consaves(wordlist *wl);
static void cktislinear(CKTcircuit *ckt, struct line *deck); static void cktislinear(CKTcircuit *ckt, struct line *deck);
void line_free_x(struct line *deck, bool recurse); void line_free_x(struct line *deck, bool recurse);
@ -362,10 +361,8 @@ inp_spsource(FILE *fp, bool comfile, char *filename)
} }
/* free the control deck */ /* free the control deck */
line_free(deck, TRUE); line_free(deck, TRUE);
/* do this here and in the 'else' branch of 'if (comfile)' */
/* if (dbs)
dbfree(dbs); */
/* set to NULL to allow generation of a new dbs */ /* set to NULL to allow generation of a new dbs */
/* do this here and in the 'else' branch of 'if (comfile)' */
dbs = NULL; dbs = NULL;
ft_dotsaves(); ft_dotsaves();
} /* end if (comfile) */ } /* end if (comfile) */
@ -661,8 +658,6 @@ inp_spsource(FILE *fp, bool comfile, char *filename)
/* linked list dbs is used to store the "save" or .save data (defined in breakp2.c), /* linked list dbs is used to store the "save" or .save data (defined in breakp2.c),
(When controls are executed later on, also stores TRACE, IPLOT, and STOP data) */ (When controls are executed later on, also stores TRACE, IPLOT, and STOP data) */
/* if (dbs)
dbfree(dbs); */
/* set to NULL to allow generation of a new dbs */ /* set to NULL to allow generation of a new dbs */
dbs = NULL; dbs = NULL;
/* .save data stored in dbs. /* .save data stored in dbs.
@ -670,11 +665,6 @@ inp_spsource(FILE *fp, bool comfile, char *filename)
.control is used */ .control is used */
ft_dotsaves(); ft_dotsaves();
/* run all 'save' commands upfront, allow same syntax as in .save,
then remove them from controls, store data in dbs. If controls contains
only 'save' commands, NULL is returned. */
controls = consaves(controls);
/* Now that the deck is loaded, do the commands, if there are any */ /* Now that the deck is loaded, do the commands, if there are any */
controls = wl_reverse(controls); controls = wl_reverse(controls);
for (wl = controls; wl; wl = wl->wl_next) for (wl = controls; wl; wl = wl->wl_next)
@ -1136,45 +1126,6 @@ inp_source(char *file)
} }
/* find 'save' commands, retrive node name(s) and store
them in dbs (by com_save), like ft_dotsaves does with .save */
static wordlist *
consaves(wordlist *wl_control)
{
wordlist *iline, *wl = NULL;
char *s;
bool onlysave = TRUE;
iline = wl_control;
while (iline) {
if (ciprefix("save", iline->wl_word)) {
wordlist *tmplist;
s = iline->wl_word;
(void) gettok(&s);
wl = wl_append(wl, gettoks(s));
tmplist = iline->wl_next;
wl_delete_slice(iline, iline->wl_next);
iline = tmplist;
}
else {
if (onlysave)
/* first occurence of a non 'save' line */
wl_control = iline;
iline = iline->wl_next;
onlysave = FALSE; /* we have lines other than save... */
}
}
com_save(wl);
/* If controls is eaten up without other than 'save...' lines, return NULL */
if (onlysave)
return (NULL);
return (wl_control);
}
/* check the input deck (after inpcom and numparam extensions) /* check the input deck (after inpcom and numparam extensions)
for linear elements. If only linear elements are found, for linear elements. If only linear elements are found,
ckt->CKTisLinear is set to 1. Return immediately if a first ckt->CKTisLinear is set to 1. Return immediately if a first