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

cleaned renaming in all files

This commit is contained in:
mariok 2020-04-13 18:12:06 +02:00
parent 67ddd98f75
commit 14c46bc3bd
18 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/spicelib/devices/dev.c
View File

@ -15,7 +15,7 @@
* uninterrupted or error-free. The end-user understands that the * uninterrupted or error-free. The end-user understands that the
* program was developed for research purposes and is advised not to * program was developed for research purposes and is advised not to
* rely exclusively on the program for any reason. * rely exclusively on the program for any reason.
* *
* IN NO EVENT SHALL THE AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, * IN NO EVENT SHALL THE AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT,
* INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
* LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
@ -93,7 +93,7 @@ int add_udn(int,Evt_Udn_Info_t **);
#include "dio/dioitf.h" #include "dio/dioitf.h"
#include "hfet1/hfetitf.h" #include "hfet1/hfetitf.h"
#include "hfet2/hfet2itf.h" #include "hfet2/hfet2itf.h"
#include "hicum2/hicumitf.h" #include "hicum2/hicum2itf.h"
#include "hisim2/hsm2itf.h" #include "hisim2/hsm2itf.h"
#include "hisimhv1/hsmhvitf.h" #include "hisimhv1/hsmhvitf.h"
#include "hisimhv2/hsmhv2itf.h" #include "hisimhv2/hsmhv2itf.h"
@ -260,7 +260,7 @@ spice_init_devices(void)
g_evt_udn_info = TMALLOC(Evt_Udn_Info_t *, 1); g_evt_udn_info = TMALLOC(Evt_Udn_Info_t *, 1);
g_evt_num_udn_types = 1; g_evt_num_udn_types = 1;
g_evt_udn_info[0] = &idn_digital_info; g_evt_udn_info[0] = &idn_digital_info;
DEVicesfl = TMALLOC(int, DEVNUM); DEVicesfl = TMALLOC(int, DEVNUM);
/* tmalloc should automatically zero the array! */ /* tmalloc should automatically zero the array! */
#endif #endif
@ -417,7 +417,7 @@ int load_opus(char *name){
printf("%s\n", msg); printf("%s\n", msg);
return 1; return 1;
} }
fetch = dlsym(lib,"CMdevNum"); fetch = dlsym(lib,"CMdevNum");
if(fetch){ if(fetch){
num = ((int * (*)(void)) fetch) (); num = ((int * (*)(void)) fetch) ();

2
src/spicelib/devices/hicum2/hicum2.c
View File

@ -12,7 +12,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/devdefs.h" #include "ngspice/devdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
IFparm HICUMpTable[] = { /* parameters */ IFparm HICUMpTable[] = { /* parameters */

2
src/spicelib/devices/hicum2/hicum2acld.c
View File

@ -13,7 +13,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"

4
src/spicelib/devices/hicum2/hicum2ask.c
View File

@ -6,14 +6,14 @@ Spice3 Implementation: 2019 Dietmar Warning
**********/ **********/
/* /*
* This routine gives access to the internal device * This routine gives access to the internal device
* parameters for HICUMs * parameters for HICUMs
*/ */
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/const.h" #include "ngspice/const.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"

22
src/spicelib/devices/hicum2/hicum2conv.c
View File

@ -12,7 +12,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
@ -29,7 +29,7 @@ HICUMconvTest(GENmodel *inModel, CKTcircuit *ckt)
double delvbpci; double delvbpci;
double delvsici; double delvsici;
double ibieihat; double ibieihat;
double ibicihat; double ibicihat;
double icieihat; double icieihat;
double ibpeihat; double ibpeihat;
@ -74,24 +74,24 @@ HICUMconvTest(GENmodel *inModel, CKTcircuit *ckt)
delvbpci = Vbpci - *(ckt->CKTstate0 + here->HICUMvbpci); delvbpci = Vbpci - *(ckt->CKTstate0 + here->HICUMvbpci);
delvsici = Vsici - *(ckt->CKTstate0 + here->HICUMvsici); delvsici = Vsici - *(ckt->CKTstate0 + here->HICUMvsici);
ibieihat = *(ckt->CKTstate0 + here->HICUMibiei) + ibieihat = *(ckt->CKTstate0 + here->HICUMibiei) +
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei; *(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei;
ibicihat = *(ckt->CKTstate0 + here->HICUMibici) + ibicihat = *(ckt->CKTstate0 + here->HICUMibici) +
*(ckt->CKTstate0 + here->HICUMibici_Vbici)*delvbici; *(ckt->CKTstate0 + here->HICUMibici_Vbici)*delvbici;
icieihat = *(ckt->CKTstate0 + here->HICUMiciei) + icieihat = *(ckt->CKTstate0 + here->HICUMiciei) +
*(ckt->CKTstate0 + here->HICUMiciei_Vbiei)*delvbiei + *(ckt->CKTstate0 + here->HICUMiciei_Vbiei)*delvbiei +
*(ckt->CKTstate0 + here->HICUMiciei_Vbici)*delvbici; *(ckt->CKTstate0 + here->HICUMiciei_Vbici)*delvbici;
ibpeihat = *(ckt->CKTstate0 + here->HICUMibpei) + ibpeihat = *(ckt->CKTstate0 + here->HICUMibpei) +
*(ckt->CKTstate0 + here->HICUMibpei_Vbpei)*delvbpei; *(ckt->CKTstate0 + here->HICUMibpei_Vbpei)*delvbpei;
ibpbihat = *(ckt->CKTstate0 + here->HICUMibpbi) + ibpbihat = *(ckt->CKTstate0 + here->HICUMibpbi) +
*(ckt->CKTstate0 + here->HICUMibpbi_Vbiei)*delvbiei + *(ckt->CKTstate0 + here->HICUMibpbi_Vbiei)*delvbiei +
*(ckt->CKTstate0 + here->HICUMibpbi_Vbici)*delvbici; *(ckt->CKTstate0 + here->HICUMibpbi_Vbici)*delvbici;
ibpcihat = *(ckt->CKTstate0 + here->HICUMibpci) + ibpcihat = *(ckt->CKTstate0 + here->HICUMibpci) +
*(ckt->CKTstate0 + here->HICUMibpci_Vbpci)*delvbici; *(ckt->CKTstate0 + here->HICUMibpci_Vbpci)*delvbici;
ibpsihat = *(ckt->CKTstate0 + here->HICUMibpsi) + ibpsihat = *(ckt->CKTstate0 + here->HICUMibpsi) +
*(ckt->CKTstate0 + here->HICUMibpsi_Vbpci)*delvbpci + *(ckt->CKTstate0 + here->HICUMibpsi_Vbpci)*delvbpci +
*(ckt->CKTstate0 + here->HICUMibpsi_Vsici)*delvsici; *(ckt->CKTstate0 + here->HICUMibpsi_Vsici)*delvsici;
isicihat = *(ckt->CKTstate0 + here->HICUMisici) + isicihat = *(ckt->CKTstate0 + here->HICUMisici) +
*(ckt->CKTstate0 + here->HICUMisici_Vsici)*delvsici; *(ckt->CKTstate0 + here->HICUMisici_Vsici)*delvsici;
Ibiei = *(ckt->CKTstate0 + here->HICUMibiei); Ibiei = *(ckt->CKTstate0 + here->HICUMibiei);

4
src/spicelib/devices/hicum2/hicum2defs.h
View File

@ -769,7 +769,7 @@ enum {
enum { enum {
//Circuit simulator specific parameters //Circuit simulator specific parameters
HICUM_MOD_NPN = 101, HICUM_MOD_NPN = 101,
HICUM_MOD_PNP, HICUM_MOD_PNP,
HICUM_MOD_TNOM, HICUM_MOD_TNOM,
//Transfer current //Transfer current
@ -1008,5 +1008,5 @@ enum {
HICUM_MOD_TYPE, HICUM_MOD_TYPE,
}; };
#include "hicumext.h" #include "hicum2ext.h"
#endif /*HICUM*/ #endif /*HICUM*/

10
src/spicelib/devices/hicum2/hicum2getic.c
View File

@ -12,7 +12,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
@ -32,13 +32,13 @@ HICUMgetic(GENmodel *inModel, CKTcircuit *ckt)
for(here = HICUMinstances(model); here ; here = HICUMnextInstance(here)) { for(here = HICUMinstances(model); here ; here = HICUMnextInstance(here)) {
if(!here->HICUMicVBEGiven) { if(!here->HICUMicVBEGiven) {
here->HICUMicVBE = here->HICUMicVBE =
*(ckt->CKTrhs + here->HICUMbaseNode) - *(ckt->CKTrhs + here->HICUMbaseNode) -
*(ckt->CKTrhs + here->HICUMemitNode); *(ckt->CKTrhs + here->HICUMemitNode);
} }
if(!here->HICUMicVCEGiven) { if(!here->HICUMicVCEGiven) {
here->HICUMicVCE = here->HICUMicVCE =
*(ckt->CKTrhs + here->HICUMcollNode) - *(ckt->CKTrhs + here->HICUMcollNode) -
*(ckt->CKTrhs + here->HICUMemitNode); *(ckt->CKTrhs + here->HICUMemitNode);
} }
} }

6
src/spicelib/devices/hicum2/hicum2init.c
View File

@ -7,9 +7,9 @@
#include "ngspice/devdefs.h" #include "ngspice/devdefs.h"
#include "hicumitf.h" #include "hicum2itf.h"
#include "hicumext.h" #include "hicum2ext.h"
#include "hicuminit.h" #include "hicum2init.h"
SPICEdev HICUMinfo = { SPICEdev HICUMinfo = {

10
src/spicelib/devices/hicum2/hicum2load.c
View File

@ -12,7 +12,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/const.h" #include "ngspice/const.h"
#include "ngspice/trandefs.h" #include "ngspice/trandefs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
@ -978,15 +978,15 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
ibpcihat = *(ckt->CKTstate0 + here->HICUMibpci) + ibpcihat = *(ckt->CKTstate0 + here->HICUMibpci) +
*(ckt->CKTstate0 + here->HICUMibpci_Vbpci)*delvbpci; *(ckt->CKTstate0 + here->HICUMibpci_Vbpci)*delvbpci;
icieihat = *(ckt->CKTstate0 + here->HICUMiciei) + icieihat = *(ckt->CKTstate0 + here->HICUMiciei) +
*(ckt->CKTstate0 + here->HICUMiciei_Vbiei)*delvbiei + *(ckt->CKTstate0 + here->HICUMiciei_Vbiei)*delvbiei +
*(ckt->CKTstate0 + here->HICUMiciei_Vbici)*delvbici; *(ckt->CKTstate0 + here->HICUMiciei_Vbici)*delvbici;
ibpbihat = *(ckt->CKTstate0 + here->HICUMibpbi) + ibpbihat = *(ckt->CKTstate0 + here->HICUMibpbi) +
*(ckt->CKTstate0 + here->HICUMibpbi_Vbpbi)*delvbpbi + *(ckt->CKTstate0 + here->HICUMibpbi_Vbpbi)*delvbpbi +
*(ckt->CKTstate0 + here->HICUMibpbi_Vbiei)*delvbiei + *(ckt->CKTstate0 + here->HICUMibpbi_Vbiei)*delvbiei +
*(ckt->CKTstate0 + here->HICUMibpbi_Vbici)*delvbici; *(ckt->CKTstate0 + here->HICUMibpbi_Vbici)*delvbici;
isicihat = *(ckt->CKTstate0 + here->HICUMisici) + isicihat = *(ckt->CKTstate0 + here->HICUMisici) +
*(ckt->CKTstate0 + here->HICUMisici_Vsici)*delvsici; *(ckt->CKTstate0 + here->HICUMisici_Vsici)*delvsici;
ibpsihat = *(ckt->CKTstate0 + here->HICUMibpsi) + ibpsihat = *(ckt->CKTstate0 + here->HICUMibpsi) +
*(ckt->CKTstate0 + here->HICUMibpsi_Vbpci)*delvbpci + *(ckt->CKTstate0 + here->HICUMibpsi_Vbpci)*delvbpci +
*(ckt->CKTstate0 + here->HICUMibpsi_Vsici)*delvsici; *(ckt->CKTstate0 + here->HICUMibpsi_Vsici)*delvsici;
/* /*

4
src/spicelib/devices/hicum2/hicum2mask.c
View File

@ -10,7 +10,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "ngspice/devdefs.h" #include "ngspice/devdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
@ -356,7 +356,7 @@ HICUMmAsk(CKTcircuit *ckt, GENmodel *instPtr, int which, IFvalue *value)
case HICUM_MOD_FLNQS: case HICUM_MOD_FLNQS:
value->iValue = here->HICUMflnqs; value->iValue = here->HICUMflnqs;
return(OK); return(OK);
//Noise //Noise
case HICUM_MOD_KF: case HICUM_MOD_KF:
value->rValue = here->HICUMkf; value->rValue = here->HICUMkf;

6
src/spicelib/devices/hicum2/hicum2mpar.c
View File

@ -13,7 +13,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/const.h" #include "ngspice/const.h"
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
@ -37,7 +37,7 @@ HICUMmParam(int param, IFvalue *value, GENmodel *inModel)
if(value->iValue) { if(value->iValue) {
model->HICUMtype = PNP; model->HICUMtype = PNP;
} }
break; break;
case HICUM_MOD_TNOM: case HICUM_MOD_TNOM:
model->HICUMtnom = value->rValue+CONSTCtoK; model->HICUMtnom = value->rValue+CONSTCtoK;
@ -459,7 +459,7 @@ HICUMmParam(int param, IFvalue *value, GENmodel *inModel)
model->HICUMflnqs = value->iValue; model->HICUMflnqs = value->iValue;
model->HICUMflnqsGiven = TRUE; model->HICUMflnqsGiven = TRUE;
break; break;
//Noise //Noise
case HICUM_MOD_KF: case HICUM_MOD_KF:
model->HICUMkf = value->rValue; model->HICUMkf = value->rValue;

14
src/spicelib/devices/hicum2/hicum2noise.c
View File

@ -6,7 +6,7 @@ Spice3 Implementation: 2019 Dietmar Warning
**********/ **********/
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "ngspice/iferrmsg.h" #include "ngspice/iferrmsg.h"
#include "ngspice/noisedef.h" #include "ngspice/noisedef.h"
@ -145,21 +145,21 @@ HICUMnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata
NevalSrc(&noizDens[HICUMFLBENOIZ], NULL, ckt, NevalSrc(&noizDens[HICUMFLBENOIZ], NULL, ckt,
N_GAIN,inst->HICUMbaseBINode, inst->HICUMemitEINode, N_GAIN,inst->HICUMbaseBINode, inst->HICUMemitEINode,
(double)0.0); (double)0.0);
noizDens[HICUMFLBENOIZ] *= inst->HICUMm * model->HICUMkf * noizDens[HICUMFLBENOIZ] *= inst->HICUMm * model->HICUMkf *
exp(model->HICUMaf * exp(model->HICUMaf *
log(MAX(fabs((*(ckt->CKTstate0 + inst->HICUMibiei)+*(ckt->CKTstate0 + inst->HICUMibpei))/inst->HICUMm),N_MINLOG))) / log(MAX(fabs((*(ckt->CKTstate0 + inst->HICUMibiei)+*(ckt->CKTstate0 + inst->HICUMibpei))/inst->HICUMm),N_MINLOG))) /
data->freq; data->freq;
lnNdens[HICUMFLBENOIZ] = lnNdens[HICUMFLBENOIZ] =
log(MAX(noizDens[HICUMFLBENOIZ],N_MINLOG)); log(MAX(noizDens[HICUMFLBENOIZ],N_MINLOG));
NevalSrc(&noizDens[HICUMFLRENOIZ], NULL, ckt, NevalSrc(&noizDens[HICUMFLRENOIZ], NULL, ckt,
N_GAIN,inst->HICUMemitNode, inst->HICUMemitEINode, N_GAIN,inst->HICUMemitNode, inst->HICUMemitEINode,
(double)0.0); (double)0.0);
noizDens[HICUMFLRENOIZ] *= inst->HICUMm * model->HICUMkfre * noizDens[HICUMFLRENOIZ] *= inst->HICUMm * model->HICUMkfre *
exp(model->HICUMafre * exp(model->HICUMafre *
log(MAX(fabs(*(ckt->CKTstate0 + inst->HICUMieie)/inst->HICUMm),N_MINLOG))) / log(MAX(fabs(*(ckt->CKTstate0 + inst->HICUMieie)/inst->HICUMm),N_MINLOG))) /
data->freq; data->freq;
lnNdens[HICUMFLRENOIZ] = lnNdens[HICUMFLRENOIZ] =
log(MAX(noizDens[HICUMFLRENOIZ],N_MINLOG)); log(MAX(noizDens[HICUMFLRENOIZ],N_MINLOG));
@ -177,12 +177,12 @@ HICUMnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata
noizDens[HICUMFLRENOIZ]; noizDens[HICUMFLRENOIZ];
lnNdens[HICUMTOTNOIZ] = lnNdens[HICUMTOTNOIZ] =
log(noizDens[HICUMTOTNOIZ]); log(noizDens[HICUMTOTNOIZ]);
*OnDens += noizDens[HICUMTOTNOIZ]; *OnDens += noizDens[HICUMTOTNOIZ];
if (data->delFreq == 0.0) { if (data->delFreq == 0.0) {
/* if we haven't done any previous integration, we need to */ /* if we haven't done any previous integration, we need to */
/* initialize our "history" variables */ /* initialize our "history" variables */

2
src/spicelib/devices/hicum2/hicum2param.c
View File

@ -13,7 +13,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/const.h" #include "ngspice/const.h"
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"

2
src/spicelib/devices/hicum2/hicum2pzld.c
View File

@ -13,7 +13,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"

32
src/spicelib/devices/hicum2/hicum2setup.c
View File

@ -5,7 +5,7 @@ Model Author: 1990 Michael Schröter TU Dresden
Spice3 Implementation: 2019 Dietmar Warning Spice3 Implementation: 2019 Dietmar Warning
**********/ **********/
/* /*
* This routine should only be called when circuit topology * This routine should only be called when circuit topology
* changes, since its computations do not depend on most * changes, since its computations do not depend on most
* device or model parameters, only on topology (as * device or model parameters, only on topology (as
@ -15,7 +15,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "ngspice/smpdefs.h" #include "ngspice/smpdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/const.h" #include "ngspice/const.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
@ -25,8 +25,8 @@ Spice3 Implementation: 2019 Dietmar Warning
int int
HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
/* load the HICUM structure with those pointers needed later /* load the HICUM structure with those pointers needed later
* for fast matrix loading * for fast matrix loading
*/ */
{ {
HICUMmodel *model = (HICUMmodel*)inModel; HICUMmodel *model = (HICUMmodel*)inModel;
@ -502,8 +502,8 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,1,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
@ -517,8 +517,8 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,2,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,2,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
@ -532,8 +532,8 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,3,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
@ -547,8 +547,8 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if (ckt->CKTcopyNodesets) { if (ckt->CKTcopyNodesets) {
if (CKTinst2Node(ckt,here,4,&tmpNode,&tmpName)==OK) { if (CKTinst2Node(ckt,here,4,&tmpNode,&tmpName)==OK) {
if (tmpNode->nsGiven) { if (tmpNode->nsGiven) {
tmp->nodeset=tmpNode->nodeset; tmp->nodeset=tmpNode->nodeset;
tmp->nsGiven=tmpNode->nsGiven; tmp->nsGiven=tmpNode->nsGiven;
} }
} }
} }
@ -557,25 +557,25 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
if(here->HICUMbaseBINode == 0) { if(here->HICUMbaseBINode == 0) {
error = CKTmkVolt(ckt, &tmp, here->HICUMname, "baseBI"); error = CKTmkVolt(ckt, &tmp, here->HICUMname, "baseBI");
if(error) return(error); if(error) return(error);
here->HICUMbaseBINode = tmp->number; here->HICUMbaseBINode = tmp->number;
} }
if(here->HICUMxfNode == 0) { if(here->HICUMxfNode == 0) {
error = CKTmkVolt(ckt, &tmp, here->HICUMname, "xf"); error = CKTmkVolt(ckt, &tmp, here->HICUMname, "xf");
if(error) return(error); if(error) return(error);
here->HICUMxfNode = tmp->number; here->HICUMxfNode = tmp->number;
} }
if(here->HICUMxf1Node == 0) { if(here->HICUMxf1Node == 0) {
error = CKTmkVolt(ckt, &tmp, here->HICUMname, "xf1"); error = CKTmkVolt(ckt, &tmp, here->HICUMname, "xf1");
if(error) return(error); if(error) return(error);
here->HICUMxf1Node = tmp->number; here->HICUMxf1Node = tmp->number;
} }
if(here->HICUMxf2Node == 0) { if(here->HICUMxf2Node == 0) {
error = CKTmkVolt(ckt, &tmp, here->HICUMname, "xf2"); error = CKTmkVolt(ckt, &tmp, here->HICUMname, "xf2");
if(error) return(error); if(error) return(error);
here->HICUMxf2Node = tmp->number; here->HICUMxf2Node = tmp->number;
} }
/* macro to make elements with built in test for out of memory */ /* macro to make elements with built in test for out of memory */

2
src/spicelib/devices/hicum2/hicum2soachk.c
View File

@ -5,7 +5,7 @@ Author: 2013 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/trandefs.h" #include "ngspice/trandefs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"

10
src/spicelib/devices/hicum2/hicum2temp.c
View File

@ -8,7 +8,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "ngspice/smpdefs.h" #include "ngspice/smpdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/const.h" #include "ngspice/const.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
@ -18,8 +18,8 @@ Spice3 Implementation: 2019 Dietmar Warning
#define TMIN -100.0 #define TMIN -100.0
#define LN_EXP_LIMIT 11.0 #define LN_EXP_LIMIT 11.0
void TMPHICJ(double , double , double , double , double , void TMPHICJ(double , double , double , double , double ,
double , double , double , double , double , double , double , double , double , double , double , double ,
double *, double *, double *); double *, double *, double *);
// TEMPERATURE UPDATE OF JUNCTION CAPACITANCE RELATED PARAMETERS // TEMPERATURE UPDATE OF JUNCTION CAPACITANCE RELATED PARAMETERS
@ -38,8 +38,8 @@ void TMPHICJ(double , double , double , double , double ,
// c_j_t : temperature update of "c_j" // c_j_t : temperature update of "c_j"
// vd_t : temperature update of "vd0" // vd_t : temperature update of "vd0"
// w_t : temperature update of "w" // w_t : temperature update of "w"
void TMPHICJ(double vt, double vt0, double qtt0, double ln_qtt0, double mg, void TMPHICJ(double vt, double vt0, double qtt0, double ln_qtt0, double mg,
double c_j, double vd0, double z, double w, double is_al, double vgeff, double c_j, double vd0, double z, double w, double is_al, double vgeff,
double *c_j_t, double *vd_t, double *w_t) double *c_j_t, double *vd_t, double *w_t)
{ {
double vdj0,vdjt,vdt; double vdj0,vdjt,vdt;

2
src/spicelib/devices/hicum2/hicum2trunc.c
View File

@ -12,7 +12,7 @@ Spice3 Implementation: 2019 Dietmar Warning
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "hicumdefs.h" #include "hicum2defs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"