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

Enable optional voltage based truncation error correction. 

This is selectable as 'option newtrunc' (--enable-Predictor is required)

Remove --enable-NEWTRUNC

Add three option parameters (default):
lteTrtol (500), lteReltol (1e-3), lteAbstol (1e-6)

Add new error function for TRAP, similar to GEAR
 (tentative, to be improved), in ckttrun.c

Enable PREDICTOR as default with Visual Studio.
This commit is contained in:
Holger Vogt 2025-12-27 15:33:11 +01:00
parent ebde8f43f1
commit 99bddad736
13 changed files with 229 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -229,10 +229,6 @@ AC_ARG_ENABLE([predictor],
AC_ARG_ENABLE([newpred], AC_ARG_ENABLE([newpred],
[AS_HELP_STRING([--enable-newpred], [Enable NEWPRED whatever it is(?)])]) [AS_HELP_STRING([--enable-newpred], [Enable NEWPRED whatever it is(?)])])
# --enable-newtrunc: define NEWTRUNC for the code
AC_ARG_ENABLE([newtrunc],
[AS_HELP_STRING([--enable-newtrunc], [Enable, how we want extrapolate capacitances.])])
# --enable-sense2: define WANT_SENSE2 for the code # --enable-sense2: define WANT_SENSE2 for the code
AC_ARG_ENABLE([sense2], AC_ARG_ENABLE([sense2],
[AS_HELP_STRING([--enable-sense2], [Use spice2 sensitivity analysis.])]) [AS_HELP_STRING([--enable-sense2], [Use spice2 sensitivity analysis.])])
@ -1044,10 +1040,6 @@ if test "x$enable_newpred" = xyes; then
AC_DEFINE([NEWPRED], [], [Define if you want to discover :)]) AC_DEFINE([NEWPRED], [], [Define if you want to discover :)])
AC_MSG_RESULT([NEWPRED enabled]) AC_MSG_RESULT([NEWPRED enabled])
fi fi
if test "x$enable_newtrunc" = xyes; then
AC_DEFINE([NEWTRUNC], [], [Do not trigger unwanted traps by default])
AC_MSG_RESULT([New truncation error calculation enabled])
fi
if test "x$enable_experimental" = xyes; then if test "x$enable_experimental" = xyes; then
AC_DEFINE([EXPERIMENTAL_CODE], [], [Define if we want some experimental code]) AC_DEFINE([EXPERIMENTAL_CODE], [], [Define if we want some experimental code])
AC_MSG_RESULT([EXPERIMENTAL_CODE enabled]) AC_MSG_RESULT([EXPERIMENTAL_CODE enabled])

17
src/frontend/com_option.c
View File

@ -77,13 +77,16 @@ com_option(wordlist *wl)
printf("gminsteps = %d\n", circuit->CKTnumGminSteps); printf("gminsteps = %d\n", circuit->CKTnumGminSteps);
printf("srcsteps = %d\n", circuit->CKTnumSrcSteps); printf("srcsteps = %d\n", circuit->CKTnumSrcSteps);
printf("\nTruncation error correction:\n"); if (circuit->CKTnewtrunc) {
printf("trtol = %f\n", circuit->CKTtrtol); printf("\nTruncation error correction, voltage based, is selected:\n");
#ifdef NEWTRUNC printf("ltereltol = %g\n", circuit->CKTlteReltol);
printf("ltereltol = %g\n", circuit->CKTlteReltol); printf("lteabstol = %g\n", circuit->CKTlteAbstol);
printf("lteabstol = %g\n", circuit->CKTlteAbstol); printf("ltetrtol = %g\n", circuit->CKTlteTrtol);
#endif /* NEWTRUNC */ }
else {
printf("\nTruncation error correction, charge based, is selected:\n");
printf("trtol = %f\n", circuit->CKTtrtol);
}
printf("\nConductances:\n"); printf("\nConductances:\n");
printf("gmin (devices) = %g\n", circuit->CKTgmin); printf("gmin (devices) = %g\n", circuit->CKTgmin);
printf("diaggmin (stepping) = %g\n", circuit->CKTdiagGmin); printf("diaggmin (stepping) = %g\n", circuit->CKTdiagGmin);

3
src/frontend/misccoms.c
View File

@ -274,9 +274,6 @@ com_version(wordlist *wl)
#ifdef PREDICTOR #ifdef PREDICTOR
fprintf(cp_out, "** --enable-predictor\n"); fprintf(cp_out, "** --enable-predictor\n");
#endif #endif
#ifdef NEWTRUNC
fprintf(cp_out, "** --enable-newtrunc\n");
#endif
#ifdef WANT_SENSE2 #ifdef WANT_SENSE2
fprintf(cp_out, "** --enable-sense2\n"); fprintf(cp_out, "** --enable-sense2\n");
#endif #endif

9
src/include/ngspice/cktdefs.h
View File

@ -216,11 +216,10 @@ struct CKTcircuit {
double CKTreltol; /* --- */ double CKTreltol; /* --- */
double CKTchgtol; /* --- */ double CKTchgtol; /* --- */
double CKTvoltTol; /* --- */ double CKTvoltTol; /* --- */
/* What is this define for ? */ double CKTlteReltol; /* relative error in voltage based truncation error estimation */
#ifdef NEWTRUNC double CKTlteAbstol; /* absolute error in voltage based truncation error estimation */
double CKTlteReltol; double CKTlteTrtol; /* scaling time step in voltage based truncation error estimation */
double CKTlteAbstol; int CKTnewtrunc; /* enable lte (local truncation error) based on voltages */
#endif /* NEWTRUNC */
double CKTgmin; /* .options GMIN */ double CKTgmin; /* .options GMIN */
double CKTgshunt; /* .options RSHUNT */ double CKTgshunt; /* .options RSHUNT */
double CKTcshunt; /* .options CSHUNT */ double CKTcshunt; /* .options CSHUNT */

4
src/include/ngspice/optdefs.h
View File

@ -132,6 +132,10 @@ enum {
OPT_KLU_MEMGROW_FACTOR, OPT_KLU_MEMGROW_FACTOR,
#endif #endif
OPT_LTERELTOL,
OPT_LTEABSTOL,
OPT_LTETRTOL,
OPT_NEWTRUNC,
}; };
#ifdef XSPICE #ifdef XSPICE

4
src/include/ngspice/tskdefs.h
View File

@ -48,10 +48,10 @@ struct TSKtask {
double TSKreltol; double TSKreltol;
double TSKchgtol; double TSKchgtol;
double TSKvoltTol; double TSKvoltTol;
#ifdef NEWTRUNC
double TSKlteReltol; double TSKlteReltol;
double TSKlteAbstol; double TSKlteAbstol;
#endif /* NEWTRUNC */ double TSKlteTrtol;
unsigned int TSKnewtrunc:1; /* voltage controlled truncation */
double TSKgmin; double TSKgmin;
double TSKgshunt; /* shunt conductance (CKTdiagGmin) */ double TSKgshunt; /* shunt conductance (CKTdiagGmin) */
double TSKcshunt; /* shunt capacitor to ground */ double TSKcshunt; /* shunt capacitor to ground */

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

@ -114,14 +114,17 @@ CKTdoJob(CKTcircuit* ckt, int reset, TSKtask* task)
ckt->CKTkluMemGrowFactor = task->TSKkluMemGrowFactor ; ckt->CKTkluMemGrowFactor = task->TSKkluMemGrowFactor ;
#endif #endif
#ifdef NEWTRUNC
ckt->CKTlteReltol = task->TSKlteReltol; ckt->CKTlteReltol = task->TSKlteReltol;
ckt->CKTlteAbstol = task->TSKlteAbstol; ckt->CKTlteAbstol = task->TSKlteAbstol;
#endif /* NEWTRUNC */ ckt->CKTlteTrtol = task->TSKlteTrtol;
ckt->CKTnewtrunc = task->TSKnewtrunc;
fprintf(stdout, "Doing analysis at TEMP = %f and TNOM = %f\n\n", fprintf(stdout, "Doing analysis at TEMP = %f and TNOM = %f\n\n",
ckt->CKTtemp - CONSTCtoK, ckt->CKTnomTemp - CONSTCtoK); ckt->CKTtemp - CONSTCtoK, ckt->CKTnomTemp - CONSTCtoK);
if (ckt->CKTnewtrunc)
fprintf(stdout, "Note: Voltage based truncation error correction selected\n");
/* 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 */
inp_evaluate_temper(ft_curckt); inp_evaluate_temper(ft_curckt);

11
src/spicelib/analysis/cktntask.c
View File

@ -82,11 +82,10 @@ CKTnewTask(CKTcircuit *ckt, TSKtask **taskPtr, IFuid taskName, TSKtask **defPtr)
tsk->TSKkluMemGrowFactor = def->TSKkluMemGrowFactor ; tsk->TSKkluMemGrowFactor = def->TSKkluMemGrowFactor ;
#endif #endif
#ifdef NEWTRUNC
tsk->TSKlteReltol = def->TSKlteReltol; tsk->TSKlteReltol = def->TSKlteReltol;
tsk->TSKlteAbstol = def->TSKlteAbstol; tsk->TSKlteAbstol = def->TSKlteAbstol;
#endif tsk->TSKlteTrtol = def->TSKlteTrtol;
tsk->TSKnewtrunc = def->TSKnewtrunc;
} else { } else {
#endif /*CDHW*/ #endif /*CDHW*/
@ -98,11 +97,11 @@ CKTnewTask(CKTcircuit *ckt, TSKtask **taskPtr, IFuid taskName, TSKtask **defPtr)
tsk->TSKreltol = 1e-3; tsk->TSKreltol = 1e-3;
tsk->TSKchgtol = 1e-14; tsk->TSKchgtol = 1e-14;
tsk->TSKvoltTol = 1e-6; tsk->TSKvoltTol = 1e-6;
#ifdef NEWTRUNC
tsk->TSKlteReltol = 1e-3; tsk->TSKlteReltol = 1e-3;
tsk->TSKlteAbstol = 1e-6; tsk->TSKlteAbstol = 1e-6;
#endif tsk->TSKlteTrtol = 500.;
tsk->TSKtrtol = 7; tsk->TSKnewtrunc = 0;
tsk->TSKtrtol = 7.;
tsk->TSKbypass = 0; tsk->TSKbypass = 0;
tsk->TSKtranMaxIter = 10; tsk->TSKtranMaxIter = 10;
tsk->TSKdcMaxIter = 100; tsk->TSKdcMaxIter = 100;

28
src/spicelib/analysis/cktsopt.c
View File

@ -187,7 +187,24 @@ CKTsetOpt(CKTcircuit *ckt, JOB *anal, int opt, IFvalue *val)
task->TSKkluMemGrowFactor = (val->rValue == 1.2); task->TSKkluMemGrowFactor = (val->rValue == 1.2);
break; break;
#endif #endif
case OPT_LTERELTOL:
task->TSKlteReltol = val->rValue;
break;
case OPT_LTEABSTOL:
task->TSKlteAbstol = val->rValue;
break;
case OPT_LTETRTOL:
task->TSKlteTrtol = val->rValue;
break;
case OPT_NEWTRUNC:
#ifdef PREDICTOR
task->TSKnewtrunc = (val->iValue != 0);
#else
task->TSKnewtrunc = 0;
fprintf(stderr, "Warning: Option 'newtrunc' ignored,\n"
" compilation with preprocessor flag 'PREDICTOR' is required.\n");
#endif
break;
/* gtri - begin - wbk - add new options */ /* gtri - begin - wbk - add new options */
#ifdef XSPICE #ifdef XSPICE
case OPT_EVT_MAX_OP_ALTER: case OPT_EVT_MAX_OP_ALTER:
@ -230,7 +247,7 @@ CKTsetOpt(CKTcircuit *ckt, JOB *anal, int opt, IFvalue *val)
ckt->enh->rshunt_data.gshunt = 1.0 / val->rValue; ckt->enh->rshunt_data.gshunt = 1.0 / val->rValue;
} }
else { else {
printf("WARNING - Rshunt option too small. Ignored.\n"); fprintf(stderr, "WARNING - Rshunt option too small. Ignored.\n");
} }
break; break;
#endif #endif
@ -353,9 +370,14 @@ static IFparm OPTtbl[] = {
{ "klu", OPT_KLU, IF_SET|IF_FLAG, { "klu", OPT_KLU, IF_SET|IF_FLAG,
"Set KLU as Direct Linear Solver" }, "Set KLU as Direct Linear Solver" },
{ "klu_memgrow_factor", OPT_KLU_MEMGROW_FACTOR, IF_SET|IF_REAL, { "klu_memgrow_factor", OPT_KLU_MEMGROW_FACTOR, IF_SET|IF_REAL,
"KLU Memory Grow Factor (default is 1.2)" } "KLU Memory Grow Factor (default is 1.2)" },
#endif #endif
{ "ltereltol", OPT_LTERELTOL,IF_SET | IF_REAL ,"Relative error tolerence" },
{ "lteabstol", OPT_LTEABSTOL,IF_SET | IF_REAL,"Absolute error tolerence" },
{ "ltetrtol", OPT_LTETRTOL,IF_SET | IF_REAL,"Truncation error overestimation factor" },
{ "newtrunc", OPT_NEWTRUNC,IF_SET | IF_FLAG,"voltage controlled truncation" }
}; };
int OPTcount = NUMELEMS(OPTtbl); int OPTcount = NUMELEMS(OPTtbl);

280
src/spicelib/analysis/ckttrunc.c
View File

@ -15,173 +15,213 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/devdefs.h" #include "ngspice/devdefs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
//#define STEPDEBUG
int int
CKTtrunc(CKTcircuit *ckt, double *timeStep) CKTtrunc(CKTcircuit *ckt, double *timeStep)
{ {
#ifndef NEWTRUNC if (ckt->CKTnewtrunc == 0) {
int i; int i;
double timetemp; double timetemp;
#ifdef STEPDEBUG #ifdef STEPDEBUG
double debugtemp; double debugtemp;
#endif /* STEPDEBUG */ #endif /* STEPDEBUG */
double startTime; double startTime;
int error = OK; int error = OK;
startTime = SPfrontEnd->IFseconds(); startTime = SPfrontEnd->IFseconds();
timetemp = HUGE; timetemp = HUGE;
for (i=0;i<DEVmaxnum;i++) { for (i = 0; i < DEVmaxnum; i++) {
if (DEVices[i] && DEVices[i]->DEVtrunc && ckt->CKThead[i]) { if (DEVices[i] && DEVices[i]->DEVtrunc && ckt->CKThead[i]) {
#ifdef STEPDEBUG #ifdef STEPDEBUG
debugtemp = timetemp; debugtemp = timetemp;
#endif /* STEPDEBUG */ #endif /* STEPDEBUG */
error = DEVices[i]->DEVtrunc (ckt->CKThead[i], ckt, &timetemp); error = DEVices[i]->DEVtrunc(ckt->CKThead[i], ckt, &timetemp);
if(error) { if (error) {
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds()
- startTime; - startTime;
return(error); return(error);
} }
#ifdef STEPDEBUG #ifdef STEPDEBUG
if(debugtemp != timetemp) { if (debugtemp != timetemp) {
printf("timestep cut by device type %s from %g to %g\n", printf("timestep cut by device type %s from %g to %g\n",
DEVices[i]->DEVpublic.name, debugtemp, timetemp); DEVices[i]->DEVpublic.name, debugtemp, timetemp);
} }
#endif /* STEPDEBUG */ #endif /* STEPDEBUG */
}
} }
*timeStep = MIN(2 * *timeStep, timetemp);
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime;
return(OK);
} }
*timeStep = MIN(2 * *timeStep,timetemp); else {
int i;
CKTnode* node;
double timetemp;
double tmp;
double diff;
double tol;
double startTime;
int size;
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime; startTime = SPfrontEnd->IFseconds();
return(OK);
#else /* NEWTRUNC */
int i;
CKTnode *node;
double timetemp;
double tmp;
double diff;
double tol;
double startTime;
int size;
startTime = SPfrontEnd->IFseconds(); timetemp = HUGE;
size = SMPmatSize(ckt->CKTmatrix);
#ifdef STEPDEBUG
printf("\nNEWTRUNC at time %g, delta %g\n", ckt->CKTtime, ckt->CKTdeltaOld[0]);
#endif
node = ckt->CKTnodes;
switch (ckt->CKTintegrateMethod) {
timetemp = HUGE; case TRAPEZOIDAL:
size = SMPmatSize(ckt->CKTmatrix);
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("at time %g, delta %g\n",ckt->CKTtime,ckt->CKTdeltaOld[0]); printf("TRAP, Order is %d\n", ckt->CKTorder);
#endif #endif
node = ckt->CKTnodes; switch (ckt->CKTorder) {
switch(ckt->CKTintegrateMethod) { case 1:
for (i = 1; i < size; i++) {
case TRAPEZOIDAL: tol = MAX(fabs(ckt->CKTrhs[i]), fabs(ckt->CKTpred[i])) *
switch(ckt->CKTorder) { ckt->CKTlteReltol + ckt->CKTlteAbstol;
case 1: node = node->next;
for(i=1;i<size;i++) { if (node->type != SP_VOLTAGE) continue;
tol = MAX( fabs(ckt->CKTrhs[i]),fabs(ckt->CKTpred[i]))* diff = ckt->CKTrhs[i] - ckt->CKTpred[i];
ckt->CKTlteReltol+ckt->CKTlteAbstol;
node = node->next;
if(node->type!= SP_VOLTAGE) continue;
diff = ckt->CKTrhs[i]-ckt->CKTpred[i];
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("%s: cor=%g, pred=%g ",node->name, printf("%s: cor=%g, pred=%g ", node->name,
ckt->CKTrhs[i],ckt->CKTpred[i]); ckt->CKTrhs[i], ckt->CKTpred[i]);
#endif #endif
if(diff != 0) { if (diff != 0) {
tmp = ckt->CKTtrtol * tol * 2 /diff; // if (!AlmostEqualUlps(diff, 0, 10)) {
tmp = ckt->CKTdeltaOld[0]*sqrt(fabs(tmp)); tmp = ckt->CKTlteTrtol * tol * 2 / diff;
timetemp = MIN(timetemp,tmp); tmp = ckt->CKTdeltaOld[0] * fabs(tmp);
timetemp = MIN(timetemp, tmp);
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("tol = %g, diff = %g, h->%g\n",tol,diff,tmp); printf("tol = %g, diff = %g, h->%g\n", tol, diff, tmp);
#endif #endif
} else { }
else {
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("diff is 0\n"); printf("diff is 0\n");
#endif #endif
}
} }
break;
case 2:
for (i = 1; i < size; i++) {
tol = MAX(fabs(ckt->CKTrhs[i]), fabs(ckt->CKTpred[i])) *
ckt->CKTlteReltol + ckt->CKTlteAbstol;
node = node->next;
if (node->type != SP_VOLTAGE) continue;
diff = ckt->CKTrhs[i] - ckt->CKTpred[i];
#ifdef STEPDEBUG
printf("%s: cor=%g, pred=%g ", node->name,
ckt->CKTrhs[i], ckt->CKTpred[i]);
#endif
if (diff != 0) {
// if (!AlmostEqualUlps(diff, 0, 10)) {
tmp = ckt->CKTlteTrtol * tol * 2 / diff;
tmp = ckt->CKTdeltaOld[0] * sqrt(fabs(tmp));
timetemp = MIN(timetemp, tmp);
#ifdef STEPDEBUG
printf("tol = %g, diff = %g, h->%g\n", tol, diff, tmp);
#endif
}
else {
#ifdef STEPDEBUG
printf("diff is 0\n");
#endif
}
}
break;
/* case 2:
for(i=1;i<size;i++) {
tol = MAX( fabs(ckt->CKTrhs[i]),fabs(ckt->CKTpred[i]))*
ckt->CKTlteReltol+ckt->CKTlteAbstol;
node = node->next;
if(node->type!= SP_VOLTAGE) continue;
diff = ckt->CKTrhs[i]-ckt->CKTpred[i];
#ifdef STEPDEBUG
printf("%s: cor=%g, pred=%g ",node->name,ckt->CKTrhs[i],
ckt->CKTpred[i]);
#endif
if(diff != 0) {
// if(!AlmostEqualUlps(diff, 0, 10)) {
tmp = tol * ckt->CKTlteTrtol * (ckt->CKTdeltaOld[0] + ckt->CKTdeltaOld[1])
/ (diff * ckt->CKTdelta);
tmp = fabs(tmp);
tmp = exp(log(tmp) / 3);
tmp *= ckt->CKTdelta;
timetemp = MIN(timetemp,tmp);
#ifdef STEPDEBUG
printf("tol = %g, diff = %g, h->%g\n",tol,diff,tmp);
#endif
} else {
#ifdef STEPDEBUG
printf("diff is 0\n");
#endif
}
}
break; */
default:
return(E_ORDER);
break;
} }
break; break;
case 2:
for(i=1;i<size;i++) { case GEAR: {
tol = MAX( fabs(ckt->CKTrhs[i]),fabs(ckt->CKTpred[i]))*
ckt->CKTlteReltol+ckt->CKTlteAbstol;
node = node->next;
if(node->type!= SP_VOLTAGE) continue;
diff = ckt->CKTrhs[i]-ckt->CKTpred[i];
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("%s: cor=%g, pred=%g ",node->name,ckt->CKTrhs[i], printf("GEAR, Order is %d\n", ckt->CKTorder);
ckt->CKTpred[i]);
#endif #endif
if(diff != 0) { double delsum = 0;
tmp = ckt->CKTdeltaOld[0]*ckt->CKTtrtol * tol * 3 * for (i = 0; i <= ckt->CKTorder; i++) {
(ckt->CKTdeltaOld[0]+ckt->CKTdeltaOld[1])/diff; delsum += ckt->CKTdeltaOld[i];
tmp = fabs(tmp);
timetemp = MIN(timetemp,tmp);
#ifdef STEPDEBUG
printf("tol = %g, diff = %g, h->%g\n",tol,diff,tmp);
#endif
} else {
#ifdef STEPDEBUG
printf("diff is 0\n");
#endif
}
} }
break; for (i = 1; i < size; i++) {
default: node = node->next;
return(E_ORDER); if (node->type != SP_VOLTAGE) continue;
break; tol = MAX(fabs(ckt->CKTrhs[i]), fabs(ckt->CKTpred[i])) *
ckt->CKTlteReltol + ckt->CKTlteAbstol;
} diff = (ckt->CKTrhs[i] - ckt->CKTpred[i]);
break;
case GEAR: {
double delsum=0;
for(i=0;i<=ckt->CKTorder;i++) {
delsum += ckt->CKTdeltaOld[i];
}
for(i=1;i<size;i++) {
node = node->next;
if(node->type!= SP_VOLTAGE) continue;
tol = MAX( fabs(ckt->CKTrhs[i]),fabs(ckt->CKTpred[i]))*
ckt->CKTlteReltol+ckt->CKTlteAbstol;
diff = (ckt->CKTrhs[i]-ckt->CKTpred[i]);
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("%s: cor=%g, pred=%g ",node->name,ckt->CKTrhs[i], printf("%s: cor=%g, pred=%g ", node->name, ckt->CKTrhs[i],
ckt->CKTpred[i]); ckt->CKTpred[i]);
#endif #endif
if(diff != 0) { if (diff != 0) {
tmp = tol*ckt->CKTtrtol*delsum/(diff*ckt->CKTdelta); tmp = tol * ckt->CKTlteTrtol * delsum / (diff * ckt->CKTdelta);
tmp = fabs(tmp); tmp = fabs(tmp);
switch(ckt->CKTorder) { switch (ckt->CKTorder) {
case 0: case 0:
break; break;
case 1: case 1:
tmp = sqrt(tmp); tmp = sqrt(tmp);
break; break;
default: default:
tmp = exp(log(tmp)/(ckt->CKTorder+1)); tmp = exp(log(tmp) / (ckt->CKTorder + 1));
break; break;
}
tmp *= ckt->CKTdelta;
timetemp = MIN(timetemp, tmp);
#ifdef STEPDEBUG
printf("tol = %g, diff = %g, h->%g\n", tol, diff, tmp);
#endif
} }
tmp *= ckt->CKTdelta; else {
timetemp = MIN(timetemp,tmp);
#ifdef STEPDEBUG #ifdef STEPDEBUG
printf("tol = %g, diff = %g, h->%g\n",tol,diff,tmp); printf("diff is 0\n");
#endif
} else {
#ifdef STEPDEBUG
printf("diff is 0\n");
#endif #endif
}
} }
} }
} break;
break;
default: default:
return(E_METHOD); return(E_METHOD);
}
*timeStep = MIN(2 * *timeStep, timetemp);
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime;
return(OK);
} }
*timeStep = MIN(2 * *timeStep,timetemp);
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime;
return(OK);
#endif /* NEWTRUNC */
} }

15
src/spicelib/devices/devsup.c
View File

@ -814,13 +814,16 @@ DEVcap(CKTcircuit *ckt, double vgd, double vgs, double vgb, double covlgd,
double double
DEVpred(CKTcircuit *ckt, int loct) DEVpred(CKTcircuit *ckt, int loct)
{ {
#ifndef NEWTRUNC if (!ckt->CKTnewtrunc) {
double xfact; double xfact;
xfact = ckt->CKTdelta/ckt->CKTdeltaOld[1]; xfact = ckt->CKTdelta / ckt->CKTdeltaOld[1];
return( ( (1+xfact) * *(ckt->CKTstate1+loct) ) - return(((1 + xfact) * *(ckt->CKTstate1 + loct)) -
( xfact * *(ckt->CKTstate2+loct) ) ); (xfact * *(ckt->CKTstate2 + loct)));
#endif /* NEWTRUNC */ }
else {
return 1.;
}
} }

9
src/xspice/icm/analog/delay/cfunc.mod
View File

@ -142,11 +142,10 @@ struct CKTcircuitmin {
double CKTreltol; /* --- */ double CKTreltol; /* --- */
double CKTchgtol; /* --- */ double CKTchgtol; /* --- */
double CKTvoltTol; /* --- */ double CKTvoltTol; /* --- */
/* What is this define for ? */ double CKTlteReltol; /* relative error in voltage based truncation error estimation */
#ifdef NEWTRUNC double CKTlteAbstol; /* absolute error in voltage based truncation error estimation */
double CKTlteReltol; double CKTlteTrtol; /* scaling time step in voltage based truncation error estimation */
double CKTlteAbstol; int CKTnewtrunc; /* enable lte (local truncation error) based on voltages */
#endif /* NEWTRUNC */
double CKTgmin; /* .options GMIN */ double CKTgmin; /* .options GMIN */
double CKTgshunt; /* .options RSHUNT */ double CKTgshunt; /* .options RSHUNT */
double CKTcshunt; /* .options CSHUNT */ double CKTcshunt; /* .options CSHUNT */

5
visualc/src/include/ngspice/config.h
View File

@ -464,9 +464,6 @@
/* Define if you want to discover :) */ /* Define if you want to discover :) */
/* #undef NEWPRED */ /* #undef NEWPRED */
/* Do not trigger unwanted traps by default */
/* #undef NEWTRUNC */
/* Define if we want NOBYPASS */ /* Define if we want NOBYPASS */
/* #undef NOBYPASS */ /* #undef NOBYPASS */
@ -490,7 +487,7 @@
#define PACKAGE_VERSION VERSION #define PACKAGE_VERSION VERSION
/* Define if we want predictor algorithm */ /* Define if we want predictor algorithm */
/* #undef PREDICTOR */ #define PREDICTOR
/* Define to 1 if the C compiler supports function prototypes. */ /* Define to 1 if the C compiler supports function prototypes. */
/* #undef PROTOTYPES */ /* #undef PROTOTYPES */