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

cleanup some line wraps

This commit is contained in:
rlar 2013-07-24 20:39:27 +02:00
parent ed6d7df0ce
commit bedbdb65bb
8 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/control.c
View File

@ -773,8 +773,7 @@ cp_evloop(char *string)
} else if (eq(wlist->wl_word, "continue")) {
cend[stackp]->co_type = CO_CONTINUE;
if (wlist->wl_next) {
cend[stackp]->co_numtimes = scannum(wlist->
wl_next->wl_word);
cend[stackp]->co_numtimes = scannum(wlist->wl_next->wl_word);
if (wlist->wl_next->wl_next)
fprintf(cp_err,
"Warning: ignored extra junk after continue %d.\n",
@ -785,8 +784,7 @@ cp_evloop(char *string)
} else if (eq(wlist->wl_word, "break")) {
cend[stackp]->co_type = CO_BREAK;
if (wlist->wl_next) {
cend[stackp]->co_numtimes = scannum(wlist->
wl_next->wl_word);
cend[stackp]->co_numtimes = scannum(wlist->wl_next->wl_word);
if (wlist->wl_next->wl_next)
fprintf(cp_err,
"Warning: ignored extra junk after break %d.\n",

21
src/spicelib/analysis/cktsens.c
View File

@ -538,24 +538,21 @@ int sens_sens(CKTcircuit *ckt, int restart)
if (is_dc) {
if (job->output_volt)
output_values[n] = delta_I
[job->output_pos->number]
- delta_I
[job->output_neg->number];
output_values[n] =
delta_I [job->output_pos->number]
- delta_I [job->output_neg->number];
else {
output_values[n] = delta_I[branch_eq];
}
output_values[n] /= delta_var;
} else {
if (job->output_volt) {
output_cvalues[n].real = delta_I
[job->output_pos->number]
- delta_I
[job->output_neg->number];
output_cvalues[n].imag = delta_iI
[job->output_pos->number]
- delta_iI
[job->output_neg->number];
output_cvalues[n].real =
delta_I [job->output_pos->number]
- delta_I [job->output_neg->number];
output_cvalues[n].imag =
delta_iI [job->output_pos->number]
- delta_iI [job->output_neg->number];
} else {
output_cvalues[n].real =
delta_I[branch_eq];

24
src/spicelib/analysis/dctrcurv.c
View File

@ -346,16 +346,17 @@ resume:
/* first get the current step in the analysis */
if (job->TRCVvType[0] == vcode) {
g_mif_info.circuit.evt_step = ((VSRCinstance *)(job->TRCVvElt[i]))
->VSRCdcValue ;
g_mif_info.circuit.evt_step =
((VSRCinstance *)(job->TRCVvElt[i]))->VSRCdcValue ;
} else if (job->TRCVvType[0] == icode) {
g_mif_info.circuit.evt_step = ((ISRCinstance *)(job->TRCVvElt[i]))
->ISRCdcValue ;
g_mif_info.circuit.evt_step =
((ISRCinstance *)(job->TRCVvElt[i]))->ISRCdcValue ;
} else if (job->TRCVvType[0] == rcode) {
g_mif_info.circuit.evt_step = ((RESinstance*)(job->TRCVvElt[i]->GENmodPtr))
->RESresist;
g_mif_info.circuit.evt_step =
((RESinstance*)(job->TRCVvElt[i]->GENmodPtr))->RESresist;
} else if (job->TRCVvType[0] == TEMP_CODE) {
g_mif_info.circuit.evt_step = ckt->CKTtemp - CONSTCtoK;
g_mif_info.circuit.evt_step =
ckt->CKTtemp - CONSTCtoK;
}
/* if first time through, call EVTop immediately and save event results */
@ -394,14 +395,11 @@ resume:
ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODEDCTRANCURVE | MODEINITPRED ;
if (job->TRCVvType[0] == vcode) {
ckt->CKTtime = ((VSRCinstance *)(job->TRCVvElt[i]))
->VSRCdcValue ;
ckt->CKTtime = ((VSRCinstance *)(job->TRCVvElt[i]))->VSRCdcValue ;
} else if (job->TRCVvType[0] == icode) {
ckt->CKTtime = ((ISRCinstance *)(job->TRCVvElt[i]))
->ISRCdcValue ;
ckt->CKTtime = ((ISRCinstance *)(job->TRCVvElt[i]))->ISRCdcValue ;
} else if (job->TRCVvType[0] == rcode) {
ckt->CKTtime = ((RESinstance *)(job->TRCVvElt[i]))
->RESresist;
ckt->CKTtime = ((RESinstance *)(job->TRCVvElt[i]))->RESresist;
}
/* PN Temp sweep */
else

3
src/spicelib/devices/asrc/asrcconv.c
View File

@ -40,8 +40,7 @@ ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt)
branch = CKTfndBranch(ckt,here->ASRCtree->vars[i].uValue);
asrc_vals[i] = *(ckt->CKTrhsOld+branch);
} else {
node_num = (here->ASRCtree->vars[i].nValue)
->number;
node_num = here->ASRCtree->vars[i].nValue->number;
asrc_vals[i] = *(ckt->CKTrhsOld+node_num);
}
}

3
src/spicelib/devices/mos3/mos3dset.c
View File

@ -392,8 +392,7 @@ d_p.d3_pqr = 0.0;
InvDeriv(&d_onfbdy,&d_onfbdy);
qbonco =gammas*sqphbs+model->MOS3narrowFactor*phibs/EffectiveWidth;
EqualDeriv(&d_dummy,&d_phibs);
TimesDeriv(&d_dummy,&d_dummy,model->
MOS3narrowFactor*EffectiveWidth);
TimesDeriv(&d_dummy,&d_dummy,model->MOS3narrowFactor*EffectiveWidth);
MultDeriv(&d_qbonco,&d_gammas,&d_sqphbs);
PlusDeriv(&d_qbonco,&d_qbonco,&d_dummy);
/*

3
src/spicelib/devices/mos9/mos9dset.c
View File

@ -394,8 +394,7 @@ d_p.d3_pqr = 0.0;
InvDeriv(&d_onfbdy,&d_onfbdy);
qbonco =gammas*sqphbs+model->MOS9narrowFactor*phibs/EffectiveWidth;
EqualDeriv(&d_dummy,&d_phibs);
TimesDeriv(&d_dummy,&d_dummy,model->
MOS9narrowFactor*EffectiveWidth);
TimesDeriv(&d_dummy,&d_dummy,model->MOS9narrowFactor*EffectiveWidth);
MultDeriv(&d_qbonco,&d_gammas,&d_sqphbs);
PlusDeriv(&d_qbonco,&d_qbonco,&d_dummy);
/*

6
src/spicelib/parser/inp2dot.c
View File

@ -607,10 +607,8 @@ dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
ft_sim->analyses[which]->analysisParms[i].dataType, tab);
error =
ft_sim->setAnalysisParm (ckt, foo,
ft_sim->
analyses
[which]->analysisParms
[i].id, parm,
ft_sim->analyses[which]->analysisParms[i].id,
parm,
NULL);
if (error)
current->error =

8
src/spicelib/parser/inpapnam.c
View File

@ -23,11 +23,9 @@ INPapName(CKTcircuit *ckt, int type, JOB *analPtr, char *parmname,
ft_sim->analyses[type]->analysisParms[i].keyword) ==
0) {
return ft_sim->setAnalysisParm (ckt, analPtr,
ft_sim->
analyses[type]->
analysisParms[i].id,
value,
NULL);
ft_sim->analyses[type]->analysisParms[i].id,
value,
NULL);
}
}
return (E_BADPARM);