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

move instance m-factor into ressetup

This commit is contained in:
h_vogt 2013-05-07 23:09:57 +02:00 committed by rlar
parent 4b8f031971
commit 0facd43319
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/spicelib/devices/res/resload.c
View File

@ -25,8 +25,6 @@ RESload(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the instances of the model */ /* loop through all the instances of the model */
for (here = model->RESinstances; here != NULL ; for (here = model->RESinstances; here != NULL ;
here = here->RESnextInstance) { here = here->RESnextInstance) {
if(!here->RESmGiven) here->RESm = 1.0;
here->REScurrent = (*(ckt->CKTrhsOld+here->RESposNode) - here->REScurrent = (*(ckt->CKTrhsOld+here->RESposNode) -
*(ckt->CKTrhsOld+here->RESnegNode)) * here->RESconduct; *(ckt->CKTrhsOld+here->RESnegNode)) * here->RESconduct;

20
src/spicelib/devices/res/ressetup.c
View File

@ -28,22 +28,10 @@ RESsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit*ckt, int *state)
/* loop through all the instances of the model */ /* loop through all the instances of the model */
for (here = model->RESinstances; here != NULL ; for (here = model->RESinstances; here != NULL ;
here=here->RESnextInstance) { here=here->RESnextInstance) {
/* if(!here->RESmGiven)
* Paolo Nenzi 2003 here->RESm = 1.0;
* The following lines are needed if I will move the defaulting code
* from REStemp to RESsetup, as in other (more recent ?) spice devices
*
* ------------------------------------------LEGACY CODE - Francesco Lannutti - October 22, 2012
* if (here->RESowner != ARCHme)
* goto matrixpointers;
*
* matrixpointers:
* ------------------------------------------
*
* put here instance parameter defaulting.
*/
/* macro to make elements with built in test for out of memory */ /* macro to make elements with built in test for out of memory */
#define TSTALLOC(ptr,first,second) \ #define TSTALLOC(ptr,first,second) \
if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\