diff --git a/src/spicelib/devices/asrc/asrcacld.c b/src/spicelib/devices/asrc/asrcacld.c index 9b15598b4..91bc05748 100644 --- a/src/spicelib/devices/asrc/asrcacld.c +++ b/src/spicelib/devices/asrc/asrcacld.c @@ -57,30 +57,12 @@ ASRCacLoad(GENmodel *inModel, CKTcircuit *ckt) } for (i = 0; i < here->ASRCtree->numVars; i++) { - switch (here->ASRCtree->varTypes[i]) { - case IF_INSTANCE: if (here->ASRCtype == ASRC_VOLTAGE) { - /* CCVS */ *(here->ASRCposptr[j++]) -= derivs[i] / factor; } else { - /* CCCS */ *(here->ASRCposptr[j++]) += derivs[i] / factor; *(here->ASRCposptr[j++]) -= derivs[i] / factor; } - break; - case IF_NODE: - if (here->ASRCtype == ASRC_VOLTAGE) { - /* VCVS */ - *(here->ASRCposptr[j++]) -= derivs[i] / factor; - } else { - /* VCCS */ - *(here->ASRCposptr[j++]) += derivs[i] / factor; - *(here->ASRCposptr[j++]) -= derivs[i] / factor; - } - break; - default: - return(E_BADPARM); - } } } } diff --git a/src/spicelib/devices/asrc/asrcload.c b/src/spicelib/devices/asrc/asrcload.c index a73be10f2..7ddba8c35 100644 --- a/src/spicelib/devices/asrc/asrcload.c +++ b/src/spicelib/devices/asrc/asrcload.c @@ -91,30 +91,12 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt) for (i = 0; i < here->ASRCtree->numVars; i++) { rhs -= (asrc_vals[i] * asrc_derivs[i]); - switch (here->ASRCtree->varTypes[i]) { - case IF_INSTANCE: if (here->ASRCtype == ASRC_VOLTAGE) { - /* CCVS */ *(here->ASRCposptr[j++]) -= asrc_derivs[i] * factor; } else { - /* CCCS */ *(here->ASRCposptr[j++]) += asrc_derivs[i] * factor; *(here->ASRCposptr[j++]) -= asrc_derivs[i] * factor; } - break; - case IF_NODE: - if (here->ASRCtype == ASRC_VOLTAGE) { - /* VCVS */ - *(here->ASRCposptr[j++]) -= asrc_derivs[i] * factor; - } else { - /* VCCS */ - *(here->ASRCposptr[j++]) += asrc_derivs[i] * factor; - *(here->ASRCposptr[j++]) -= asrc_derivs[i] * factor; - } - break; - default: - return(E_BADPARM); - } } /* Insert the RHS */ diff --git a/src/spicelib/devices/asrc/asrcpzld.c b/src/spicelib/devices/asrc/asrcpzld.c index 17fadc76d..5284c5b7b 100644 --- a/src/spicelib/devices/asrc/asrcpzld.c +++ b/src/spicelib/devices/asrc/asrcpzld.c @@ -73,30 +73,12 @@ ASRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) } for (i = 0; i < here->ASRCtree->numVars; i++) { - switch (here->ASRCtree->varTypes[i]) { - case IF_INSTANCE: if (here->ASRCtype == ASRC_VOLTAGE) { - /* CCVS */ *(here->ASRCposptr[j++]) -= asrc_derivs[i] / factor; } else { - /* CCCS */ *(here->ASRCposptr[j++]) += asrc_derivs[i] / factor; *(here->ASRCposptr[j++]) -= asrc_derivs[i] / factor; } - break; - case IF_NODE: - if (here->ASRCtype == ASRC_VOLTAGE) { - /* VCVS */ - *(here->ASRCposptr[j++]) -= asrc_derivs[i] / factor; - } else { - /* VCCS */ - *(here->ASRCposptr[j++]) += asrc_derivs[i] / factor; - *(here->ASRCposptr[j++]) -= asrc_derivs[i] / factor; - } - break; - default: - return(E_BADPARM); - } } } }