[cantera]: renaming
This commit is contained in:
Nicholas Malaya
commit
0aafd5bcd7
819 changed files with 4450 additions and 181701 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: $
|
||||
|
||||
# will need to add python and matlab
|
||||
SUBDIRS = src user cxx
|
||||
SUBDIRS = ext src user cxx
|
||||
|
|
|
|||
|
|
@ -23,28 +23,28 @@ namespace Cantera_CXX{ }
|
|||
|
||||
using namespace Cantera_CXX;
|
||||
|
||||
#include "kernel/ct_defs.h"
|
||||
#include "ct_defs.h"
|
||||
|
||||
// some useful functions
|
||||
#include "kernel/global.h"
|
||||
#include "global.h"
|
||||
|
||||
// the CanteraError exception class
|
||||
#include "kernel/ctexceptions.h"
|
||||
#include "ctexceptions.h"
|
||||
|
||||
//
|
||||
//#include "kernel/importCTML.h"
|
||||
|
||||
// The Cantera logger class
|
||||
#include "kernel/logger.h"
|
||||
#include "logger.h"
|
||||
|
||||
// Include the timer
|
||||
#include "kernel/clockWC.h"
|
||||
#include "clockWC.h"
|
||||
|
||||
// Include routines for reading and writing XML files
|
||||
#include "kernel/xml.h"
|
||||
#include "xml.h"
|
||||
|
||||
// Include string utility routines
|
||||
#include "kernel/stringUtils.h"
|
||||
#include "stringUtils.h"
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "kernel/IdealGasPhase.h"
|
||||
#include "kernel/GRI_30_Kinetics.h"
|
||||
#include "kernel/importKinetics.h"
|
||||
#include "kernel/stringUtils.h"
|
||||
#include "IdealGasPhase.h"
|
||||
#include "GRI_30_Kinetics.h"
|
||||
#include "importKinetics.h"
|
||||
#include "stringUtils.h"
|
||||
|
||||
namespace Cantera_CXX {
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "kernel/IdealGasPhase.h"
|
||||
#include "kernel/GasKinetics.h"
|
||||
#include "kernel/importKinetics.h"
|
||||
#include "kernel/stringUtils.h"
|
||||
#include "IdealGasPhase.h"
|
||||
#include "GasKinetics.h"
|
||||
#include "importKinetics.h"
|
||||
#include "stringUtils.h"
|
||||
|
||||
namespace Cantera_CXX {
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
*/
|
||||
#ifndef CT_EQUIL_INCL
|
||||
#define CT_EQUIL_INCL
|
||||
#include "kernel/equil.h"
|
||||
#include "kernel/ChemEquil.h"
|
||||
#include "kernel/MultiPhaseEquil.h"
|
||||
#include "equil.h"
|
||||
#include "ChemEquil.h"
|
||||
#include "MultiPhaseEquil.h"
|
||||
#ifdef WITH_VCSNONIDEAL
|
||||
#include "kernel/vcs_MultiPhaseEquil.h"
|
||||
#include "vcs_MultiPhaseEquil.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "kernel/ThermoPhase.h"
|
||||
#include "kernel/ThermoFactory.h"
|
||||
#include "ThermoPhase.h"
|
||||
#include "ThermoFactory.h"
|
||||
|
||||
/*
|
||||
* The Definitions for these functions are all located in
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
#include "thermo.h"
|
||||
|
||||
#include "kernel/Kinetics.h"
|
||||
#include "kernel/InterfaceKinetics.h"
|
||||
#include "kernel/GasKinetics.h"
|
||||
#include "kernel/KineticsFactory.h"
|
||||
#include "kernel/importKinetics.h"
|
||||
#include "Kinetics.h"
|
||||
#include "InterfaceKinetics.h"
|
||||
#include "GasKinetics.h"
|
||||
#include "KineticsFactory.h"
|
||||
#include "importKinetics.h"
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef CT_RXNPATHS_H
|
||||
#define CT_RXNPATHS_H
|
||||
|
||||
#include "kernel/ReactionPath.h"
|
||||
#include "ReactionPath.h"
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
#ifndef CT_TRANSPORT_INCL
|
||||
#define CT_TRANSPORT_INCL
|
||||
|
||||
#include "kernel/TransportFactory.h"
|
||||
#include "kernel/DustyGasTransport.h"
|
||||
#include "kernel/MultiTransport.h"
|
||||
#include "kernel/MixTransport.h"
|
||||
#include "TransportFactory.h"
|
||||
#include "DustyGasTransport.h"
|
||||
#include "MultiTransport.h"
|
||||
#include "MixTransport.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
*/
|
||||
#ifndef CT_INCL_ZERODIM_H
|
||||
#define CT_INCL_ZERODIM_H
|
||||
#include "kernel/Reactor.h"
|
||||
#include "kernel/ReactorNet.h"
|
||||
#include "kernel/Reservoir.h"
|
||||
#include "kernel/Wall.h"
|
||||
#include "kernel/flowControllers.h"
|
||||
#include "kernel/FlowReactor.h"
|
||||
#include "kernel/ConstPressureReactor.h"
|
||||
#include "Reactor.h"
|
||||
#include "ReactorNet.h"
|
||||
#include "Reservoir.h"
|
||||
#include "Wall.h"
|
||||
#include "flowControllers.h"
|
||||
#include "FlowReactor.h"
|
||||
#include "ConstPressureReactor.h"
|
||||
|
||||
using namespace CanteraZeroD;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
cc_sources = importPhase.cpp
|
||||
|
||||
AM_CPPFLAGS = -I/workspace/src/cantera/pecos_autotools/build/include/cantera
|
||||
AM_CPPFLAGS = -I$(top_builddir)/build/include
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctcxx.la
|
||||
|
|
@ -14,4 +14,9 @@ library_include_HEADERS = $(h_sources)
|
|||
__top_builddir__build_lib_libctcxx_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
|
||||
__top_builddir__build_lib_libctcxx_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
# header file accumulation
|
||||
all:
|
||||
@echo copying headers $<
|
||||
cp -u ../include/*.h $(top_builddir)/build/include/
|
||||
|
||||
CLEANFILES = *.o
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "kernel/ThermoPhase.h"
|
||||
#include "kernel/ThermoFactory.h"
|
||||
#include "ThermoPhase.h"
|
||||
#include "ThermoFactory.h"
|
||||
|
||||
namespace Cantera {}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@ cc_sources = band.c cvband.c cvbandpre.c cvdense.c cvdiag.c \
|
|||
cvode.c cvspgmr.c dense.c iterativ.c llnlmath.c \
|
||||
nvector.c spgmr.c
|
||||
|
||||
h_sources = band.h cvband.h cvbandpre.h cvdense.h cvdiag.h \
|
||||
h_sources = band.h cvband.h cvbandpre.h cvdense.h cvdiag.h \
|
||||
cvode.h cvspgmr.h dense.h iterativ.h llnlmath.h \
|
||||
llnltyps.h nvector.h spgmr.h
|
||||
|
||||
|
||||
AM_CPPFLAGS =
|
||||
AM_CPPFLAGS = -I.
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
AM_FCFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
|
|
@ -23,3 +22,8 @@ __top_builddir__build_lib_libcvode_la_LDFLAGS = $(all_libraries) -release $
|
|||
__top_builddir__build_lib_libcvode_la_SOURCES = $(fc_sources) $(cc_sources)
|
||||
|
||||
CLEANFILES = *.o
|
||||
|
||||
# header file accumulation
|
||||
all:
|
||||
@echo copying headers $<
|
||||
cp -u *.h $(top_builddir)/build/include/
|
||||
|
|
@ -58,3 +58,8 @@ __top_builddir__build_lib_libctblas_la_LDFLAGS = $(all_libraries) -release
|
|||
__top_builddir__build_lib_libctblas_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
CLEANFILES = *.o
|
||||
|
||||
# header file accumulation
|
||||
all:
|
||||
@echo copying headers $<
|
||||
cp -u *.h $(top_builddir)/build/include/
|
||||
|
|
@ -25,3 +25,8 @@ __top_builddir__build_lib_libctlapack_la_LDFLAGS = $(all_libraries) -releas
|
|||
__top_builddir__build_lib_libctlapack_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
CLEANFILES = *.o
|
||||
|
||||
# header file accumulation
|
||||
all:
|
||||
@echo copying headers $<
|
||||
cp -u *.h $(top_builddir)/build/include/
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue