don't print status output in dcpss.c, if norefvalue is set

This commit is contained in:
Holger Vogt 2019-01-13 20:04:09 +01:00
parent 9dd47e3029
commit b771ee9c60
1 changed files with 15 additions and 13 deletions

View File

@ -1464,30 +1464,32 @@ resume:
UPDATE_STATS(DOING_TRAN); UPDATE_STATS(DOING_TRAN);
return(error); return(error);
} }
if(newdelta > .9 * ckt->CKTdelta) { if (newdelta > .9 * ckt->CKTdelta) {
if((ckt->CKTorder == 1) && (ckt->CKTmaxOrder > 1)) { /* don't rise the order for backward Euler */ if ((ckt->CKTorder == 1) && (ckt->CKTmaxOrder > 1)) { /* don't rise the order for backward Euler */
newdelta = ckt->CKTdelta; newdelta = ckt->CKTdelta;
ckt->CKTorder = 2; ckt->CKTorder = 2;
error = CKTtrunc(ckt,&newdelta); error = CKTtrunc(ckt, &newdelta);
if(error) { if (error) {
UPDATE_STATS(DOING_TRAN); UPDATE_STATS(DOING_TRAN);
return(error); return(error);
} }
if(newdelta <= 1.05 * ckt->CKTdelta) { if (newdelta <= 1.05 * ckt->CKTdelta) {
ckt->CKTorder = 1; ckt->CKTorder = 1;
} }
} }
/* time point OK - 630 */ /* time point OK - 630 */
ckt->CKTdelta = newdelta; ckt->CKTdelta = newdelta;
#ifdef NDEV #ifdef NDEV
/* show a time process indicator, by Gong Ding, gdiso@ustc.edu */ if (!ft_norefprint) {
if(ckt->CKTtime/ckt->CKTfinalTime*100<10.0) /* show a time process indicator, by Gong Ding, gdiso@ustc.edu */
fprintf (stderr, "%%%3.2lf\b\b\b\b\b", ckt->CKTtime / ckt->CKTfinalTime * 100) ; if (ckt->CKTtime / ckt->CKTfinalTime * 100 < 10.0)
else if(ckt->CKTtime/ckt->CKTfinalTime*100<100.0) fprintf(stderr, "%%%3.2lf\b\b\b\b\b", ckt->CKTtime / ckt->CKTfinalTime * 100);
fprintf (stderr, "%%%4.2lf\b\b\b\b\b\b", ckt->CKTtime / ckt->CKTfinalTime * 100) ; else if (ckt->CKTtime / ckt->CKTfinalTime * 100 < 100.0)
else fprintf(stderr, "%%%4.2lf\b\b\b\b\b\b", ckt->CKTtime / ckt->CKTfinalTime * 100);
fprintf (stderr, "%%%5.2lf\b\b\b\b\b\b\b", ckt->CKTtime / ckt->CKTfinalTime * 100) ; else
fflush(stdout); fprintf(stderr, "%%%5.2lf\b\b\b\b\b\b\b", ckt->CKTtime / ckt->CKTfinalTime * 100);
fflush(stdout);
}
#endif #endif
#ifdef STEPDEBUG #ifdef STEPDEBUG