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

drop condition 'expr_w_temper' when used with devtlist and modtlist 

The actual condition is (devtlist || modtlist)
yet functions
  inp_parse_temper_trees()
  inp_evaluate_temper()
can cope with that anyway.
This commit is contained in:
rlar 2016-11-05 17:20:11 +01:00
parent cd6fdbf380
commit 46b971aef9
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontend/inp.c
View File

@ -820,12 +820,10 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
fclose(fdo); fclose(fdo);
} }
if (expr_w_temper) { /* Now the circuit is defined, so generate the parse trees */
/* Now the circuit is defined, so generate the parse trees */ inp_parse_temper_trees();
inp_parse_temper_trees(); /* Get the actual data for model and device instance parameters */
/* Get the actual data for model and device instance parameters */ inp_evaluate_temper();
inp_evaluate_temper();
}
/* 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) */
@ -1837,7 +1835,6 @@ set_tlist(struct circ *curckt)
{ {
modtlist = curckt->modtlist; modtlist = curckt->modtlist;
devtlist = curckt->devtlist; devtlist = curckt->devtlist;
expr_w_temper = (modtlist || devtlist);
} }
/* remove the actual modtlist and devtlist */ /* remove the actual modtlist and devtlist */

3
src/spicelib/analysis/cktdojob.c
View File

@ -114,8 +114,7 @@ CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task)
/* call altermod and alter on device and model parameters assembled in /* call altermod and alter on device and model parameters assembled in
devtlist and modtlist (if using temper) because we have a new temperature */ devtlist and modtlist (if using temper) because we have a new temperature */
if (expr_w_temper) inp_evaluate_temper();
inp_evaluate_temper();
error = 0; error = 0;

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

@ -143,8 +143,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
job->TRCVvSave[i] = ckt->CKTtemp; /* Saves the old circuit temperature */ job->TRCVvSave[i] = ckt->CKTtemp; /* Saves the old circuit temperature */
job->TRCVvType[i] = TEMP_CODE; /* Set the sweep type code */ job->TRCVvType[i] = TEMP_CODE; /* Set the sweep type code */
ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK; /* Set the new circuit temp */ ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK; /* Set the new circuit temp */
if (expr_w_temper) inp_evaluate_temper();
inp_evaluate_temper();
CKTtemp(ckt); CKTtemp(ckt);
goto found; goto found;
} }
@ -276,8 +275,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
job->TRCVvStart[i]; job->TRCVvStart[i];
} else if (job->TRCVvType[i] == TEMP_CODE) { } else if (job->TRCVvType[i] == TEMP_CODE) {
ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK; ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK;
if (expr_w_temper) inp_evaluate_temper();
inp_evaluate_temper();
CKTtemp(ckt); CKTtemp(ckt);
} else if (job->TRCVvType[i] == rcode) { } else if (job->TRCVvType[i] == rcode) {
((RESinstance *)(job->TRCVvElt[i]))->RESresist = ((RESinstance *)(job->TRCVvElt[i]))->RESresist =
@ -470,8 +468,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt); DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt);
} else if (job->TRCVvType[i] == TEMP_CODE) { /* temperature */ } else if (job->TRCVvType[i] == TEMP_CODE) { /* temperature */
ckt->CKTtemp += job->TRCVvStep[i]; ckt->CKTtemp += job->TRCVvStep[i];
if (expr_w_temper) inp_evaluate_temper();
inp_evaluate_temper();
CKTtemp(ckt); CKTtemp(ckt);
} }
@ -508,8 +505,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt); DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt);
} else if (job->TRCVvType[i] == TEMP_CODE) { } else if (job->TRCVvType[i] == TEMP_CODE) {
ckt->CKTtemp = job->TRCVvSave[i]; ckt->CKTtemp = job->TRCVvSave[i];
if (expr_w_temper) inp_evaluate_temper();
inp_evaluate_temper();
CKTtemp(ckt); CKTtemp(ckt);
} }