mextram name change

This commit is contained in:
dwarning 2011-08-24 19:27:51 +00:00
parent 41c14d7df4
commit 15c4c12755
8 changed files with 25 additions and 16 deletions

View File

@ -1,3 +1,9 @@
2011-08-24 Dietmar Warning
* configure.ac, inp2q.c, inpdomod.c, dev.c, ngspice.xml, bjt504t.va:
change the name of the mextram verilog module according to model developer
used naming convention (mextram.va is substituted by bjt504t.va), means
including parasitic substrate transistor and selfheating is enabled
2011-08-24 Robert Larice
* src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml :
adms, fix an extra backslash,

View File

@ -896,7 +896,7 @@ dnl The makefiles for adms (to be added to AC_CONFIG_FILES by ./autogen.sh --adm
VLADEV=" spicelib/devices/adms/ekv/libekv.la \
spicelib/devices/adms/hicum0/libhicum0.la \
spicelib/devices/adms/hicum2/libhicum2.la \
spicelib/devices/adms/mextram/libmextram.la \
spicelib/devices/adms/mextram/libbjt504t.la \
spicelib/devices/adms/psp102/libpsp102.la "
else

View File

@ -3396,10 +3396,10 @@ inline double _d0_vt(double) { return 1.3806503e-23/1.602176462e-1
<admst:value-to select="value" string="hicum2"/>
</admst:new>
</admst:when>
<admst:when test="[name='bjt504_va']">
<admst:when test="[name='bjt504tva']">
<admst:new datatype="attribute" inputs="'ngspicename'">
<admst:push select="../attribute" path="."/>
<admst:value-to select="value" string="mextram"/>
<admst:value-to select="value" string="bjt504t"/>
</admst:new>
</admst:when>
<admst:when test="[name='pjfet_va']">
@ -3458,7 +3458,7 @@ inline double _d0_vt(double) { return 1.3806503e-23/1.602176462e-1
</admst:new>
</admst:if>
</admst:when>
<admst:when test="[name='vbic' or name='hic0_full' or name='hic2_full' or name='bjt504_va']">
<admst:when test="[name='vbic' or name='hic0_full' or name='hic2_full' or name='bjt504tva']">
<admst:if test="[nilled(modulevariablep[name='npn'])]">
<admst:new datatype="variablep" inputs="'npn'">
<admst:push select="../modulevariablep" path="." oncompare="."/>

View File

@ -5,7 +5,10 @@
-->
<!--
$Log$
Revision 1.21 2011-01-13 17:05:46 dwarning
Revision 1.22 2011-08-24 19:27:51 dwarning
mextram name change
Revision 1.21 2011/01/13 17:05:46 dwarning
set version parameter to 2.3.0
Revision 1.20 2007/07/05 10:20:48 r29173
@ -1978,10 +1981,10 @@
<admst:value-to select="value" value="hicum2"/>
</admst:new>
</admst:when>
<admst:when test="[name='bjt504_va']">
<admst:when test="[name='bjt504tva']">
<admst:new datatype="attribute" arguments="ngspicename">
<admst:push into="../attribute" select="." onduplicate="abort"/>
<admst:value-to select="value" value="mextram"/>
<admst:value-to select="value" value="bjt504t"/>
</admst:new>
</admst:when>
<admst:when test="[name='psp102']">
@ -2049,7 +2052,7 @@
</admst:new>
</admst:if>
</admst:when>
<admst:when test="[name='vbic' or name='hic0_full' or name='hic2_full' or name='bjt504_va']">
<admst:when test="[name='vbic' or name='hic0_full' or name='hic2_full' or name='bjt504tva']">
<admst:if test="[nilled(variable[name='npn'])]">
<admst:value-of select="analog"/>
<admst:value-of select="."/>

View File

@ -2,7 +2,7 @@
`define SELFHEATING
`define SUBSTRATE
module bjt504_va (c, b, e, s, dt);
module bjt504tva (c, b, e, s, dt);
`ifdef insideADMS
`define P(p) (*p*)

View File

@ -127,7 +127,7 @@ int add_udn(int,Evt_Udn_Info_t **);
#ifdef ADMS
#include "adms/hicum0/hicum0itf.h"
#include "adms/hicum2/hicum2itf.h"
#include "adms/mextram/mextramitf.h"
#include "adms/mextram/bjt504titf.h"
#include "adms/ekv/ekvitf.h"
#include "adms/psp102/psp102itf.h"
#endif
@ -249,7 +249,7 @@ spice_init_devices(void)
#ifdef ADMS
DEVices[54] = get_hicum0_info();
DEVices[55] = get_hicum2_info();
DEVices[56] = get_mextram_info();
DEVices[56] = get_bjt504t_info();
DEVices[57] = get_ekv_info();
DEVices[58] = get_psp102_info();
#else
@ -293,7 +293,7 @@ SPICEdev ** devices(void)
#define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v4", "bsim4v5", "bsim4v6", \
"bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv", \
"cap", "cccs", "ccvs", "csw", "dio", "hfet", "hfet2", "ind", "isrc", "jfet", "ltra", "mes", "mesa" ,"mos1", "mos2", "mos3", \
"mos6", "mos9", "res", "soi3", "sw", "tra", "urc", "vccs", "vcvs", "vsrc", "hicum0", "hicum2", "mextram", "ekv", "psp102"}
"mos6", "mos9", "res", "soi3", "sw", "tra", "urc", "vccs", "vcvs", "vsrc", "hicum0", "hicum2", "bjt504t", "ekv", "psp102"}
#else
#define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v4", "bsim4v5", "bsim4v6", \
"bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv", \

View File

@ -94,7 +94,7 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
}
else if ((thismodel->INPmodType == INPtypelook("hicum0"))
|| (thismodel->INPmodType == INPtypelook("hicum2"))
|| (thismodel->INPmodType == INPtypelook("mextram")))
|| (thismodel->INPmodType == INPtypelook("bjt504t")))
{
node5 = gnode; /* 4-terminal adms device - thermal node to ground */
nname5 = copy("0");
@ -129,7 +129,7 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
#ifdef ADMS
&& (thismodel->INPmodType != INPtypelook("hicum0"))
&& (thismodel->INPmodType != INPtypelook("hicum2"))
&& (thismodel->INPmodType != INPtypelook("mextram"))
&& (thismodel->INPmodType != INPtypelook("bjt504t"))
#endif
&& (thismodel->INPmodType != INPtypelook("VBIC")))
{
@ -139,7 +139,7 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
#ifdef ADMS
if ((nodeflag && (thismodel->INPmodType != INPtypelook("hicum0")))
&& (nodeflag && (thismodel->INPmodType != INPtypelook("hicum2")))
&& (nodeflag && (thismodel->INPmodType != INPtypelook("mextram"))))
&& (nodeflag && (thismodel->INPmodType != INPtypelook("bjt504t"))))
{
LITERR("Too much nodes for this model type")
return;

View File

@ -65,7 +65,7 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
break;
#ifdef ADMS
case 6:
type = INPtypelook("mextram");
type = INPtypelook("bjt504t");
if(type < 0) {
err = INPmkTemp(
"Device type MEXTRAM not available in this binary\n");