From 26f81ad26a36e0bf08f9336c1bbc3971f6172794 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Tue, 7 Feb 2012 16:47:30 +0000 Subject: [PATCH] [cantera]: adding multigastransport test --- configure.ac | 1 + test_problems/Makefile.am | 4 ++-- test_problems/multiGasTransport/Makefile.am | 23 +++++++++++++++++++ .../multiGasTransport/multiGasTransport.cpp | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 test_problems/multiGasTransport/Makefile.am diff --git a/configure.ac b/configure.ac index 70cea94da..eef8cc8ac 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,7 @@ AC_OUTPUT(Makefile \ test_problems/diamondSurf/Makefile \ test_problems/diamondSurf_dupl/Makefile \ test_problems/fracCoeff/Makefile \ + test_problems/multiGasTransport/Makefile \ test_problems/cathermo/Makefile \ test_problems/cathermo/DH_graph_1/Makefile \ test_problems/cathermo/DH_graph_acommon/Makefile \ diff --git a/test_problems/Makefile.am b/test_problems/Makefile.am index 9cb0d3a6c..43b2852f5 100644 --- a/test_problems/Makefile.am +++ b/test_problems/Makefile.am @@ -2,11 +2,11 @@ #SUBDIRS = surfkin silane_equil VPsilance_test \ negATest diamondSurf_dupl surfSolverTest \ ChemEquil_gri_matrix ChemEquil_gri_pairs \ - mixGasTransport multiGasTransport printUtilUnitTest + mixGasTransport printUtilUnitTest SUBDIRS = cathermo mixGasTransport ChemEquil_gri_matrix ChemEquil_gri_pairs SUBDIRS += ChemEquil_ionizedGas ChemEquil_red1 CpJump cxx_ex diamondSurf -SUBDIRS += diamondSurf_dupl fracCoeff +SUBDIRS += diamondSurf_dupl fracCoeff multiGasTransport # # would be good to add: diff --git a/test_problems/multiGasTransport/Makefile.am b/test_problems/multiGasTransport/Makefile.am new file mode 100644 index 000000000..280b44c5c --- /dev/null +++ b/test_problems/multiGasTransport/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = multiGasTransport.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = multiGasTransport +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +multiGasTransport_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/multiGasTransport/multiGasTransport.cpp b/test_problems/multiGasTransport/multiGasTransport.cpp index e2f6ddc9e..c3d261eb3 100644 --- a/test_problems/multiGasTransport/multiGasTransport.cpp +++ b/test_problems/multiGasTransport/multiGasTransport.cpp @@ -36,7 +36,7 @@ using namespace std; #include "transport.h" #include "IdealGasMix.h" -#include "kernel/TransportFactory.h" +#include "TransportFactory.h" using namespace Cantera; using namespace Cantera_CXX;