From 70db937d32f2885e80334f28c1d63ee5357fbb2b Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Mon, 18 Jun 2012 16:16:55 +0000 Subject: [PATCH] [cantera2.0]: 2nd round of test makefiles edited --- test_problems/ChemEquil_gri_matrix/Makefile.am | 6 +++--- test_problems/ChemEquil_gri_pairs/Makefile.am | 6 +++--- test_problems/ChemEquil_ionizedGas/Makefile.am | 6 +++--- test_problems/ChemEquil_red1/Makefile.am | 6 +++--- test_problems/CpJump/Makefile.am | 6 +++--- test_problems/cathermo/HMW_test_1/Makefile.am | 4 ++-- test_problems/cathermo/VPissp/Makefile.am | 4 ++-- test_problems/cathermo/ims/Makefile.am | 4 ++-- test_problems/cathermo/issp/Makefile.am | 4 ++-- test_problems/cathermo/stoichSubSSTP/Makefile.am | 6 +++--- test_problems/cathermo/testIAPWS/Makefile.am | 6 +++--- test_problems/cathermo/testIAPWSPres/Makefile.am | 6 +++--- test_problems/cathermo/testIAPWSTripP/Makefile.am | 6 +++--- test_problems/cathermo/testWaterPDSS/Makefile.am | 4 ++-- test_problems/cathermo/testWaterTP/Makefile.am | 6 +++--- test_problems/cathermo/wtWater/Makefile.am | 6 +++--- test_problems/diamondSurf/Makefile.am | 6 +++--- test_problems/diamondSurf_dupl/Makefile.am | 6 +++--- test_problems/mixGasTransport/Makefile.am | 4 ++-- 19 files changed, 51 insertions(+), 51 deletions(-) diff --git a/test_problems/ChemEquil_gri_matrix/Makefile.am b/test_problems/ChemEquil_gri_matrix/Makefile.am index a721a0195..b15a94b5a 100644 --- a/test_problems/ChemEquil_gri_matrix/Makefile.am +++ b/test_problems/ChemEquil_gri_matrix/Makefile.am @@ -1,12 +1,12 @@ cc_sources = gri_matrix.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) diff --git a/test_problems/ChemEquil_gri_pairs/Makefile.am b/test_problems/ChemEquil_gri_pairs/Makefile.am index d8f17cfb2..8e841ded9 100644 --- a/test_problems/ChemEquil_gri_pairs/Makefile.am +++ b/test_problems/ChemEquil_gri_pairs/Makefile.am @@ -1,12 +1,12 @@ cc_sources = gri_pairs.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) diff --git a/test_problems/ChemEquil_ionizedGas/Makefile.am b/test_problems/ChemEquil_ionizedGas/Makefile.am index fed67a386..d2b88b869 100644 --- a/test_problems/ChemEquil_ionizedGas/Makefile.am +++ b/test_problems/ChemEquil_ionizedGas/Makefile.am @@ -1,12 +1,12 @@ cc_sources = ionizedGasEquil.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) diff --git a/test_problems/ChemEquil_red1/Makefile.am b/test_problems/ChemEquil_red1/Makefile.am index cf76ee85f..34dcd6894 100644 --- a/test_problems/ChemEquil_red1/Makefile.am +++ b/test_problems/ChemEquil_red1/Makefile.am @@ -1,12 +1,12 @@ cc_sources = basopt_red1.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) diff --git a/test_problems/CpJump/Makefile.am b/test_problems/CpJump/Makefile.am index 8c631190b..28cc471f9 100644 --- a/test_problems/CpJump/Makefile.am +++ b/test_problems/CpJump/Makefile.am @@ -1,12 +1,12 @@ cc_sources = CpJump.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) diff --git a/test_problems/cathermo/HMW_test_1/Makefile.am b/test_problems/cathermo/HMW_test_1/Makefile.am index c02a37977..1d10c1858 100644 --- a/test_problems/cathermo/HMW_test_1/Makefile.am +++ b/test_problems/cathermo/HMW_test_1/Makefile.am @@ -1,10 +1,10 @@ cc_sources = HMW_test_1.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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/ diff --git a/test_problems/cathermo/VPissp/Makefile.am b/test_problems/cathermo/VPissp/Makefile.am index 0a5e76384..6368bce3d 100644 --- a/test_problems/cathermo/VPissp/Makefile.am +++ b/test_problems/cathermo/VPissp/Makefile.am @@ -1,10 +1,10 @@ cc_sources = ISSPTester.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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/ diff --git a/test_problems/cathermo/ims/Makefile.am b/test_problems/cathermo/ims/Makefile.am index 5df20349f..e5402074d 100644 --- a/test_problems/cathermo/ims/Makefile.am +++ b/test_problems/cathermo/ims/Makefile.am @@ -1,10 +1,10 @@ cc_sources = IMSTester.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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/ diff --git a/test_problems/cathermo/issp/Makefile.am b/test_problems/cathermo/issp/Makefile.am index 0a5e76384..6368bce3d 100644 --- a/test_problems/cathermo/issp/Makefile.am +++ b/test_problems/cathermo/issp/Makefile.am @@ -1,10 +1,10 @@ cc_sources = ISSPTester.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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/ diff --git a/test_problems/cathermo/stoichSubSSTP/Makefile.am b/test_problems/cathermo/stoichSubSSTP/Makefile.am index a556f78fd..5a842a9af 100644 --- a/test_problems/cathermo/stoichSubSSTP/Makefile.am +++ b/test_problems/cathermo/stoichSubSSTP/Makefile.am @@ -1,10 +1,10 @@ -cc_sources = stoichSubSSTP.cpp sortAlgorithms.cpp +cc_sources = stoichSubSSTP.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ -I$(top_builddir)/test_problems/shared 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/ diff --git a/test_problems/cathermo/testIAPWS/Makefile.am b/test_problems/cathermo/testIAPWS/Makefile.am index 7f8c58791..be3449983 100644 --- a/test_problems/cathermo/testIAPWS/Makefile.am +++ b/test_problems/cathermo/testIAPWS/Makefile.am @@ -1,12 +1,12 @@ cc_sources = testIAPWSphi.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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++ +LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ -pthread AM_LDFLAGS = -L$(top_builddir)/build/lib/ LIBS = $(LINK) diff --git a/test_problems/cathermo/testIAPWSPres/Makefile.am b/test_problems/cathermo/testIAPWSPres/Makefile.am index cb896d37a..49daac1d4 100644 --- a/test_problems/cathermo/testIAPWSPres/Makefile.am +++ b/test_problems/cathermo/testIAPWSPres/Makefile.am @@ -1,12 +1,12 @@ cc_sources = testPress.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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++ +LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ -pthread AM_LDFLAGS = -L$(top_builddir)/build/lib/ LIBS = $(LINK) diff --git a/test_problems/cathermo/testIAPWSTripP/Makefile.am b/test_problems/cathermo/testIAPWSTripP/Makefile.am index f99546fc9..f9afc0d35 100644 --- a/test_problems/cathermo/testIAPWSTripP/Makefile.am +++ b/test_problems/cathermo/testIAPWSTripP/Makefile.am @@ -1,12 +1,12 @@ cc_sources = testTripleP.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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++ +LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ -pthread AM_LDFLAGS = -L$(top_builddir)/build/lib/ LIBS = $(LINK) diff --git a/test_problems/cathermo/testWaterPDSS/Makefile.am b/test_problems/cathermo/testWaterPDSS/Makefile.am index afd2b04a8..ddafb8245 100644 --- a/test_problems/cathermo/testWaterPDSS/Makefile.am +++ b/test_problems/cathermo/testWaterPDSS/Makefile.am @@ -1,10 +1,10 @@ cc_sources = testWaterPDSS.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ AM_CPPFLAGS = $(INC) AM_CXXFLAGS = $(AM_CPPFLAGS) -LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK = -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/ diff --git a/test_problems/cathermo/testWaterTP/Makefile.am b/test_problems/cathermo/testWaterTP/Makefile.am index 60f65d466..478a5ce49 100644 --- a/test_problems/cathermo/testWaterTP/Makefile.am +++ b/test_problems/cathermo/testWaterTP/Makefile.am @@ -1,10 +1,10 @@ cc_sources = testWaterSSTP.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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,7 +14,7 @@ bin_PROGRAMS = testWaterSSTP library_includedir = $(INC) #----------------------- -# Cantera DH graph test +# Cantera test #----------------------- testWaterSSTP_SOURCES = $(cc_sources) diff --git a/test_problems/cathermo/wtWater/Makefile.am b/test_problems/cathermo/wtWater/Makefile.am index 5fc8f2821..6eaa49624 100644 --- a/test_problems/cathermo/wtWater/Makefile.am +++ b/test_problems/cathermo/wtWater/Makefile.am @@ -1,10 +1,10 @@ cc_sources = wtWater.cpp -INC = -I$(top_builddir)/build/include/ +INC = -I$(top_builddir)/include/ 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,7 +14,7 @@ bin_PROGRAMS = wtWater library_includedir = $(INC) #----------------------- -# Cantera DH graph test +# Cantera test #----------------------- wtWater_SOURCES = $(cc_sources) diff --git a/test_problems/diamondSurf/Makefile.am b/test_problems/diamondSurf/Makefile.am index 4c39cc948..90b796888 100644 --- a/test_problems/diamondSurf/Makefile.am +++ b/test_problems/diamondSurf/Makefile.am @@ -1,12 +1,12 @@ cc_sources = runDiamond.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) diff --git a/test_problems/diamondSurf_dupl/Makefile.am b/test_problems/diamondSurf_dupl/Makefile.am index 41485a59f..25d2b9d39 100644 --- a/test_problems/diamondSurf_dupl/Makefile.am +++ b/test_problems/diamondSurf_dupl/Makefile.am @@ -1,12 +1,12 @@ cc_sources = runDiamondDupl.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) diff --git a/test_problems/mixGasTransport/Makefile.am b/test_problems/mixGasTransport/Makefile.am index 1d99d54bd..2b7bc09a2 100644 --- a/test_problems/mixGasTransport/Makefile.am +++ b/test_problems/mixGasTransport/Makefile.am @@ -1,10 +1,10 @@ cc_sources = mixGasTransport.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/