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

drop #ifdef MUTUAL

This commit is contained in:
Francesco Lannutti 2014-04-26 20:09:21 +02:00 committed by rlar
parent 1172be10b1
commit 86a5d92047
16 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/spicelib/devices/ind/ind.c
View File

@ -63,7 +63,6 @@ int INDmPTSize = NUMELEMS(INDmPTable);
int INDiSize = sizeof(INDinstance); int INDiSize = sizeof(INDinstance);
int INDmSize = sizeof(INDmodel); int INDmSize = sizeof(INDmodel);
#ifdef MUTUAL
IFparm MUTpTable[] = { /* parameters */ IFparm MUTpTable[] = { /* parameters */
IOPAP( "k", MUT_COEFF, IF_REAL , "Mutual inductance"), IOPAP( "k", MUT_COEFF, IF_REAL , "Mutual inductance"),
@ -86,5 +85,3 @@ int MUTpTSize = NUMELEMS(MUTpTable);
int MUTmPTSize = 0; int MUTmPTSize = 0;
int MUTiSize = sizeof(INDinstance); int MUTiSize = sizeof(INDinstance);
int MUTmSize = sizeof(INDmodel); int MUTmSize = sizeof(INDmodel);
#endif /*MUTUAL*/

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

@ -6,10 +6,6 @@ Author: 1985 Thomas L. Quarles
#ifndef IND #ifndef IND
#define IND #define IND
/* turn on mutual inductor code */
#define MUTUAL
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
#include "ngspice/complex.h" #include "ngspice/complex.h"
#include "ngspice/gendefs.h" #include "ngspice/gendefs.h"
@ -125,7 +121,6 @@ struct sINDmodel { /* model structure for an inductor */
}; };
#ifdef MUTUAL
/* structures used to describe mutual inductors */ /* structures used to describe mutual inductors */
@ -184,7 +179,6 @@ struct INDsystem {
struct INDsystem *next_system; struct INDsystem *next_system;
}; };
#endif /*MUTUAL*/
/* device parameters */ /* device parameters */
#define IND_IND 1 #define IND_IND 1
@ -221,7 +215,6 @@ struct INDsystem {
#define IND_QUEST_SENS_CPLX 205 #define IND_QUEST_SENS_CPLX 205
#define IND_QUEST_SENS_DC 206 #define IND_QUEST_SENS_DC 206
#ifdef MUTUAL
/* device parameters */ /* device parameters */
#define MUT_COEFF 401 #define MUT_COEFF 401
#define MUT_IND1 402 #define MUT_IND1 402
@ -238,7 +231,6 @@ struct INDsystem {
#define MUT_QUEST_SENS_CPLX 605 #define MUT_QUEST_SENS_CPLX 605
#define MUT_QUEST_SENS_DC 606 #define MUT_QUEST_SENS_DC 606
#endif /*MUTUAL*/
#include "indext.h" #include "indext.h"

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

@ -24,12 +24,10 @@ INDload(GENmodel *inModel, CKTcircuit *ckt)
double m; double m;
int error; int error;
#ifdef MUTUAL
MUTinstance *muthere; MUTinstance *muthere;
MUTmodel *mutmodel; MUTmodel *mutmodel;
int ktype; int ktype;
int itype; int itype;
#endif
/* loop through all the inductor models */ /* loop through all the inductor models */
for( ; model != NULL; model = INDnextModel(model)) { for( ; model != NULL; model = INDnextModel(model)) {
@ -49,7 +47,6 @@ INDload(GENmodel *inModel, CKTcircuit *ckt)
*(ckt->CKTrhsOld + here->INDbrEq); *(ckt->CKTrhsOld + here->INDbrEq);
} }
} }
#ifdef MUTUAL
} }
} }
ktype = CKTtypelook("mutual"); ktype = CKTtypelook("mutual");
@ -84,7 +81,6 @@ INDload(GENmodel *inModel, CKTcircuit *ckt)
for (here = INDinstances(model); here != NULL ; for (here = INDinstances(model); here != NULL ;
here=INDnextInstance(here)) { here=INDnextInstance(here)) {
#endif /*MUTUAL*/
if(ckt->CKTmode & MODEDC) { if(ckt->CKTmode & MODEDC) {
req = 0.0; req = 0.0;
veq = 0.0; veq = 0.0;

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

@ -22,7 +22,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
INDmodel *model = (INDmodel*)inModel; INDmodel *model = (INDmodel*)inModel;
INDinstance *here; INDinstance *here;
double cind,icind,val,ival; double cind,icind,val,ival;
#ifdef MUTUAL
MUTinstance *muthere; MUTinstance *muthere;
MUTmodel *mutmodel; MUTmodel *mutmodel;
double cind1; double cind1;
@ -48,7 +47,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
double k2; double k2;
int ktype; int ktype;
int itype; int itype;
#endif
SENstruct *info; SENstruct *info;
info = ckt->CKTsenInfo; info = ckt->CKTsenInfo;
@ -59,7 +57,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
for (here = INDinstances(model); here != NULL ; for (here = INDinstances(model); here != NULL ;
here=INDnextInstance(here)) { here=INDnextInstance(here)) {
#ifdef MUTUAL
} }
} }
ktype = CKTtypelook("mutual"); ktype = CKTtypelook("mutual");
@ -142,7 +139,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the instances of the model */ /* loop through all the instances of the model */
for (here = INDinstances(model); here != NULL ; for (here = INDinstances(model); here != NULL ;
here=INDnextInstance(here)) { here=INDnextInstance(here)) {
#endif /* MUTUAL */
if(here->INDsenParmNo){ if(here->INDsenParmNo){
cind = *(ckt->CKTrhsOld + here->INDbrEq); cind = *(ckt->CKTrhsOld + here->INDbrEq);
icind = *(ckt->CKTirhsOld + here->INDbrEq); icind = *(ckt->CKTirhsOld + here->INDbrEq);

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

@ -28,7 +28,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
double tag1; double tag1;
SENstruct *info; SENstruct *info;
#ifdef MUTUAL
MUTinstance *muthere; MUTinstance *muthere;
MUTmodel *mutmodel; MUTmodel *mutmodel;
double cind1; double cind1;
@ -39,7 +38,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
int itype; int itype;
int IND1_brEq; int IND1_brEq;
int IND2_brEq; int IND2_brEq;
#endif
info = ckt->CKTsenInfo; info = ckt->CKTsenInfo;
@ -65,7 +63,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
for (here = INDinstances(model); here != NULL ; for (here = INDinstances(model); here != NULL ;
here=INDnextInstance(here)) { here=INDnextInstance(here)) {
#ifdef MUTUAL
} }
} }
ktype = CKTtypelook("mutual"); ktype = CKTtypelook("mutual");
@ -122,7 +119,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
for (here = INDinstances(model); here != NULL ; for (here = INDinstances(model); here != NULL ;
here=INDnextInstance(here)) { here=INDnextInstance(here)) {
#endif /* MUTUAL */
cind = *(ckt->CKTrhsOld + here->INDbrEq); cind = *(ckt->CKTrhsOld + here->INDbrEq);
#ifdef SENSDEBUG #ifdef SENSDEBUG
fprintf(stdout,"\n cind=%.5e\n",cind); fprintf(stdout,"\n cind=%.5e\n",cind);

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

@ -28,7 +28,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
double dummy1; double dummy1;
double dummy2; double dummy2;
SENstruct *info; SENstruct *info;
#ifdef MUTUAL
MUTinstance *muthere; MUTinstance *muthere;
MUTmodel *mutmodel; MUTmodel *mutmodel;
double sxp1; double sxp1;
@ -37,7 +36,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
double rootl1,rootl2; double rootl1,rootl2;
int ktype; int ktype;
int itype; int itype;
#endif
info = ckt->CKTsenInfo; info = ckt->CKTsenInfo;
if(ckt->CKTmode & MODEINITTRAN) return(OK); if(ckt->CKTmode & MODEINITTRAN) return(OK);
@ -67,7 +65,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
} }
#ifdef MUTUAL
} }
} }
ktype = CKTtypelook("mutual"); ktype = CKTtypelook("mutual");
@ -128,7 +125,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the instances of the model */ /* loop through all the instances of the model */
for (here = INDinstances(model); here != NULL ; for (here = INDinstances(model); here != NULL ;
here=INDnextInstance(here)) { here=INDnextInstance(here)) {
#endif /* MUTUAL */
for(iparmno = 1;iparmno<=info->SENparms;iparmno++){ for(iparmno = 1;iparmno<=info->SENparms;iparmno++){
if(ckt->CKTmode&MODETRANOP){ if(ckt->CKTmode&MODETRANOP){

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

@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
int int
MUTacLoad(GENmodel *inModel, CKTcircuit *ckt) MUTacLoad(GENmodel *inModel, CKTcircuit *ckt)
{ {
@ -32,4 +31,3 @@ MUTacLoad(GENmodel *inModel, CKTcircuit *ckt)
return(OK); return(OK);
} }
#endif /* MUTUAL */

2
src/spicelib/devices/ind/mutask.c
View File

@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
/*ARGSUSED*/ /*ARGSUSED*/
int int
@ -98,4 +97,3 @@ MUTask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
} }
/* NOTREACHED */ /* NOTREACHED */
} }
#endif /* MUTUAL */

2
src/spicelib/devices/ind/mutdel.c
View File

@ -9,11 +9,9 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
int int
MUTdelete(GENinstance *gen_inst) MUTdelete(GENinstance *gen_inst)
{ {
NG_IGNORE(gen_inst); NG_IGNORE(gen_inst);
return OK; return OK;
} }
#endif /*MUTUAL*/

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

@ -8,11 +8,7 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
void void
MUTdestroy(void) MUTdestroy(void)
{ {
} }
#endif

3
src/spicelib/devices/ind/mutmdel.c
View File

@ -8,12 +8,9 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
int int
MUTmDelete(GENmodel *gen_model) MUTmDelete(GENmodel *gen_model)
{ {
NG_IGNORE(gen_model); NG_IGNORE(gen_model);
return OK; return OK;
} }
#endif /* MUTUAL */

2
src/spicelib/devices/ind/mutparam.c
View File

@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
/* ARGSUSED */ /* ARGSUSED */
int int
MUTparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select) MUTparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
@ -40,4 +39,3 @@ MUTparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
} }
return(OK); return(OK);
} }
#endif /* MUTUAL */

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

@ -13,7 +13,6 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
/* ARGSUSED */ /* ARGSUSED */
int int
MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
@ -38,4 +37,3 @@ MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
return(OK); return(OK);
} }
#endif /*MUTUAL*/

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

@ -24,8 +24,6 @@ Author: 1985 Thomas L. Quarles
} while(0) } while(0)
#ifdef MUTUAL
int int
MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
{ {
@ -66,5 +64,3 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
return(OK); return(OK);
} }
#endif

2
src/spicelib/devices/ind/mutsprt.c
View File

@ -17,7 +17,6 @@ This function is obsolete (was used by an old sensitivity analysis)
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
/* ARGSUSED */ /* ARGSUSED */
void void
MUTsPrint(GENmodel *inModel, CKTcircuit* ckt) MUTsPrint(GENmodel *inModel, CKTcircuit* ckt)
@ -48,4 +47,3 @@ MUTsPrint(GENmodel *inModel, CKTcircuit* ckt)
} }
} }
} }
#endif /* MUTUAL */

2
src/spicelib/devices/ind/mutsset.c
View File

@ -17,7 +17,6 @@ This function is obsolete (was used by an old sensitivity analysis)
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef MUTUAL
/*ARGSUSED*/ /*ARGSUSED*/
int int
MUTsSetup(SENstruct *info, GENmodel *inModel) MUTsSetup(SENstruct *info, GENmodel *inModel)
@ -41,4 +40,3 @@ MUTsSetup(SENstruct *info, GENmodel *inModel)
} }
return(OK); return(OK);
} }
#endif /* MUTUAL */