fix rewrite, has_cuda is now part of the gneric GENmodel

This commit is contained in:
rlar 2018-04-01 19:18:46 +02:00
parent 18e8adfc7a
commit cde8cd5544
97 changed files with 49 additions and 343 deletions

View File

@ -71,12 +71,6 @@ typedef struct sASRCmodel { /* model structure for a source */
#define ASRCinstances(inst) ((ASRCinstance *)((inst)->gen.GENinstances))
#define ASRCmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
} ASRCmodel;

View File

@ -35,7 +35,7 @@ ASRCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
for (here = ASRCinstances(model); here; here=ASRCnextInstance(here)) {

View File

@ -360,12 +360,6 @@ typedef struct sBJTmodel { /* model structure for a bjt */
#define BJTinstances(inst) ((BJTinstance *)((inst)->gen.GENinstances))
#define BJTmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BJTtype;
int BJTsubs;

View File

@ -36,7 +36,7 @@ BJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(model->BJTtype != NPN && model->BJTtype != PNP) {

View File

@ -29,7 +29,7 @@ B1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt,
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for B1 MOSFET Models */

View File

@ -349,12 +349,6 @@ typedef struct sBSIM1model { /* model structure for a resistor */
#define B1instances(inst) ((B1instance *)((inst)->gen.GENinstances))
#define B1modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int B1type; /* device type : 1 = nmos, -1 = pmos */
double B1vfb0;

View File

@ -28,7 +28,7 @@ B2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for B2 MOSFET Models */

View File

@ -272,12 +272,6 @@ typedef struct sBSIM2model { /* model structure for a resistor */
#define B2instances(inst) ((B2instance *)((inst)->gen.GENinstances))
#define B2modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int B2type; /* device type: 1 = nmos, -1 = pmos */
int pad;

View File

@ -54,7 +54,7 @@ BSIM3instance **InstArray;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for BSIM3 MOSFET Models */

View File

@ -445,12 +445,6 @@ typedef struct sBSIM3model
#define BSIM3instances(inst) ((BSIM3instance *)((inst)->gen.GENinstances))
#define BSIM3modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM3type;
int BSIM3mobMod;

View File

@ -704,12 +704,6 @@ typedef struct sB3SOIDDmodel
#define B3SOIDDinstances(inst) ((B3SOIDDinstance *)((inst)->gen.GENinstances))
#define B3SOIDDmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int B3SOIDDtype;
int B3SOIDDmobMod;

View File

@ -52,7 +52,7 @@ IFuid tmpName;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for B3SOIDD MOSFET Models */

View File

@ -696,12 +696,6 @@ typedef struct sB3SOIFDmodel
#define B3SOIFDinstances(inst) ((B3SOIFDinstance *)((inst)->gen.GENinstances))
#define B3SOIFDmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int B3SOIFDtype;
int B3SOIFDmobMod;

View File

@ -52,7 +52,7 @@ IFuid tmpName;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for B3SOIFD MOSFET Models */

View File

@ -665,12 +665,6 @@ typedef struct sB3SOIPDmodel
#define B3SOIPDinstances(inst) ((B3SOIPDinstance *)((inst)->gen.GENinstances))
#define B3SOIPDmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int B3SOIPDtype;
int B3SOIPDmobMod;

View File

@ -52,7 +52,7 @@ IFuid tmpName;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for B3SOIPD MOSFET Models */

View File

@ -40,7 +40,7 @@ IFuid tmpName;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for BSIM3v0 MOSFET Models */

View File

@ -363,12 +363,6 @@ typedef struct sBSIM3v0model
#define BSIM3v0instances(inst) ((BSIM3v0instance *)((inst)->gen.GENinstances))
#define BSIM3v0modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM3v0type;
int BSIM3v0mobMod;

View File

@ -46,7 +46,7 @@ IFuid tmpName;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for BSIM3v1 MOSFET Models */

View File

@ -365,12 +365,6 @@ typedef struct sBSIM3v1model
#define BSIM3v1instances(inst) ((BSIM3v1instance *)((inst)->gen.GENinstances))
#define BSIM3v1modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM3v1type;
int BSIM3v1mobMod;

View File

@ -50,7 +50,7 @@ BSIM3v32instance **InstArray;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for BSIM3v32 MOSFET Models */

View File

@ -442,12 +442,6 @@ typedef struct sBSIM3v32model
#define BSIM3v32instances(inst) ((BSIM3v32instance *)((inst)->gen.GENinstances))
#define BSIM3v32modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM3v32type;
int BSIM3v32mobMod;

View File

@ -114,7 +114,7 @@ BSIM4instance **InstArray;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* process defaults of model parameters */

View File

@ -942,12 +942,6 @@ typedef struct sBSIM4model
#define BSIM4instances(inst) ((BSIM4instance *)((inst)->gen.GENinstances))
#define BSIM4modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM4type;
int BSIM4mobMod;

View File

@ -71,7 +71,7 @@ BSIM4v5instance **InstArray;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* process defaults of model parameters */

View File

@ -859,12 +859,6 @@ typedef struct sBSIM4v5model
#define BSIM4v5instances(inst) ((BSIM4v5instance *)((inst)->gen.GENinstances))
#define BSIM4v5modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM4v5type;
int BSIM4v5mobMod;

View File

@ -78,7 +78,7 @@ BSIM4v6instance **InstArray;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* process defaults of model parameters */

View File

@ -880,12 +880,6 @@ typedef struct sBSIM4v6model
#define BSIM4v6instances(inst) ((BSIM4v6instance *)((inst)->gen.GENinstances))
#define BSIM4v6modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM4v6type;
int BSIM4v6mobMod;

View File

@ -2603,7 +2603,7 @@ do { if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NUL
model->n_instances = i ;
/* This model supports CUDA */
model->has_cuda = 1 ;
model->gen.has_cuda = 1 ;
}
/* loop through all the BSIM4v7 models */

View File

@ -1435,12 +1435,6 @@ typedef struct sBSIM4v7model
#define BSIM4v7instances(inst) ((BSIM4v7instance *)((inst)->gen.GENinstances))
#define BSIM4v7modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int BSIM4v7type;
int BSIM4v7mobMod;

View File

@ -1195,12 +1195,6 @@ typedef struct sB4SOImodel
#define B4SOIinstances(inst) ((B4SOIinstance *)((inst)->gen.GENinstances))
#define B4SOImodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int B4SOItype;
int B4SOImobMod;

View File

@ -64,7 +64,7 @@ B4SOIinstance **InstArray;
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for B4SOI MOSFET Models */

View File

@ -120,12 +120,6 @@ typedef struct sCAPmodel { /* model structure for a capacitor */
#define CAPinstances(inst) ((CAPinstance *)((inst)->gen.GENinstances))
#define CAPmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double CAPtnom; /* temperature at which capacitance measured */
double CAPtempCoeff1; /* linear temperature coefficient */
double CAPtempCoeff2; /* quadratic temperature coefficient */

View File

@ -138,7 +138,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
model->n_instances = i ;
/* This model supports CUDA */
model->has_cuda = 1 ;
model->gen.has_cuda = 1 ;
}
/* loop through all the capacitor models */

View File

@ -62,12 +62,6 @@ typedef struct sCCCSmodel { /* model structure for a source */
#define CCCSinstances(inst) ((CCCSinstance *)((inst)->gen.GENinstances))
#define CCCSmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
} CCCSmodel;
/* device parameters */

View File

@ -31,7 +31,7 @@ CCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* loop through all the instances of the model */

View File

@ -69,12 +69,6 @@ typedef struct sCCVSmodel { /* model structure for a CCVsource */
#define CCVSinstances(inst) ((CCVSinstance *)((inst)->gen.GENinstances))
#define CCVSmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
} CCVSmodel;
/* device parameters */

View File

@ -29,7 +29,7 @@ CCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* loop through all the instances of the model */

View File

@ -91,12 +91,6 @@ typedef struct sCPLmodel { /* model structure for a cpl */
#define CPLinstances(inst) ((CPLinstance *)((inst)->gen.GENinstances))
#define CPLmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double *Rm;
int Rm_counter;
double *Gm;

View File

@ -151,7 +151,7 @@ CPLsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if (!model->Rmgiven) {

View File

@ -75,12 +75,6 @@ typedef struct sCSWmodel { /* model structure for a switch */
#define CSWinstances(inst) ((CSWinstance *)((inst)->gen.GENinstances))
#define CSWmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double CSWonResistance; /* switch "on" resistance */
double CSWoffResistance; /* switch "off" resistance */
double CSWiThreshold; /* switching threshold current */

View File

@ -27,7 +27,7 @@ CSWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default Value Processing for Switch Model */

View File

@ -185,12 +185,6 @@ typedef struct sDIOmodel { /* model structure for a diode */
#define DIOinstances(inst) ((DIOinstance *)((inst)->gen.GENinstances))
#define DIOmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
unsigned DIOlevelGiven : 1;
unsigned DIOsatCurGiven : 1;
unsigned DIOsatSWCurGiven : 1;

View File

@ -29,7 +29,7 @@ DIOsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(!model->DIOlevelGiven) {

View File

@ -170,12 +170,6 @@ typedef struct sHFETAmodel {
#define HFETAinstances(inst) ((HFETAinstance *)((inst)->gen.GENinstances))
#define HFETAmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int HFETAtype;
int HFETAgatemod;

View File

@ -33,7 +33,7 @@ HFETAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if( (model->HFETAtype != NHFET) && (model->HFETAtype != PHFET) ) {

View File

@ -115,12 +115,6 @@ typedef struct sHFET2model {
#define HFET2instances(inst) ((HFET2instance *)((inst)->gen.GENinstances))
#define HFET2modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int HFET2type;
double HFET2cf;

View File

@ -24,7 +24,7 @@ int HFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if((TYPE != NHFET) && (TYPE != PHFET) )

View File

@ -739,12 +739,6 @@ typedef struct sHSM2model { /* model structure for a resistor */
#define HSM2instances(inst) ((HSM2instance *)((inst)->gen.GENinstances))
#define HSM2modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int HSM2_type; /* device type: 1 = nmos, -1 = pmos */
int HSM2_level; /* level */
int HSM2_info; /* information */

View File

@ -124,7 +124,7 @@ int HSM2setup(
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for HSM2 MOSFET Models */

View File

@ -1012,12 +1012,6 @@ typedef struct sHSMHVmodel { /* model structure for a resistor */
#define HSMHVinstances(inst) ((HSMHVinstance *)((inst)->gen.GENinstances))
#define HSMHVmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int HSMHV_type; /* device type: 1 = nmos, -1 = pmos */
int HSMHV_level; /* level */
int HSMHV_info; /* information */

View File

@ -68,7 +68,7 @@ int HSMHVsetup(
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for HVMOS Models */

View File

@ -1137,12 +1137,6 @@ typedef struct sHSMHV2model { /* model structure for a resistor */
#define HSMHV2instances(inst) ((HSMHV2instance *)((inst)->gen.GENinstances))
#define HSMHV2modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int HSMHV2_type; /* device type: 1 = nmos, -1 = pmos */
int HSMHV2_level; /* level */
int HSMHV2_info; /* information */

View File

@ -128,7 +128,7 @@ int HSMHV2setup(
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default value Processing for HVMOS Models */

View File

@ -130,12 +130,6 @@ struct sINDmodel { /* model structure for an inductor */
#define INDinstances(inst) ((INDinstance *)((inst)->gen.GENinstances))
#define INDmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double INDmInd; /* Model inductance */
double INDtnom; /* temperature at which inductance measured */
double INDtempCoeff1; /* first temperature coefficient */
@ -257,12 +251,6 @@ struct sMUTmodel { /* model structure for a mutual inductor */
#define MUTinstances(inst) ((MUTinstance *)((inst)->gen.GENinstances))
#define MUTmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
#ifdef USE_CUSPICE
MUTparamCPUstruct MUTparamCPU;
MUTparamGPUstruct MUTparamGPU;

View File

@ -125,7 +125,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
model->n_instances = i ;
/* This model supports CUDA */
model->has_cuda = 1 ;
model->gen.has_cuda = 1 ;
}
/* loop through all the inductor models */

View File

@ -81,7 +81,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
model->n_instances = i;
/* This model supports CUDA */
model->has_cuda = 1 ;
model->gen.has_cuda = 1 ;
}
/* loop through all the mutual inductor models */

View File

@ -197,12 +197,6 @@ typedef struct sJFETmodel { /* model structure for a jfet */
#define JFETinstances(inst) ((JFETinstance *)((inst)->gen.GENinstances))
#define JFETmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int JFETtype;
double JFETthreshold;

View File

@ -31,7 +31,7 @@ JFETsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if( (model->JFETtype != NJF) && (model->JFETtype != PJF) ) {

View File

@ -209,12 +209,6 @@ typedef struct sJFET2model { /* model structure for a jfet */
#define JFET2instances(inst) ((JFET2instance *)((inst)->gen.GENinstances))
#define JFET2modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int JFET2type;
#define PARAM(code,id,flag,ref,default,descrip) double ref;

View File

@ -32,7 +32,7 @@ JFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if( (model->JFET2type != NJF) && (model->JFET2type != PJF) ) {

View File

@ -108,12 +108,6 @@ typedef struct sLTRAmodel { /* model structure for a transmission lines */
#define LTRAinstances(inst) ((LTRAinstance *)((inst)->gen.GENinstances))
#define LTRAmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double LTRAh1dashFirstVal; /* first needed value of h1dasg at
current timepoint */
double LTRAh2FirstVal; /* first needed value of h2 at current

View File

@ -29,7 +29,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if (!model->LTRAnlGiven) {

View File

@ -190,12 +190,6 @@ typedef struct sMESmodel { /* model structure for a mesfet */
#define MESinstances(inst) ((MESinstance *)((inst)->gen.GENinstances))
#define MESmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int MEStype;
double MESthreshold;

View File

@ -28,7 +28,7 @@ MESsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if( (model->MEStype != NMF) && (model->MEStype != PMF) ) {

View File

@ -256,12 +256,6 @@ typedef struct sMESAmodel { /* model structure for a MESAfet */
#define MESAinstances(inst) ((MESAinstance *)((inst)->gen.GENinstances))
#define MESAmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int MESAtype;
double MESAthreshold;

View File

@ -31,7 +31,7 @@ MESAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if( (model->MESAtype != NMF) ) {

View File

@ -347,12 +347,6 @@ typedef struct sMOS1model { /* model structure for a resistor */
#define MOS1instances(inst) ((MOS1instance *)((inst)->gen.GENinstances))
#define MOS1modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int MOS1type; /* device type : 1 = nmos, -1 = pmos */
double MOS1tnom; /* temperature at which parameters measured */
double MOS1latDiff;

View File

@ -29,7 +29,7 @@ MOS1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt,
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(!model->MOS1typeGiven) {

View File

@ -354,12 +354,6 @@ typedef struct sMOS2model { /* model structure for a resistor */
#define MOS2instances(inst) ((MOS2instance *)((inst)->gen.GENinstances))
#define MOS2modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int MOS2type; /* device type : 1 = nmos, -1 = pmos */
int MOS2gateType;

View File

@ -28,7 +28,7 @@ MOS2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(!model->MOS2typeGiven) {

View File

@ -352,12 +352,6 @@ typedef struct sMOS3model { /* model structure for a resistor */
#define MOS3instances(inst) ((MOS3instance *)((inst)->gen.GENinstances))
#define MOS3modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int MOS3type; /* device type : 1 = nmos, -1 = pmos */
double MOS3tnom; /* temperature at which parameters measured */
double MOS3latDiff;

View File

@ -32,7 +32,7 @@ MOS3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* perform model defaulting */

View File

@ -279,12 +279,6 @@ typedef struct sMOS6model { /* model structure for a resistor */
#define MOS6instances(inst) ((MOS6instance *)((inst)->gen.GENinstances))
#define MOS6modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int MOS6type; /* device type : 1 = nmos, -1 = pmos */
double MOS6tnom; /* temperature at which parameters measured */
double MOS6latDiff;

View File

@ -29,7 +29,7 @@ MOS6setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt,
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(!model->MOS6typeGiven) {

View File

@ -354,12 +354,6 @@ typedef struct sMOS9model { /* model structure for a resistor */
#define MOS9instances(inst) ((MOS9instance *)((inst)->gen.GENinstances))
#define MOS9modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int MOS9type; /* device type : 1 = nmos, -1 = pmos */
double MOS9tnom; /* temperature at which parameters measured */
double MOS9latDiff;

View File

@ -32,7 +32,7 @@ MOS9setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* perform model defaulting */

View File

@ -148,12 +148,6 @@ typedef struct sRESmodel { /* model structure for a resistor */
#define RESinstances(inst) ((RESinstance *)((inst)->gen.GENinstances))
#define RESmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double REStnom; /* temperature at which resistance measured */
double REStempCoeff1; /* first temperature coefficient of resistors */
double REStempCoeff2; /* second temperature coefficient of resistors */

View File

@ -96,7 +96,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
model->n_instances = i ;
/* This model supports CUDA */
model->has_cuda = 1 ;
model->gen.has_cuda = 1 ;
}
/* loop through all the resistor models */

View File

@ -482,12 +482,6 @@ typedef struct sSOI3model { /* model structure for an SOI3 MOSFET */
#define SOI3instances(inst) ((SOI3instance *)((inst)->gen.GENinstances))
#define SOI3modName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int SOI3type; /* device type : 1 = nsoi, -1 = psoi */
double SOI3tnom; /* temperature at which parameters measured */
double SOI3latDiff;

View File

@ -57,7 +57,7 @@ SOI3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(!model->SOI3typeGiven) {

View File

@ -74,12 +74,6 @@ typedef struct sSWmodel { /* model structure for a switch */
#define SWinstances(inst) ((SWinstance *)((inst)->gen.GENinstances))
#define SWmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double SWonResistance; /* switch "on" resistance */
double SWoffResistance; /* switch "off" resistance */
double SWvThreshold; /* switching threshold voltage */

View File

@ -27,7 +27,7 @@ SWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* Default Value Processing for Switch Model */

View File

@ -123,12 +123,6 @@ typedef struct sTRAmodel { /* model structure for a transmission lines */
#define TRAinstances(inst) ((TRAinstance *)((inst)->gen.GENinstances))
#define TRAmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
} TRAmodel;
/* device parameters */

View File

@ -32,7 +32,7 @@ TRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* loop through all the instances of the model */

View File

@ -81,12 +81,6 @@ typedef struct sTXLmodel { /* model structure for a txl */
#define TXLinstances(inst) ((TXLinstance *)((inst)->gen.GENinstances))
#define TXLmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double R;
double L;
double G;

View File

@ -89,7 +89,7 @@ TXLsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit*ckt, int *state)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if (!model->Rgiven) {

View File

@ -48,12 +48,6 @@ typedef struct sURCmodel { /* model structure for a resistor */
#define URCinstances(inst) ((URCinstance *)((inst)->gen.GENinstances))
#define URCmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
double URCk; /* propagation constant for URC */
double URCfmax; /* max frequence of interest */
double URCrPerL; /* resistance per unit length */

View File

@ -65,7 +65,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(!model->URCkGiven)

View File

@ -414,12 +414,6 @@ typedef struct sVBICmodel { /* model structure for a vbic */
#define VBICinstances(inst) ((VBICinstance *)((inst)->gen.GENinstances))
#define VBICmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
int VBICtype;
double VBICtnom;

View File

@ -37,7 +37,7 @@ VBICsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
if(model->VBICtype != NPN && model->VBICtype != PNP) {

View File

@ -72,12 +72,6 @@ typedef struct sVCCSmodel { /* model structure for a source */
#define VCCSinstances(inst) ((VCCSinstance *)((inst)->gen.GENinstances))
#define VCCSmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
} VCCSmodel;
/* device parameters */

View File

@ -32,7 +32,7 @@ VCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* loop through all the instances of the model */

View File

@ -78,12 +78,6 @@ typedef struct sVCVSmodel { /* model structure for a source */
#define VCVSinstances(inst) ((VCVSinstance *)((inst)->gen.GENinstances))
#define VCVSmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
} VCVSmodel;
/* device parameters */

View File

@ -30,7 +30,7 @@ VCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
#ifdef USE_CUSPICE
/* This model doesn't support CUDA */
model->has_cuda = 0 ;
model->gen.has_cuda = 0 ;
#endif
/* loop through all the instances of the model */

View File

@ -142,12 +142,6 @@ typedef struct sVSRCmodel {
#define VSRCinstances(inst) ((VSRCinstance *)((inst)->gen.GENinstances))
#define VSRCmodName gen.GENmodName
#ifdef USE_CUSPICE
unsigned int has_cuda:1 ;
#endif
/* --- end of generic struct GENmodel --- */
#ifdef USE_CUSPICE
VSRCparamCPUstruct VSRCparamCPU ;
VSRCparamGPUstruct VSRCparamGPU ;

View File

@ -82,7 +82,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
model->n_instances = i ;
/* This model supports CUDA */
model->has_cuda = 1 ;
model->gen.has_cuda = 1 ;
}
/* loop through all the voltage source models */