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

Pre-processor flag NEWTRUNC replaced by 'option newtrunc' 

stored in ->CKTnewtrunc
Compiling with pre-processor flag PREDICTOR is required.
This commit is contained in:
Holger Vogt 2025-11-08 17:28:34 +01:00
parent 913c735139
commit 2cfffc5a24
13 changed files with 220 additions and 233 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],
[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
AC_ARG_ENABLE([sense2],
[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_MSG_RESULT([NEWPRED enabled])
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
AC_DEFINE([EXPERIMENTAL_CODE], [], [Define if we want some experimental code])
AC_MSG_RESULT([EXPERIMENTAL_CODE enabled])

12
src/frontend/com_option.c
View File

@ -77,14 +77,16 @@ com_option(wordlist *wl)
printf("gminsteps = %d\n", circuit->CKTnumGminSteps);
printf("srcsteps = %d\n", circuit->CKTnumSrcSteps);
printf("\nTruncation error correction:\n");
printf("trtol = %f\n", circuit->CKTtrtol);
#ifdef NEWTRUNC
if (circuit->CKTnewtrunc) {
printf("\nTruncation error correction, voltage based, is selected:\n");
printf("ltereltol = %g\n", circuit->CKTlteReltol);
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("gmin (devices) = %g\n", circuit->CKTgmin);
printf("diaggmin (stepping) = %g\n", circuit->CKTdiagGmin);

3
src/frontend/misccoms.c
View File

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

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

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

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

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

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

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

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

@ -114,11 +114,10 @@ CKTdoJob(CKTcircuit* ckt, int reset, TSKtask* task)
ckt->CKTkluMemGrowFactor = task->TSKkluMemGrowFactor ;
#endif
#ifdef NEWTRUNC
ckt->CKTlteReltol = task->TSKlteReltol;
ckt->CKTlteAbstol = task->TSKlteAbstol;
ckt->CKTlteTrtol = task->TSKlteTrtol;
#endif /* NEWTRUNC */
ckt->CKTnewtrunc = task->TSKnewtrunc;
fprintf(stdout, "Doing analysis at TEMP = %f and TNOM = %f\n\n",
ckt->CKTtemp - CONSTCtoK, ckt->CKTnomTemp - CONSTCtoK);

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

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

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

@ -187,7 +187,6 @@ CKTsetOpt(CKTcircuit *ckt, JOB *anal, int opt, IFvalue *val)
task->TSKkluMemGrowFactor = (val->rValue == 1.2);
break;
#endif
#ifdef NEWTRUNC
case OPT_LTERELTOL:
task->TSKlteReltol = val->rValue;
break;
@ -197,8 +196,15 @@ CKTsetOpt(CKTcircuit *ckt, JOB *anal, int opt, IFvalue *val)
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 */
#ifdef XSPICE
case OPT_EVT_MAX_OP_ALTER:
@ -241,7 +247,7 @@ CKTsetOpt(CKTcircuit *ckt, JOB *anal, int opt, IFvalue *val)
ckt->enh->rshunt_data.gshunt = 1.0 / val->rValue;
}
else {
printf("WARNING - Rshunt option too small. Ignored.\n");
fprintf(stderr, "WARNING - Rshunt option too small. Ignored.\n");
}
break;
#endif
@ -367,11 +373,10 @@ static IFparm OPTtbl[] = {
"KLU Memory Grow Factor (default is 1.2)" },
#endif
#ifdef NEWTRUNC
{ "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" }
#endif
{ "ltetrtol", OPT_LTETRTOL,IF_SET | IF_REAL,"Truncation error overestimation factor" },
{ "newtrunc", OPT_NEWTRUNC,IF_SET | IF_FLAG,"voltage controlled truncation" }
};

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

@ -19,7 +19,7 @@ Author: 1985 Thomas L. Quarles
int
CKTtrunc(CKTcircuit *ckt, double *timeStep)
{
#ifndef NEWTRUNC
if (ckt->CKTnewtrunc == 0) {
int i;
double timetemp;
#ifdef STEPDEBUG
@ -31,32 +31,33 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)
startTime = SPfrontEnd->IFseconds();
timetemp = HUGE;
for (i=0;i<DEVmaxnum;i++) {
for (i = 0; i < DEVmaxnum; i++) {
if (DEVices[i] && DEVices[i]->DEVtrunc && ckt->CKThead[i]) {
#ifdef STEPDEBUG
debugtemp = timetemp;
#endif /* STEPDEBUG */
error = DEVices[i]->DEVtrunc (ckt->CKThead[i], ckt, &timetemp);
if(error) {
error = DEVices[i]->DEVtrunc(ckt->CKThead[i], ckt, &timetemp);
if (error) {
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds()
- startTime;
return(error);
}
#ifdef STEPDEBUG
if(debugtemp != timetemp) {
if (debugtemp != timetemp) {
printf("timestep cut by device type %s from %g to %g\n",
DEVices[i]->DEVpublic.name, debugtemp, timetemp);
}
#endif /* STEPDEBUG */
}
}
*timeStep = MIN(2 * *timeStep,timetemp);
*timeStep = MIN(2 * *timeStep, timetemp);
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime;
return(OK);
#else /* NEWTRUNC */
}
else {
int i;
CKTnode *node;
CKTnode* node;
double timetemp;
double tmp;
double diff;
@ -69,36 +70,37 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)
timetemp = HUGE;
size = SMPmatSize(ckt->CKTmatrix);
#ifdef STEPDEBUG
printf("\nNEWTRUNC at time %g, delta %g\n",ckt->CKTtime,ckt->CKTdeltaOld[0]);
printf("\nNEWTRUNC at time %g, delta %g\n", ckt->CKTtime, ckt->CKTdeltaOld[0]);
#endif
node = ckt->CKTnodes;
switch(ckt->CKTintegrateMethod) {
switch (ckt->CKTintegrateMethod) {
case TRAPEZOIDAL:
#ifdef STEPDEBUG
printf("TRAP, Order is %d\n", ckt->CKTorder);
#endif
switch(ckt->CKTorder) {
switch (ckt->CKTorder) {
case 1:
for(i=1;i<size;i++) {
tol = MAX( fabs(ckt->CKTrhs[i]),fabs(ckt->CKTpred[i]))*
ckt->CKTlteReltol+ckt->CKTlteAbstol;
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];
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]);
printf("%s: cor=%g, pred=%g ", node->name,
ckt->CKTrhs[i], ckt->CKTpred[i]);
#endif
if(diff != 0) {
// if (!AlmostEqualUlps(diff, 0, 10)) {
if (diff != 0) {
// if (!AlmostEqualUlps(diff, 0, 10)) {
tmp = ckt->CKTlteTrtol * tol * 2 / diff;
tmp = ckt->CKTdeltaOld[0]*fabs(tmp);
timetemp = MIN(timetemp,tmp);
tmp = ckt->CKTdeltaOld[0] * fabs(tmp);
timetemp = MIN(timetemp, tmp);
#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
} else {
}
else {
#ifdef STEPDEBUG
printf("diff is 0\n");
#endif
@ -132,32 +134,32 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)
}
}
break;
/* case 2:
/* 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
#ifdef STEPDEBUG
printf("%s: cor=%g, pred=%g ",node->name,ckt->CKTrhs[i],
ckt->CKTpred[i]);
#endif
#endif
if(diff != 0) {
// if(!AlmostEqualUlps(diff, 0, 10)) {
// 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
#ifdef STEPDEBUG
printf("tol = %g, diff = %g, h->%g\n",tol,diff,tmp);
#endif
#endif
} else {
#ifdef STEPDEBUG
#ifdef STEPDEBUG
printf("diff is 0\n");
#endif
#endif
}
}
break; */
@ -172,39 +174,40 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)
#ifdef STEPDEBUG
printf("GEAR, Order is %d\n", ckt->CKTorder);
#endif
double delsum=0;
for(i=0;i<=ckt->CKTorder;i++) {
double delsum = 0;
for (i = 0; i <= ckt->CKTorder; i++) {
delsum += ckt->CKTdeltaOld[i];
}
for(i=1;i<size;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]);
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
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]);
#endif
if(diff != 0) {
tmp = tol*ckt->CKTlteTrtol*delsum/(diff*ckt->CKTdelta);
if (diff != 0) {
tmp = tol * ckt->CKTlteTrtol * delsum / (diff * ckt->CKTdelta);
tmp = fabs(tmp);
switch(ckt->CKTorder) {
switch (ckt->CKTorder) {
case 0:
break;
case 1:
tmp = sqrt(tmp);
break;
default:
tmp = exp(log(tmp)/(ckt->CKTorder+1));
tmp = exp(log(tmp) / (ckt->CKTorder + 1));
break;
}
tmp *= ckt->CKTdelta;
timetemp = MIN(timetemp,tmp);
timetemp = MIN(timetemp, tmp);
#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
} else {
}
else {
#ifdef STEPDEBUG
printf("diff is 0\n");
#endif
@ -217,8 +220,8 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep)
return(E_METHOD);
}
*timeStep = MIN(2 * *timeStep,timetemp);
*timeStep = MIN(2 * *timeStep, timetemp);
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime;
return(OK);
#endif /* NEWTRUNC */
}
}

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

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

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

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

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

@ -464,9 +464,6 @@
/* Define if you want to discover :) */
/* #undef NEWPRED */
/* Do not trigger unwanted traps by default */
#define NEWTRUNC
/* Define if we want NOBYPASS */
/* #undef NOBYPASS */