finish hicum SH review, next testing.

This commit is contained in:
Markus Mueller 2020-05-31 20:38:16 +02:00
parent e3c194e050
commit c1444a06b6
1 changed files with 4 additions and 12 deletions

View File

@ -2748,8 +2748,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
} }
} }
// Write DC Currents and their derivatives on the correct variables of the HiCUM equivalent circuit // Write to state vector
*(ckt->CKTstate0 + here->HICUMvbiei) = Vbiei; *(ckt->CKTstate0 + here->HICUMvbiei) = Vbiei;
*(ckt->CKTstate0 + here->HICUMvbici) = Vbici; *(ckt->CKTstate0 + here->HICUMvbici) = Vbici;
*(ckt->CKTstate0 + here->HICUMvbpei) = Vbpei; *(ckt->CKTstate0 + here->HICUMvbpei) = Vbpei;
@ -3095,11 +3094,11 @@ c Branch: xf-ground, Stamp element: Rxf
// ############### FINISH STAMPS NO SH ######################### // ############### FINISH STAMPS NO SH #########################
// ############################################################# // #############################################################
if (model->HICUMflsh) { if (model->HICUMflsh && model->HICUMrth >= MIN_R) {
// ############################################################# // #############################################################
// ############### STAMP WITH SH ADDITIONS ##################### // ############### STAMP WITH SH ADDITIONS #####################
// ############################################################# // #############################################################
// Stamp element: Ibiei f_Bi = + f_Ei = - // Stamp element: Ibiei f_Bi = + f_Ei = -
rhs_current = -Ibiei_dT*Vrth; rhs_current = -Ibiei_dT*Vrth;
*(ckt->CKTrhs + here->HICUMbaseBINode) += -rhs_current; *(ckt->CKTrhs + here->HICUMbaseBINode) += -rhs_current;
@ -3210,14 +3209,7 @@ c Branch: xf-ground, Stamp element: Rxf
*(here->HICUMtempTempPtr) += Icth_dT; *(here->HICUMtempTempPtr) += Icth_dT;
// finish // finish
// Stamp element: Ith // Stamp element: Ith f_T = - Ith
//before
// rhs_current = Ith + Icth - Icth_dT*Vrth
// + Ith_Vbiei*Vbiei + Ith_Vbici*Vbici + Ith_Vciei*Vciei
// + Ith_Vbpei*Vbpei + Ith_Vbpci*Vbpci + Ith_Vsici*Vsici
// + Ith_Vbpbi*Vbpbi
// + Ith_Vcic*Vcic + Ith_Vbbp*Vbbp + Ith_Veie*Veie;
//Markus suggestion, f_T = - Ith
rhs_current = Ith + Icth - Icth_dT*Vrth rhs_current = Ith + Icth - Icth_dT*Vrth
- Ith_Vbiei*Vbiei - Ith_Vbici*Vbici - Ith_Vciei*Vciei - Ith_Vbiei*Vbiei - Ith_Vbici*Vbici - Ith_Vciei*Vciei
- Ith_Vbpei*Vbpei - Ith_Vbpci*Vbpci - Ith_Vsici*Vsici - Ith_Vbpei*Vbpei - Ith_Vbpci*Vbpci - Ith_Vsici*Vsici