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

hicumL2 load routine seems to be working, next ac?

This commit is contained in:
Markus Mueller 2020-06-01 19:18:45 +02:00
parent 29a61f21e2
commit d61b510207
6 changed files with 120 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ HICUMacLoad(GENmodel *inModel, CKTcircuit *ckt)
HICUMmodel *model = (HICUMmodel*)inModel;
double Ibpei_Vbpei;
double Ibiei_Vbiei;
double Ibiei_Vbici;
double Ibici_Vbici;
double Ibpci_Vbpci;
double Isici_Vsici;
@ -69,6 +70,7 @@ HICUMacLoad(GENmodel *inModel, CKTcircuit *ckt)
Isis_Vsis = 1/model->HICUMrsu;
Ibiei_Vbiei = *(ckt->CKTstate0 + here->HICUMibiei_Vbiei);
Ibiei_Vbici = *(ckt->CKTstate0 + here->HICUMibiei_Vbici);
Ibpei_Vbpei = *(ckt->CKTstate0 + here->HICUMibpei_Vbpei);
Iciei_Vbiei = *(ckt->CKTstate0 + here->HICUMiciei_Vbiei);
Iciei_Vbici = *(ckt->CKTstate0 + here->HICUMiciei_Vbici);
@ -85,7 +87,7 @@ HICUMacLoad(GENmodel *inModel, CKTcircuit *ckt)
c The real part
*/
/*
c Stamp element: Ibiei
c Stamp element: Ibiei (missing Ibiei_Vbici)
*/
*(here->HICUMbaseBIBaseBIPtr) += Ibiei_Vbiei;
*(here->HICUMbaseBIEmitEIPtr) += -Ibiei_Vbiei;

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

@ -79,7 +79,8 @@ HICUMconvTest(GENmodel *inModel, CKTcircuit *ckt)
delvrth = Vrth - *(ckt->CKTstate0 + here->HICUMvrth);
ibieihat = *(ckt->CKTstate0 + here->HICUMibiei) +
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei;
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei +
*(ckt->CKTstate0 + here->HICUMibiei_Vbici)*delvbici;
ibicihat = *(ckt->CKTstate0 + here->HICUMibici) +
*(ckt->CKTstate0 + here->HICUMibici_Vbici)*delvbici;
icieihat = *(ckt->CKTstate0 + here->HICUMiciei) +

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

@ -313,122 +313,123 @@ typedef struct sHICUMinstance {
#define HICUMibiei HICUMstate+6
#define HICUMibiei_Vbiei HICUMstate+7
#define HICUMibiei_Vbici HICUMstate+8
#define HICUMibpei HICUMstate+8
#define HICUMibpei_Vbpei HICUMstate+9
#define HICUMibpei HICUMstate+9
#define HICUMibpei_Vbpei HICUMstate+10
#define HICUMiciei HICUMstate+10
#define HICUMiciei_Vbiei HICUMstate+11
#define HICUMiciei_Vbici HICUMstate+12
#define HICUMiciei HICUMstate+11
#define HICUMiciei_Vbiei HICUMstate+12
#define HICUMiciei_Vbici HICUMstate+13
#define HICUMibici HICUMstate+13
#define HICUMibici_Vbici HICUMstate+14
#define HICUMibici HICUMstate+14
#define HICUMibici_Vbici HICUMstate+15
#define HICUMibpbi HICUMstate+15
#define HICUMibpbi_Vbpbi HICUMstate+16
#define HICUMibpbi_Vbiei HICUMstate+17
#define HICUMibpbi_Vbici HICUMstate+18
#define HICUMibpbi HICUMstate+16
#define HICUMibpbi_Vbpbi HICUMstate+17
#define HICUMibpbi_Vbiei HICUMstate+18
#define HICUMibpbi_Vbici HICUMstate+19
#define HICUMibpci HICUMstate+19
#define HICUMibpci_Vbpci HICUMstate+20
#define HICUMibpci HICUMstate+20
#define HICUMibpci_Vbpci HICUMstate+21
#define HICUMisici HICUMstate+21
#define HICUMisici_Vsici HICUMstate+22
#define HICUMisici HICUMstate+22
#define HICUMisici_Vsici HICUMstate+23
#define HICUMibpsi HICUMstate+23
#define HICUMibpsi_Vbpci HICUMstate+24
#define HICUMibpsi_Vsici HICUMstate+25
#define HICUMibpsi HICUMstate+24
#define HICUMibpsi_Vbpci HICUMstate+25
#define HICUMibpsi_Vsici HICUMstate+26
#define HICUMisis_Vsis HICUMstate+26
#define HICUMisis_Vsis HICUMstate+27
#define HICUMieie HICUMstate+27 // needed for re-flicker noise
#define HICUMieie HICUMstate+28 // needed for re-flicker noise
#define HICUMqrbi HICUMstate+28
#define HICUMcqrbi HICUMstate+29
#define HICUMqrbi HICUMstate+29
#define HICUMcqrbi HICUMstate+30
#define HICUMqjei HICUMstate+30
#define HICUMcqjei HICUMstate+31
#define HICUMqjei HICUMstate+31
#define HICUMcqjei HICUMstate+32
#define HICUMqdeix HICUMstate+32
#define HICUMcqdeix HICUMstate+33
#define HICUMqdeix HICUMstate+33
#define HICUMcqdeix HICUMstate+34
#define HICUMqjci HICUMstate+34
#define HICUMcqjci HICUMstate+35
#define HICUMqjci HICUMstate+35
#define HICUMcqjci HICUMstate+36
#define HICUMqdci HICUMstate+36
#define HICUMcqdci HICUMstate+37
#define HICUMqdci HICUMstate+37
#define HICUMcqdci HICUMstate+38
#define HICUMqjep HICUMstate+38
#define HICUMcqjep HICUMstate+39
#define HICUMqjep HICUMstate+39
#define HICUMcqjep HICUMstate+40
#define HICUMqjcx0_i HICUMstate+40
#define HICUMcqcx0_t_i HICUMstate+41
#define HICUMqjcx0_i HICUMstate+41
#define HICUMcqcx0_t_i HICUMstate+42
#define HICUMqjcx0_ii HICUMstate+42
#define HICUMcqcx0_t_ii HICUMstate+43
#define HICUMqjcx0_ii HICUMstate+43
#define HICUMcqcx0_t_ii HICUMstate+44
#define HICUMqdsu HICUMstate+44
#define HICUMcqdsu HICUMstate+45
#define HICUMqdsu HICUMstate+45
#define HICUMcqdsu HICUMstate+46
#define HICUMqjs HICUMstate+46
#define HICUMcqjs HICUMstate+47
#define HICUMqjs HICUMstate+47
#define HICUMcqjs HICUMstate+48
#define HICUMqscp HICUMstate+48
#define HICUMcqscp HICUMstate+49
#define HICUMqscp HICUMstate+49
#define HICUMcqscp HICUMstate+50
#define HICUMqbepar1 HICUMstate+50
#define HICUMcqbepar1 HICUMstate+51
#define HICUMgqbepar1 HICUMstate+52
#define HICUMqbepar1 HICUMstate+51
#define HICUMcqbepar1 HICUMstate+52
#define HICUMgqbepar1 HICUMstate+53
#define HICUMqbepar2 HICUMstate+53
#define HICUMcqbepar2 HICUMstate+54
#define HICUMgqbepar2 HICUMstate+55
#define HICUMqbepar2 HICUMstate+54
#define HICUMcqbepar2 HICUMstate+55
#define HICUMgqbepar2 HICUMstate+56
#define HICUMqbcpar1 HICUMstate+56
#define HICUMcqbcpar1 HICUMstate+57
#define HICUMgqbcpar1 HICUMstate+58
#define HICUMqbcpar1 HICUMstate+57
#define HICUMcqbcpar1 HICUMstate+58
#define HICUMgqbcpar1 HICUMstate+59
#define HICUMqbcpar2 HICUMstate+59
#define HICUMcqbcpar2 HICUMstate+60
#define HICUMgqbcpar2 HICUMstate+61
#define HICUMqbcpar2 HICUMstate+60
#define HICUMcqbcpar2 HICUMstate+61
#define HICUMgqbcpar2 HICUMstate+62
#define HICUMqsu HICUMstate+62
#define HICUMcqsu HICUMstate+63
#define HICUMgqsu HICUMstate+64
#define HICUMqsu HICUMstate+63
#define HICUMcqsu HICUMstate+64
#define HICUMgqsu HICUMstate+65
#define HICUMqcth HICUMstate+65 /* thermal capacitor charge */
#define HICUMcqcth HICUMstate+66 /* thermal capacitor current */
#define HICUMqcth HICUMstate+66 /* thermal capacitor charge */
#define HICUMcqcth HICUMstate+67 /* thermal capacitor current */
#define HICUMvrth HICUMstate+67
#define HICUMicth_dT HICUMstate+68
#define HICUMvrth HICUMstate+68
#define HICUMicth_dT HICUMstate+69
#define HICUMvxf HICUMstate+69
#define HICUMqxf HICUMstate+70
#define HICUMcqxf HICUMstate+71
#define HICUMgqxf HICUMstate+72
#define HICUMixf_Vbiei HICUMstate+73
#define HICUMixf_Vbici HICUMstate+74
#define HICUMvxf HICUMstate+70
#define HICUMqxf HICUMstate+71
#define HICUMcqxf HICUMstate+72
#define HICUMgqxf HICUMstate+73
#define HICUMixf_Vbiei HICUMstate+74
#define HICUMixf_Vbici HICUMstate+75
#define HICUMvxf1 HICUMstate+75
#define HICUMqxf1 HICUMstate+76
#define HICUMcqxf1 HICUMstate+77
#define HICUMgqxf1 HICUMstate+78
#define HICUMixf1_Vbiei HICUMstate+79
#define HICUMixf1_Vbici HICUMstate+80
#define HICUMixf1_Vfx2 HICUMstate+81
#define HICUMvxf1 HICUMstate+76
#define HICUMqxf1 HICUMstate+77
#define HICUMcqxf1 HICUMstate+78
#define HICUMgqxf1 HICUMstate+79
#define HICUMixf1_Vbiei HICUMstate+80
#define HICUMixf1_Vbici HICUMstate+81
#define HICUMixf1_Vfx2 HICUMstate+82
#define HICUMvxf2 HICUMstate+82
#define HICUMqxf2 HICUMstate+83
#define HICUMcqxf2 HICUMstate+84
#define HICUMgqxf2 HICUMstate+85
#define HICUMixf2_Vbiei HICUMstate+86
#define HICUMixf2_Vbici HICUMstate+87
#define HICUMixf2_Vfx1 HICUMstate+88
#define HICUMvxf2 HICUMstate+83
#define HICUMqxf2 HICUMstate+84
#define HICUMcqxf2 HICUMstate+85
#define HICUMgqxf2 HICUMstate+86
#define HICUMixf2_Vbiei HICUMstate+87
#define HICUMixf2_Vbici HICUMstate+88
#define HICUMixf2_Vfx1 HICUMstate+89
#define HICUMith HICUMstate+89
#define HICUMith_Vrth HICUMstate+90
#define HICUMith HICUMstate+90
#define HICUMith_Vrth HICUMstate+91
#define HICUMnumStates 91
#define HICUMnumStates 92
/* per model data */
typedef struct sHICUMmodel { /* model structure for a hicum */

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

@ -819,6 +819,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
*(ckt->CKTstate1 + here->HICUMibiei);
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei) =
*(ckt->CKTstate1 + here->HICUMibiei_Vbiei);
*(ckt->CKTstate0 + here->HICUMibiei_Vbici) =
*(ckt->CKTstate1 + here->HICUMibiei_Vbici);
*(ckt->CKTstate0 + here->HICUMibpei) =
*(ckt->CKTstate1 + here->HICUMibpei);
*(ckt->CKTstate0 + here->HICUMibpei_Vbpei) =
@ -951,7 +953,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
if (model->HICUMflsh)
Vrth = *(ckt->CKTrhsOld + here->HICUMtempNode);
ibieihat = *(ckt->CKTstate0 + here->HICUMibiei) +
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei;
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei +
*(ckt->CKTstate0 + here->HICUMibiei_Vbici)*delvbici;
ibicihat = *(ckt->CKTstate0 + here->HICUMibici) +
*(ckt->CKTstate0 + here->HICUMibici_Vbici)*delvbici;
ibpeihat = *(ckt->CKTstate0 + here->HICUMibpei) +
@ -1044,6 +1047,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ibiei = *(ckt->CKTstate0 + here->HICUMibiei);
Ibiei_Vbiei = *(ckt->CKTstate0 + here->HICUMibiei_Vbiei);
Ibici_Vbici = *(ckt->CKTstate0 + here->HICUMibiei_Vbici);
Ibpei = *(ckt->CKTstate0 + here->HICUMibpei);
Ibpei_Vbpei = *(ckt->CKTstate0 + here->HICUMibpei_Vbpei);
@ -2076,6 +2080,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
*(ckt->CKTstate0 + here->HICUMibiei) = Ibiei;
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei) = Ibiei_Vbiei;
*(ckt->CKTstate0 + here->HICUMibiei_Vbici) = Ibiei_Vbici;
*(ckt->CKTstate0 + here->HICUMibpei) = Ibpei;
*(ckt->CKTstate0 + here->HICUMibpei_Vbpei) = Ibpei_Vbpei;

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

@ -24,6 +24,7 @@ HICUMpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
HICUMmodel *model = (HICUMmodel*)inModel;
double Ibpei_Vbpei;
double Ibiei_Vbiei;
double Ibiei_Vbici;
double Ibici_Vbici;
double Ibpci_Vbpci;
double Isici_Vsici;
@ -69,6 +70,7 @@ HICUMpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
Isis_Vsis = 1/model->HICUMrsu;
Ibiei_Vbiei = *(ckt->CKTstate0 + here->HICUMibiei_Vbiei);
Ibiei_Vbici = *(ckt->CKTstate0 + here->HICUMibiei_Vbici);
Ibpei_Vbpei = *(ckt->CKTstate0 + here->HICUMibpei_Vbpei);
Iciei_Vbiei = *(ckt->CKTstate0 + here->HICUMiciei_Vbiei);
Iciei_Vbici = *(ckt->CKTstate0 + here->HICUMiciei_Vbici);
@ -82,10 +84,10 @@ HICUMpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
Ibpci_Vbpci = *(ckt->CKTstate0 + here->HICUMibpci_Vbpci);
/*
c The real part
c The real part
*/
/*
c Stamp element: Ibiei
c Stamp element: Ibiei (missing Ibiei_Vbici)
*/
*(here->HICUMbaseBIBaseBIPtr) += Ibiei_Vbiei;
*(here->HICUMbaseBIEmitEIPtr) += -Ibiei_Vbiei;

29
src/spicelib/devices/hicum2/hicumL2.cpp
View File

@ -478,7 +478,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
int error;
double Vbe, Vcic, Vbbp, Veie, Vsis, Vbpe;
double Ibiei, Ibiei_Vbiei;
double Ibiei, Ibiei_Vbiei, Ibiei_Vbici;
double Ibici, Ibici_Vbici;
double Ibpei, Ibpei_Vbpei;
double Ibpci, Ibpci_Vbpci;
@ -1398,6 +1398,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
*(ckt->CKTstate1 + here->HICUMibiei);
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei) =
*(ckt->CKTstate1 + here->HICUMibiei_Vbiei);
*(ckt->CKTstate0 + here->HICUMibiei_Vbici) =
*(ckt->CKTstate1 + here->HICUMibiei_Vbici);
*(ckt->CKTstate0 + here->HICUMibpei) =
*(ckt->CKTstate1 + here->HICUMibpei);
*(ckt->CKTstate0 + here->HICUMibpei_Vbpei) =
@ -1533,7 +1535,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
if (model->HICUMflsh)
Vrth = *(ckt->CKTrhsOld + here->HICUMtempNode);
ibieihat = *(ckt->CKTstate0 + here->HICUMibiei) +
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei;
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei)*delvbiei+
*(ckt->CKTstate0 + here->HICUMibiei_Vbici)*delvbici,
ibicihat = *(ckt->CKTstate0 + here->HICUMibici) +
*(ckt->CKTstate0 + here->HICUMibici_Vbici)*delvbici;
ibpeihat = *(ckt->CKTstate0 + here->HICUMibpei) +
@ -1620,6 +1623,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ibiei = *(ckt->CKTstate0 + here->HICUMibiei);
Ibiei_Vbiei = *(ckt->CKTstate0 + here->HICUMibiei_Vbiei);
Ibiei_Vbici = *(ckt->CKTstate0 + here->HICUMibiei_Vbici);
Ibpei = *(ckt->CKTstate0 + here->HICUMibpei);
Ibpei_Vbpei = *(ckt->CKTstate0 + here->HICUMibpei_Vbpei);
@ -2311,7 +2315,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ibiei += model->HICUMtype*ibh_rec;
Ibiei_Vbiei += model->HICUMtype*ibh_rec_Vbiei;
Ibiei_dT += model->HICUMtype*ibh_rec_dT;
//derivative of Ibiei to Vbici missing via ibh_rec!
Ibiei_Vbici += model->HICUMtype*ibh_rec_Vbici;
if (model->HICUMtunode==1.0) {
Ibpei += -model->HICUMtype*ibet;
@ -2420,13 +2424,15 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ith_Vbici += (here->HICUMvdci_t.rpart-Vbici)*iavl_Vbici - iavl;
} else if (model->HICUMflsh == 2) {
//Iciei(Vbiei,Vbici)*Vciei
Ith_Vciei += Iciei;
Ith_Vbiei += Iciei_Vbiei*Vciei;
Ith_Vbici += Iciei_Vbici*Vciei;
Ith_Vciei += it;
Ith_Vbiei += it_Vbiei*Vciei;
Ith_Vbici += it_Vbici*Vciei;
//Vbiei*Ibiei(Vbiei)
Ith_Vbiei += Ibiei + Ibiei_Vbiei*Vbiei;
Ith_Vbici += Ibiei_Vbici*Vbiei;
//Vbici*Ibici(Vbici)
Ith_Vbici += Ibici + Ibici_Vbici+Vbici;
Ith_Vbici += Ibici + Ibici_Vbici*Vbici;
Ith_Vbici += (here->HICUMvdci_t.rpart-Vbici)*iavl_Vbici - iavl;
//Vbpei*Ibpei(Vbpei)
Ith_Vbpei += Ibpei + Ibpei_Vbpei*Vbpei;
//Vpbci*Ibpci(Vbpci)
@ -2440,7 +2446,6 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ith_Vbici += Ibpbi_Vbici*Vbpbi;
}
if (here->HICUMre_t.rpart >= MIN_R) {
//Veie*Ieie(Veiei) = Veie**2 /re_t
Ith_Veie = 2*Veie/here->HICUMre_t.rpart;
}
if (here->HICUMrcx_t.rpart >= MIN_R) {
@ -2775,6 +2780,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
*(ckt->CKTstate0 + here->HICUMibiei) = Ibiei;
*(ckt->CKTstate0 + here->HICUMibiei_Vbiei) = Ibiei_Vbiei;
*(ckt->CKTstate0 + here->HICUMibiei_Vbici) = Ibiei_Vbici;
*(ckt->CKTstate0 + here->HICUMibpei) = Ibpei;
*(ckt->CKTstate0 + here->HICUMibpei_Vbpei) = Ibpei_Vbpei;
@ -2881,7 +2887,7 @@ load:
// finish
// Branch: biei, Stamp element: Ibiei = Ibei + Irei ( was Ijbei )
rhs_current = model->HICUMtype * (Ibiei - Ibiei_Vbiei*Vbiei);
rhs_current = model->HICUMtype * (Ibiei - Ibiei_Vbiei*Vbiei - Ibiei_Vbici*Vbici);
*(ckt->CKTrhs + here->HICUMbaseBINode) += -rhs_current;
*(ckt->CKTrhs + here->HICUMemitEINode) += rhs_current;
// with respect to Vbiei
@ -2889,6 +2895,11 @@ load:
*(here->HICUMemitEIEmitEIPtr) += Ibiei_Vbiei;
*(here->HICUMbaseBIEmitEIPtr) += -Ibiei_Vbiei;
*(here->HICUMemitEIBaseBIPtr) += -Ibiei_Vbiei;
// with respect to Vbici
*(here->HICUMbaseBIBaseBIPtr) += Ibiei_Vbici;
*(here->HICUMemitEICollCIPtr) += Ibiei_Vbici;
*(here->HICUMbaseBICollCIPtr) += -Ibiei_Vbici;
*(here->HICUMemitEIBaseBIPtr) += -Ibiei_Vbici;
// finish
// Branch: bpei, Stamp element: Ibpei = Ibep + Irep ( was Ijbep )