From d2f885acd5570d21818c63c149be153e85a1f243 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Sat, 30 Jul 2011 03:17:00 +0000
Subject: [PATCH] added the ida solver

---
 Cantera/cxx/include/Cantera.mak.in | 8 ++++++--
 Cantera/cxx/include/integrators.h  | 2 ++
 Cantera/cxx/include/numerics.h     | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Cantera/cxx/include/Cantera.mak.in b/Cantera/cxx/include/Cantera.mak.in
index 23c5114bd..b45e9bd32 100644
--- a/Cantera/cxx/include/Cantera.mak.in
+++ b/Cantera/cxx/include/Cantera.mak.in
@@ -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
diff --git a/Cantera/cxx/include/integrators.h b/Cantera/cxx/include/integrators.h
index 69a603dae..de9d23719 100755
--- a/Cantera/cxx/include/integrators.h
+++ b/Cantera/cxx/include/integrators.h
@@ -6,5 +6,7 @@
 #define CT_INTEG_H_INCL
 
 #include "kernel/Integrator.h"
+#include "kernel/DAE_Solver.h"
+#include "kernel/IDA_Solver.h"
 
 #endif
diff --git a/Cantera/cxx/include/numerics.h b/Cantera/cxx/include/numerics.h
index ea143c3dd..0aa803eac 100755
--- a/Cantera/cxx/include/numerics.h
+++ b/Cantera/cxx/include/numerics.h
@@ -4,5 +4,6 @@
 #include "kernel/DenseMatrix.h"
 #include "kernel/BandMatrix.h"
 #include "kernel/SquareMatrix.h"
+#include "kernel/NonlinearSolver.h"
 
 #endif