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

Updated the Makefile and took out ifdefs.

Browse source
This commit is contained in:
Harry Moffat 2007-12-04 18:10:47 +00:00
parent c1f6bf0c87
commit f1b29f5f06
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
examples/cxx/Makefile.in
View file

@ -54,7 +54,18 @@ LCXX_END_LIBS = @LCXX_END_LIBS@
CANTERA_LIBDIR=@buildlib@
# required Cantera libraries
CANTERA_LIBS =
CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/libkinetics.a \
$(CANTERA_LIBDIR)/libtransport.a \
$(CANTERA_LIBDIR)/libthermo.a \
$(CANTERA_LIBDIR)/libctnumerics.a \
$(CANTERA_LIBDIR)/libcvode.a \
$(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libctmath.a \
$(CANTERA_LIBDIR)/libtpx.a \
$(CANTERA_LIBDIR)/libconverters.a
# the directory where Cantera include files may be found.
CANTERA_INC=-I@ctroot@/build/include
@ -79,13 +90,11 @@ DEPENDS=$(OBJS:.o=.d)
%.d:
@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a
$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS)
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \
$(LINK_OPTIONS) $(EXT_LIBS) @LIBS@ \
$(LCXX_END_LIBS)
# Add an additional target for stability:
$(OBJS): $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a
clean:
$(RM) $(OBJS) $(PROGRAM)

3
examples/cxx/kinetics_example1.cpp
View file

@ -126,10 +126,7 @@ int kinetics_example1(int job) {
<< " kin1.csv (Excel CSV file)" << endl
<< " kin1.dat (Tecplot data file)" << endl;
#define DEBUG_HKM
#ifdef DEBUG_HKM
delete gg;
#endif
return 0;
}

3
examples/cxx/kinetics_example3.cpp
View file

@ -120,10 +120,7 @@ int kinetics_example3(int job) {
<< " kin3.csv (Excel CSV file)" << endl
<< " kin3.dat (Tecplot data file)" << endl;
#define DEBUG_HKM
#ifdef DEBUG_HKM
delete gg;
#endif
return 0;
}

1
examples/cxx/rxnpath_example1.cpp
View file

@ -101,7 +101,6 @@ int rxnpath_example1(int job) {
// 3.0
IdealGasMix gas("gri30.cti", "gri30");
gas.setState_TPX(1001.0, OneAtm, "H2:2.0, O2:1.0, N2:4.0");
int nsp = gas.nSpecies();
// create a reactor
Reactor r;