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

spicelib/devices/{sw,csw}, #4/, clean up negative hysteresis 

Rewrite special behaviour for negative hysteresis.
This is a functional invariant cleanup of commit:

> commit 0dae4607a0
> Date:   Wed Apr 25 18:28:20 2001 +0000
>
>     Added a patch to csw and sw from Jon Engelbert dealing with negative histeresys
This commit is contained in:
rlar 2018-03-10 11:01:23 +01:00
parent b4db438731
commit 56d1d3901d
2 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/spicelib/devices/csw/cswload.c
View File

@ -56,21 +56,17 @@ CSWload(GENmodel *inModel, CKTcircuit *ckt)
current_state = previous_state; current_state = previous_state;
} else if (ckt->CKTmode & (MODEINITFLOAT)) { } else if (ckt->CKTmode & (MODEINITFLOAT)) {
/* fixme, missleading comment: */
/* use state0 since INITTRAN or INITPRED already called */ /* use state0 since INITTRAN or INITPRED already called */
if (model->CSWiHysteresis > 0) { if (i_ctrl > (model->CSWiThreshold + fabs(model->CSWiHysteresis)))
if (i_ctrl > (model->CSWiThreshold + fabs(model->CSWiHysteresis))) current_state = REALLY_ON;
current_state = REALLY_ON; else if (i_ctrl < (model->CSWiThreshold - fabs(model->CSWiHysteresis)))
else if (i_ctrl < (model->CSWiThreshold - fabs(model->CSWiHysteresis))) current_state = REALLY_OFF;
current_state = REALLY_OFF; else
else if (model->CSWiHysteresis > 0) {
current_state = previous_state; current_state = previous_state;
} else { } else {
if (i_ctrl > (model->CSWiThreshold + fabs(model->CSWiHysteresis)))
current_state = REALLY_ON;
else if (i_ctrl < (model->CSWiThreshold - fabs(model->CSWiHysteresis)))
current_state = REALLY_OFF;
else {
/* in hysteresis... change value if going from low to hysteresis, /* in hysteresis... change value if going from low to hysteresis,
* or from hi to hysteresis. */ * or from hi to hysteresis. */
@ -84,7 +80,6 @@ CSWload(GENmodel *inModel, CKTcircuit *ckt)
else else
internalerror("bad value for previous region in swload"); internalerror("bad value for previous region in swload");
} }
}
if (current_state != old_current_state) { if (current_state != old_current_state) {
ckt->CKTnoncon++; /* ensure one more iteration */ ckt->CKTnoncon++; /* ensure one more iteration */
@ -93,19 +88,14 @@ CSWload(GENmodel *inModel, CKTcircuit *ckt)
} else if (ckt->CKTmode & (MODEINITTRAN | MODEINITPRED)) { } else if (ckt->CKTmode & (MODEINITTRAN | MODEINITPRED)) {
if (model->CSWiHysteresis > 0) { if (i_ctrl > (model->CSWiThreshold + fabs(model->CSWiHysteresis)))
if (i_ctrl > (model->CSWiThreshold + fabs(model->CSWiHysteresis))) current_state = REALLY_ON;
current_state = REALLY_ON; else if (i_ctrl < (model->CSWiThreshold - fabs(model->CSWiHysteresis)))
else if (i_ctrl < (model->CSWiThreshold - fabs(model->CSWiHysteresis))) current_state = REALLY_OFF;
current_state = REALLY_OFF; else
else if (model->CSWiHysteresis > 0) {
current_state = previous_state; current_state = previous_state;
} else { } else {
if (i_ctrl > (model->CSWiThreshold + fabs(model->CSWiHysteresis)))
current_state = REALLY_ON;
else if (i_ctrl < (model->CSWiThreshold - fabs(model->CSWiHysteresis)))
current_state = REALLY_OFF;
else {
/* in hysteresis... change value if going from low to hysteresis, /* in hysteresis... change value if going from low to hysteresis,
* or from hi to hysteresis. */ * or from hi to hysteresis. */
@ -119,7 +109,6 @@ CSWload(GENmodel *inModel, CKTcircuit *ckt)
else else
internalerror("bad value for previous region in cswload"); internalerror("bad value for previous region in cswload");
} }
}
} }
ckt->CKTstate0[here->CSWswitchstate] = current_state; ckt->CKTstate0[here->CSWswitchstate] = current_state;

42
src/spicelib/devices/sw/swload.c
View File

@ -61,20 +61,17 @@ SWload(GENmodel *inModel, CKTcircuit *ckt)
} else if (ckt->CKTmode & (MODEINITFLOAT)) { } else if (ckt->CKTmode & (MODEINITFLOAT)) {
/* fixme, missleading comment: */
/* use state0 since INITTRAN or INITPRED already called */ /* use state0 since INITTRAN or INITPRED already called */
if (model->SWvHysteresis > 0) { if (v_ctrl > (model->SWvThreshold + fabs(model->SWvHysteresis)))
if (v_ctrl > (model->SWvThreshold + fabs(model->SWvHysteresis))) current_state = REALLY_ON;
current_state = REALLY_ON; else if (v_ctrl < (model->SWvThreshold - fabs(model->SWvHysteresis)))
else if (v_ctrl < (model->SWvThreshold - fabs(model->SWvHysteresis))) current_state = REALLY_OFF;
current_state = REALLY_OFF; else
else if (model->SWvHysteresis > 0) {
current_state = old_current_state; current_state = old_current_state;
} else { // negative hysteresis case. } else {
if (v_ctrl > (model->SWvThreshold + fabs(model->SWvHysteresis))) // in hysteresis... change value if going from low to hysteresis, or from hi to hysteresis.
current_state = REALLY_ON;
else if (v_ctrl < (model->SWvThreshold - fabs(model->SWvHysteresis)))
current_state = REALLY_OFF;
else { // in hysteresis... change value if going from low to hysteresis, or from hi to hysteresis.
// if previous state was in hysteresis, then don't change the state.. // if previous state was in hysteresis, then don't change the state..
if (previous_state == HYST_OFF || previous_state == HYST_ON) if (previous_state == HYST_OFF || previous_state == HYST_ON)
current_state = previous_state; current_state = previous_state;
@ -85,7 +82,6 @@ SWload(GENmodel *inModel, CKTcircuit *ckt)
else else
internalerror("bad value for previous state in swload"); internalerror("bad value for previous state in swload");
} }
}
if (current_state != old_current_state) { if (current_state != old_current_state) {
ckt->CKTnoncon++; /* ensure one more iteration */ ckt->CKTnoncon++; /* ensure one more iteration */
@ -94,19 +90,14 @@ SWload(GENmodel *inModel, CKTcircuit *ckt)
} else if (ckt->CKTmode & (MODEINITTRAN | MODEINITPRED)) { } else if (ckt->CKTmode & (MODEINITTRAN | MODEINITPRED)) {
if (model->SWvHysteresis > 0) { if (v_ctrl > (model->SWvThreshold + fabs(model->SWvHysteresis)))
if (v_ctrl > (model->SWvThreshold + fabs(model->SWvHysteresis))) current_state = REALLY_ON;
current_state = REALLY_ON; else if (v_ctrl < (model->SWvThreshold - fabs(model->SWvHysteresis)))
else if (v_ctrl < (model->SWvThreshold - fabs(model->SWvHysteresis))) current_state = REALLY_OFF;
current_state = REALLY_OFF; else
else if (model->SWvHysteresis > 0) {
current_state = previous_state; current_state = previous_state;
} else { // negative hysteresis case. } else {
if (v_ctrl > (model->SWvThreshold + fabs(model->SWvHysteresis)))
current_state = REALLY_ON;
else if (v_ctrl < (model->SWvThreshold - fabs(model->SWvHysteresis)))
current_state = REALLY_OFF;
else {
if (previous_state == HYST_ON || previous_state == HYST_OFF) if (previous_state == HYST_ON || previous_state == HYST_OFF)
current_state = previous_state; current_state = previous_state;
else if (previous_state == REALLY_ON) else if (previous_state == REALLY_ON)
@ -114,7 +105,6 @@ SWload(GENmodel *inModel, CKTcircuit *ckt)
else if (previous_state == REALLY_OFF) else if (previous_state == REALLY_OFF)
current_state = REALLY_ON; current_state = REALLY_ON;
} }
}
} }
// code added to force the state to be updated. // code added to force the state to be updated.