fix SENSDEBUG related code

This commit is contained in:
dwarning 2013-04-23 09:12:42 +02:00 committed by rlar
parent 89c4c16829
commit f26d28b5bd
6 changed files with 23 additions and 24 deletions

View File

@ -451,7 +451,7 @@ resume:
}
if (job->TRCVvType[i] == TEMP_CODE) { /* Temperature */
printf("Current Circuit Temperature : %.5e C\n",
ckt-CKTtemp - CONSTCtoK);
ckt->CKTtemp - CONSTCtoK);
}
#endif /* SENSDEBUG */

View File

@ -540,11 +540,11 @@ load:
,cbe,icbe,cce,icce);
printf("cc = %.7e + j%.7e , ce = %.7e + j%.7e,",
,cc,icc,ce,ice);
cc,icc,ce,ice);
printf("ccprm = %.7e + j%.7e , ceprm = %.7e + j%.7e",
ccprm,iccprm,ceprm,iceprm);
printf("cb = %.7e + j%.7e , cbprm = %.7e + j%.7e , ",
cb,icb,cbprm,icbprm)
cb,icb,cbprm,icbprm);
printf("cs = %.7e + j%.7e\n",
cs,ics);
#endif /* SENSDEBUG */

View File

@ -56,10 +56,10 @@ DIOsLoad(GENmodel *inModel, CKTcircuit *ckt)
#ifdef SENSDEBUG
printf("DIOsenload\n");
fprintf(file,"DIOsenload\n");
fprintf(file,"CKTtime = %.5e\n",ckt->CKTtime);
fprintf(file,"CKTorder = %.5e\n",ckt->CKTorder);
fprintf(file,"tag0 = %.5e tag1 = %.5e\n",tag0,tag1);
fprintf(stdout,"DIOsenload\n");
fprintf(stdout,"CKTtime = %.5e\n",ckt->CKTtime);
fprintf(stdout,"CKTorder = %.5e\n",ckt->CKTorder);
fprintf(stdout,"tag0 = %.5e tag1 = %.5e\n",tag0,tag1);
#endif /* SENSDEBUG */
/* loop through all the diode models */
@ -70,7 +70,7 @@ DIOsLoad(GENmodel *inModel, CKTcircuit *ckt)
here=here->DIOnextInstance) {
#ifdef SENSDEBUG
fprintf(file,"pos = %d , posprm = %d ,neg = %d, senparmno = %d\n",
fprintf(stdout,"pos = %d , posprm = %d ,neg = %d, senparmno = %d\n",
here->DIOposNode ,here->DIOposPrimeNode,here->DIOnegNode,
here->DIOsenParmNo);
#endif /* SENSDEBUG */
@ -94,7 +94,7 @@ DIOsLoad(GENmodel *inModel, CKTcircuit *ckt)
#ifdef SENSDEBUG
fprintf(file,"cd0 = %.7e \n",cd0);
fprintf(stdout,"cd0 = %.7e \n",cd0);
#endif /* SENSDEBUG */
A0 = here->DIOarea;
@ -120,9 +120,9 @@ DIOsLoad(GENmodel *inModel, CKTcircuit *ckt)
*(here->DIOdphidp) = DqdDp;
#ifdef SENSDEBUG
fprintf(file,"cd0 = %.7e ,cd = %.7e,DcdDp=%.7e\n", cd0,cd,DcdDp);
fprintf(file,"cspr0 = %.7e ,DcsprDp=%.7e\n", cspr0,DcsprDp);
fprintf(file,"qd0 = %.7e ,qd = %.7e,DqdDp=%.7e\n", qd0,qd,DqdDp);
fprintf(stdout,"cd0 = %.7e ,cd = %.7e,DcdDp=%.7e\n", cd0,cd,DcdDp);
fprintf(stdout,"cspr0 = %.7e ,DcsprDp=%.7e\n", cspr0,DcsprDp);
fprintf(stdout,"qd0 = %.7e ,qd = %.7e,DqdDp=%.7e\n", qd0,qd,DqdDp);
#endif /* SENSDEBUG */
if((info->SENmode == TRANSEN) &&
@ -152,12 +152,12 @@ next:
2*(iparmno - 1) + 1);
#ifdef SENSDEBUG
fprintf(file,"\n iparmno=%d,Osxp=%.7e\n",iparmno,Osxp);
fprintf(stdout,"\n iparmno=%d,Osxp=%.7e\n",iparmno,Osxp);
#endif /* SENSDEBUG */
if(iparmno == here->DIOsenParmNo) Osxp = Osxp - tag0 * DqdDp;
#ifdef SENSDEBUG
fprintf(file,"Osxp=%.7e\n",Osxp);
fprintf(stdout,"Osxp=%.7e\n",Osxp);
#endif /* SENSDEBUG */
*(info->SEN_RHS[here->DIOposPrimeNode] + iparmno) += Osxp;

View File

@ -150,9 +150,9 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
ival = cind * ckt->CKTomega ;
#ifdef SENSDEBUG
fprintf(file,"cind = %.5e,icind = %.5e\n",cind,icind);
fprintf(file,"val = %.5e,ival = %.5e\n",val,ival);
fprintf(file,"brEq = %.5e,senparmno = %.5e\n",
fprintf(stdout,"cind = %.5e,icind = %.5e\n",cind,icind);
fprintf(stdout,"val = %.5e,ival = %.5e\n",val,ival);
fprintf(stdout,"brEq = %.5e,senparmno = %.5e\n",
here->INDbrEq,here->INDsenParmNo);
#endif /* SENSDEBUG */

View File

@ -47,8 +47,8 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
if((info->SENmode == TRANSEN) && (ckt->CKTmode & MODEINITTRAN)) return(OK);
#ifdef SENSDEBUG
fprintf(file,"INDsenLoad\n");
fprintf(file,"time = %.5e\n",ckt->CKTtime);
fprintf(stdout,"INDsenLoad\n");
fprintf(stdout,"time = %.5e\n",ckt->CKTtime);
#endif /* SENSDEBUG */
@ -109,7 +109,7 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
}
#ifdef SENSDEBUG
fprintf(file,"cind1 = %.5e,cind2 = %.5e\n",cind1,cind2);
fprintf(stdout,"cind1 = %.5e,cind2 = %.5e\n",cind1,cind2);
#endif /* SENSDEBUG */
}
@ -125,8 +125,8 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
#endif /* MUTUAL */
cind = *(ckt->CKTrhsOld + here->INDbrEq);
#ifdef SENSDEBUG
fprintf(file,"\n cind=%.5e\n",cind);
fprintf(file,"\n tag0=%.5e,tag1=%.5e\n",tag0,tag1);
fprintf(stdout,"\n cind=%.5e\n",cind);
fprintf(stdout,"\n tag0=%.5e,tag1=%.5e\n",tag0,tag1);
#endif /* SENSDEBUG */
for(iparmno = 1;iparmno<=info->SENparms;iparmno++){
Osxp = tag0 * *(ckt->CKTstate1 + here->INDsensxp
@ -135,7 +135,7 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt)
+ 2*(iparmno - 1) + 1);
if(iparmno == here->INDsenParmNo) Osxp = Osxp - tag0 * cind;
#ifdef SENSDEBUG
fprintf(file,"\n Osxp=%.5e\n",Osxp);
fprintf(stdout,"\n Osxp=%.5e\n",Osxp);
#endif /* SENSDEBUG */
*(info->SEN_RHS[here->INDbrEq] + iparmno) -= Osxp;

View File

@ -873,7 +873,6 @@ next1:
printf("gpi = %.7e\n", Ibe_Vbei);
printf("gmu = %.7e, gm = %.7e\n", Ibc_Vbci, Itzf_Vbei);
printf("go = %.7e, gx = %.7e\n", Itzf_Vbci, Irbi_Vrbi);
printf("geqcb = %.7e, geqbx = %.7e\n", geqcb, geqbx);
printf("cc = %.7e, cb = %.7e\n", Ibe+Itzf, Ibe);
#endif /* SENSDEBUG */
continue; /* go to 1000 */