diff --git a/ChangeLog b/ChangeLog index a9d33f2a7..ef8daa6fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2010-11-06 Robert Larice + * src/spicelib/devices/nbjt/nbjt.c , + * src/spicelib/devices/nbjt/nbjtparm.c , + * src/spicelib/devices/nbjt2/nbt2.c , + * src/spicelib/devices/nbjt2/nbt2parm.c , + * src/spicelib/devices/numd/numd.c , + * src/spicelib/devices/numd/numdparm.c , + * src/spicelib/devices/numd2/nud2.c , + * src/spicelib/devices/numd2/nud2parm.c , + * src/spicelib/devices/numos/numm.c , + * src/spicelib/devices/numos/nummparm.c , + * src/spicelib/devices/urc/urc.c , + * src/spicelib/devices/urc/urcparam.c : + change some model parameters from IF_REAL to IF_INTEGER + which have been internaly integers anyway. + 2010-11-06 Dietmar Warning * configure.ac, visualc/include/config.h, frontend/miscoms.c, mos1-9/*.c * remove two really ancient configuration options: diff --git a/src/spicelib/devices/nbjt/nbjt.c b/src/spicelib/devices/nbjt/nbjt.c index add74d65e..c3c7fceb8 100644 --- a/src/spicelib/devices/nbjt/nbjt.c +++ b/src/spicelib/devices/nbjt/nbjt.c @@ -17,8 +17,8 @@ IFparm NBJTpTable[] = { /* parameters */ IP("off", NBJT_OFF, IF_FLAG, "Device initially off"), IP("ic.file", NBJT_IC_FILE, IF_STRING, "Initial condition file"), IOP("area", NBJT_AREA, IF_REAL, "Area factor"), - IP("save", NBJT_PRINT, IF_REAL, "Save Solutions"), - IP("print", NBJT_PRINT, IF_REAL, "Print Solutions"), + IP("save", NBJT_PRINT, IF_INTEGER, "Save Solutions"), + IP("print", NBJT_PRINT, IF_INTEGER, "Print Solutions"), OP("g11", NBJT_G11, IF_REAL, "Conductance"), OP("c11", NBJT_C11, IF_REAL, "Capacitance"), OP("y11", NBJT_Y11, IF_COMPLEX, "Admittance"), diff --git a/src/spicelib/devices/nbjt/nbjtparm.c b/src/spicelib/devices/nbjt/nbjtparm.c index 2c42c5d3f..40e75c3fb 100644 --- a/src/spicelib/devices/nbjt/nbjtparm.c +++ b/src/spicelib/devices/nbjt/nbjtparm.c @@ -31,7 +31,7 @@ NBJTparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) inst->NBJTicFileGiven = TRUE; break; case NBJT_PRINT: - inst->NBJTprint = value->rValue; + inst->NBJTprint = value->iValue; inst->NBJTprintGiven = TRUE; break; case NBJT_TEMP: diff --git a/src/spicelib/devices/nbjt2/nbt2.c b/src/spicelib/devices/nbjt2/nbt2.c index 68f2cddfa..bf313e5b3 100644 --- a/src/spicelib/devices/nbjt2/nbt2.c +++ b/src/spicelib/devices/nbjt2/nbt2.c @@ -18,8 +18,8 @@ IFparm NBJT2pTable[] = { /* parameters */ IP("ic.file", NBJT2_IC_FILE, IF_STRING, "Initial condition file"), IOP("w", NBJT2_WIDTH, IF_REAL, "Width factor"), IOP("area", NBJT2_AREA, IF_REAL, "Area factor"), - IP("save", NBJT2_PRINT, IF_REAL, "Save solutions"), - IP("print", NBJT2_PRINT, IF_REAL, "Print solutions"), + IP("save", NBJT2_PRINT, IF_INTEGER, "Save solutions"), + IP("print", NBJT2_PRINT, IF_INTEGER, "Print solutions"), OP("g11", NBJT2_G11, IF_REAL, "Conductance"), OP("c11", NBJT2_C11, IF_REAL, "Capacitance"), OP("y11", NBJT2_Y11, IF_COMPLEX, "Admittance"), diff --git a/src/spicelib/devices/nbjt2/nbt2parm.c b/src/spicelib/devices/nbjt2/nbt2parm.c index dfd04cc91..930d80685 100644 --- a/src/spicelib/devices/nbjt2/nbt2parm.c +++ b/src/spicelib/devices/nbjt2/nbt2parm.c @@ -35,7 +35,7 @@ NBJT2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) inst->NBJT2icFileGiven = TRUE; break; case NBJT2_PRINT: - inst->NBJT2print = value->rValue; + inst->NBJT2print = value->iValue; inst->NBJT2printGiven = TRUE; break; case NBJT2_TEMP: diff --git a/src/spicelib/devices/numd/numd.c b/src/spicelib/devices/numd/numd.c index 021a87b25..6380d91cc 100644 --- a/src/spicelib/devices/numd/numd.c +++ b/src/spicelib/devices/numd/numd.c @@ -12,8 +12,8 @@ IFparm NUMDpTable[] = { /* parameters */ IP("off", NUMD_OFF, IF_FLAG, "Initially off"), IP("ic.file", NUMD_IC_FILE, IF_REAL, "Initial conditions file"), IOP("area", NUMD_AREA, IF_REAL, "Area factor"), - IP("save", NUMD_PRINT, IF_REAL, "Save Solutions"), - IP("print", NUMD_PRINT, IF_REAL, "Print Solutions"), + IP("save", NUMD_PRINT, IF_INTEGER, "Save Solutions"), + IP("print", NUMD_PRINT, IF_INTEGER, "Print Solutions"), OP("vd", NUMD_VD, IF_REAL, "Voltage"), OP("id", NUMD_ID, IF_REAL, "Current"), OP("g11", NUMD_G11, IF_REAL, "Conductance"), diff --git a/src/spicelib/devices/numd/numdparm.c b/src/spicelib/devices/numd/numdparm.c index 25ea6c91b..22c217fbf 100644 --- a/src/spicelib/devices/numd/numdparm.c +++ b/src/spicelib/devices/numd/numdparm.c @@ -27,7 +27,7 @@ NUMDparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) inst->NUMDicFileGiven = TRUE; break; case NUMD_PRINT: - inst->NUMDprint = value->rValue; + inst->NUMDprint = value->iValue; inst->NUMDprintGiven = TRUE; break; case NUMD_TEMP: diff --git a/src/spicelib/devices/numd2/nud2.c b/src/spicelib/devices/numd2/nud2.c index a3b2fd2f6..cb5a73431 100644 --- a/src/spicelib/devices/numd2/nud2.c +++ b/src/spicelib/devices/numd2/nud2.c @@ -18,8 +18,8 @@ IFparm NUMD2pTable[] = { /* parameters */ IP("ic.file", NUMD2_IC_FILE, IF_STRING, "Initial condition file"), IOP("w", NUMD2_WIDTH, IF_REAL, "Width factor"), IOP("area", NUMD2_AREA, IF_REAL, "Area factor"), - IP("save", NUMD2_PRINT, IF_REAL, "Save solutions"), - IP("print", NUMD2_PRINT, IF_REAL, "Print solutions"), + IP("save", NUMD2_PRINT, IF_INTEGER, "Save solutions"), + IP("print", NUMD2_PRINT, IF_INTEGER, "Print solutions"), OP("vd", NUMD2_VD, IF_REAL, "Voltage"), OP("id", NUMD2_ID, IF_REAL, "Current"), OP("g11", NUMD2_G11, IF_REAL, "Conductance"), diff --git a/src/spicelib/devices/numd2/nud2parm.c b/src/spicelib/devices/numd2/nud2parm.c index f3a11c62e..c623f3771 100644 --- a/src/spicelib/devices/numd2/nud2parm.c +++ b/src/spicelib/devices/numd2/nud2parm.c @@ -31,7 +31,7 @@ NUMD2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) inst->NUMD2icFileGiven = TRUE; break; case NUMD2_PRINT: - inst->NUMD2print = value->rValue; + inst->NUMD2print = value->iValue; inst->NUMD2printGiven = TRUE; break; case NUMD2_TEMP: diff --git a/src/spicelib/devices/numos/numm.c b/src/spicelib/devices/numos/numm.c index 944c72b2a..55e63e572 100644 --- a/src/spicelib/devices/numos/numm.c +++ b/src/spicelib/devices/numos/numm.c @@ -20,8 +20,8 @@ IFparm NUMOSpTable[] = { /* parameters */ IOP("area", NUMOS_AREA, IF_REAL, "Area factor"), IOP("w", NUMOS_WIDTH, IF_REAL, "Width factor"), IOP("l", NUMOS_LENGTH, IF_REAL, "Length factor"), - IP("save", NUMOS_PRINT, IF_REAL, "Save solutions"), - IP("print", NUMOS_PRINT, IF_REAL, "Print solutions"), + IP("save", NUMOS_PRINT, IF_INTEGER, "Save solutions"), + IP("print", NUMOS_PRINT, IF_INTEGER, "Print solutions"), OP("g11", NUMOS_G11, IF_REAL, "Conductance"), OP("c11", NUMOS_C11, IF_REAL, "Capacitance"), OP("y11", NUMOS_Y11, IF_COMPLEX, "Admittance"), diff --git a/src/spicelib/devices/numos/nummparm.c b/src/spicelib/devices/numos/nummparm.c index c758a6e8c..9ea47bbaa 100644 --- a/src/spicelib/devices/numos/nummparm.c +++ b/src/spicelib/devices/numos/nummparm.c @@ -39,7 +39,7 @@ NUMOSparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) inst->NUMOSicFileGiven = TRUE; break; case NUMOS_PRINT: - inst->NUMOSprint = value->rValue; + inst->NUMOSprint = value->iValue; inst->NUMOSprintGiven = TRUE; break; case NUMOS_TEMP: diff --git a/src/spicelib/devices/urc/urc.c b/src/spicelib/devices/urc/urc.c index 2f8dc3244..256aa1aff 100644 --- a/src/spicelib/devices/urc/urc.c +++ b/src/spicelib/devices/urc/urc.c @@ -10,7 +10,7 @@ Author: 1987 Thomas L. Quarles IFparm URCpTable[] = { /* parameters */ IOPU( "l", URC_LEN, IF_REAL, "Length of transmission line"), - IOPU( "n", URC_LUMPS, IF_REAL, "Number of lumps"), + IOPU( "n", URC_LUMPS, IF_INTEGER, "Number of lumps"), OPU( "pos_node",URC_POS_NODE,IF_INTEGER,"Positive node of URC"), OPU( "neg_node",URC_NEG_NODE,IF_INTEGER,"Negative node of URC"), OPU( "gnd", URC_GND_NODE,IF_INTEGER,"Ground node of URC") diff --git a/src/spicelib/devices/urc/urcparam.c b/src/spicelib/devices/urc/urcparam.c index 18029c592..96a0b8445 100644 --- a/src/spicelib/devices/urc/urcparam.c +++ b/src/spicelib/devices/urc/urcparam.c @@ -23,7 +23,7 @@ URCparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select) here->URClenGiven = TRUE; break; case URC_LUMPS: - here->URClumps = value->rValue; + here->URClumps = value->iValue; here->URClumpsGiven = TRUE; break; default: