added the ida solver

This commit is contained in:
Harry Moffat 2011-07-30 03:17:00 +00:00
parent 2082b57699
commit d2f885acd5
3 changed files with 9 additions and 2 deletions

View file

@ -88,9 +88,13 @@ CANTERA_SUNDIALS_LIB_DIR=@sundials_lib_dir@
ifeq ($(CANTERA_use_sundials), 1)
CANTERA_CVODE_LIBS=-L$(CANTERA_SUNDIALS_LIB_DIR) @CVODE_LIBS@
CANTERA_CVODE_LIBS_DEP=@sundials_lib_dep@
CANTERA_SUNDIALS_LIBS=-L$(CANTERA_SUNDIALS_LIB_DIR) @sundials_lib@
CANTERA_SUNDIALS_LIBS_DEP=@sundials_lib_dep@
else
CANTERA_CVODE_LIBS= -L$(CANTERA_LIBSDIR) -lcvode
CANTERA_CVODE_LIBS_DEP=$(CANTERA_LIBSDIR)/libcvode.a
CANTERA_SUNDIALS_LIBS=-L$(CANTERA_LIBSDIR) -lcvode
CANTERA_SUNDIALS_LIBS_DEP=-L$(CANTERA_LIBSDIR)/libcvode.a
endif
#
#######################################################################
@ -133,11 +137,11 @@ CANTERA_DEFINES = -DCANTERA_VERSION=@ctversion@
CANTERA_TOTAL_LIBS2 = -L$(CANTERA_LIBSDIR) @LOCAL_LIBS@
#
CANTERA_TOTAL_LIBS= $(CANTERA_CORE_LIBS) $(CANTERA_BOOST_LIBS) \
$(CANTERA_CVODE_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \
$(CANTERA_SUNDIALS_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \
$(CANTERA_F2C_LIBS)
#
CANTERA_TOTAL_LIBS_DEP= $(CANTERA_CORE_LIBS_DEP) \
$(CANTERA_CVODE_LIBS_DEP) \
$(CANTERA_SUNDIALS_LIBS_DEP) \
$(CANTERA_BLAS_LAPACK_LIBS_DEP)
#
# Dependency Line

View file

@ -6,5 +6,7 @@
#define CT_INTEG_H_INCL
#include "kernel/Integrator.h"
#include "kernel/DAE_Solver.h"
#include "kernel/IDA_Solver.h"
#endif

View file

@ -4,5 +4,6 @@
#include "kernel/DenseMatrix.h"
#include "kernel/BandMatrix.h"
#include "kernel/SquareMatrix.h"
#include "kernel/NonlinearSolver.h"
#endif