diff --git a/src/spicelib/devices/ind/ind.c b/src/spicelib/devices/ind/ind.c index 430b46b78..1001cb373 100644 --- a/src/spicelib/devices/ind/ind.c +++ b/src/spicelib/devices/ind/ind.c @@ -63,7 +63,6 @@ int INDmPTSize = NUMELEMS(INDmPTable); int INDiSize = sizeof(INDinstance); int INDmSize = sizeof(INDmodel); -#ifdef MUTUAL IFparm MUTpTable[] = { /* parameters */ IOPAP( "k", MUT_COEFF, IF_REAL , "Mutual inductance"), @@ -86,5 +85,3 @@ int MUTpTSize = NUMELEMS(MUTpTable); int MUTmPTSize = 0; int MUTiSize = sizeof(INDinstance); int MUTmSize = sizeof(INDmodel); - -#endif /*MUTUAL*/ diff --git a/src/spicelib/devices/ind/inddefs.h b/src/spicelib/devices/ind/inddefs.h index d043c4afe..7daf2ca9a 100644 --- a/src/spicelib/devices/ind/inddefs.h +++ b/src/spicelib/devices/ind/inddefs.h @@ -6,10 +6,6 @@ Author: 1985 Thomas L. Quarles #ifndef IND #define IND - -/* turn on mutual inductor code */ -#define MUTUAL - #include "ngspice/ifsim.h" #include "ngspice/complex.h" #include "ngspice/gendefs.h" @@ -106,7 +102,6 @@ typedef struct sINDmodel { /* model structure for an inductor */ } INDmodel; -#ifdef MUTUAL /* structures used to describe mutual inductors */ @@ -149,7 +144,6 @@ IFuid MUTmodName; /* pointer to character string naming this model */ } MUTmodel; -#endif /*MUTUAL*/ /* device parameters */ #define IND_IND 1 @@ -186,7 +180,6 @@ IFuid MUTmodName; /* pointer to character string naming this model */ #define IND_QUEST_SENS_CPLX 205 #define IND_QUEST_SENS_DC 206 -#ifdef MUTUAL /* device parameters */ #define MUT_COEFF 401 #define MUT_IND1 402 @@ -203,7 +196,6 @@ IFuid MUTmodName; /* pointer to character string naming this model */ #define MUT_QUEST_SENS_CPLX 605 #define MUT_QUEST_SENS_DC 606 -#endif /*MUTUAL*/ #include "indext.h" diff --git a/src/spicelib/devices/ind/indload.c b/src/spicelib/devices/ind/indload.c index 711953f89..0a7c243c8 100644 --- a/src/spicelib/devices/ind/indload.c +++ b/src/spicelib/devices/ind/indload.c @@ -24,12 +24,10 @@ INDload(GENmodel *inModel, CKTcircuit *ckt) double m; int error; -#ifdef MUTUAL MUTinstance *muthere; MUTmodel *mutmodel; int ktype; int itype; -#endif /* loop through all the inductor models */ for( ; model != NULL; model = model->INDnextModel ) { @@ -49,7 +47,6 @@ INDload(GENmodel *inModel, CKTcircuit *ckt) *(ckt->CKTrhsOld + here->INDbrEq); } } -#ifdef MUTUAL } } ktype = CKTtypelook("mutual"); @@ -84,7 +81,6 @@ INDload(GENmodel *inModel, CKTcircuit *ckt) for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { -#endif /*MUTUAL*/ if(ckt->CKTmode & MODEDC) { req = 0.0; veq = 0.0; diff --git a/src/spicelib/devices/ind/indsacl.c b/src/spicelib/devices/ind/indsacl.c index 78fc36cc5..77e83dad6 100644 --- a/src/spicelib/devices/ind/indsacl.c +++ b/src/spicelib/devices/ind/indsacl.c @@ -22,7 +22,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) INDmodel *model = (INDmodel*)inModel; INDinstance *here; double cind,icind,val,ival; -#ifdef MUTUAL MUTinstance *muthere; MUTmodel *mutmodel; double cind1; @@ -48,7 +47,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) double k2; int ktype; int itype; -#endif SENstruct *info; info = ckt->CKTsenInfo; @@ -59,7 +57,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { -#ifdef MUTUAL } } ktype = CKTtypelook("mutual"); @@ -142,7 +139,6 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { -#endif /* MUTUAL */ if(here->INDsenParmNo){ cind = *(ckt->CKTrhsOld + here->INDbrEq); icind = *(ckt->CKTirhsOld + here->INDbrEq); diff --git a/src/spicelib/devices/ind/indsload.c b/src/spicelib/devices/ind/indsload.c index 74f9f99cd..941755fbc 100644 --- a/src/spicelib/devices/ind/indsload.c +++ b/src/spicelib/devices/ind/indsload.c @@ -28,7 +28,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt) double tag1; SENstruct *info; -#ifdef MUTUAL MUTinstance *muthere; MUTmodel *mutmodel; double cind1; @@ -39,7 +38,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt) int itype; int IND1_brEq; int IND2_brEq; -#endif info = ckt->CKTsenInfo; @@ -65,7 +63,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt) for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { -#ifdef MUTUAL } } ktype = CKTtypelook("mutual"); @@ -122,7 +119,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt) for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { -#endif /* MUTUAL */ cind = *(ckt->CKTrhsOld + here->INDbrEq); #ifdef SENSDEBUG fprintf(stdout,"\n cind=%.5e\n",cind); diff --git a/src/spicelib/devices/ind/indsupd.c b/src/spicelib/devices/ind/indsupd.c index 8ebddb552..2844cd1d0 100644 --- a/src/spicelib/devices/ind/indsupd.c +++ b/src/spicelib/devices/ind/indsupd.c @@ -28,7 +28,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) double dummy1; double dummy2; SENstruct *info; -#ifdef MUTUAL MUTinstance *muthere; MUTmodel *mutmodel; double sxp1; @@ -37,7 +36,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) double rootl1,rootl2; int ktype; int itype; -#endif info = ckt->CKTsenInfo; if(ckt->CKTmode & MODEINITTRAN) return(OK); @@ -65,9 +63,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) *(ckt->CKTstate0 + here->INDsensxp + 2 * (iparmno - 1)) = sxp; } - - -#ifdef MUTUAL } } ktype = CKTtypelook("mutual"); @@ -128,7 +123,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { -#endif /* MUTUAL */ for(iparmno = 1;iparmno<=info->SENparms;iparmno++){ if(ckt->CKTmode&MODETRANOP){ diff --git a/src/spicelib/devices/ind/mutacld.c b/src/spicelib/devices/ind/mutacld.c index 367eae234..e1c38f197 100644 --- a/src/spicelib/devices/ind/mutacld.c +++ b/src/spicelib/devices/ind/mutacld.c @@ -11,8 +11,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/sperror.h" #include "ngspice/suffix.h" - -#ifdef MUTUAL int MUTacLoad(GENmodel *inModel, CKTcircuit *ckt) { @@ -32,4 +30,3 @@ MUTacLoad(GENmodel *inModel, CKTcircuit *ckt) return(OK); } -#endif /* MUTUAL */ diff --git a/src/spicelib/devices/ind/mutask.c b/src/spicelib/devices/ind/mutask.c index dbf8a16b5..702a1ba46 100644 --- a/src/spicelib/devices/ind/mutask.c +++ b/src/spicelib/devices/ind/mutask.c @@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/sperror.h" #include "ngspice/suffix.h" -#ifdef MUTUAL /*ARGSUSED*/ int @@ -98,4 +97,3 @@ MUTask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, } /* NOTREACHED */ } -#endif /* MUTUAL */ diff --git a/src/spicelib/devices/ind/mutdel.c b/src/spicelib/devices/ind/mutdel.c index 361287800..bd74b6002 100644 --- a/src/spicelib/devices/ind/mutdel.c +++ b/src/spicelib/devices/ind/mutdel.c @@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/suffix.h" -#ifdef MUTUAL int MUTdelete(GENmodel *inModel, IFuid name, GENinstance **kill) { @@ -33,4 +32,3 @@ MUTdelete(GENmodel *inModel, IFuid name, GENinstance **kill) } return(E_NODEV); } -#endif /*MUTUAL*/ diff --git a/src/spicelib/devices/ind/mutdest.c b/src/spicelib/devices/ind/mutdest.c index 25f4109f9..88a81952c 100644 --- a/src/spicelib/devices/ind/mutdest.c +++ b/src/spicelib/devices/ind/mutdest.c @@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/suffix.h" -#ifdef MUTUAL void MUTdestroy(GENmodel **inModel) { @@ -33,4 +32,3 @@ MUTdestroy(GENmodel **inModel) if(oldmod) FREE(oldmod); *model = NULL; } -#endif /* MUTUAL */ diff --git a/src/spicelib/devices/ind/mutmdel.c b/src/spicelib/devices/ind/mutmdel.c index 406775106..3cac97f70 100644 --- a/src/spicelib/devices/ind/mutmdel.c +++ b/src/spicelib/devices/ind/mutmdel.c @@ -10,8 +10,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/sperror.h" #include "ngspice/suffix.h" - -#ifdef MUTUAL int MUTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { @@ -39,4 +37,3 @@ delgot: return(OK); } -#endif /* MUTUAL */ diff --git a/src/spicelib/devices/ind/mutparam.c b/src/spicelib/devices/ind/mutparam.c index 038a568b8..1a331701d 100644 --- a/src/spicelib/devices/ind/mutparam.c +++ b/src/spicelib/devices/ind/mutparam.c @@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/suffix.h" -#ifdef MUTUAL /* ARGSUSED */ int MUTparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select) @@ -40,4 +39,3 @@ MUTparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select) } return(OK); } -#endif /* MUTUAL */ diff --git a/src/spicelib/devices/ind/mutpzld.c b/src/spicelib/devices/ind/mutpzld.c index be1c2eece..c46a326ab 100644 --- a/src/spicelib/devices/ind/mutpzld.c +++ b/src/spicelib/devices/ind/mutpzld.c @@ -13,7 +13,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/suffix.h" -#ifdef MUTUAL /* ARGSUSED */ int MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) @@ -38,4 +37,3 @@ MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) return(OK); } -#endif /*MUTUAL*/ diff --git a/src/spicelib/devices/ind/mutsetup.c b/src/spicelib/devices/ind/mutsetup.c index 06d9b82fc..56e98f11d 100644 --- a/src/spicelib/devices/ind/mutsetup.c +++ b/src/spicelib/devices/ind/mutsetup.c @@ -16,7 +16,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/suffix.h" -#ifdef MUTUAL /*ARGSUSED*/ int MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) @@ -69,4 +68,3 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ } return(OK); } -#endif /* MUTUAL */ diff --git a/src/spicelib/devices/ind/mutsprt.c b/src/spicelib/devices/ind/mutsprt.c index 629f91db7..ff1bf5aa5 100644 --- a/src/spicelib/devices/ind/mutsprt.c +++ b/src/spicelib/devices/ind/mutsprt.c @@ -17,7 +17,6 @@ This function is obsolete (was used by an old sensitivity analysis) #include "ngspice/suffix.h" -#ifdef MUTUAL /* ARGSUSED */ void MUTsPrint(GENmodel *inModel, CKTcircuit* ckt) @@ -48,4 +47,3 @@ MUTsPrint(GENmodel *inModel, CKTcircuit* ckt) } } } -#endif /* MUTUAL */ diff --git a/src/spicelib/devices/ind/mutsset.c b/src/spicelib/devices/ind/mutsset.c index d65cfaa2d..7b89c1a86 100644 --- a/src/spicelib/devices/ind/mutsset.c +++ b/src/spicelib/devices/ind/mutsset.c @@ -17,7 +17,6 @@ This function is obsolete (was used by an old sensitivity analysis) #include "ngspice/sperror.h" #include "ngspice/suffix.h" -#ifdef MUTUAL /*ARGSUSED*/ int MUTsSetup(SENstruct *info, GENmodel *inModel) @@ -41,4 +40,3 @@ MUTsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } -#endif /* MUTUAL */