research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[cantera2.0]: all tests now compile, from makefile.am modifications

Browse source
This commit is contained in:
Nicholas Malaya 2012-06-18 16:42:46 +00:00
parent 70db937d32
commit 43660e4c0c
13 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test_problems/NASA9poly_test/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = NASA9poly_test.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

4
test_problems/PecosTransport/Makefile.am
View file

@ -1,10 +1,10 @@
cc_sources = PecosTransport.cpp
INC = -I. -I$(top_builddir)/build/include/ -g
INC = -I. -I$(top_builddir)/include/ -g
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/

14
test_problems/PecosTransport/PecosTransport.cpp
View file

@ -22,10 +22,12 @@ using namespace std;
/*****************************************************************/
/*****************************************************************/
#include "Cantera.h"
#include "transport.h"
#include "IdealGasMix.h"
#include "TransportFactory.h"
#include "cantera/transport.h"
#include "cantera/IdealGasMix.h"
#include "cantera/transport/TransportFactory.h"
#include "cantera/Cantera.h"
using namespace Cantera;
using namespace Cantera_CXX;
@ -144,9 +146,9 @@ int main(int argc, char** argv) {
grad_T[1] = (T3 - T1) / dist;
int log_level = 0;
Transport * tran = newTransportMgr("Pecos", &g, log_level=0);
Transport * tran = newTransportMgr("Mix", &g, log_level=0);
PecosTransport * tranMix = dynamic_cast<PecosTransport *>(tran);
MixTransport * tranMix = dynamic_cast<MixTransport *>(tran);
g.setState_TPX(1500.0, pres, DATA_PTR(Xset));

6
test_problems/VPsilane_test/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = silane_equil.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

6
test_problems/fracCoeff/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = fracCoeff.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

6
test_problems/multiGasTransport/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = multiGasTransport.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

4
test_problems/negATest/Makefile.am
View file

@ -1,10 +1,10 @@
cc_sources = negATest.cpp
INC = -I. -I$(top_builddir)/build/include/ -g
INC = -I. -I$(top_builddir)/include/ -g
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/

6
test_problems/printUtilUnitTest/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = pUtest.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/ -I$(top_builddir)/src/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

6
test_problems/pureFluidTest/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = testPureWater.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

6
test_problems/silane_equil/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = silane_equil.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

6
test_problems/spectroscopy/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = spectratest.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/ -I$(top_builddir)/src/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

6
test_problems/surfSolverTest/Makefile.am
View file

@ -1,13 +1,13 @@
cc_sources = surfaceSolver.cpp
cc2_sources = surfaceSolver2.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/ -I$(top_builddir)/src/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)

6
test_problems/surfkin/Makefile.am
View file

@ -1,12 +1,12 @@
cc_sources = surfdemo.cpp
INC = -I. -I$(top_builddir)/build/include/
INC = -I. -I$(top_builddir)/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
LINK += -lctlapack -lctblas -lctf2c -lm -lctf2c -lstdc++
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)