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

Merge commit 'd0576b' into pre-master-44 

Fixed incorrect OSDItrunc() state index when $limit is present.
This commit is contained in:
dwarning 2024-12-11 20:56:26 +01:00
parent e0a4b9c4c8 d0576b6e03
commit fd10259265
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osdi/osdiload.c
View File

@ -23,12 +23,15 @@
#include <string.h>
#include <sys/types.h>
#define NUM_SIM_PARAMS 5
#define NUM_SIM_PARAMS 10
char *sim_params[NUM_SIM_PARAMS + 1] = {
"gdev", "gmin", "tnom", "simulatorVersion", "sourceScaleFactor", NULL};
"gdev", "gmin", "tnom",
"simulatorVersion", "sourceScaleFactor", "initializeLimiting",
"epsmin", "reltol", "vntol", "abstol",
NULL};
char *sim_params_str[1] = {NULL};
double sim_param_vals[NUM_SIM_PARAMS] = {0, 0, 0, 0, 0};
double sim_param_vals[NUM_SIM_PARAMS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
/* values returned by $simparam*/
OsdiSimParas get_simparams(const CKTcircuit *ckt) {
@ -37,8 +40,12 @@ OsdiSimParas get_simparams(const CKTcircuit *ckt) {
double sourceScaleFactor = ckt->CKTsrcFact;
double gmin = ((ckt->CKTgmin) > (ckt->CKTdiagGmin)) ? (ckt->CKTgmin)
: (ckt->CKTdiagGmin);
double initializeLimiting = (ckt->CKTmode & MODEINITJCT) ? 1 : 0;
double sim_param_vals_[NUM_SIM_PARAMS] = {
gdev, gmin, ckt->CKTnomTemp, simulatorVersion, sourceScaleFactor};
// Verilog-A tnom is in degrees Celsius
gdev, gmin, ckt->CKTnomTemp-CONSTCtoK, simulatorVersion, sourceScaleFactor, initializeLimiting,
ckt->CKTepsmin, ckt->CKTreltol, ckt->CKTvoltTol, ckt->CKTabstol };
memcpy(&sim_param_vals, &sim_param_vals_, sizeof(double) * NUM_SIM_PARAMS);
OsdiSimParas sim_params_ = {.names = sim_params,
.vals = (double *)&sim_param_vals,

2
src/osdi/osditrunc.c
View File

@ -30,7 +30,7 @@ int OSDItrunc(GENmodel *in_model, CKTcircuit *ckt, double *timestep) {
}
}
int state = inst->GENstate;
int state = inst->GENstate + (int)descr->num_states;
for (uint32_t i = 0; i < descr->num_nodes; i++) {
if (descr->nodes[i].react_residual_off != UINT32_MAX) {
CKTterr(state, ckt, timestep);