From 778b7303934f64f4ec039c660999e52ba214844c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81rp=C3=A1d=20B=C5=B1rmen?= Date: Sat, 30 Nov 2024 22:08:37 +0100 Subject: [PATCH] Exposed more $simparams via OSDI. initializeLimiting, epsmin, reltol, vntol, abstol --- src/osdi/osdiload.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/osdi/osdiload.c b/src/osdi/osdiload.c index 094d55d58..c07bb377a 100644 --- a/src/osdi/osdiload.c +++ b/src/osdi/osdiload.c @@ -23,12 +23,15 @@ #include #include -#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,11 @@ 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}; + gdev, gmin, ckt->CKTnomTemp, 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,