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

upon finishing 'optran', restore old CKTstep 

remove unused
This commit is contained in:
Holger Vogt 2020-05-25 09:30:56 +02:00
parent 0eafec254e
commit 7de526237e
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/spicelib/analysis/optran.c
View File

@ -47,8 +47,12 @@ static double opstepsize = 1e-8;
static double opramptime = 0.; static double opramptime = 0.;
/* command to set the 6 optran flags /* command to set the 6 optran flags
CKTnoOpIter (default 0, set by option noopiter CKTnoOpIter (default 0, set by 'option noopiter')
CKTnumGminSteps
CKTnumSrcSteps
opfinaltime
opstepsize
opramptime
*/ */
void com_optran(wordlist* wl) { void com_optran(wordlist* wl) {
@ -61,17 +65,14 @@ void com_optran(wordlist* wl) {
} }
/* wordlist with 6 parameters */ /* wordlist with 6 parameters */
ft_curckt->ci_defTask->TSKnoOpIter = strtol(wltmp->wl_word, &stpstr, 10); ft_curckt->ci_defTask->TSKnoOpIter = strtol(wltmp->wl_word, &stpstr, 10);
// cckt->CKTnoOpIter = strtol(wltmp->wl_word, &stpstr, 10);
if ((errno == ERANGE) || (*stpstr != '\0')) if ((errno == ERANGE) || (*stpstr != '\0'))
goto bugquit; goto bugquit;
wltmp = wltmp->wl_next; wltmp = wltmp->wl_next;
ft_curckt->ci_defTask->TSKnumGminSteps = strtol(wltmp->wl_word, &stpstr, 10); ft_curckt->ci_defTask->TSKnumGminSteps = strtol(wltmp->wl_word, &stpstr, 10);
// cckt->CKTnumGminSteps = strtol(wltmp->wl_word, &stpstr, 10);
if ((errno == ERANGE) || (*stpstr != '\0')) if ((errno == ERANGE) || (*stpstr != '\0'))
goto bugquit; goto bugquit;
wltmp = wltmp->wl_next; wltmp = wltmp->wl_next;
ft_curckt->ci_defTask->TSKnumSrcSteps = strtol(wltmp->wl_word, &stpstr, 10); ft_curckt->ci_defTask->TSKnumSrcSteps = strtol(wltmp->wl_word, &stpstr, 10);
// cckt->CKTnumSrcSteps = strtol(wltmp->wl_word, &stpstr, 10);
if ((errno == ERANGE) || (*stpstr != '\0')) if ((errno == ERANGE) || (*stpstr != '\0'))
goto bugquit; goto bugquit;
wltmp = wltmp->wl_next; wltmp = wltmp->wl_next;
@ -218,21 +219,21 @@ OPtran(CKTcircuit *ckt)
int error; int error;
int save_order; int save_order;
long save_mode; long save_mode;
double maxstepsize = 0.0, prevmaxstepsize = 0.0; double maxstepsize = 0.0, prevmaxstepsize = 0.0, prevstepsize=0.;
int ltra_num; int ltra_num;
#if defined SHARED_MODULE #if defined SHARED_MODULE
int redostep; int redostep;
#endif #endif
/*
ACAN *acjob = (ACAN *) ckt->CKTcurJob; ACAN *acjob = (ACAN *) ckt->CKTcurJob;
TRANan *trjob = (TRANan *) ckt->CKTcurJob; TRANan *trjob = (TRANan *) ckt->CKTcurJob;
NOISEAN *nojob = (NOISEAN *) ckt->CKTcurJob; NOISEAN *nojob = (NOISEAN *) ckt->CKTcurJob;
*/
if(optime == 0) { if(optime == 0) {
int type = ckt->CKTcurJob->JOBtype; // int type = ckt->CKTcurJob->JOBtype;
SPfrontEnd->IFerrorf(ERR_INFO, "Transient op started"); SPfrontEnd->IFerrorf(ERR_INFO, "Transient op started");
#if 0 #if 0
@ -252,6 +253,7 @@ OPtran(CKTcircuit *ckt)
} }
#else #else
prevmaxstepsize = ckt->CKTmaxStep; prevmaxstepsize = ckt->CKTmaxStep;
prevstepsize = ckt->CKTstep;
ckt->CKTmaxStep = ckt->CKTstep = opstepsize; ckt->CKTmaxStep = ckt->CKTstep = opstepsize;
#endif #endif
delta=MIN(opfinaltime/100,ckt->CKTstep)/10; delta=MIN(opfinaltime/100,ckt->CKTstep)/10;
@ -378,6 +380,7 @@ OPtran(CKTcircuit *ckt)
tfree(opbreaks); tfree(opbreaks);
SPfrontEnd->IFerrorf(ERR_INFO, "Transient op finished successfully"); SPfrontEnd->IFerrorf(ERR_INFO, "Transient op finished successfully");
ckt->CKTmaxStep = prevmaxstepsize; ckt->CKTmaxStep = prevmaxstepsize;
ckt->CKTstep = prevstepsize;
return(OK); return(OK);
} }