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

[cantera]: updating test directory paths

Browse source
This commit is contained in:
Nicholas Malaya 2012-02-06 20:16:36 +00:00
parent 2746301631
commit c56b5f7b4d
24 changed files with 41 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cantera/cxx/include/thermo.h
View file

@ -9,9 +9,9 @@
#ifndef CT_THERMO_INCL
#define CT_THERMO_INCL
#include "kernel/ThermoFactory.h"
#include "ThermoFactory.h"
#include "importPhase.h"
#include "kernel/SurfPhase.h"
#include "kernel/EdgePhase.h"
#include "SurfPhase.h"
#include "EdgePhase.h"
#endif

4
test_problems/cathermo/DH_graph_NM/Makefile.am
View file

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

4
test_problems/cathermo/DH_graph_Pitzer/Makefile.am
View file

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

4
test_problems/cathermo/DH_graph_bdotak/Makefile.am
View file

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

2
test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
View file

@ -18,7 +18,7 @@
#include "importCTML.h"
#else
#include "Cantera.h"
#include "kernel/logger.h"
#include "logger.h"
#include "thermo.h"
#include "TemperatureTable.h"
#include "HMWSoln.h"

4
test_problems/cathermo/HMW_dupl_test/Makefile.am
View file

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

2
test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
View file

@ -18,7 +18,7 @@
#include "importCTML.h"
#else
#include "Cantera.h"
#include "kernel/logger.h"
#include "logger.h"
#include "thermo.h"
#include "TemperatureTable.h"
#include "HMWSoln.h"

4
test_problems/cathermo/HMW_graph_CpvT/Makefile.am
View file

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

4
test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
View file

@ -11,10 +11,8 @@
#include "Cantera.h"
#include "kernel/logger.h"
#include "logger.h"
#include "HMWSoln.h"
#include <cstdio>
using namespace std;

4
test_problems/cathermo/HMW_graph_GvI/Makefile.am
View file

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

4
test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
View file

@ -19,9 +19,9 @@
#include "ThermoPhase.h"
#include "Cantera.h"
#include "kernel/logger.h"
#include "logger.h"
#include "thermo.h"
#include "kernel/HMWSoln.h"
#include "HMWSoln.h"
#endif
#include "TemperatureTable.h"

4
test_problems/cathermo/HMW_graph_GvT/Makefile.am
View file

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

2
test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
View file

@ -11,7 +11,7 @@
#include "Cantera.h"
#include "thermo.h"
#include "kernel/HMWSoln.h"
#include "HMWSoln.h"
#include "TemperatureTable.h"
#include <cstdio>

4
test_problems/cathermo/HMW_graph_HvT/Makefile.am
View file

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

2
test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
View file

@ -19,7 +19,7 @@
#include "Cantera.h"
//#include "vcs_Cantera_input.h"
//#include "vcs_Cantera_convert.h"
#include "kernel/logger.h"
#include "logger.h"
#include "thermo.h"
#include "TemperatureTable.h"
#include "HMWSoln.h"

4
test_problems/cathermo/HMW_graph_VvT/Makefile.am
View file

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

2
test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
View file

@ -7,7 +7,7 @@
#include "Cantera.h"
#include "kernel/HMWSoln.h"
#include "HMWSoln.h"
#include <cstdio>

4
test_problems/cathermo/HMW_test_1/Makefile.am
View file

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

4
test_problems/cathermo/HMW_test_3/Makefile.am
View file

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

4
test_problems/cathermo/VPissp/Makefile.am
View file

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

2
test_problems/cathermo/issp/ISSPTester.cpp
View file

@ -28,7 +28,7 @@
#include "IdealSolidSolnPhase.h"
#else
#include "Cantera.h"
#include "kernel/IdealSolidSolnPhase.h"
#include "IdealSolidSolnPhase.h"
#endif
#include <cstdio>

4
test_problems/cathermo/issp/Makefile.am
View file

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

4
test_problems/cathermo/stoichSubSSTP/Makefile.am
View file

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

2
test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
View file

@ -18,7 +18,7 @@
#else
#include "Cantera.h"
#include "thermo.h"
#include "kernel/StoichSubstanceSSTP.h"
#include "StoichSubstanceSSTP.h"
#endif
#include "TemperatureTable.h"