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

[cantera]: back to where we started

Browse source
This commit is contained in:
Nicholas Malaya 2012-02-04 00:23:34 +00:00
parent 0c26ea8c72
commit eaeb49c22e
5 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cantera/cxx/include/Cantera.h
View file

@ -23,28 +23,28 @@ namespace Cantera_CXX{ }
using namespace Cantera_CXX; using namespace Cantera_CXX;
#include "kernel/ct_defs.h" #include "ct_defs.h"
// some useful functions // some useful functions
#include "kernel/global.h" #include "global.h"
// the CanteraError exception class // the CanteraError exception class
#include "kernel/ctexceptions.h" #include "ctexceptions.h"
// //
//#include "kernel/importCTML.h" //#include "kernel/importCTML.h"
// The Cantera logger class // The Cantera logger class
#include "kernel/logger.h" #include "logger.h"
// Include the timer // Include the timer
#include "kernel/clockWC.h" #include "clockWC.h"
// Include routines for reading and writing XML files // Include routines for reading and writing XML files
#include "kernel/xml.h" #include "xml.h"
// Include string utility routines // Include string utility routines
#include "kernel/stringUtils.h" #include "stringUtils.h"
#endif #endif

12
Cantera/ext/f2c_libs/Makefile.am
View file

@ -49,13 +49,15 @@ library_include_HEADERS = $(h_sources)
# Cantera Converters C/C++ library # Cantera Converters C/C++ library
#----------------------- #-----------------------
__top_builddir__build_lib_libctf2c_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
__top_builddir__build_lib_libctf2c_la_SOURCES = $(cc_sources) $(h_sources)
CLEANFILES = *.o
# header file accumulation # header file accumulation
all: all:
@echo copying headers $< @echo copying headers $<
cp sysdep1.h0 sysdep1.h cp sysdep1.h0 sysdep1.h
cp signal1.h0 signal1.h
cp $(h_sources) $(top_builddir)/build/include/ cp $(h_sources) $(top_builddir)/build/include/
__top_builddir__build_lib_libctf2c_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
__top_builddir__build_lib_libctf2c_la_SOURCES = $(cc_sources) $(h_sources)
CLEANFILES = *.o

2
Cantera/src/thermo/Makefile.am
View file

@ -19,7 +19,7 @@ h_sources = State.h Elements.h Constituents.h Phase.h mix_defs.h \
PDSS.h HMWSoln.h WaterSSTP.h MetalSHEelectrons.h \ PDSS.h HMWSoln.h WaterSSTP.h MetalSHEelectrons.h \
IdealSolidSolnPhase.h StoichSubstanceSSTP.h \ IdealSolidSolnPhase.h StoichSubstanceSSTP.h \
SingleSpeciesTP.h MineralEQ3.h PseudoBinaryVPSSTP.h \ SingleSpeciesTP.h MineralEQ3.h PseudoBinaryVPSSTP.h \
MargulesVPSSTP.h StoichSubstance.h MargulesVPSSTP.h StoichSubstance.h electrolytes.h
cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \ cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \
ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp \ ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp \

5
test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
View file

@ -15,10 +15,9 @@
#include "DebyeHuckel.h" #include "DebyeHuckel.h"
#else #else
#include "Cantera.h" #include "Cantera.h"
#include "kernel/logger.h" #include "logger.h"
#include "kernel/DebyeHuckel.h" #include "DebyeHuckel.h"
#endif #endif
#include <cstdio> #include <cstdio>
using namespace std; using namespace std;

2
test_problems/cathermo/DH_graph_1/Makefile.am
View file

@ -1,6 +1,6 @@
cc_sources = DH_graph_1.cpp 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_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS) AM_CXXFLAGS = $(AM_CPPFLAGS)