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

unify ind/mut (append Ptr)

This commit is contained in:
rlar 2016-06-18 23:54:15 +02:00
parent 9e208d6a05
commit 8f9ad61019
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/spicelib/devices/ind/inddefs.h
View File

@ -124,8 +124,8 @@ IFuid MUTindName1; /* name of coupled inductor 1 */
IFuid MUTindName2; /* name of coupled inductor 2 */ IFuid MUTindName2; /* name of coupled inductor 2 */
INDinstance *MUTind1; /* pointer to coupled inductor 1 */ INDinstance *MUTind1; /* pointer to coupled inductor 1 */
INDinstance *MUTind2; /* pointer to coupled inductor 2 */ INDinstance *MUTind2; /* pointer to coupled inductor 2 */
double *MUTbr1br2; /* pointers to off-diagonal intersections of */ double *MUTbr1br2Ptr; /* pointers to off-diagonal intersections of */
double *MUTbr2br1; /* current branch equations in matrix */ double *MUTbr2br1Ptr; /* current branch equations in matrix */
unsigned MUTindGiven : 1; /* flag to indicate inductance was specified */ unsigned MUTindGiven : 1; /* flag to indicate inductance was specified */
int MUTsenParmNo; /* parameter # for sensitivity use; int MUTsenParmNo; /* parameter # for sensitivity use;

4
src/spicelib/devices/ind/indload.c
View File

@ -71,8 +71,8 @@ INDload(GENmodel *inModel, CKTcircuit *ckt)
muthere->MUTind1->INDbrEq); muthere->MUTind1->INDbrEq);
} }
*(muthere->MUTbr1br2) -= muthere->MUTfactor*ckt->CKTag[0]; *(muthere->MUTbr1br2Ptr) -= muthere->MUTfactor*ckt->CKTag[0];
*(muthere->MUTbr2br1) -= muthere->MUTfactor*ckt->CKTag[0]; *(muthere->MUTbr2br1Ptr) -= muthere->MUTfactor*ckt->CKTag[0];
} }
} }
itype = CKTtypelook("Inductor"); itype = CKTtypelook("Inductor");

4
src/spicelib/devices/ind/mutacld.c
View File

@ -25,8 +25,8 @@ MUTacLoad(GENmodel *inModel, CKTcircuit *ckt)
here = here->MUTnextInstance) { here = here->MUTnextInstance) {
val = ckt->CKTomega * here->MUTfactor; val = ckt->CKTomega * here->MUTfactor;
*(here->MUTbr1br2 +1) -= val; *(here->MUTbr1br2Ptr +1) -= val;
*(here->MUTbr2br1 +1) -= val; *(here->MUTbr2br1Ptr +1) -= val;
} }
} }
return(OK); return(OK);

8
src/spicelib/devices/ind/mutpzld.c
View File

@ -29,10 +29,10 @@ MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
here = here->MUTnextInstance) { here = here->MUTnextInstance) {
val = here->MUTfactor; val = here->MUTfactor;
*(here->MUTbr1br2 ) -= val * s->real; *(here->MUTbr1br2Ptr ) -= val * s->real;
*(here->MUTbr1br2 +1) -= val * s->imag; *(here->MUTbr1br2Ptr +1) -= val * s->imag;
*(here->MUTbr2br1 ) -= val * s->real; *(here->MUTbr2br1Ptr ) -= val * s->real;
*(here->MUTbr2br1 +1) -= val * s->imag; *(here->MUTbr2br1Ptr +1) -= val * s->imag;
} }
} }
return(OK); return(OK);

4
src/spicelib/devices/ind/mutsetup.c
View File

@ -63,8 +63,8 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
return(E_NOMEM);\ return(E_NOMEM);\
} } while(0) } } while(0)
TSTALLOC(MUTbr1br2,MUTind1->INDbrEq,MUTind2->INDbrEq); TSTALLOC(MUTbr1br2Ptr,MUTind1->INDbrEq,MUTind2->INDbrEq);
TSTALLOC(MUTbr2br1,MUTind2->INDbrEq,MUTind1->INDbrEq); TSTALLOC(MUTbr2br1Ptr,MUTind2->INDbrEq,MUTind1->INDbrEq);
} }
} }
return(OK); return(OK);