[cantera]: more hackery to get examples working

2012-02-06 21:07:43 +00:00 · 2012-02-06 21:07:43 +00:00 · 5d1111f7c7
commit 5d1111f7c7
parent f516af92cc
16 changed files with 51 additions and 57 deletions
--- a/Cantera/cxx/include/GRI30.h
+++ b/Cantera/cxx/include/GRI30.h
@ -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 {

--- a/Cantera/cxx/include/reactionpaths.h
+++ b/Cantera/cxx/include/reactionpaths.h
@ -1,6 +1,6 @@
 #ifndef CT_RXNPATHS_H
 #define CT_RXNPATHS_H

-#include "kernel/ReactionPath.h"
+#include "ReactionPath.h"

 #endif
--- a/Cantera/cxx/include/transport.h
+++ b/Cantera/cxx/include/transport.h
@ -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
--- a/Cantera/cxx/include/zerodim.h
+++ b/Cantera/cxx/include/zerodim.h
@ -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;

--- a/Cantera/src/kinetics/Makefile.am
+++ b/Cantera/src/kinetics/Makefile.am
@ -4,7 +4,7 @@ h_sources  = importKinetics.h GRI_30_Kinetics.h KineticsFactory.h      \
             FalloffMgr.h ThirdBodyMgr.h RateCoeffMgr.h ReactionData.h \
             RxnRates.h Enhanced3BConc.h StoichManager.h solveSP.h     \
             AqueousKinetics.h InterfaceKinetics.h ImplicitSurfChem.h  \
-             Group.h
+             Group.h ReactionPath.h

 cc_sources = importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp  \
             GasKinetics.cpp AqueousKinetics.cpp FalloffFactory.cpp      \
--- a/Makefile.am
+++ b/Makefile.am
@ -2,8 +2,7 @@ include $(top_srcdir)/doxygen/aminclude.am

 # Build in these directories:
 SUBDIRS  = Cantera test_problems
-SUBDIRS += doxygen 
-#examples 
+SUBDIRS += doxygen examples 

 # Distribute these directories:
 DIST_SUBDIRS = Cantera examples
--- a/configure.ac
+++ b/configure.ac
@ -69,8 +69,6 @@ DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs)

 # Generate Output Files

-#                   examples/Makefile                                       \
-#		   examples/cxx/Makefile                                   \

 AC_OUTPUT(Makefile                                                         \
                   test_problems/Makefile                                  \
@ -119,11 +117,10 @@ AC_OUTPUT(Makefile                                                         \
                   Cantera/src/thermo/Makefile                             \
 		   Cantera/src/transport/Makefile                          \
                   Cantera/src/spectra/Makefile Cantera/src/zeroD/Makefile \
-                   Cantera/src/equil/Makefile)
+                   Cantera/src/equil/Makefile                              \
+                   examples/Makefile                                       \
+		   examples/cxx/Makefile)                                   

 # FINAL SUMMARY
 AX_SUMMARIZE_CONFIG 

-#  ext/lapack/Makefile                                     \
-
-
--- a/examples/cxx/Makefile.am
+++ b/examples/cxx/Makefile.am
@ -5,18 +5,16 @@ cc_sources = examples.cpp kinetics_example1.cpp kinetics_example2.cpp \
 	     transport_example1.cpp transport_example2.cpp            \
 	     rxnpath_example1.cpp 

-LINK                 = -lkinetics -ltransport -lthermo -lctnumerics
-LINK                += -lctbase -ltpx -lctmath -lconverters 
-LINK                += -luser -lcvode -lstdc++ -lctlapack 
-LINK                += -lctblas -lctf2c -lctcxx
+LINK                 = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo 
+LINK                += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode 
+LINK                += -lctlapack -lctblas -lctf2c -lm -lstdc++

-#LIBS                 = -L$(top_builddir)/build/lib/ $(LINK)
-LIBS                 = -L/workspace/src/cantera/pecos_autotools/build/lib/ $(LINK)
-AM_CPPFLAGS          = -I. -I/workspace/src/cantera/pecos_autotools/build/include/ -I/workspace/src/cantera/pecos_autotools/build/include/cantera -I/workspace/src/cantera/pecos_autotools/build/include/cantera/kernel
+LIBS                 = -L$(top_builddir)/build/lib/ $(LINK)
+AM_CPPFLAGS          = -I. -I$(top_builddir)/build/include/
 AM_CXXFLAGS          = $(AM_CPPFLAGS)

 bin_PROGRAMS         = cxx_examples
-library_includedir   = $(includedir) -I/workspace/src/cantera/pecos_autotools/build/include/
+library_includedir   = $(includedir) -I$(top_builddir)/build/include/

 #-----------------------
 # Cantera cxx examples
--- a/examples/cxx/example_utils.h
+++ b/examples/cxx/example_utils.h
@ -1,8 +1,8 @@
 #ifndef CT_EXAMPLE_UTILS_H
 #define CT_EXAMPLE_UTILS_H

-#include <kernel/Array.h>
-#include <kernel/plots.h>
+#include <Array.h>
+#include <plots.h>

 using namespace Cantera;
 using namespace std;
--- a/examples/cxx/examples.cpp
+++ b/examples/cxx/examples.cpp
@ -1,4 +1,4 @@
-#include <cantera/Cantera.h>
+#include <Cantera.h>
 using namespace Cantera;
 using namespace std;

--- a/examples/cxx/kinetics_example1.cpp
+++ b/examples/cxx/kinetics_example1.cpp
@ -10,9 +10,9 @@
 //
 /////////////////////////////////////////////////////////////

-#include <cantera/Cantera.h>
-#include <cantera/zerodim.h>
-#include <cantera/IdealGasMix.h>
+#include <Cantera.h>
+#include <zerodim.h>
+#include <IdealGasMix.h>
 #include <time.h>
 #include "example_utils.h"
 using namespace Cantera;
--- a/examples/cxx/kinetics_example2.cpp
+++ b/examples/cxx/kinetics_example2.cpp
@ -16,9 +16,9 @@
 #pragma warning(disable:4503)
 #endif

-#include <cantera/Cantera.h>
-#include <cantera/GRI30.h>
-#include <cantera/zerodim.h>
+#include <Cantera.h>
+#include <GRI30.h>
+#include <zerodim.h>
 #include <time.h>
 #include "example_utils.h"

--- a/examples/cxx/kinetics_example3.cpp
+++ b/examples/cxx/kinetics_example3.cpp
@ -16,9 +16,9 @@
 #pragma warning(disable:4503)
 #endif

-#include <cantera/Cantera.h>
-#include <cantera/zerodim.h>
-#include <cantera/IdealGasMix.h>
+#include <Cantera.h>
+#include <zerodim.h>
+#include <IdealGasMix.h>
 #include <time.h>
 #include "example_utils.h"

--- a/examples/cxx/rxnpath_example1.cpp
+++ b/examples/cxx/rxnpath_example1.cpp
@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////
 //
-//  reaction path diagrams
+//  reactiona diagrams
 //
 //  $Author: hkmoffa $
 //  $Revision: 1.9 $
@ -16,12 +16,12 @@
 #pragma warning(disable:4503)
 #endif

-#include <cantera/Cantera.h>
-#include <cantera/zerodim.h>
+#include <Cantera.h>
+#include <zerodim.h>
 #include <time.h>
 #include "example_utils.h"
-#include <cantera/reactionpaths.h>
-#include <cantera/IdealGasMix.h>
+#include <reactionpaths.h>
+#include <IdealGasMix.h>

 // #include <iostream>
 // using namespace std;
--- a/examples/cxx/transport_example1.cpp
+++ b/examples/cxx/transport_example1.cpp
@ -16,11 +16,11 @@
 #pragma warning(disable:4503)
 #endif

-#include <cantera/Cantera.h>
-#include <cantera/transport.h>
+#include <Cantera.h>
+#include <transport.h>
 #include <time.h>
 #include "example_utils.h"
-#include <cantera/IdealGasMix.h>
+#include <IdealGasMix.h>

 using namespace Cantera;
 using namespace Cantera_CXX;
--- a/examples/cxx/transport_example2.cpp
+++ b/examples/cxx/transport_example2.cpp
@ -16,12 +16,12 @@
 #pragma warning(disable:4503)
 #endif

-#include <cantera/Cantera.h>
-#include <cantera/transport.h>
+#include <Cantera.h>
+#include <transport.h>
 #include <time.h>
 #include "example_utils.h"
-#include <cantera/equilibrium.h>
-#include <cantera/IdealGasMix.h>
+#include <equilibrium.h>
+#include <IdealGasMix.h>

 using namespace Cantera;
 using namespace Cantera_CXX;