mostly unwanted whitespace changes

This commit is contained in:
Francesco Lannutti 2014-04-26 20:09:21 +02:00 committed by rlar
parent b9b1a33cca
commit b991345f2f
55 changed files with 43 additions and 77 deletions

View File

@ -81,11 +81,11 @@ CKTload(CKTcircuit *ckt)
if (status != 0)
return (E_NOMEM) ;
#else
size = SMPmatSize(ckt->CKTmatrix);
for (i = 0; i <= size; i++) {
ckt->CKTrhs[i] = 0;
}
SMPclear(ckt->CKTmatrix);
size = SMPmatSize (ckt->CKTmatrix) ;
for (i = 0 ; i <= size ; i++)
*(ckt->CKTrhs + i) = 0 ;
SMPclear (ckt->CKTmatrix) ;
#endif
#ifdef STEPDEBUG

View File

@ -53,7 +53,8 @@ typedef struct sElement {
double val ;
} Element ;
static int
static
int
Compare (const void *a, const void *b)
{
Element *A, *B ;
@ -62,7 +63,8 @@ Compare (const void *a, const void *b)
return (A->row - B->row) ;
}
static int
static
int
Compress (int *Ai, int *Bp, int num_rows, int n_COO)
{
int i, j ;

View File

@ -354,8 +354,7 @@ DCtran(CKTcircuit *ckt,
if (status != 0)
return (E_NOMEM) ;
#else
bcopy(ckt->CKTstate0, ckt->CKTstate1,
(size_t) ckt->CKTnumStates * sizeof(double));
bcopy (ckt->CKTstate0, ckt->CKTstate1, (size_t) ckt->CKTnumStates * sizeof(double)) ;
#endif
#ifdef WANT_SENSE2
@ -807,9 +806,10 @@ resume:
if (status != 0)
return (E_NOMEM) ;
#else
for(i=0;i<ckt->CKTnumStates;i++) {
ckt->CKTstate2[i] = ckt->CKTstate1[i];
ckt->CKTstate3[i] = ckt->CKTstate1[i];
for (i = 0 ; i < ckt->CKTnumStates ; i++)
{
ckt->CKTstate2 [i] = ckt->CKTstate1 [i] ;
ckt->CKTstate3 [i] = ckt->CKTstate1 [i] ;
}
#endif

View File

@ -90,5 +90,3 @@ get_b3soidd_info (void)
{
return &B3SOIDDinfo;
}

View File

@ -86,11 +86,6 @@ SPICEdev B3SOIFDinfo = {
};
SPICEdev *
get_b3soifd_info (void)
{

View File

@ -71,5 +71,5 @@ BSIM4instance *here;
#endif
}
return(OK);
return (OK) ;
}

View File

@ -2654,7 +2654,7 @@ do { if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NUL
/* Different Values for the CKTloadOutput */
l += 5 ;
}
else if (here->BSIM4rgateMod == 2)
else if (here->BSIM4rgateMod == 2)
{
/* m * gcrg */
if ((here->BSIM4gNodeExt != 0) && (here->BSIM4gNodeExt != 0))
@ -3169,7 +3169,7 @@ do { if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NUL
}
#endif
return(OK);
return (OK) ;
}
int

View File

@ -2511,5 +2511,5 @@ int Size_Not_Found, i;
#endif
}
return(OK);
return (OK) ;
}

View File

@ -88,7 +88,6 @@ SPICEdev BSIM4v4info = {
};
SPICEdev *
get_bsim4v4_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev BSIM4v5info = {
};
SPICEdev *
get_bsim4v5_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev BSIM4v6info = {
};
SPICEdev *
get_bsim4v6_info(void)
{

View File

@ -91,5 +91,3 @@ get_b4soi_info (void)
{
return &B4SOIinfo;
}

View File

@ -115,6 +115,6 @@ CAPtemp(GENmodel *inModel, CKTcircuit *ckt)
#endif
}
return(OK);
return (OK) ;
}

View File

@ -89,7 +89,6 @@ SPICEdev DIOinfo = {
};
SPICEdev *
get_dio_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev HFET2info = {
};
SPICEdev *
get_hfet2_info(void)
{

View File

@ -86,7 +86,6 @@ SPICEdev HSM2info = {
};
SPICEdev *
get_hsm2_info(void)
{

View File

@ -86,7 +86,6 @@ SPICEdev HSMHVinfo = {
};
SPICEdev *
get_hsmhv_info(void)
{

View File

@ -160,7 +160,6 @@ typedef struct sINDmodel { /* model structure for an inductor */
} INDmodel;
/* structures used to describe mutual inductors */
@ -288,6 +287,7 @@ IFuid MUTmodName; /* pointer to character string naming this model */
#define IND_QUEST_SENS_CPLX 205
#define IND_QUEST_SENS_DC 206
/* device parameters */
#define MUT_COEFF 401
#define MUT_IND1 402

View File

@ -162,7 +162,7 @@ SPICEdev MUTinfo = {
#ifdef CIDER
/* DEVdump */ NULL,
/* DEVacct */ NULL,
#endif
#endif
&MUTiSize,
&MUTmSize,

View File

@ -29,6 +29,7 @@ INDload(GENmodel *inModel, CKTcircuit *ckt)
int ktype;
int itype;
/* loop through all the inductor models */
for( ; model != NULL; model = model->INDnextModel ) {

View File

@ -22,6 +22,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
INDmodel *model = (INDmodel*)inModel;
INDinstance *here;
double cind,icind,val,ival;
MUTinstance *muthere;
MUTmodel *mutmodel;
double cind1;
@ -47,6 +48,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
double k2;
int ktype;
int itype;
SENstruct *info;
info = ckt->CKTsenInfo;
@ -139,6 +141,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the instances of the model */
for (here = model->INDinstances; here != NULL ;
here=here->INDnextInstance) {
if(here->INDsenParmNo){
cind = *(ckt->CKTrhsOld + here->INDbrEq);
icind = *(ckt->CKTirhsOld + here->INDbrEq);

View File

@ -26,8 +26,8 @@ INDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
CKTnode *tmp;
/* loop through all the inductor models */
for( ; model != NULL; model = model->INDnextModel ) {
for ( ; model != NULL ; model = model->INDnextModel)
{
/* Default Value Processing for Model Parameters */
if (!model->INDmIndGiven) {
model->INDmInd = 0.0;
@ -194,7 +194,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
}
#endif
return(OK);
return (OK) ;
}
int

View File

@ -28,6 +28,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
double dummy1;
double dummy2;
SENstruct *info;
MUTinstance *muthere;
MUTmodel *mutmodel;
double sxp1;
@ -37,6 +38,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
int ktype;
int itype;
info = ckt->CKTsenInfo;
if(ckt->CKTmode & MODEINITTRAN) return(OK);
@ -123,6 +125,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the instances of the model */
for (here = model->INDinstances; here != NULL ;
here=here->INDnextInstance) {
for(iparmno = 1;iparmno<=info->SENparms;iparmno++){
if(ckt->CKTmode&MODETRANOP){

View File

@ -5,14 +5,12 @@ Author: 2003 Paolo Nenzi
/*
*/
#include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h"
#include "inddefs.h"
#include "ngspice/sperror.h"
#include "ngspice/suffix.h"
#ifdef USE_CUSPICE
#include "ngspice/CUSPICE/CUSPICE.h"
#endif
@ -101,6 +99,6 @@ INDtemp(GENmodel *inModel, CKTcircuit *ckt)
#endif
}
return(OK);
return (OK) ;
}

View File

@ -30,8 +30,8 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
NG_IGNORE(states);
/* loop through all the mutual inductor models */
for( ; model != NULL; model = model->MUTnextModel ) {
for ( ; model != NULL ; model = model->MUTnextModel)
{
/* loop through all the instances of the model */
for (here = model->MUTinstances; here != NULL ;
here=here->MUTnextInstance) {
@ -164,5 +164,5 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
}
#endif
return(OK);
return (OK) ;
}

View File

@ -5,7 +5,6 @@ Author: 2003 Paolo Nenzi
/*
*/
#include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h"
#include "inddefs.h"
@ -50,7 +49,7 @@ MUTtemp(GENmodel *inModel, CKTcircuit *ckt)
* M = k * \/l1 * l2
*/
here->MUTfactor = here->MUTcoupling * sqrt(ind1 * ind2);
#ifdef USE_CUSPICE
model->MUTparamCPU.MUTfactorArray[i] = here->MUTfactor ;
model->MUTparamCPU.MUTflux1Array[i] = here->MUTind1->INDflux ;
@ -70,5 +69,5 @@ MUTtemp(GENmodel *inModel, CKTcircuit *ckt)
#endif
}
return(OK);
return (OK) ;
}

View File

@ -20,7 +20,6 @@ libisrc_la_SOURCES = \
isrctemp.c
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

View File

@ -89,5 +89,5 @@ ISRCtemp(GENmodel *inModel, CKTcircuit *ckt)
}
return(OK);
return (OK) ;
}

View File

@ -88,7 +88,6 @@ SPICEdev JFETinfo = {
};
SPICEdev *
get_jfet_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev JFET2info = {
};
SPICEdev *
get_jfet2_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev LTRAinfo = {
};
SPICEdev *
get_ltra_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev MESinfo = {
};
SPICEdev *
get_mes_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev MESAinfo = {
};
SPICEdev *
get_mesa_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev MOS1info = {
};
SPICEdev *
get_mos1_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev MOS2info = {
};
SPICEdev *
get_mos2_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev MOS3info = {
};
SPICEdev *
get_mos3_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev MOS6info = {
};
SPICEdev *
get_mos6_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev MOS9info = {
};
SPICEdev *
get_mos9_info(void)
{

View File

@ -89,7 +89,6 @@ SPICEdev NBJTinfo = {
};
SPICEdev *
get_nbjt_info(void)
{

View File

@ -89,7 +89,6 @@ SPICEdev NBJT2info = {
};
SPICEdev *
get_nbjt2_info(void)
{

View File

@ -89,7 +89,6 @@ SPICEdev NDEVinfo = {
};
SPICEdev *
get_ndev_info(void)
{

View File

@ -89,7 +89,6 @@ SPICEdev NUMDinfo = {
};
SPICEdev *
get_numd_info(void)
{

View File

@ -89,7 +89,6 @@ SPICEdev NUMD2info = {
};
SPICEdev *
get_numd2_info(void)
{

View File

@ -89,7 +89,6 @@ SPICEdev NUMOSinfo = {
};
SPICEdev *
get_numos_info(void)
{

View File

@ -116,5 +116,5 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
}
#endif
return(OK);
return (OK) ;
}

View File

@ -139,5 +139,5 @@ REStemp(GENmodel *inModel, CKTcircuit *ckt)
#endif
}
return(OK);
return (OK) ;
}

View File

@ -88,7 +88,6 @@ SPICEdev SOI3info = {
};
SPICEdev *
get_soi3_info(void)
{

View File

@ -89,7 +89,6 @@ SPICEdev SWinfo = {
};
SPICEdev *
get_sw_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev TRAinfo = {
};
SPICEdev *
get_tra_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev URCinfo = {
};
SPICEdev *
get_urc_info(void)
{

View File

@ -93,7 +93,6 @@ SPICEdev VBICinfo = {
};
SPICEdev *
get_vbic_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev VCCSinfo = {
};
SPICEdev *
get_vccs_info(void)
{

View File

@ -88,7 +88,6 @@ SPICEdev VCVSinfo = {
};
SPICEdev *
get_vcvs_info(void)
{

View File

@ -142,7 +142,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
}
#endif
return(OK);
return (OK) ;
}
int

View File

@ -20,7 +20,7 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt)
/* Pre-process voltage source parameters
*/
{
VSRCmodel *model = (VSRCmodel *) inModel;
VSRCmodel *model = (VSRCmodel *)inModel;
VSRCinstance *here;
double radians;
@ -90,5 +90,5 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt)
}
return(OK);
return (OK) ;
}