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

Added UMFPACK as new experimental linear solver, (#2 changed files) 

Some files modified due to UMFPACK integration
 Some bugs and minor/cosmetic fixed
 TODO: Correct cktacct.c to let it print fill-ins
       properly using UMFPACK or SuperLU
This commit is contained in:
Francesco Lannutti 2012-03-12 19:20:20 +01:00 committed by Francesco Lannutti
parent 3560c8ee16
commit d9ae95f962
146 changed files with 397 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure.ac
View File

@ -1093,9 +1093,27 @@ if test "$enable_superlu" = "yes"; then
fi
AM_CONDITIONAL([SuperLU_WANTED], [test "$enable_superlu" = "yes"])
#REMOVE THIS TEST IN THE FUTURE WHEN BOTH KLU AND SuperLU ARE SUPPORTED IN THE MEAN TIME
if test "$enable_klu" = "yes" && test "$enable_superlu" = "yes" ; then
# --enable-umfpack: Use UMFPACK linear systems solver
AC_ARG_ENABLE(umfpack,
AS_HELP_STRING([--enable-umfpack],[Use UMFPACK linear systems solver]))
# Add UMFPACK solver to ngspice
if test "$enable_umfpack" = "yes"; then
AC_MSG_RESULT(Checking for ATLAS library...)
AC_CHECK_LIB(atlas, ATL_buildinfo, [], AC_MSG_ERROR([ERROR!!! You must have ATLAS installed]))
AC_CHECK_LIB(f77blas, dgemm_, [], AC_MSG_ERROR([ERROR!!! You must have ATLAS installed]))
AC_DEFINE(UMFPACK,[],[Define if we want UMFPACK linear systems solver])
AC_MSG_RESULT(WARNING: UMFPACK solver enabled)
fi
AM_CONDITIONAL([UMFPACK_WANTED], [test "$enable_umfpack" = "yes"])
#REMOVE THIS TEST IN THE FUTURE WHEN KLU, SuperLU AND UMFPACK ARE SUPPORTED IN THE MEAN TIME
if (test "$enable_klu" = "yes" && test "$enable_superlu" = "yes") ; then
AC_MSG_ERROR(ERROR: KLU and SuperLU can't be enabled together at the moment)
elif (test "$enable_klu" = "yes" && test "$enable_umfpack" = "yes") ; then
AC_MSG_ERROR(ERROR: KLU and UMFPACK can't be enabled together at the moment)
elif (test "$enable_superlu" = "yes" && test "$enable_umfpack" = "yes") ; then
AC_MSG_ERROR(ERROR: SuperLU and UMFPACK can't be enabled together at the moment)
fi
if test "$enable_pss" = "yes"; then
@ -1111,6 +1129,9 @@ AM_COND_IF([KLU_WANTED],
AM_COND_IF([SuperLU_WANTED],
[AC_CONFIG_FILES([src/maths/SuperLU/Makefile])])
AM_COND_IF([UMFPACK_WANTED],
[AC_CONFIG_FILES([src/maths/UMFPACK/Makefile])])
AC_CONFIG_FILES([Makefile
man/Makefile
man/man1/Makefile

12
src/Makefile.am
View File

@ -178,6 +178,10 @@ if SuperLU_WANTED
ngspice_LDADD += maths/SuperLU/libSuperLU.la
endif
if UMFPACK_WANTED
ngspice_LDADD += maths/UMFPACK/libUMFPACK.la
endif
ngspice_LDADD += \
maths/sparse/libsparse.la \
misc/libmisc.la
@ -288,6 +292,10 @@ if SuperLU_WANTED
ngmultidec_LDADD += maths/SuperLU/libSuperLU.la
endif
if UMFPACK_WANTED
ngmultidec_LDADD += maths/UMFPACK/libUMFPACK.la
endif
## ngmakeidx:
ngmakeidx_SOURCES = makeidx.c
@ -427,6 +435,10 @@ if SuperLU_WANTED
libspice_la_LIBADD += maths/SuperLU/libSuperLU.la
endif
if UMFPACK_WANTED
libspice_la_LIBADD += maths/UMFPACK/libUMFPACK.la
endif
libspice_la_LIBADD += \
maths/deriv/libderiv.la \
maths/cmaths/libcmaths.la \

2
src/include/ngspice/devdefs.h
View File

@ -101,7 +101,7 @@ typedef struct SPICEdev {
int *DEVinstSize; /* size of an instance */
int *DEVmodSize; /* size of a model */
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
int (*DEVbindCSC)(GENmodel*, CKTcircuit*);
int (*DEVbindCSCComplex)(GENmodel*, CKTcircuit*);
#endif

23
src/include/ngspice/smpdefs.h
View File

@ -22,6 +22,8 @@ Modified: 2000 AlansFixes
#include "ngspice/klu.h"
#elif defined(SuperLU)
#include "ngspice/slu_ddefs.h"
#elif defined(UMFPACK)
#include "ngspice/umfpack.h"
#endif
struct SMPmatrix {
@ -70,6 +72,25 @@ struct SMPmatrix {
int CKTsuperluMODE ;
#define CKTsuperluON 1 /* SuperLU MODE ON definition */
#define CKTsuperluOFF 0 /* SuperLU MODE OFF definition */
#elif defined(UMFPACK)
int *CKTumfpackAp ;
int *CKTumfpackAi ;
double *CKTumfpackAx ;
void *CKTumfpackSymbolic ;
void *CKTumfpackNumeric ;
double *CKTumfpackControl ;
double *CKTumfpackInfo ;
double *CKTumfpackIntermediate ;
double *CKTumfpackX ;
double **CKTbind_Sparse ;
double **CKTbind_CSC ;
double **CKTbind_CSC_Complex ;
double **CKTdiag_CSC ;
int CKTumfpackN ;
int CKTumfpacknz ;
int CKTumfpackMODE ;
#define CKTumfpackON 1 /* UMFPACK MODE ON definition */
#define CKTumfpackOFF 0 /* UMFPACK MODE OFF definition */
#endif
};
@ -78,7 +99,7 @@ struct SMPmatrix {
typedef struct SMPmatrix SMPmatrix ;
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
void SMPmatrix_CSC ( SMPmatrix * ) ;
void SMPnnz ( SMPmatrix * ) ;
#endif

23
src/maths/Makefile.am
View File

@ -13,16 +13,23 @@ SUBDIRS += SuperLU
DIST_SUBDIRS += SuperLU
endif
if UMFPACK_WANTED
SUBDIRS += UMFPACK
DIST_SUBDIRS += UMFPACK
endif
MAINTAINERCLEANFILES = Makefile.in
if !UMFPACK_WANTED
if !KLU_WANTED
if SuperLU_WANTED
MAINTAINERCLEANFILES += KLU/Makefile.in
else
if !SuperLU_WANTED #SPARSE_WANTED
MAINTAINERCLEANFILES += KLU/Makefile.in SuperLU/Makefile.in UMFPACK/Makefile.in
else #SuperLU_WANTED
MAINTAINERCLEANFILES += KLU/Makefile.in UMFPACK/Makefile.in
endif
else #KLU_WANTED
MAINTAINERCLEANFILES += SuperLU/Makefile.in UMFPACK/Makefile.in
endif
else #UMFPACK_WANTED
MAINTAINERCLEANFILES += KLU/Makefile.in SuperLU/Makefile.in
endif
else
if !SuperLU_WANTED
MAINTAINERCLEANFILES += SuperLU/Makefile.in
endif
endif

4
src/maths/SuperLU/superlusmp.c
View File

@ -307,7 +307,7 @@ SMPcSolve (SMPmatrix *Matrix, double RHS[], double iRHS[], double Spare[], doubl
*/
void
SMPsolve(SMPmatrix *Matrix, double RHS[], double Spare[])
SMPsolve (SMPmatrix *Matrix, double RHS[], double Spare[])
{//printf("Solve\n");
int i, *pExtOrder ;
@ -344,7 +344,7 @@ SMPmatSize (SMPmatrix *Matrix)
* SMPnewMatrix()
*/
int
SMPnewMatrix(SMPmatrix *Matrix)
SMPnewMatrix (SMPmatrix *Matrix)
{
int Error;
Matrix->SPmatrix = spCreate (0, 1, &Error) ;

19
src/maths/ni/niinit.c
View File

@ -66,6 +66,25 @@ NIinit(CKTcircuit *ckt)
ckt->CKTmatrix->CKTsuperluN = 0 ;
ckt->CKTmatrix->CKTsuperlunz = 0 ;
ckt->CKTmatrix->CKTsuperluMODE = CKTsuperluON ; /* TO BE SUBSTITUTED WITH THE HEURISTICS */
#elif defined(UMFPACK)
ckt->CKTmatrix->CKTumfpackAp = NULL ;
ckt->CKTmatrix->CKTumfpackAi = NULL ;
ckt->CKTmatrix->CKTumfpackAx = NULL ;
ckt->CKTmatrix->CKTumfpackSymbolic = NULL ;
ckt->CKTmatrix->CKTumfpackNumeric = NULL ;
ckt->CKTmatrix->CKTumfpackControl = NULL ;
ckt->CKTmatrix->CKTumfpackInfo = NULL ;
ckt->CKTmatrix->CKTumfpackIntermediate = NULL ;
ckt->CKTmatrix->CKTumfpackX = NULL ;
ckt->CKTmatrix->CKTbind_Sparse = NULL ;
ckt->CKTmatrix->CKTbind_CSC = NULL ;
ckt->CKTmatrix->CKTbind_CSC_Complex = NULL ;
ckt->CKTmatrix->CKTdiag_CSC = NULL ;
ckt->CKTmatrix->CKTumfpackN = 0 ;
ckt->CKTmatrix->CKTumfpacknz = 0 ;
ckt->CKTmatrix->CKTumfpackMODE = CKTumfpackON ; /* TO BE SUBSTITUTED WITH THE HEURISTICS */
#endif
ckt->CKTniState = NIUNINITIALIZED;

4
src/maths/sparse/Makefile.am
View File

@ -20,9 +20,13 @@ else
if SuperLU_WANTED
libsparse_la_SOURCES += spCSC.c
else
if UMFPACK_WANTED
libsparse_la_SOURCES += spCSC.c
else
libsparse_la_SOURCES += spsmp.c
endif
endif
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include

27
src/spicelib/analysis/cktop.c
View File

@ -83,6 +83,33 @@ ckt->CKTmode = firstmode;
if (DEVices [i] && DEVices [i]->DEVbindCSC)
DEVices [i]->DEVbindCSC (ckt->CKThead [i], ckt) ;
}
#elif defined(UMFPACK)
if (ckt->CKTmatrix->CKTumfpackMODE)
{
int i ;
int n = ckt->CKTmatrix->CKTumfpackN ;
int nz = ckt->CKTmatrix->CKTumfpacknz ;
ckt->CKTmatrix->CKTumfpackAp = TMALLOC (int, n + 1) ;
ckt->CKTmatrix->CKTumfpackAi = TMALLOC (int, nz) ;
ckt->CKTmatrix->CKTumfpackAx = TMALLOC (double, nz) ;
ckt->CKTmatrix->CKTumfpackControl = TMALLOC (double, UMFPACK_CONTROL) ;
ckt->CKTmatrix->CKTumfpackInfo = TMALLOC (double, UMFPACK_INFO) ;
ckt->CKTmatrix->CKTumfpackIntermediate = TMALLOC (double, n) ;
ckt->CKTmatrix->CKTumfpackX = TMALLOC (double, n) ;
ckt->CKTmatrix->CKTbind_Sparse = TMALLOC (double *, nz) ;
ckt->CKTmatrix->CKTbind_CSC = TMALLOC (double *, nz) ;
ckt->CKTmatrix->CKTdiag_CSC = TMALLOC (double *, n) ;
SMPmatrix_CSC (ckt->CKTmatrix) ;
for (i = 0 ; i < DEVmaxnum ; i++)
if (DEVices [i] && DEVices [i]->DEVbindCSC)
DEVices [i]->DEVbindCSC (ckt->CKThead [i], ckt) ;
}
#endif
if (!ckt->CKTnoOpIter){

3
src/spicelib/analysis/cktsetup.c
View File

@ -84,6 +84,9 @@ CKTsetup(CKTcircuit *ckt)
#elif defined(SuperLU)
if (ckt->CKTmatrix->CKTsuperluMODE)
SMPnnz (ckt->CKTmatrix) ;
#elif defined(UMFPACK)
if (ckt->CKTmatrix->CKTumfpackMODE)
SMPnnz (ckt->CKTmatrix) ;
#endif
for(i=0;i<=MAX(2,ckt->CKTmaxOrder)+1;i++) { /* dctran needs 3 states as minimum */

2
src/spicelib/devices/asrc/asrcinit.c
View File

@ -74,7 +74,7 @@ SPICEdev ASRCinfo = {
#endif
/* DEVinstSize */ &ASRCiSize,
/* DEVmodSize */ &ASRCmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ NULL,
/* DEVbindCSCComplex */ NULL,
#endif

4
src/spicelib/devices/bjt/Makefile.am
View File

@ -43,6 +43,10 @@ if SuperLU_WANTED
libbjt_la_SOURCES += bjtbindCSC.c
endif
if UMFPACK_WANTED
libbjt_la_SOURCES += bjtbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bjt/bjtext.h
View File

@ -34,7 +34,7 @@ extern int BJTdSetup(GENmodel*, register CKTcircuit*);
#endif
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BJTbindCSC(GENmodel*, CKTcircuit*);
extern int BJTbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bjt/bjtinit.c
View File

@ -73,7 +73,7 @@ SPICEdev BJTinfo = { /* description from struct IFdevice */
#endif
/* DEVinstSize */ &BJTiSize,
/* DEVmodSize */ &BJTmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BJTbindCSC,
/* DEVbindCSCComplex */ BJTbindCSCComplex,
#endif

4
src/spicelib/devices/bsim1/Makefile.am
View File

@ -39,6 +39,10 @@ if SuperLU_WANTED
libbsim1_la_SOURCES += b1bindCSC.c
endif
if UMFPACK_WANTED
libbsim1_la_SOURCES += b1bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim1/bsim1ext.h
View File

@ -30,7 +30,7 @@ extern int B1trunc(GENmodel*,CKTcircuit*,double*);
extern int B1disto(int,GENmodel*,CKTcircuit*);
extern int B1dSetup(GENmodel*, register CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int B1bindCSC(GENmodel*, CKTcircuit*);
extern int B1bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim1/bsim1init.c
View File

@ -73,7 +73,7 @@ SPICEdev B1info = {
#endif
/* DEVinstSize */ &B1iSize,
/* DEVmodSize */ &B1mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ B1bindCSC,
/* DEVbindCSCComplex */ B1bindCSCComplex,
#endif

4
src/spicelib/devices/bsim2/Makefile.am
View File

@ -37,6 +37,10 @@ if SuperLU_WANTED
libbsim2_la_SOURCES += b2bindCSC.c
endif
if UMFPACK_WANTED
libbsim2_la_SOURCES += b2bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim2/bsim2ext.h
View File

@ -26,7 +26,7 @@ extern int B2unsetup(GENmodel*,CKTcircuit*);
extern int B2temp(GENmodel*,CKTcircuit*);
extern int B2trunc(GENmodel*,CKTcircuit*,double*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int B2bindCSC(GENmodel*, CKTcircuit*);
extern int B2bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim2/bsim2init.c
View File

@ -73,7 +73,7 @@ SPICEdev B2info = {
#endif
/* DEVinstSize */ &B2iSize,
/* DEVmodSize */ &B2mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ B2bindCSC,
/* DEVbindCSCComplex */ B2bindCSCComplex,
#endif

4
src/spicelib/devices/bsim3/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim3_la_SOURCES += b3bindCSC.c
endif
if UMFPACK_WANTED
libbsim3_la_SOURCES += b3bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim3/bsim3ext.h
View File

@ -29,7 +29,7 @@ extern int BSIM3trunc(GENmodel*,CKTcircuit*,double*);
extern int BSIM3noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int BSIM3unsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM3bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM3bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim3/bsim3init.c
View File

@ -72,7 +72,7 @@ SPICEdev BSIM3info = {
#endif
/* DEVinstSize */ &BSIM3iSize,
/* DEVmodSize */ &BSIM3mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BSIM3bindCSC,
/* DEVbindCSCComplex */ BSIM3bindCSCComplex,
#endif

4
src/spicelib/devices/bsim3soi_dd/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim3soidd_la_SOURCES += b3soiddbindCSC.c
endif
if UMFPACK_WANTED
libbsim3soidd_la_SOURCES += b3soiddbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim3soi_dd/b3soiddext.h
View File

@ -29,7 +29,7 @@ extern int B3SOIDDtrunc(GENmodel*,CKTcircuit*,double*);
extern int B3SOIDDnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int B3SOIDDunsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int B3SOIDDbindCSC(GENmodel*, CKTcircuit*);
extern int B3SOIDDbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
View File

@ -70,7 +70,7 @@ SPICEdev B3SOIDDinfo = {
#endif
/* DEVinstSize */ &B3SOIDDiSize,
/* DEVmodSize */ &B3SOIDDmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ B3SOIDDbindCSC,
/* DEVbindCSCComplex */ B3SOIDDbindCSCComplex,
#endif

4
src/spicelib/devices/bsim3soi_fd/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim3soifd_la_SOURCES += b3soifdbindCSC.c
endif
if UMFPACK_WANTED
libbsim3soifd_la_SOURCES += b3soifdbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim3soi_fd/b3soifdext.h
View File

@ -30,7 +30,7 @@ extern int B3SOIFDnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int B3SOIFDunsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int B3SOIFDbindCSC(GENmodel*, CKTcircuit*);
extern int B3SOIFDbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
View File

@ -71,7 +71,7 @@ SPICEdev B3SOIFDinfo = {
#endif
/* DEVinstSize*/ &B3SOIFDiSize,
/* DEVmodSize*/ &B3SOIFDmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ B3SOIFDbindCSC,
/* DEVbindCSCComplex */ B3SOIFDbindCSCComplex,
#endif

4
src/spicelib/devices/bsim3soi_pd/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim3soipd_la_SOURCES += b3soipdbindCSC.c
endif
if UMFPACK_WANTED
libbsim3soipd_la_SOURCES += b3soipdbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim3soi_pd/b3soipdext.h
View File

@ -29,7 +29,7 @@ extern int B3SOIPDtrunc(GENmodel*,CKTcircuit*,double*);
extern int B3SOIPDnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int B3SOIPDunsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int B3SOIPDbindCSC(GENmodel*, CKTcircuit*);
extern int B3SOIPDbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim3soi_pd/b3soipdinit.c
View File

@ -72,7 +72,7 @@ SPICEdev B3SOIPDinfo = {
#endif
/* DEVinstSize*/ &B3SOIPDiSize,
/* DEVmodSize*/ &B3SOIPDmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ B3SOIPDbindCSC,
/* DEVbindCSCComplex */ B3SOIPDbindCSCComplex,
#endif

4
src/spicelib/devices/bsim3v0/Makefile.am
View File

@ -35,6 +35,10 @@ if SuperLU_WANTED
libbsim3v0_la_SOURCES += b3v0bindCSC.c
endif
if UMFPACK_WANTED
libbsim3v0_la_SOURCES += b3v0bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim3v0/bsim3v0ext.h
View File

@ -29,7 +29,7 @@ extern int BSIM3v0noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int BSIM3v0unsetup(GENmodel *, CKTcircuit *);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM3v0bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM3v0bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim3v0/bsim3v0init.c
View File

@ -71,7 +71,7 @@ SPICEdev B3v0info = {
#endif
/* DEVinstSize */ &BSIM3v0iSize,
/* DEVmodSize */ &BSIM3v0mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BSIM3v0bindCSC,
/* DEVbindCSCComplex */ BSIM3v0bindCSCComplex,
#endif

4
src/spicelib/devices/bsim3v1/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim3v1_la_SOURCES += b3v1bindCSC.c
endif
if UMFPACK_WANTED
libbsim3v1_la_SOURCES += b3v1bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim3v1/bsim3v1ext.h
View File

@ -30,7 +30,7 @@ extern int BSIM3v1noise(int, int, GENmodel *, CKTcircuit *, Ndata *, double *);
extern int BSIM3v1unsetup(GENmodel *, CKTcircuit *);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM3v1bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM3v1bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim3v1/bsim3v1init.c
View File

@ -71,7 +71,7 @@ SPICEdev BSIM3v1info = {
#endif
/* DEVinstSize */ &BSIM3v1iSize,
/* DEVmodSize */ &BSIM3v1mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BSIM3v1bindCSC,
/* DEVbindCSCComplex */ BSIM3v1bindCSCComplex,
#endif

4
src/spicelib/devices/bsim3v32/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim3v32_la_SOURCES += b3v32bindCSC.c
endif
if UMFPACK_WANTED
libbsim3v32_la_SOURCES += b3v32bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim3v32/bsim3v32ext.h
View File

@ -30,7 +30,7 @@ extern int BSIM3v32trunc(GENmodel*,CKTcircuit*,double*);
extern int BSIM3v32noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int BSIM3v32unsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM3v32bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM3v32bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim3v32/bsim3v32init.c
View File

@ -72,7 +72,7 @@ SPICEdev BSIM3v32info = {
#endif
/* DEVinstSize */ &BSIM3v32iSize,
/* DEVmodSize */ &BSIM3v32mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BSIM3v32bindCSC,
/* DEVbindCSCComplex */ BSIM3v32bindCSCComplex,
#endif

4
src/spicelib/devices/bsim4/Makefile.am
View File

@ -37,6 +37,10 @@ if SuperLU_WANTED
libbsim4_la_SOURCES += b4bindCSC.c
endif
if UMFPACK_WANTED
libbsim4_la_SOURCES += b4bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim4/bsim4ext.h
View File

@ -29,7 +29,7 @@ extern int BSIM4trunc(GENmodel*,CKTcircuit*,double*);
extern int BSIM4noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int BSIM4unsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM4bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM4bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim4/bsim4init.c
View File

@ -73,7 +73,7 @@ SPICEdev BSIM4info = {
#endif
&BSIM4iSize, /* DEVinstSize */
&BSIM4mSize, /* DEVmodSize */
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BSIM4bindCSC,
/* DEVbindCSCComplex */ BSIM4bindCSCComplex,
#endif

4
src/spicelib/devices/bsim4v4/Makefile.am
View File

@ -37,6 +37,10 @@ if SuperLU_WANTED
libbsim4v4_la_SOURCES += b4v4bindCSC.c
endif
if UMFPACK_WANTED
libbsim4v4_la_SOURCES += b4v4bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim4v4/bsim4v4ext.h
View File

@ -32,7 +32,7 @@ extern int BSIM4v4unsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM4v4bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM4v4bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim4v4/bsim4v4init.c
View File

@ -73,7 +73,7 @@ SPICEdev BSIM4v4info = {
#endif
&BSIM4v4iSize, /* DEVinstSize */
&BSIM4v4mSize, /* DEVmodSize */
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BSIM4v4bindCSC,
/* DEVbindCSCComplex */ BSIM4v4bindCSCComplex,
#endif

4
src/spicelib/devices/bsim4v5/Makefile.am
View File

@ -37,6 +37,10 @@ if SuperLU_WANTED
libbsim4v5_la_SOURCES += b4v5bindCSC.c
endif
if UMFPACK_WANTED
libbsim4v5_la_SOURCES += b4v5bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim4v5/bsim4v5ext.h
View File

@ -29,7 +29,7 @@ extern int BSIM4v5trunc(GENmodel*,CKTcircuit*,double*);
extern int BSIM4v5noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int BSIM4v5unsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM4v5bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM4v5bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim4v5/bsim4v5init.c
View File

@ -73,7 +73,7 @@ SPICEdev BSIM4v5info = {
#endif
&BSIM4v5iSize, /* DEVinstSize */
&BSIM4v5mSize, /* DEVmodSize */
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ BSIM4v5bindCSC,
/* DEVbindCSCComplex */ BSIM4v5bindCSCComplex,
#endif

4
src/spicelib/devices/bsim4v6/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim4v6_la_SOURCES += b4v6bindCSC.c
endif
if UMFPACK_WANTED
libbsim4v6_la_SOURCES += b4v6bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsim4v6/bsim4v6ext.h
View File

@ -29,7 +29,7 @@ extern int BSIM4v6trunc(GENmodel*,CKTcircuit*,double*);
extern int BSIM4v6noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int BSIM4v6unsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int BSIM4v6bindCSC(GENmodel*, CKTcircuit*);
extern int BSIM4v6bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsim4v6/bsim4v6init.c
View File

@ -73,7 +73,7 @@ SPICEdev BSIM4v6info = {
#endif
&BSIM4v6iSize, /* DEVinstSize */
&BSIM4v6mSize, /* DEVmodSize */
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
BSIM4v6bindCSC, /* DEVbindklu */
BSIM4v6bindCSCComplex, /* DEVbindkluComplex */
#endif

4
src/spicelib/devices/bsimsoi/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libbsim4soi_la_SOURCES += b4soibindCSC.c
endif
if UMFPACK_WANTED
libbsim4soi_la_SOURCES += b4soibindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/bsimsoi/b4soiext.h
View File

@ -31,7 +31,7 @@ extern int B4SOItrunc(GENmodel*,CKTcircuit*,double*);
extern int B4SOInoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int B4SOIunsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int B4SOIbindCSC(GENmodel*, CKTcircuit*);
extern int B4SOIbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/bsimsoi/b4soiinit.c
View File

@ -71,7 +71,7 @@ SPICEdev B4SOIinfo = {
#endif
/* DEVinstSize */ &B4SOIiSize,
/* DEVmodSize */ &B4SOImSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ B4SOIbindCSC,
/* DEVbindCSCComplex */ B4SOIbindCSCComplex,
#endif

4
src/spicelib/devices/cap/Makefile.am
View File

@ -37,6 +37,10 @@ if SuperLU_WANTED
libcap_la_SOURCES += capbindCSC.c
endif
if UMFPACK_WANTED
libcap_la_SOURCES += capbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/cap/capext.h
View File

@ -23,7 +23,7 @@ extern int CAPsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
extern int CAPtemp(GENmodel*,CKTcircuit*);
extern int CAPtrunc(GENmodel*,CKTcircuit*,double*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int CAPbindCSC(GENmodel*, CKTcircuit*);
extern int CAPbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/cap/capinit.c
View File

@ -72,7 +72,7 @@ SPICEdev CAPinfo = {
#endif
/* DEVinstSize */ &CAPiSize,
/* DEVmodSize */ &CAPmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindklu */ CAPbindCSC,
/* DEVbindkluComplex */ CAPbindCSCComplex,
#endif

4
src/spicelib/devices/cccs/Makefile.am
View File

@ -31,6 +31,10 @@ if SuperLU_WANTED
libcccs_la_SOURCES += cccsbindCSC.c
endif
if UMFPACK_WANTED
libcccs_la_SOURCES += cccsbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)
MAINTAINERCLEANFILES = Makefile.in

2
src/spicelib/devices/cccs/cccsext.h
View File

@ -18,7 +18,7 @@ extern int CCCSsSetup(SENstruct*,GENmodel*);
extern int CCCSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int CCCSbindCSC(GENmodel*, CKTcircuit*);
extern int CCCSbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/cccs/cccsinit.c
View File

@ -72,7 +72,7 @@ SPICEdev CCCSinfo = {
#endif
/* DEVinstSize */ &CCCSiSize,
/* DEVmodSize */ &CCCSmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ CCCSbindCSC,
/* DEVbindCSCComplex */ CCCSbindCSCComplex,
#endif

4
src/spicelib/devices/ccvs/Makefile.am
View File

@ -32,6 +32,10 @@ if SuperLU_WANTED
libccvs_la_SOURCES += ccvsbindCSC.c
endif
if UMFPACK_WANTED
libccvs_la_SOURCES += ccvsbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/ccvs/ccvsext.h
View File

@ -18,7 +18,7 @@ extern int CCVSsSetup(SENstruct*,GENmodel*);
extern int CCVSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
extern int CCVSunsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int CCVSbindCSC(GENmodel*, CKTcircuit*);
extern int CCVSbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/ccvs/ccvsinit.c
View File

@ -73,7 +73,7 @@ SPICEdev CCVSinfo = {
#endif
/* DEVinstSize */ &CCVSiSize,
/* DEVmodSize */ &CCVSmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ CCVSbindCSC,
/* DEVbindCSCComplex */ CCVSbindCSCComplex,
#endif

2
src/spicelib/devices/cpl/cplinit.c
View File

@ -73,7 +73,7 @@ SPICEdev CPLinfo = {
#endif
/* DEVinstSize */ &CPLiSize,
/* DEVmodSize */ &CPLmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ NULL,
/* DEVbindCSCComplex */ NULL,
#endif

4
src/spicelib/devices/csw/Makefile.am
View File

@ -32,6 +32,10 @@ if SuperLU_WANTED
libcsw_la_SOURCES += cswbindCSC.c
endif
if UMFPACK_WANTED
libcsw_la_SOURCES += cswbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)
MAINTAINERCLEANFILES = Makefile.in

2
src/spicelib/devices/csw/cswext.h
View File

@ -18,7 +18,7 @@ extern int CSWsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
extern int CSWnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int CSWtrunc(GENmodel*,CKTcircuit*,double*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int CSWbindCSC(GENmodel*, CKTcircuit*);
extern int CSWbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/csw/cswinit.c
View File

@ -75,7 +75,7 @@ SPICEdev CSWinfo = {
#endif
/* DEVinstSize */ &CSWiSize,
/* DEVmodSize */ &CSWmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ CSWbindCSC,
/* DEVbindCSCComplex */ CSWbindCSCComplex,
#endif

4
src/spicelib/devices/dio/Makefile.am
View File

@ -42,6 +42,10 @@ if SuperLU_WANTED
libdio_la_SOURCES += diobindCSC.c
endif
if UMFPACK_WANTED
libdio_la_SOURCES += diobindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/dio/dioext.h
View File

@ -29,7 +29,7 @@ extern int DIOdisto(int,GENmodel*,CKTcircuit*);
extern int DIOnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int DIOdSetup(DIOmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int DIObindCSC(GENmodel*, CKTcircuit*);
extern int DIObindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/dio/dioinit.c
View File

@ -74,7 +74,7 @@ SPICEdev DIOinfo = {
#endif
/* DEVinstSize */ &DIOiSize,
/* DEVmodSize */ &DIOmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ DIObindCSC,
/* DEVbindCSCComplex */ DIObindCSCComplex,
#endif

4
src/spicelib/devices/hfet1/Makefile.am
View File

@ -33,6 +33,10 @@ if SuperLU_WANTED
libhfet_la_SOURCES += hfetbindCSC.c
endif
if UMFPACK_WANTED
libhfet_la_SOURCES += hfetbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/hfet1/hfetext.h
View File

@ -19,7 +19,7 @@ extern int HFETAtemp(GENmodel*,CKTcircuit*);
extern int HFETAtrunc(GENmodel*,CKTcircuit*,double*);
extern int HFETAunsetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int HFETAbindCSC(GENmodel*, CKTcircuit*);
extern int HFETAbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/hfet1/hfetinit.c
View File

@ -73,7 +73,7 @@ SPICEdev HFETAinfo = {
#endif
/* DEVinstSize */ &HFETAiSize,
/* DEVmodSize */ &HFETAmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ HFETAbindCSC,
/* DEVbindCSCComplex */ HFETAbindCSC,
#endif

4
src/spicelib/devices/hfet2/Makefile.am
View File

@ -33,6 +33,10 @@ if SuperLU_WANTED
libhfet2_la_SOURCES += hfet2bindCSC.c
endif
if UMFPACK_WANTED
libhfet2_la_SOURCES += hfet2bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/hfet2/hfet2ext.h
View File

@ -19,7 +19,7 @@ extern int HFET2temp(GENmodel*,CKTcircuit*);
extern int HFET2trunc(GENmodel*,CKTcircuit*,double*);
extern int HFET2unsetup( GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int HFET2bindCSC(GENmodel*, CKTcircuit*);
extern int HFET2bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/hfet2/hfet2init.c
View File

@ -73,7 +73,7 @@ SPICEdev HFET2info = {
#endif
/* DEVinstSize */ &HFET2iSize,
/* DEVmodSize */ &HFET2mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ HFET2bindCSC,
/* DEVbindCSCComplex */ HFET2bindCSCComplex,
#endif

4
src/spicelib/devices/hisim2/Makefile.am
View File

@ -39,6 +39,10 @@ if SuperLU_WANTED
libhisim2_la_SOURCES += hsm2bindCSC.c
endif
if UMFPACK_WANTED
libhisim2_la_SOURCES += hsm2bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/hisim2/hsm2ext.h
View File

@ -38,7 +38,7 @@ extern int HSM2temp(GENmodel*,CKTcircuit*);
extern int HSM2trunc(GENmodel*,CKTcircuit*,double*);
extern int HSM2noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int HSM2bindCSC(GENmodel*, CKTcircuit*);
extern int HSM2bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/hisim2/hsm2init.c
View File

@ -71,7 +71,7 @@ SPICEdev HSM2info = {
#endif
/* DEVinstSize */ &HSM2iSize,
/* DEVmodSize */ &HSM2mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ HSM2bindCSC,
/* DEVbindCSCComplex */ HSM2bindCSCComplex,
#endif

4
src/spicelib/devices/hisimhv1/Makefile.am
View File

@ -40,6 +40,10 @@ if SuperLU_WANTED
libhisimhv1_la_SOURCES += hsmhvbindCSC.c
endif
if UMFPACK_WANTED
libhisimhv1_la_SOURCES += hsmhvbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/hisimhv1/hsmhvext.h
View File

@ -38,7 +38,7 @@ extern int HSMHVtemp(GENmodel*,CKTcircuit*);
extern int HSMHVtrunc(GENmodel*,CKTcircuit*,double*);
extern int HSMHVnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int HSMHVbindCSC(GENmodel*, CKTcircuit*);
extern int HSMHVbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/hisimhv1/hsmhvinit.c
View File

@ -71,7 +71,7 @@ SPICEdev HSMHVinfo = {
#endif
/* DEVinstSize */ &HSMHViSize,
/* DEVmodSize */ &HSMHVmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ HSMHVbindCSC,
/* DEVbindCSCComplex */ HSMHVbindCSCComplex,
#endif

4
src/spicelib/devices/ind/Makefile.am
View File

@ -48,6 +48,10 @@ if SuperLU_WANTED
libind_la_SOURCES += indMUTbindCSC.c
endif
if UMFPACK_WANTED
libind_la_SOURCES += indMUTbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/ind/indext.h
View File

@ -37,7 +37,7 @@ extern int MUTsSetup(SENstruct*,GENmodel*);
extern int MUTsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
extern int MUTtemp(GENmodel *inModel, CKTcircuit *ckt);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int INDbindCSC(GENmodel*, CKTcircuit*);
extern int INDbindCSCComplex(GENmodel*, CKTcircuit*);
extern int MUTbindCSC(GENmodel*, CKTcircuit*);

4
src/spicelib/devices/ind/indinit.c
View File

@ -72,7 +72,7 @@ SPICEdev INDinfo = {
#endif
/* DEVinstSize */ &INDiSize,
/* DEVmodSize */ &INDmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ INDbindCSC,
/* DEVbindCSCComplex */ INDbindCSCComplex,
#endif
@ -145,7 +145,7 @@ SPICEdev MUTinfo = {
#endif
&MUTiSize,
&MUTmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ MUTbindCSC,
/* DEVbindCSCComplex */ MUTbindCSCComplex,
#endif

2
src/spicelib/devices/isrc/isrcinit.c
View File

@ -73,7 +73,7 @@ SPICEdev ISRCinfo = {
#endif
/* DEVinstSize */ &ISRCiSize,
/* DEVmodSize */ &ISRCmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ NULL,
/* DEVbindCSCComplex */ NULL,
#endif

4
src/spicelib/devices/jfet/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libjfet_la_SOURCES += jfetbindCSC.c
endif
if UMFPACK_WANTED
libjfet_la_SOURCES += jfetbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/jfet/jfetext.h
View File

@ -23,7 +23,7 @@ extern int JFETdisto(int,GENmodel*,CKTcircuit*);
extern int JFETnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int JFETdSetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int JFETbindCSC(GENmodel*, CKTcircuit*);
extern int JFETbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/jfet/jfetinit.c
View File

@ -73,7 +73,7 @@ SPICEdev JFETinfo = {
#endif
/* DEVinstSize */ &JFETiSize,
/* DEVmodSize */ &JFETmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ JFETbindCSC,
/* DEVbindCSCComplex */ JFETbindCSCComplex,
#endif

4
src/spicelib/devices/jfet2/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libjfet2_la_SOURCES += jfet2bindCSC.c
endif
if UMFPACK_WANTED
libjfet2_la_SOURCES += jfet2bindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/jfet2/jfet2ext.h
View File

@ -23,7 +23,7 @@ extern int JFET2temp(GENmodel*,CKTcircuit*);
extern int JFET2trunc(GENmodel*,CKTcircuit*,double*);
extern int JFET2noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int JFET2bindCSC(GENmodel*, CKTcircuit*);
extern int JFET2bindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/jfet2/jfet2init.c
View File

@ -73,7 +73,7 @@ SPICEdev JFET2info = {
#endif
/* DEVinstSize */ &JFET2iSize,
/* DEVmodSize */ &JFET2mSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ JFET2bindCSC,
/* DEVbindCSCComplex */ JFET2bindCSCComplex,
#endif

4
src/spicelib/devices/ltra/Makefile.am
View File

@ -33,6 +33,10 @@ if SuperLU_WANTED
libltra_la_SOURCES += ltrabindCSC.c
endif
if UMFPACK_WANTED
libltra_la_SOURCES += ltrabindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/ltra/ltraext.h
View File

@ -45,7 +45,7 @@ extern void LTRArcCoeffsSetup(double*,double*,double*,double*,double*,double*,in
extern void LTRArlcCoeffsSetup(double*,double*,double*,double*,double*,double*,int,double,double,double,double,double*,int,double,int*);
extern int LTRAstraightLineCheck(double,double,double,double,double,double,double,double);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int LTRAbindCSC(GENmodel*, CKTcircuit*);
extern int LTRAbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/ltra/ltrainit.c
View File

@ -73,7 +73,7 @@ SPICEdev LTRAinfo = {
#endif
/* DEVinstSize */ &LTRAiSize,
/* DEVmodSize */ &LTRAmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ LTRAbindCSC,
/* DEVbindCSCComplex */ LTRAbindCSCComplex,
#endif

4
src/spicelib/devices/mes/Makefile.am
View File

@ -36,6 +36,10 @@ if SuperLU_WANTED
libmes_la_SOURCES += mesbindCSC.c
endif
if UMFPACK_WANTED
libmes_la_SOURCES += mesbindCSC.c
endif
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/mes/mesext.h
View File

@ -24,7 +24,7 @@ extern int MESnoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*);
extern int MESdSetup(GENmodel*,CKTcircuit*);
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
extern int MESbindCSC(GENmodel*, CKTcircuit*);
extern int MESbindCSCComplex(GENmodel*, CKTcircuit*);
#endif

2
src/spicelib/devices/mes/mesinit.c
View File

@ -73,7 +73,7 @@ SPICEdev MESinfo = {
#endif
/* DEVinstSize */ &MESiSize,
/* DEVmodSize */ &MESmSize,
#if defined(KLU) || defined(SuperLU)
#if defined(KLU) || defined(SuperLU) || defined(UMFPACK)
/* DEVbindCSC */ MESbindCSC,
/* DEVbindCSCComplex */ MESbindCSCComplex,
#endif

Some files were not shown because too many files have changed in this diff Show More