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, shift agauss evaluation before subckt substitution. So parameters with agauss are set once only for all devices.

This commit is contained in:
h_vogt 2016-07-09 18:30:31 +02:00 committed by rlar
parent 7ad8637455
commit 1d73f4d8be
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontend/inp.c
View File

@ -598,6 +598,13 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
#ifdef HAS_PROGREP #ifdef HAS_PROGREP
SetAnalyse("Prepare Deck", 0); SetAnalyse("Prepare Deck", 0);
#endif #endif
/*FIXME This is for the globel param setting only */
/* replace agauss(x,y,z) in each b-line by suitable value */
static char *statfcn[] = { "agauss", "gauss", "aunif", "unif", "limit" };
int ii;
for (ii = 0; ii < 5; ii++)
eval_agauss(deck, statfcn[ii]);
/* Now expand subcircuit macros and substitute numparams.*/ /* Now expand subcircuit macros and substitute numparams.*/
if (!cp_getvar("nosubckt", CP_BOOL, NULL)) if (!cp_getvar("nosubckt", CP_BOOL, NULL))
if ((deck->li_next = inp_subcktexpand(deck->li_next)) == NULL) { if ((deck->li_next = inp_subcktexpand(deck->li_next)) == NULL) {
@ -674,12 +681,14 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
inp_parse_temper(deck, &modtlist, &devtlist); inp_parse_temper(deck, &modtlist, &devtlist);
/* replace agauss(x,y,z) in each b-line by suitable value */ /* replace agauss(x,y,z) in each b-line by suitable value */
/* FIXME: This is for the local param setting (not yet implemented in
inp_fix_agauss_in_param() for model parameters according to HSPICE manual)
static char *statfcn[] = { "agauss", "gauss", "aunif", "unif", "limit" }; static char *statfcn[] = { "agauss", "gauss", "aunif", "unif", "limit" };
int ii; int ii;
for (ii = 0; ii < 5; ii++) for (ii = 0; ii < 5; ii++)
eval_agauss(deck, statfcn[ii]); eval_agauss(deck, statfcn[ii]); */
/* If user wants all currents saved (.options savecurrents), add .save /* If user wants all currents saved (.options savecurrents), add .save
to wl_first with all terminal currents available on selected devices */ to wl_first with all terminal currents available on selected devices */
wl_first = inp_savecurrents(deck, options, wl_first, controls); wl_first = inp_savecurrents(deck, options, wl_first, controls);