diff --git a/src/frontend/inp.c b/src/frontend/inp.c index fb560bb11..369901b99 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -745,12 +745,10 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile) fclose(fdo); } - if (expr_w_temper) { - /* Now the circuit is defined, so generate the parse trees */ - inp_parse_temper_trees(ft_curckt); - /* Get the actual data for model and device instance parameters */ - inp_evaluate_temper(ft_curckt); - } + /* Now the circuit is defined, so generate the parse trees */ + inp_parse_temper_trees(ft_curckt); + /* Get the actual data for model and device instance parameters */ + inp_evaluate_temper(ft_curckt); /* 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) */ diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c index 11f282829..04944ebab 100644 --- a/src/spicelib/analysis/cktdojob.c +++ b/src/spicelib/analysis/cktdojob.c @@ -116,8 +116,7 @@ CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task) /* call altermod and alter on device and model parameters assembled in devtlist and modtlist (if using temper) because we have a new temperature */ - if (expr_w_temper) - inp_evaluate_temper(ft_curckt); + inp_evaluate_temper(ft_curckt); error = 0; diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index ce7b30178..a292360f5 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -144,8 +144,7 @@ DCtrCurv(CKTcircuit *ckt, int restart) 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 */ - if (expr_w_temper) - inp_evaluate_temper(ft_curckt); + inp_evaluate_temper(ft_curckt); CKTtemp(ckt); goto found; } @@ -277,8 +276,7 @@ DCtrCurv(CKTcircuit *ckt, int restart) job->TRCVvStart[i]; } else if (job->TRCVvType[i] == TEMP_CODE) { ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK; - if (expr_w_temper) - inp_evaluate_temper(ft_curckt); + inp_evaluate_temper(ft_curckt); CKTtemp(ckt); } else if (job->TRCVvType[i] == rcode) { ((RESinstance *)(job->TRCVvElt[i]))->RESresist = @@ -471,8 +469,7 @@ DCtrCurv(CKTcircuit *ckt, int restart) DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt); } else if (job->TRCVvType[i] == TEMP_CODE) { /* temperature */ ckt->CKTtemp += job->TRCVvStep[i]; - if (expr_w_temper) - inp_evaluate_temper(ft_curckt); + inp_evaluate_temper(ft_curckt); CKTtemp(ckt); } @@ -509,8 +506,7 @@ DCtrCurv(CKTcircuit *ckt, int restart) DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt); } else if (job->TRCVvType[i] == TEMP_CODE) { ckt->CKTtemp = job->TRCVvSave[i]; - if (expr_w_temper) - inp_evaluate_temper(ft_curckt); + inp_evaluate_temper(ft_curckt); CKTtemp(ckt); }