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

sharedspice.c: improve progress analysis

This commit is contained in:
h_vogt 2013-08-25 16:01:21 +02:00 committed by rlar
parent 28dcedbfa6
commit b33f374d22
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sharedspice.c
View File

@ -1377,6 +1377,11 @@ void SetAnalyse(
int diffsec, diffmillisec; /* differences actual minus prev. time stamp */ int diffsec, diffmillisec; /* differences actual minus prev. time stamp */
int result; /* return value from callback function */ int result; /* return value from callback function */
CKTcircuit *ckt = NULL;
if (ft_curckt)
ckt = ft_curckt->ci_ckt;
/* If caller has sent NULL address for statfcn */ /* If caller has sent NULL address for statfcn */
if (nostatuswanted) if (nostatuswanted)
return; return;
@ -1389,7 +1394,19 @@ void SetAnalyse(
timediff(&timenow, &timebefore, &diffsec, &diffmillisec); timediff(&timenow, &timebefore, &diffsec, &diffmillisec);
s = TMALLOC(char, 128); s = TMALLOC(char, 128);
if (!strcmp(Analyse, "tran")) {
if (ckt && (ckt->CKTtime > ckt->CKTfinalTime - ckt->CKTmaxStep)) {
sprintf(s, "--ready--");
result = statfcn(s, ng_ident, userptr);
tfree(s);
return;
}
}
if (DecaPercent >= 1000){ if (DecaPercent >= 1000){
/* Because CKTmaxStep may be smaller than 0.1%, we print only when CKTtime is large enough. */
if (!strcmp(Analyse, "tran") && ckt && (ckt->CKTtime < ckt->CKTfinalTime - ckt->CKTmaxStep))
return;
sprintf( s, "--ready--"); sprintf( s, "--ready--");
result = statfcn(s, ng_ident, userptr); result = statfcn(s, ng_ident, userptr);
tfree(s); tfree(s);