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

remove dead assign statements, yet just commented them out for the time 

being
This commit is contained in:
Markus Mueller 2021-05-13 11:34:29 +02:00 committed by Holger Vogt
parent c0bd7ca6e2
commit 5c71349bad
1 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1171,7 +1171,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
if(ckt->CKTmode & MODEINITSMSIG) { if(ckt->CKTmode & MODEINITSMSIG) {
Vbiei = *(ckt->CKTstate0 + here->HICUMvbiei); Vbiei = *(ckt->CKTstate0 + here->HICUMvbiei);
Vbici = *(ckt->CKTstate0 + here->HICUMvbici); Vbici = *(ckt->CKTstate0 + here->HICUMvbici);
Vciei = Vbiei - Vbici; // dead assign:
//Vciei = Vbiei - Vbici;
Vbpei = *(ckt->CKTstate0 + here->HICUMvbpei); Vbpei = *(ckt->CKTstate0 + here->HICUMvbpei);
Vbpci = *(ckt->CKTstate0 + here->HICUMvbpci); Vbpci = *(ckt->CKTstate0 + here->HICUMvbpci);
Vbci = model->HICUMtype*( Vbci = model->HICUMtype*(
@ -1210,7 +1211,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
} else if(ckt->CKTmode & MODEINITTRAN) { } else if(ckt->CKTmode & MODEINITTRAN) {
Vbiei = *(ckt->CKTstate1 + here->HICUMvbiei); Vbiei = *(ckt->CKTstate1 + here->HICUMvbiei);
Vbici = *(ckt->CKTstate1 + here->HICUMvbici); Vbici = *(ckt->CKTstate1 + here->HICUMvbici);
Vciei = Vbiei - Vbici; // dead assign:
//Vciei = Vbiei - Vbici;
Vbpei = *(ckt->CKTstate1 + here->HICUMvbpei); Vbpei = *(ckt->CKTstate1 + here->HICUMvbpei);
Vbpci = *(ckt->CKTstate1 + here->HICUMvbpci); Vbpci = *(ckt->CKTstate1 + here->HICUMvbpci);
Vbci = model->HICUMtype*( Vbci = model->HICUMtype*(
@ -1266,7 +1268,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
} else if((ckt->CKTmode & MODEINITJCT) && (here->HICUMoff==0)) { } else if((ckt->CKTmode & MODEINITJCT) && (here->HICUMoff==0)) {
Vbiei = here->HICUMtVcrit; Vbiei = here->HICUMtVcrit;
Vbici = 0.0; Vbici = 0.0;
Vciei = Vbiei - Vbici; // dead assign:
//Vciei = Vbiei - Vbici;
Vsc = Vsici = 0.0; Vsc = Vsici = 0.0;
Vbe = Vbpei = Vbiei; Vbe = Vbpei = Vbiei;
Vbci = Vbpci = Vbici; Vbci = Vbpci = Vbici;
@ -1283,7 +1286,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
( (ckt->CKTmode & MODEINITFIX) && (here->HICUMoff!=0))) { ( (ckt->CKTmode & MODEINITFIX) && (here->HICUMoff!=0))) {
Vbe=0.0; Vbe=0.0;
Vbiei=Vbe; Vbiei=Vbe;
Vciei=0.0; // dead assign:
//Vciei=0.0;
Vbci=Vbici=Vbpci=0.0; Vbci=Vbici=Vbpci=0.0;
Vbpei=0.0; Vbpei=0.0;
Vsc=Vsici=0.0; Vsc=Vsici=0.0;
@ -1308,10 +1312,11 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
xfact * *(ckt->CKTstate2 + here->HICUMvsici); xfact * *(ckt->CKTstate2 + here->HICUMvsici);
Vbpbi = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvbpbi)- Vbpbi = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvbpbi)-
xfact * *(ckt->CKTstate2 + here->HICUMvbpbi); xfact * *(ckt->CKTstate2 + here->HICUMvbpbi);
Vxf = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvxf)- // dead assign:
xfact * *(ckt->CKTstate2 + here->HICUMvxf); // Vxf = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvxf)-
Vxf1 = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvxf1)- // xfact * *(ckt->CKTstate2 + here->HICUMvxf);
xfact * *(ckt->CKTstate2 + here->HICUMvxf1); // Vxf1 = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvxf1)-
// xfact * *(ckt->CKTstate2 + here->HICUMvxf1);
Vxf2 = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvxf2)- Vxf2 = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvxf2)-
xfact * *(ckt->CKTstate2 + here->HICUMvxf2); xfact * *(ckt->CKTstate2 + here->HICUMvxf2);
Vrth = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvrth); Vrth = (1+xfact) * *(ckt->CKTstate1 + here->HICUMvrth);
@ -1458,9 +1463,10 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Vbiei = model->HICUMtype*( Vbiei = model->HICUMtype*(
*(ckt->CKTrhsOld+here->HICUMbaseBINode)- *(ckt->CKTrhsOld+here->HICUMbaseBINode)-
*(ckt->CKTrhsOld+here->HICUMemitEINode)); *(ckt->CKTrhsOld+here->HICUMemitEINode));
Vbe = model->HICUMtype*( // no direct Vbe branch exists, dont need this voltage:
*(ckt->CKTrhsOld+here->HICUMbaseNode)- // Vbe = model->HICUMtype*(
*(ckt->CKTrhsOld+here->HICUMemitNode)); // *(ckt->CKTrhsOld+here->HICUMbaseNode)-
// *(ckt->CKTrhsOld+here->HICUMemitNode));
Vbici = model->HICUMtype*( Vbici = model->HICUMtype*(
*(ckt->CKTrhsOld+here->HICUMbaseBINode)- *(ckt->CKTrhsOld+here->HICUMbaseBINode)-
*(ckt->CKTrhsOld+here->HICUMcollCINode)); *(ckt->CKTrhsOld+here->HICUMcollCINode));
@ -1485,8 +1491,9 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Vsici = model->HICUMtype*( Vsici = model->HICUMtype*(
*(ckt->CKTrhsOld+here->HICUMsubsSINode)- *(ckt->CKTrhsOld+here->HICUMsubsSINode)-
*(ckt->CKTrhsOld+here->HICUMcollCINode)); *(ckt->CKTrhsOld+here->HICUMcollCINode));
Vxf = *(ckt->CKTrhsOld + here->HICUMxfNode); // not needed because convergence in NQS network is not checked here
Vxf1 = *(ckt->CKTrhsOld + here->HICUMxf1Node); //Vxf = *(ckt->CKTrhsOld + here->HICUMxfNode);
//Vxf1 = *(ckt->CKTrhsOld + here->HICUMxf1Node);
Vxf2 = *(ckt->CKTrhsOld + here->HICUMxf2Node); Vxf2 = *(ckt->CKTrhsOld + here->HICUMxf2Node);
Vciei = Vbiei - Vbici; Vciei = Vbiei - Vbici;
if (selfheat) { if (selfheat) {
@ -1518,9 +1525,6 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Vsc = model->HICUMtype*( Vsc = model->HICUMtype*(
*(ckt->CKTrhsOld+here->HICUMsubsNode)- *(ckt->CKTrhsOld+here->HICUMsubsNode)-
*(ckt->CKTrhsOld+here->HICUMcollNode)); *(ckt->CKTrhsOld+here->HICUMcollNode));
Vcic = model->HICUMtype*(
*(ckt->CKTrhsOld+here->HICUMcollCINode)-
*(ckt->CKTrhsOld+here->HICUMcollNode));
Vbci = model->HICUMtype*( Vbci = model->HICUMtype*(
*(ckt->CKTrhsOld+here->HICUMbaseNode)- *(ckt->CKTrhsOld+here->HICUMbaseNode)-
*(ckt->CKTrhsOld+here->HICUMcollCINode)); *(ckt->CKTrhsOld+here->HICUMcollCINode));
@ -1715,7 +1719,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ibpci_Vbpci = *(ckt->CKTstate0 + here->HICUMibpci_Vbpci); Ibpci_Vbpci = *(ckt->CKTstate0 + here->HICUMibpci_Vbpci);
Ibpci_Vrth = *(ckt->CKTstate0 + here->HICUMibpci_Vrth); Ibpci_Vrth = *(ckt->CKTstate0 + here->HICUMibpci_Vrth);
Ieie = *(ckt->CKTstate0 + here->HICUMieie); //dead assign:
//Ieie = *(ckt->CKTstate0 + here->HICUMieie);
Ieie_Vrth = *(ckt->CKTstate0 + here->HICUMieie_Vrth); Ieie_Vrth = *(ckt->CKTstate0 + here->HICUMieie_Vrth);
Isis_Vsis = *(ckt->CKTstate0 + here->HICUMisis_Vsis); Isis_Vsis = *(ckt->CKTstate0 + here->HICUMisis_Vsis);
@ -1873,12 +1878,13 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
a_h = result_a_h.rpart(); //needed to check if newton iteration needed a_h = result_a_h.rpart(); //needed to check if newton iteration needed
Q_p = result_Q_p.rpart(); //needed to check if newton iteration needed Q_p = result_Q_p.rpart(); //needed to check if newton iteration needed
Tf = result_Tf.rpart(); //needed to check if newton iteration needed Tf = result_Tf.rpart(); //needed to check if newton iteration needed
itf_dT = result_itf.dpart(); // dead assign:
itr_dT = result_itr.dpart(); //itf_dT = result_itf.dpart();
Qf_dT = result_Qf.dpart(); //itr_dT = result_itr.dpart();
Qr_dT = result_Qr.dpart(); //Qf_dT = result_Qf.dpart();
Q_bf_dT= result_Q_bf.dpart(); //Qr_dT = result_Qr.dpart();
Tf_dT = result_Tf.dpart(); //Q_bf_dT= result_Q_bf.dpart();
//Tf_dT = result_Tf.dpart();
if (!(Qf > RTOLC*Q_p || a_h > RTOLC)) { // in this case the newton is not run and the derivatives of the initial solution are needed if (!(Qf > RTOLC*Q_p || a_h > RTOLC)) { // in this case the newton is not run and the derivatives of the initial solution are needed
calc_it_initial(Temp_dual, Vbiei , Vbici , Q_0+1_e*Q_0_dT , T_f0+1_e*T_f0_dT , ick+1_e*ick_dT , &result_itf, &result_itr, &result_Qf, &result_Qr, &result_Q_bf, &result_a_h, &result_Q_p, &result_Tf); calc_it_initial(Temp_dual, Vbiei , Vbici , Q_0+1_e*Q_0_dT , T_f0+1_e*T_f0_dT , ick+1_e*ick_dT , &result_itf, &result_itr, &result_Qf, &result_Qr, &result_Q_bf, &result_a_h, &result_Q_p, &result_Tf);
@ -2195,8 +2201,9 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ixf1 = Vxf1; Ixf1 = Vxf1;
Ixf1_Vxf1 = 1.0; Ixf1_Vxf1 = 1.0;
Ixf1_Vxf2 = 0; Ixf1_Vxf2 = 0;
Ixf1_ditf = 0; // dead assign:
Ixf1_dTf = 0; //Ixf1_ditf = 0;
//Ixf1_dTf = 0;
Ixf1_Vbiei = 0; Ixf1_Vbiei = 0;
Ixf1_Vbici = 0; Ixf1_Vbici = 0;
Ixf1_dT = 0; Ixf1_dT = 0;
@ -2204,7 +2211,8 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ixf2 = Vxf2; Ixf2 = Vxf2;
Ixf2_Vxf2 = 1.0; Ixf2_Vxf2 = 1.0;
Ixf2_Vxf1 = 0; Ixf2_Vxf1 = 0;
Ixf2_dTf = 0; // dead assign:
//Ixf2_dTf = 0;
Ixf2_Vbiei = 0; Ixf2_Vbiei = 0;
Ixf2_Vbici = 0; Ixf2_Vbici = 0;
Ixf2_dT = 0; Ixf2_dT = 0;
@ -2217,8 +2225,9 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
Ixf = Vxf; Ixf = Vxf;
Ixf_Vxf = 1.0; Ixf_Vxf = 1.0;
Ixf_Tf = 0; // dead assign:
Ixf_Qdei = 0; //Ixf_Tf = 0;
//Ixf_Qdei = 0;
Ixf_Vbiei = 0; Ixf_Vbiei = 0;
Ixf_Vbici = 0; Ixf_Vbici = 0;
Ixf_dT = 0; Ixf_dT = 0;