diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..70abbc409 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +cantera developers: \ No newline at end of file diff --git a/Cantera/Makefile.am b/Cantera/Makefile.am new file mode 100644 index 000000000..e7f5b3e5b --- /dev/null +++ b/Cantera/Makefile.am @@ -0,0 +1,4 @@ +# $Id: $ + +# will need to add python and matlab +SUBDIRS = ext src user cxx diff --git a/Cantera/cxx/Makefile.am b/Cantera/cxx/Makefile.am new file mode 100644 index 000000000..f963effea --- /dev/null +++ b/Cantera/cxx/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = src \ No newline at end of file diff --git a/Cantera/cxx/src/Makefile.am b/Cantera/cxx/src/Makefile.am new file mode 100644 index 000000000..fcd35b991 --- /dev/null +++ b/Cantera/cxx/src/Makefile.am @@ -0,0 +1,28 @@ +h_sources = + +cc_sources = importPhase.cpp + +AM_CPPFLAGS = -I$(top_builddir)/build/include +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctcxx.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libctcxx_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctcxx_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libctcxx_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctcxx_includedir = $(prefix)/include + + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ + +CLEANFILES = *.o diff --git a/Cantera/ext/Makefile.am b/Cantera/ext/Makefile.am new file mode 100644 index 000000000..d0aeba4f5 --- /dev/null +++ b/Cantera/ext/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = f2c_libs f2c_blas f2c_lapack f2c_math cvode tpx + diff --git a/Cantera/src/Makefile.am b/Cantera/src/Makefile.am new file mode 100644 index 000000000..9e77467e2 --- /dev/null +++ b/Cantera/src/Makefile.am @@ -0,0 +1,6 @@ +# $Id: $ + +# will need to add python and matlab +SUBDIRS = base numerics converters thermo transport oneD zeroD kinetics spectra equil + + diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am new file mode 100644 index 000000000..02ee0b8ed --- /dev/null +++ b/Cantera/src/base/Makefile.am @@ -0,0 +1,37 @@ +h_sources = utilities.h ct_defs.h ctexceptions.h logger.h \ + ctml.h plots.h stringUtils.h xml.h \ + Array.h vec_functions.h global.h XML_Writer.h \ + FactoryBase.h clockWC.h PrintCtrl.h \ + LogPrintCtrl.h mdp_allo.h + +cc_sources = ct2ctml.cpp ctml.cpp misc.cpp plots.cpp \ + stringUtils.cpp xml.cpp clockWC.cpp \ + PrintCtrl.cpp LogPrintCtrl.cpp mdp_allo.cpp \ + checkFinite.cpp + +AM_CPPFLAGS = -I$(top_builddir) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctbase.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = utilities.h + +otherincludedir = $(top_builddir)/build/include/cantera/kernel +otherinclude_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libctbase_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libctbase_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctbase_includedir = $(prefix)/include + +# header file accumulation -- only copy if file updated! +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ + +CLEANFILES = *.o diff --git a/Cantera/src/base/xml.h b/Cantera/src/base/xml.h index 75ffbaaab..678093568 100644 --- a/Cantera/src/base/xml.h +++ b/Cantera/src/base/xml.h @@ -13,7 +13,6 @@ #include "ct_defs.h" #include "global.h" - #include #include #include diff --git a/Cantera/src/converters/Makefile.am b/Cantera/src/converters/Makefile.am new file mode 100644 index 000000000..490ea50d3 --- /dev/null +++ b/Cantera/src/converters/Makefile.am @@ -0,0 +1,29 @@ +h_sources = ck2ct.h CKParser.h CKReader.h Constituent.h Reaction.h \ + Species.h writelog.h ck2ctml.h ckr_defs.h ckr_utils.h \ + Element.h RxnSpecies.h thermoFunctions.h + +cc_sources = atomicWeightDB.cpp ck2ctml.cpp CKReader.cpp filter.cpp \ + Reaction.cpp thermoFunctions.cpp ck2ct.cpp CKParser.cpp \ + ckr_utils.cpp NASA9Parser.cpp Species.cpp writelog.cpp + +AM_CPPFLAGS = -I../base -I../../../ +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libconverters.la +library_includedir = $(includedir) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libconverters_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libconverters_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libconverters_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libconverters_includedir = $(prefix)/include + + +# header file accumulation +all: + @echo copying headers $< + cp -p $(h_sources) $(top_builddir)/build/include/ diff --git a/Cantera/src/equil/Makefile.am b/Cantera/src/equil/Makefile.am new file mode 100644 index 000000000..e20bd0a85 --- /dev/null +++ b/Cantera/src/equil/Makefile.am @@ -0,0 +1,55 @@ +h_sources = ChemEquil.h PropertyCalculator.h vcs_internal.h \ + equil.h vcs_defs.h vcs_IntStarStar.h vcs_SpeciesProperties.h \ + MultiPhaseEquil.h vcs_DoubleStarStar.h vcs_MultiPhaseEquil.h vcs_species_thermo.h \ + MultiPhase.h vcs_Exception.h vcs_prob.h vcs_VolPhase.h \ + vcs_solve.h + +#ChemEquil.h MultiPhase.h MultiPhaseEquil.h equil.h \ + PropertyCalculator.h vcs_equilibrate.h \ + vcs_MultiPhaseEquil.h vcs_VolPhase.h vcs_DoubleStarStar.h \ + vcs_prob.h vcs_SpeciesProperties.h vcs_internal.h \ + vcs_species_thermo.h vcs_TP.h vcs_util.h vcs_VolPhase.h \ + vcs_MultiPhaseEquil.h + +cc_sources = BasisOptimize.cpp vcs_Gibbs.cpp vcs_root1d.cpp \ + ChemEquil.cpp vcs_rxnadj.cpp vcs_TP.cpp \ + equilibrate.cpp vcs_IntStarStar.cpp vcs_setMolesLinProg.cpp \ + MultiPhase.cpp vcs_MultiPhaseEquil.cpp vcs_solve.cpp \ + MultiPhaseEquil.cpp vcs_nondim.cpp vcs_solve_TP.cpp \ + vcs_DoubleStarStar.cpp vcs_phaseStability.cpp vcs_SpeciesProperties.cpp \ + vcs_elem.cpp vcs_prep.cpp vcs_species_thermo.cpp \ + vcs_elem_rearrange.cpp vcs_prob.cpp vcs_inest.cpp \ + vcs_equilibrate.cpp vcs_rearrange.cpp vcs_util.cpp \ + vcs_Exception.cpp vcs_report.cpp vcs_VolPhase.cpp \ + vcs_linmaxc.cpp vcs_dbocls.c vcs_dbolsm.c vcs_dbols.c vcs_dvout.c \ + vcs_ivout.c vcs_dmout.c vcs_xerror.c + +#BasisOptimize.cpp ChemEquil.cpp MultiPhase.cpp \ + MultiPhaseEquil.cpp equilibrate.cpp vcs_equilibrate.cpp \ + vcs_MultiPhaseEquil.cpp vcs_VolPhase.cpp \ + vcs_DoubleStarStar.cpp vcs_prob.cpp \ + vcs_SpeciesProperties.cpp vcs_MultiPhaseEquil.cpp \ + vcs_species_thermo.cpp vcs_TP.cpp vcs_util.cpp \ + vcs_VolPhase.cpp + +AM_CPPFLAGS = -I$(top_builddir)/build/include +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libequil.la +library_includedir = $(includedir) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libequil_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libequil_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libequil_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libequil_includedir = $(prefix)/include + + +# header file accumulation before install +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/Cantera/src/kinetics/Kinetics.cpp b/Cantera/src/kinetics/Kinetics.cpp index 90ddf36ca..234fe52ff 100644 --- a/Cantera/src/kinetics/Kinetics.cpp +++ b/Cantera/src/kinetics/Kinetics.cpp @@ -7,8 +7,6 @@ * Kinetics managers calculate rates of progress of species due to homogeneous or heterogeneous kinetics. */ // Copyright 2001-2004 California Institute of Technology - - #include "InterfaceKinetics.h" #include "SurfPhase.h" diff --git a/Cantera/src/kinetics/Makefile.am b/Cantera/src/kinetics/Makefile.am new file mode 100644 index 000000000..f823ecdad --- /dev/null +++ b/Cantera/src/kinetics/Makefile.am @@ -0,0 +1,35 @@ +h_sources = importKinetics.h GRI_30_Kinetics.h KineticsFactory.h \ + Kinetics.h GasKinetics.h \ + FalloffFactory.h ReactionStoichMgr.h reaction_defs.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 ReactionPath.h + +cc_sources = importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp \ + GasKinetics.cpp AqueousKinetics.cpp FalloffFactory.cpp \ + ReactionStoichMgr.cpp Kinetics.cpp solveSP.cpp \ + ReactionPath.cpp InterfaceKinetics.cpp ImplicitSurfChem.cpp \ + Group.cpp + +AM_CPPFLAGS = -I../numerics -I../thermo -I../base +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libkinetics.la +library_includedir = $(includedir) + +#----------------------- +# Cantera Kinetics C/C++ library +#----------------------- + +__top_builddir__build_lib_libkinetics_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libkinetics_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libkinetics_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libkinetics_includedir = $(prefix)/include + + +# header file accumulation +all: + @echo copying headers $< + cp -p $(h_sources) $(top_builddir)/build/include/ diff --git a/Cantera/src/numerics/Makefile.am b/Cantera/src/numerics/Makefile.am new file mode 100644 index 000000000..abdb47f98 --- /dev/null +++ b/Cantera/src/numerics/Makefile.am @@ -0,0 +1,30 @@ +h_sources = ArrayViewer.h DenseMatrix.h funcs.h ctlapack.h Func1.h \ + FuncEval.h polyfit.h BandMatrix.h Integrator.h \ + DAE_Solver.h ResidEval.h sort.h SquareMatrix.h \ + ResidJacEval.h NonlinearSolver.h + +cc_sources = DenseMatrix.cpp funcs.cpp Func1.cpp ODE_integrators.cpp \ + BandMatrix.cpp DAE_solvers.cpp sort.cpp CVodeInt.cpp \ + SquareMatrix.cpp ResidJacEval.cpp NonlinearSolver.cpp + +AM_CPPFLAGS = -I$(top_builddir)/build/include/ -I$(top_builddir) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctnumerics.la +library_includedir = $(includedir) + +#----------------------- +# Cantera numerics C/C++ library +#----------------------- + +__top_builddir__build_lib_libctnumerics_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctnumerics_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libctnumerics_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctnumerics_includedir = $(prefix)/include + + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/Cantera/src/numerics/ctlapack.h b/Cantera/src/numerics/ctlapack.h index 32ff577e0..d74014f6e 100644 --- a/Cantera/src/numerics/ctlapack.h +++ b/Cantera/src/numerics/ctlapack.h @@ -13,6 +13,10 @@ #include "ct_defs.h" +typedef double doublereal; +typedef int integer; +typedef int ftnlen; + //#include // map BLAS names to names with or without a trailing underscore. diff --git a/Cantera/src/numerics/funcs.cpp b/Cantera/src/numerics/funcs.cpp index 262fcd3dd..467a15a7f 100644 --- a/Cantera/src/numerics/funcs.cpp +++ b/Cantera/src/numerics/funcs.cpp @@ -12,6 +12,7 @@ using namespace std; +#include "ctlapack.h" #include "ct_defs.h" #include "ctexceptions.h" #include "stringUtils.h" @@ -130,8 +131,8 @@ namespace Cantera { * * @return returns the RMS error of the polynomial of degree ndeg . */ - doublereal polyfit(int n, doublereal* x, doublereal* y, doublereal* w, - int maxdeg, int& ndeg, doublereal eps, doublereal* r) { + doublereal polyfit(int n, doublereal* x, doublereal* y, doublereal* w, int maxdeg, int& ndeg, doublereal eps, doublereal* r) + { integer nn = n; integer mdeg = maxdeg; integer ndg = ndeg; diff --git a/Cantera/src/oneD/Makefile.am b/Cantera/src/oneD/Makefile.am new file mode 100644 index 000000000..434745bfc --- /dev/null +++ b/Cantera/src/oneD/Makefile.am @@ -0,0 +1,28 @@ +cc_sources = MultiJac.cpp MultiNewton.cpp newton_utils.cpp OneDim.cpp \ + StFlow.cpp boundaries1D.cpp refine.cpp Sim1D.cpp Domain1D.cpp + +h_sources = Inlet1D.h MultiJac.h Sim1D.h StFlow.h \ + Surf1D.h Domain1D.h MultiNewton.h OneDim.h \ + Resid1D.h Solid1D.h refine.h + +AM_CPPFLAGS = -I../base -I../thermo -I../kinetics -I../transport -I../numerics -I../../../ +AM_CXXFLAGS = $(AM_CPPFLAGS) -fPIC + +lib_LTLIBRARIES = $(top_builddir)/build/lib/liboneD.la +library_includedir = $(includedir) + +#----------------------- +# Cantera OneD C/C++ library +#----------------------- + +__top_builddir__build_lib_liboneD_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_liboneD_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_liboneD_include_HEADERS = $(h_sources) +__top_builddir__build_lib_liboneD_includedir = $(prefix)/include + + +# header file accumulation +all: + @echo copying headers $< + cp -p $(h_sources) $(top_builddir)/build/include/ diff --git a/Cantera/src/spectra/Makefile.am b/Cantera/src/spectra/Makefile.am new file mode 100644 index 000000000..be7b721ac --- /dev/null +++ b/Cantera/src/spectra/Makefile.am @@ -0,0 +1,23 @@ +h_sources = DiatomicMolecule.h LineBroadener.h Nuclei.h \ + rotor.h spectralUtilities.h + +cc_sources = LineBroadener.cpp rotor.cpp spectralUtilities.cpp + +AM_CPPFLAGS = -I../base +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctspectra.la +library_includedir = $(includedir) + +#----------------------- +# Cantera Spectra C/C++ library +#----------------------- + +__top_builddir__build_lib_libctspectra_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctspectra_la_SOURCES = $(cc_sources) $(h_sources) + + +# header file accumulation +all: + @echo copying headers $< + cp -p $(h_sources) $(top_builddir)/build/include/ diff --git a/Cantera/src/thermo/Makefile.am b/Cantera/src/thermo/Makefile.am new file mode 100644 index 000000000..c2e71a781 --- /dev/null +++ b/Cantera/src/thermo/Makefile.am @@ -0,0 +1,65 @@ +h_sources = State.h Elements.h Constituents.h Phase.h mix_defs.h \ + ThermoPhase.h IdealGasPhase.h ConstDensityThermo.h \ + SpeciesThermoFactory.h ThermoFactory.h \ + NasaPoly1.h NasaPoly2.h NasaThermo.h Nasa9Poly1.h \ + Nasa9PolyMultiTempRegion.h WaterPropsIAPWS.h \ + ShomateThermo.h ShomatePoly.h ConstCpPoly.h \ + SimpleThermo.h SpeciesThermoMgr.h \ + SpeciesThermoInterpType.h VPSSMgr_Water_ConstVol.h \ + GeneralSpeciesThermo.h Mu0Poly.h \ + speciesThermoTypes.h SpeciesThermo.h SurfPhase.h \ + EdgePhase.h IdealSolnGasVPSS.h MolalityVPSSTP.h \ + VPSSMgr.h VPSSMgrFactory.h VPSSMgr_General.h \ + VPSSMgr_IdealGas.h VPSSMgr_ConstVol.h PDSS_ConstVol.h \ + PDSS_IdealGas.h PDSS_SSVol.h DebyeHuckel.h \ + VPStandardStateTP.h PDSS_Water.h WaterProps.h \ + WaterPropsIAPWSphi.h VPSSMgr_Water_HKFT.h PDSS_HKFT.h \ + PDSS_IonsFromNeutral.h IonsFromNeutralVPSSTP.h \ + GibbsExcessVPSSTP.h LatticePhase.h IdealMolalSoln.h \ + PDSS.h HMWSoln.h WaterSSTP.h MetalSHEelectrons.h \ + IdealSolidSolnPhase.h StoichSubstanceSSTP.h \ + SingleSpeciesTP.h MineralEQ3.h PseudoBinaryVPSSTP.h \ + MargulesVPSSTP.h StoichSubstance.h electrolytes.h \ + PureFluidPhase.h LatticeSolidPhase.h + +cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \ + ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp \ + SpeciesThermoFactory.cpp ConstCpPoly.cpp Nasa9Poly1.cpp \ + Nasa9PolyMultiTempRegion.cpp PDSS_Water.cpp PDSS_HKFT.cpp \ + Mu0Poly.cpp GeneralSpeciesThermo.cpp SurfPhase.cpp \ + ThermoFactory.cpp phasereport.cpp SpeciesThermoInterpType.cpp \ + VPSSMgr.cpp VPSSMgrFactory.cpp VPSSMgr_General.cpp \ + IdealSolnGasVPSS.cpp MolalityVPSSTP.cpp VPStandardStateTP.cpp \ + VPSSMgr_IdealGas.cpp VPSSMgr_ConstVol.cpp PDSS_ConstVol.cpp \ + PDSS_IdealGas.cpp PDSS_SSVol.cpp DebyeHuckel.cpp PDSS.cpp \ + WaterProps.cpp WaterPropsIAPWS.cpp WaterPropsIAPWSphi.cpp \ + VPSSMgr_Water_HKFT.cpp VPSSMgr_Water_ConstVol.cpp \ + PDSS_IonsFromNeutral.cpp IonsFromNeutralVPSSTP.cpp \ + GibbsExcessVPSSTP.cpp LatticePhase.cpp IdealMolalSoln.cpp \ + HMWSoln.cpp HMWSoln_input.cpp WaterSSTP.cpp \ + MetalSHEelectrons.cpp \ + IdealSolidSolnPhase.cpp LatticeSolidPhase.cpp \ + SingleSpeciesTP.cpp MineralEQ3.cpp \ + PseudoBinaryVPSSTP.cpp MargulesVPSSTP.cpp \ + StoichSubstanceSSTP.cpp PureFluidPhase.cpp StoichSubstance.cpp + +AM_CPPFLAGS = -I../base +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libthermo.la +library_includedir = $(includedir) + +#----------------------- +# Cantera thermo C/C++ library +#----------------------- + +__top_builddir__build_lib_libthermo_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libthermo_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libthermo_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libthermo_includedir = $(prefix)/include + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/Cantera/src/thermo/WaterPropsIAPWS.h b/Cantera/src/thermo/WaterPropsIAPWS.h index 6f231ce52..30adfefbf 100644 --- a/Cantera/src/thermo/WaterPropsIAPWS.h +++ b/Cantera/src/thermo/WaterPropsIAPWS.h @@ -15,6 +15,8 @@ #include "WaterPropsIAPWSphi.h" #include "config.h" +typedef double doublereal; + namespace Cantera { /** * @name Names for the phase regions diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.h b/Cantera/src/thermo/WaterPropsIAPWSphi.h index 4ce1aa5ed..cee837e94 100644 --- a/Cantera/src/thermo/WaterPropsIAPWSphi.h +++ b/Cantera/src/thermo/WaterPropsIAPWSphi.h @@ -15,6 +15,8 @@ #include "config.h" +typedef double doublereal; + /*! * the WaterPropsIAPSWSphi class support low level calls for * the real description of water. diff --git a/Cantera/src/transport/Makefile.am b/Cantera/src/transport/Makefile.am new file mode 100644 index 000000000..e0762c15a --- /dev/null +++ b/Cantera/src/transport/Makefile.am @@ -0,0 +1,34 @@ +h_sources = AqueousTransport.h LiquidTransportData.h L_matrix.h \ + MultiTransport.h TransportBase.h WaterTransport.h \ + DustyGasTransport.h LiquidTransport.h MixTransport.h \ + SimpleTransport.h TransportFactory.h FtnTransport.h \ + LiquidTransportParams.h MMCollisionInt.h \ + SolidTransport.h TransportParams.h +# WaterSSTP.h + +cc_sources = AqueousTransport.cpp LiquidTransport.cpp MMCollisionInt.cpp \ + SimpleTransport.cpp TransportBase.cpp WaterTransport.cpp \ + DustyGasTransport.cpp MixTransport.cpp MultiTransport.cpp \ + SolidTransport.cpp TransportFactory.cpp + +AM_CPPFLAGS = -I../base -I../thermo -I../numerics +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libtransport.la +library_includedir = $(includedir) + +#----------------------- +# Cantera Transport C/C++ library +#----------------------- + +__top_builddir__build_lib_libtransport_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libtransport_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libtransport_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libtransport_includedir = $(prefix)/include + + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/Cantera/src/zeroD/Makefile.am b/Cantera/src/zeroD/Makefile.am new file mode 100644 index 000000000..d0b0314ad --- /dev/null +++ b/Cantera/src/zeroD/Makefile.am @@ -0,0 +1,28 @@ +h_sources = Reactor.h ReactorBase.h FlowDevice.h Wall.h ReactorNet.h \ + flowControllers.h PID_Controller.h Reservoir.h FlowReactor.h \ + ConstPressureReactor.h ReactorFactory.h + +cc_sources = Reactor.cpp ReactorBase.cpp FlowDevice.cpp Wall.cpp \ + ReactorNet.cpp FlowReactor.cpp ConstPressureReactor.cpp \ + ReactorFactory.cpp + +AM_CPPFLAGS = -I../base -I../thermo -I../kinetics -I../numerics +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libzeroD.la +library_includedir = $(includedir) + +#----------------------- +# Cantera OneD C/C++ library +#----------------------- + +__top_builddir__build_lib_libzeroD_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libzeroD_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libzeroD_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libzeroD_includedir = $(prefix)/include + +# header file accumulation +all: + @echo copying headers $< + cp -p $(h_sources) $(top_builddir)/build/include/ diff --git a/Cantera/user/Makefile.am b/Cantera/user/Makefile.am new file mode 100644 index 000000000..bd6545341 --- /dev/null +++ b/Cantera/user/Makefile.am @@ -0,0 +1,17 @@ +cc_sources = user.cpp + +AM_CPPFLAGS = -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libuser.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libuser_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libuser_la_SOURCES = $(cc_sources) $(h_sources) + +CLEANFILES = *.o diff --git a/License.rtf b/License.rtf deleted file mode 100755 index 9142e3da8..000000000 --- a/License.rtf +++ /dev/null @@ -1,176 +0,0 @@ -{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset1\fprq2{\*\panose 02040503050406030204}Cambria Math;} -{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f39\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\f40\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f42\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f44\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\f45\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f46\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;} -{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;} -{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} -{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}} -{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; -\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 } -\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\* -\cs10 \additive \ssemihidden Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused \sqformat Normal Table;}} -{\*\rsidtbl \rsid602915\rsid2033138\rsid8664322\rsid12135870}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info -{\title Copyright (c) 2001-2009, California Institute of Technology}{\author Dave Goodwin}{\operator Harry K. Moffat}{\creatim\yr2009\mo7\dy31\hr19\min41}{\revtim\yr2009\mo7\dy31\hr19\min41}{\version2}{\edmins6}{\nofpages1}{\nofwords256}{\nofchars1502} -{\*\company Caltech}{\nofcharsws1755}{\vern32771}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1318\margr1318\margt1440\margb1440\gutter0\ltrsect -\widowctrl\ftnbj\aenddoc\trackmoves1\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\noxlattoyen -\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\nolnhtadjtbl\rsidroot8664322 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar -\sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4 -\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (} -{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar -\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid602915 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 -\insrsid8664322\charrsid602915 -\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12135870 Copyright (c) 2001-2009}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2033138\charrsid602915 , California Institute of Technology}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid602915 . }{\rtlch\fcs1 \af0 \ltrch\fcs0 -\insrsid2033138\charrsid602915 All rights reserved.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2033138 -\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid602915 -\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12135870 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12135870 Copyright (c) 2009, 2011, Sandia Corporation. Under the terms of -Contract AC04-94AL85000 with Sandia Corporation, the U.S. Government retains certain rights to certain parts of this software. -\par All rights reserved. -\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12135870\charrsid602915 -\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid602915 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2033138\charrsid602915 -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -\par -\par \u-4064\'3fRedistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -\par -\par Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -\par -\par \u-4064\'3fNeither the name of the California Institute of Technology}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12135870 , Sandia Corporation nor the names of other}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2033138\charrsid602915 - contributors may be used to endorse or promote products derived from this software without specific prior written permission. -\par -\par THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND AN -Y EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDE -N -TAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STR -ICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -\par -\par -\par }{\*\themedata 504b030414000600080000002100828abc13fa0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d8 -72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7 -2a3150038327acf409935ed7d757e5ee14302999a654e99e393c18936c8f23a4dc072479697d1c81e51a3b13c07e4087e6b628ee8cf5c4489cf1c4d075f92a0b -44d7a07a83c82f308ac7b0a0f0fbf90c2480980b58abc733615aa2d210c2e02cb04430076a7ee833dfb6ce62e3ed7e14693e8317d8cd0433bf5c60f53fea2fe7 -065bd80facb647e9e25c7fc421fd2ddb526b2e9373fed4bb902e182e97b7b461e6bfad3f010000ffff0300504b030414000600080000002100a5d6a7e7c00000 -00360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4fc7060abb08 -84a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b63095120f88d94fbc -52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462a1a82fe353 -bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f7468656d652f7468 -656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b4b0d592c9c -070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b4757e8d3f7 -29e245eb2b260a0238fd010000ffff0300504b03041400060008000000210096b5ade296060000501b0000160000007468656d652f7468656d652f7468656d65 -312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87615b8116d8 -a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad79482a9c04 -98f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b5d8a314d3c -94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab999fb7b471 -7509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9699640f671 -9e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd5868b37a088d1 -e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d60cf03ac1a5 -193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f9e7ef3f2d1 -17d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be15c308d3f2 -8acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a99793849c26ae6 -6252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d32a423279a -668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2af074481847 -bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86e877f0034e -16bafb0e258ebb4faf06b769e888340b103d3311da9750aa9d0a1cd3e4efca31a3508f6d0c5c5c398602f8e2ebc71591f5b616e24dd893aa3261fb44f95d843b -5974bb5c04f4edafb95b7892ec1108f3f98de75dc97d5772bdff7cc95d94cf672db4b3da0a6557f70db629362d72bcb0431e53c6066acac80d699a6409fb44d0 -8741bdce9c0e4971624a2378cceaba830b05366b90e0ea23aaa241845368b0eb9e2612ca8c742851ca251ceccc70256d8d87265dd96361531f186c3d9058edf2 -c00eafe8e1fc5c509031bb4d680e9f39a3154de0accc56ae644441edd76156d7429d995bdd88664a9dc3ad50197c38af1a0c16d684060441db02565e85f3b966 -0d0713cc48a0ed6ef7dedc2dc60b17e92219e180643ed27acffba86e9c94c78ab90980d8a9f0913ee49d62b512b79626fb06dccee2a432bbc60276b9f7dec44b -7904cfbca4f3f6443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc399161ee314bc2e75cf8759081743be1236ec4f4d6693e5336fb672c5dc24a8c33585b5fb -9cc24e1d4885545b58463634cc5416022cd19cacfccb4d30eb45296023fd35a458598360f8d7a4003bbaae25e331f155d9d9a5116d3bfb9a95523e51440ca2e0 -088dd844ec6370bf0e55d027a012ae264c45d02f708fa6ad6da6dce29c255df9f6cae0ec38666984b372ab5334cf640b37795cc860de4ae2816e95b21be5ceaf -8a49f90b52a51cc6ff3355f47e0237052b81f6800fd7b802239daf6d8f0b1571a8426944fdbe80c6c1d40e8816b88b8569082ab84c36ff0539d4ff6dce591a26 -ade1c0a7f669880485fd484582903d284b26fa4e2156cff62e4b9265844c4495c495a9157b440e091bea1ab8aaf7760f4510eaa69a6465c0e04ec69ffb9e65d0 -28d44d4e39df9c1a52ecbd3607fee9cec7263328e5d661d3d0e4f62f44acd855ed7ab33cdf7bcb8ae889599bd5c8b3029895b6825696f6af29c239b75a5bb1e6 -345e6ee6c28117e73586c1a2214ae1be07e93fb0ff51e133fb65426fa843be0fb515c187064d0cc206a2fa926d3c902e907670048d931db4c1a44959d366ad93 -b65abe595f70a75bf03d616c2dd959fc7d4e6317cd99cbcec9c58b34766661c7d6766ca1a9c1b327531486c6f941c638c67cd22a7f75e2a37be0e82db8df9f30 -254d30c1372581a1f51c983c80e4b71ccdd28dbf000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f74 -68656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f24 -51eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198 -720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528 -a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100828abc13fa0000001c0200001300000000000000000000000000 -000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b000000000000000000000000 -002b0100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000140200007468 -656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210096b5ade296060000501b000016000000000000000000 -00000000d10200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b010000270000000000 -00000000000000009b0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000960a00000000} -{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d -617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 -6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 -656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} -{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; -\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9; -\lsdpriority39 \lsdlocked0 toc 1;\lsdpriority39 \lsdlocked0 toc 2;\lsdpriority39 \lsdlocked0 toc 3;\lsdpriority39 \lsdlocked0 toc 4;\lsdpriority39 \lsdlocked0 toc 5;\lsdpriority39 \lsdlocked0 toc 6;\lsdpriority39 \lsdlocked0 toc 7; -\lsdpriority39 \lsdlocked0 toc 8;\lsdpriority39 \lsdlocked0 toc 9;\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdpriority1 \lsdlocked0 Default Paragraph Font; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority59 \lsdlocked0 Table Grid;\lsdunhideused0 \lsdlocked0 Placeholder Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdunhideused0 \lsdlocked0 Revision; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference; -\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 010500000200000018000000 -4d73786d6c322e534158584d4c5265616465722e352e3000000000000000000000060000 -d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f0000000000000000000000009083 -98404912ca01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000..9509f8fd0 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,17 @@ +include $(top_srcdir)/doxygen/aminclude.am + +# Build in these directories: +SUBDIRS = Cantera tools test_problems +SUBDIRS += doxygen examples + +# Distribute these directories: +DISTDIRS = Cantera examples + +# generated documentation will be included in distributed archive +EXTRA_DIST = bootstrap $(DX_CONFIG) +EXTRA_DIST += AUTHORS README + +# Support for pkgconfig +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = cantera.pc + diff --git a/NEWS b/NEWS new file mode 100644 index 000000000..19e278aa7 --- /dev/null +++ b/NEWS @@ -0,0 +1 @@ +11/10/11 cantera 1.8.0 development begins on autotools chain \ No newline at end of file diff --git a/README.txt b/README similarity index 93% rename from README.txt rename to README index e8c4c03bc..cffa19764 100644 --- a/README.txt +++ b/README @@ -1,9 +1,9 @@ - + C A N T E R A - release 1.8 + release 1.8 + autotools - 08/2009 + 12/2011 *************************************************************** *** @@ -19,7 +19,6 @@ for usage, and a DISCLAIMER OF ALL WARRANTIES. All trademarks referenced herein are property of their respective holders. - Web sites ========== diff --git a/bootstrap b/bootstrap new file mode 100755 index 000000000..ad711f6ce --- /dev/null +++ b/bootstrap @@ -0,0 +1,54 @@ +#! /bin/sh +# $Id: bootstrap 469 2008-09-05 00:16:18Z rhys $ +# +# bootstrap: Utility to easy autoconf/automake toolchain setup on +# checkout from revision control. +# +# Copyright (c) 2002 Daniel Elstner +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License VERSION 2 as +# published by the Free Software Foundation. You are not allowed to +# use any other version of the license; unless you got the explicit +# permission from the author to do so. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +dir=`echo "$0" | sed 's,[^/]*$,,'` +test "x${dir}" = "x" && dir='.' + +if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`" +then + echo "This script must be executed directly from the source directory." + exit 1 +fi + +rm -f config.cache acconfig.h + +echo "- aclocal. (local)" && \ +aclocal -I m4 -I m4/common && \ +echo "- autoheader." && \ +autoheader && \ + +if type glibtoolize >/dev/null 2>&1; then + echo "- glibtool." + glibtoolize --automake --copy --force +else + echo "- libtool." + libtoolize --automake --copy --force +fi + +echo "- automake." && \ +automake --add-missing --copy && \ +echo "- autoconf." && \ +autoconf && \ +exit 0 + +exit 1 diff --git a/cantera.pc.in b/cantera.pc.in new file mode 100644 index 000000000..95b788f1e --- /dev/null +++ b/cantera.pc.in @@ -0,0 +1,22 @@ +# @PACKAGE_NAME@ installation details +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +# Fortran compilation and linking information +# Retrieve these using `pkg-config --variable=name @PACKAGE_NAME@` +fflags=-I@libdir@ +flibs=-L@libdir@ -lf@PACKAGE_NAME@ -l@PACKAGE_NAME@ + +Name: @PACKAGE_NAME@ +Description: @PACKAGE_DESCRIPTION@ +URL: @PACKAGE_URL@ +Requires: +Version: @VERSION@ + +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${libdir} ${LINK} +Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac new file mode 100644 index 000000000..ccad871e0 --- /dev/null +++ b/configure.ac @@ -0,0 +1,174 @@ + -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.61) +AC_INIT([cantera], [1.8.0], [nick@ices.utexas.edu]) +AC_CONFIG_HEADER(config.h) +AC_CONFIG_AUX_DIR([build-aux]) +#AX_ENABLE_BUILDDIR +AM_INIT_AUTOMAKE(-Wall -Werror) + +# snarf and provide versioning numbers +AX_SPLIT_VERSION +GENERIC_MAJOR_VERSION=$AX_MAJOR_VERSION +GENERIC_MINOR_VERSION=$AX_MINOR_VERSION +GENERIC_MICRO_VERSION=$AX_POINT_VERSION +GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION +GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION + +AC_SUBST(GENERIC_VERSION) +AC_SUBST(GENERIC_MAJOR_VERSION) +AC_SUBST(GENERIC_MINOR_VERSION) +AC_SUBST(GENERIC_MICRO_VERSION) +AC_SUBST(GENERIC_RELEASE) + +PACKAGE_DESCRIPTION="An object-oriented software toolkit for chemical kinetics, thermodynamics, and transport processes." +AC_SUBST([PACKAGE_DESCRIPTION]) +PACKAGE_URL="http://code.google.com/p/cantera/" +AC_SUBST([PACKAGE_URL]) + +# add trailing underscore(s) +AC_DEFINE([LAPACK_FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after fortran functions]) +LAPACK_FTN_TRAILING_UNDERSCORE=1 +AC_DEFINE([FTN_TRAILING_UNDERSCORE],1,[Define to add underscore after fortran functions]) +FTN_TRAILING_UNDERSCORE=1 +AC_DEFINE([LAPACK_NAMES_LOWERCASE],1,[Define to make lapack functions lowercase]) +LAPACK_NAMES_LOWERCASE=1 +AC_DEFINE([LAPACK_FTN_STRING_LEN_AT_END],1,[Define to add string to end of lapack functions]) +LAPACK_FTN_STRING_LEN_AT_END=1 + +AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t]) +AH_BOTTOM([ +typedef double doublereal; // Fortran double precision +typedef int integer; // Fortran integer +typedef int ftnlen; // Fortran hidden string length type + +#define STRING_LEN_AT_END +#define STORE_MOLE_FRACTIONS + +#define INCL_PURE_FLUIDS 1 +#define WITH_PURE_FLUIDS 1 + +#define WITH_LATTICE_SOLID 1 +#define WITH_METAL 1 +#define WITH_STOICH_SUBSTANCE 1 +#define WITH_IDEAL_SOLUTIONS 1 +#define WITH_ELECTROLYTES 1 +#define HAS_SSTREAM 1 + +#define CANTERA_DATA "/usr/local/cantera/data" + +]) + +# ------------------------------ +# Checks for required programs +# ------------------------------ + +AC_PROG_CC +AC_PROG_CXX +AC_PROG_FC +AC_PROG_F77 + +AC_PROG_LIBTOOL +AM_SANITY_CHECK + +# ---------------- +# Doxygen support +# ---------------- + +DX_HTML_FEATURE(ON) +DX_CHM_FEATURE(OFF) +DX_CHI_FEATURE(OFF) + +DX_MAN_FEATURE(OFF) +DX_RTF_FEATURE(OFF) +DX_XML_FEATURE(OFF) +DX_PDF_FEATURE(ON) +DX_PS_FEATURE(OFF) +DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs) + +# Generate Output Files +AC_OUTPUT(Makefile \ + test_problems/Makefile \ + test_problems/mixGasTransport/Makefile \ + test_problems/ChemEquil_gri_matrix/Makefile \ + test_problems/ChemEquil_gri_pairs/Makefile \ + test_problems/ChemEquil_ionizedGas/Makefile \ + test_problems/ChemEquil_red1/Makefile \ + test_problems/CpJump/Makefile \ + test_problems/cxx_ex/Makefile \ + test_problems/diamondSurf/Makefile \ + test_problems/diamondSurf_dupl/Makefile \ + test_problems/fracCoeff/Makefile \ + test_problems/multiGasTransport/Makefile \ + test_problems/negATest/Makefile \ + test_problems/NASA9poly_test/Makefile \ + test_problems/printUtilUnitTest/Makefile \ + test_problems/pureFluidTest/Makefile \ + test_problems/silane_equil/Makefile \ + test_problems/spectroscopy/Makefile \ + test_problems/surfkin/Makefile \ + test_problems/surfSolverTest/Makefile \ + test_problems/VPsilane_test/Makefile \ + test_problems/VCSnonideal/Makefile \ + test_problems/cathermo/Makefile \ + test_problems/cathermo/DH_graph_1/Makefile \ + test_problems/cathermo/DH_graph_acommon/Makefile \ + test_problems/cathermo/DH_graph_bdotak/Makefile \ + test_problems/cathermo/DH_graph_NM/Makefile \ + test_problems/cathermo/DH_graph_Pitzer/Makefile \ + test_problems/cathermo/HMW_dupl_test/Makefile \ + test_problems/cathermo/HMW_graph_CpvT/Makefile \ + test_problems/cathermo/HMW_graph_HvT/Makefile \ + test_problems/cathermo/HMW_graph_GvI/Makefile \ + test_problems/cathermo/HMW_graph_GvT/Makefile \ + test_problems/cathermo/HMW_graph_VvT/Makefile \ + test_problems/cathermo/HMW_test_1/Makefile \ + test_problems/cathermo/HMW_test_3/Makefile \ + test_problems/cathermo/ims/Makefile \ + test_problems/cathermo/issp/Makefile \ + test_problems/cathermo/stoichSubSSTP/Makefile \ + test_problems/cathermo/testIAPWS/Makefile \ + test_problems/cathermo/testIAPWSPres/Makefile \ + test_problems/cathermo/testIAPWSTripP/Makefile \ + test_problems/cathermo/testWaterPDSS/Makefile \ + test_problems/cathermo/testWaterTP/Makefile \ + test_problems/cathermo/VPissp/Makefile \ + test_problems/cathermo/wtWater/Makefile \ + doxygen/Makefile \ + tools/Makefile \ + tools/testtools/Makefile \ + Cantera/ext/Makefile \ + Cantera/ext/tpx/Makefile \ + Cantera/ext/cvode/Makefile \ + Cantera/ext/f2c_blas/Makefile \ + Cantera/ext/f2c_lapack/Makefile \ + Cantera/ext/f2c_libs/Makefile \ + Cantera/ext/f2c_math/Makefile \ + Cantera/Makefile \ + Cantera/user/Makefile \ + Cantera/src/Makefile \ + Cantera/cxx/Makefile \ + Cantera/cxx/src/Makefile \ + Cantera/src/base/Makefile \ + Cantera/src/converters/Makefile \ + Cantera/src/kinetics/Makefile \ + Cantera/src/numerics/Makefile Cantera/src/oneD/Makefile \ + Cantera/src/thermo/Makefile \ + Cantera/src/transport/Makefile \ + Cantera/src/spectra/Makefile Cantera/src/zeroD/Makefile \ + Cantera/src/equil/Makefile \ + examples/Makefile \ + examples/cxx/Makefile \ + cantera.pc) + +# skipped tests +# test_problems/ck2cti/Makefile +# test_problems/nasa9_reader/Makefile +# test_problems/rankine_democxx/Makefile +# test_problems/VCSnonideal/NaCl_equil/Makefile + + +# FINAL SUMMARY +AX_SUMMARIZE_CONFIG + diff --git a/docs/Makefile.am b/docs/Makefile.am new file mode 100644 index 000000000..d4b54bc41 --- /dev/null +++ b/docs/Makefile.am @@ -0,0 +1,6 @@ +EXTRA_DIST = cantera.dox cantera.page txt_common fig_common +EXTRA_DIST += install.page tutorial.page + +dist-hook: + rm -rf `find $(distdir)/ -name .svn` + rm -rf `find $(distdir)/ -name .deps` diff --git a/docs/aminclude.am b/docs/aminclude.am new file mode 100644 index 000000000..5e2adb2a1 --- /dev/null +++ b/docs/aminclude.am @@ -0,0 +1,170 @@ +#----------------------------------- +# PECOS - add any additional doxygen +# dependencies here. +#----------------------------------- + +PECOS_extra_dependencies = doxygen/cantera.page \ + doxygen/txt_common/about.page \ + doxygen/txt_common/acknowledgment.page + +## --------------------------------- ## +## Format-independent Doxygen rules. ## +## --------------------------------- ## + +if DX_COND_doc + +## ------------------------------- ## +## Rules specific for HTML output. ## +## ------------------------------- ## + +if DX_COND_html + +DX_CLEAN_HTML = @DX_DOCDIR@/html + +endif DX_COND_html + +## ------------------------------ ## +## Rules specific for CHM output. ## +## ------------------------------ ## + +if DX_COND_chm + +DX_CLEAN_CHM = @DX_DOCDIR@/chm + +if DX_COND_chi + +DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi + +endif DX_COND_chi + +endif DX_COND_chm + +## ------------------------------ ## +## Rules specific for MAN output. ## +## ------------------------------ ## + +if DX_COND_man + +DX_CLEAN_MAN = @DX_DOCDIR@/man + +endif DX_COND_man + +## ------------------------------ ## +## Rules specific for RTF output. ## +## ------------------------------ ## + +if DX_COND_rtf + +DX_CLEAN_RTF = @DX_DOCDIR@/rtf + +endif DX_COND_rtf + +## ------------------------------ ## +## Rules specific for XML output. ## +## ------------------------------ ## + +if DX_COND_xml + +DX_CLEAN_XML = @DX_DOCDIR@/xml + +endif DX_COND_xml + +## ----------------------------- ## +## Rules specific for PS output. ## +## ----------------------------- ## + +if DX_COND_ps + +DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps + +DX_PS_GOAL = doxygen-ps + +doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps + +@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag + cd @DX_DOCDIR@/latex; \ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ + $(DX_LATEX) refman.tex; \ + $(MAKEINDEX_PATH) refman.idx; \ + $(DX_LATEX) refman.tex; \ + countdown=5; \ + while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ + refman.log > /dev/null 2>&1 \ + && test $$countdown -gt 0; do \ + $(DX_LATEX) refman.tex; \ + countdown=`expr $$countdown - 1`; \ + done; \ + $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi + +endif DX_COND_ps + +## ------------------------------ ## +## Rules specific for PDF output. ## +## ------------------------------ ## + +if DX_COND_pdf + +DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf + +DX_PDF_GOAL = doxygen-pdf + +doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf + +@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag + cd @DX_DOCDIR@/latex; \ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ + $(DX_PDFLATEX) refman.tex; \ + $(DX_MAKEINDEX) refman.idx; \ + $(DX_PDFLATEX) refman.tex; \ + countdown=5; \ + while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ + refman.log > /dev/null 2>&1 \ + && test $$countdown -gt 0; do \ + $(DX_PDFLATEX) refman.tex; \ + countdown=`expr $$countdown - 1`; \ + done; \ + mv refman.pdf ../@PACKAGE@.pdf + +endif DX_COND_pdf + +## ------------------------------------------------- ## +## Rules specific for LaTeX (shared for PS and PDF). ## +## ------------------------------------------------- ## + +if DX_COND_latex + +DX_CLEAN_LATEX = @DX_DOCDIR@/latex + +endif DX_COND_latex + +.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) + +.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) + +doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag + +doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) + +doc: doxygen-doc +docs: doxygen-doc + +@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) $(PECOS_extra_dependencies) + rm -rf @DX_DOCDIR@ + $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) + +DX_CLEANFILES = \ + @DX_DOCDIR@/@PACKAGE@.tag \ + -r \ + $(DX_CLEAN_HTML) \ + $(DX_CLEAN_CHM) \ + $(DX_CLEAN_CHI) \ + $(DX_CLEAN_MAN) \ + $(DX_CLEAN_RTF) \ + $(DX_CLEAN_XML) \ + $(DX_CLEAN_PS) \ + $(DX_CLEAN_PDF) \ + $(DX_CLEAN_LATEX) + +# Additional PECOS dependencies + +endif DX_COND_doc diff --git a/docs/install_examples/cygwin_gcc344_f2c_numeric.sh b/docs/install_examples/cygwin_gcc344_f2c_numeric.sh deleted file mode 100755 index 71f82d694..000000000 --- a/docs/install_examples/cygwin_gcc344_f2c_numeric.sh +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/sh -# ------------------------------------------------------------------------------ -# -# Example Cantera pre-preconfig configuration script -# -# Platform: cygwin -# Compiler: gcc -# python: v. 2.5.2 (full installation) -# matlab: no -# f2c: yes -# -# -# Specific places where the User must custimize the installation -# is indiciated with the USER_INPUT_NEEDED lines. -# -# -# Specify the installation directory here: -# USER_INPUT_NEEDED -# -# ----------------------------------------------------------------------------- -# -CANTERA_CONFIG_PREFIX=/cygdrive/c/cygwin_env/arch/cygwin/cantera-1.8_develop -export CANTERA_CONFIG_PREFIX - -SET_PYTHON_SITE_PACKAGE_TOPDIR=y -export SET_PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_SITE_PACKAGE_TOPDIR=$CANTERA_CONFIG_PREFIX -export PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_CMD=/usr/bin/python -export PYTHON_CMD - -# -# The full python package works within cygwin. Minimal is needed at the least -# -PYTHON_PACKAGE='full' -#PYTHON_PACKAGE='minimal' -export PYTHON_PACKAGE - -WITH_IDEAL_SOLUTIONS="y" -export WITH_IDEAL_SOLUTIONS - -WITH_ELECTROLYTES="y" -export WITH_ELECTROLYTES - -WITH_VCSNONIDEAL="y" -export WITH_VCSNONIDEAL - -# -# Matlab on the pc is supported through the windows vc++ 8.0 compilation -# environment -# -BUILD_MATLAB_TOOLBOX="n" -export BUILD_MATLAB_TOOLBOX - -NUMARRAY_HOME='' -export NUMARRAY_HOME -# -# Turns on extra debugging -# -DEBUG_MODE='y' -export DEBUG_MODE -# -# Numeric must have already been installed in the -# /usr/lib/python2.5/site-packages -# directory before the Cantera installation. If not, you can always -# do a minimal python installation and forego forming Cantera's python interface. -# -USE_NUMERIC="y" -export USE_NUMERIC -# -# We use F2C with the cygwin installation. However, the g77 interface should -# work too. -# -BUILD_WITH_F2C="y" -export BUILD_WITH_F2C - -BITCOMPILE="32" -export BITCOMPILE -# -# We use the default gcc compilers that come with cygwin. Currently, this -# is gcc v. 3.4.4. -# -CXX='g++' -export CXX -# -CC='gcc' -export CC -# -F77='g77' -export F77 -# -# Debug options -# -# -DDEBUG_HKM -# -DDEBUG_BASISOPTIMIZE -# -DDEBUG_CHEMEQUIL -# -CXXFLAGS="-g -Wall " -export CXXFLAGS - -CFLAGS=$CXXFLAGS -export CFLAGS - -FFLAGS="-g " -export FFLAGS - -LDFLAGS='-g' -export LDFLAGS - -LCXX_END_LIBS="-lm -lstdc++" -export LCXX_END_LIBS - -# The gcc compiler in cygwin will put a .exe extension on anyway. So, -# we might as well define this field as .exe. cygwin will automagically -# equate executable files with no extension as having an .exe extension. -# This is very mysterious. However, the mystery goes away if you define -# these files to have a .exe suffix from the getgo. -EXE_EXT=".exe" -export EXE_EXT - -EXTRA_LINK="" -export EXTRA_LINK - -MAKE=make -export MAKE -# -# Specify the SUNDIALS option -# -USE_SUNDIALS='n' -export USE_SUNDIALS -# -# Specify where to find the sundials installation directories -# -SUNDIALS_HOME='/cygdrive/c/cygwin_env/libraries/sundials' -export SUNDIALS_HOME -# -# Ok, fire off the main preconfig script -# -./preconfig - diff --git a/docs/install_examples/linux.64_sierra_gcc444_python264_numpy b/docs/install_examples/linux.64_sierra_gcc444_python264_numpy deleted file mode 100755 index 39a93c332..000000000 --- a/docs/install_examples/linux.64_sierra_gcc444_python264_numpy +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh -# -# This is currently the test base. Meaning that the blessed versions -# of all test problems are created from this configuration. -# -CANTERA_CONFIG_PREFIX=${HOME}/arch/linux64_gcc444/cantera-1.8_liquidTransportDevelop -export CANTERA_CONFIG_PREFIX - -SET_PYTHON_SITE_PACKAGE_TOPDIR=y -export SET_PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_SITE_PACKAGE_TOPDIR=$CANTERA_CONFIG_PREFIX -export PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_CMD=${HOME}/arch/linux64_gcc444/python-2.6.4/bin/python -export PYTHON_CMD - -PYTHON_PACKAGE='full' -#PYTHON_PACKAGE='minimal' -export PYTHON_PACKAGE - -DEBUG_MODE='y' -export DEBUG_MODE - -WITH_IDEAL_SOLUTIONS="y" -export WITH_IDEAL_SOLUTIONS - -WITH_ELECTROLYTES="y" -export WITH_ELECTROLYTES - -WITH_VCSNONIDEAL="y" -export WITH_VCSNONIDEAL - -WITH_H298MODIFY_CAPABILITY='y' -export WITH_H298MODIFY_CAPABILITY - -WITH_REAL_GASSES='y' -export WITH_REAL_GASSES - -BUILD_MATLAB_TOOLBOX="y" -export BUILD_MATLAB_TOOLBOX - -INSTALL_BIN=config/install-sh -export INSTALL_BIN - -MATLAB_CMD="/usr/local/matlab/7.13/bin/matlab" -export MATLAB_CMD - -BUILD_F90_INTERFACE="y" -export BUILD_F90_INTERFACE - -NUMARRAY_HOME='' -export NUMARRAY_HOME - -USE_NUMPY='y' -export USE_NUMPY - -NUMPY_INC_DIR="${HOME}/arch/linux64_gcc444/python-2.6.4/lib/python2.6/site-packages/numpy/core/include" -export NUMPY_INC_DIR - -GRAPHVIZDIR=/usr/netpub/graphviz-2.26.3/bin -export GRAPHVIZDIR - -# -# -USE_NUMERIC="n" -export USE_NUMERIC - -BUILD_WITH_F2C="n" -export BUILD_WITH_F2C - -BITCOMPILE="64" -export BITCOMPILE - -AFLAGS='DEBUG' - -CXX='/sierra/Sntools/extras/compilers/gcc-4.4.4/bin/g++' -export CXX - -CXX_DEPENDS='/sierra/Sntools/extras/compilers/gcc-4.4.4/bin/g++ -MM' -export CXX_DEPENDS - -CC='/sierra/Sntools/extras/compilers/gcc-4.4.4/bin/gcc' -export CC - -F77='/sierra/Sntools/extras/compilers/gcc-4.4.4/bin/gfortran' -export F77 - -FFLAGS="-g " -export FFLAGS - -CFLAGS="-g " -export CFLAGS - -#CXXFLAGS="-g -Wall -Woverloaded-virtual -DDEBUG_HKM -DDEBUG_HKM_EPEQUIL -DDEBUG_NUMJAC" -CXXFLAGS="-g -Wall -Woverloaded-virtual -DDEBUG_HKM -DDEBUG_HKM_EPEQUIL " -export CXXFLAGS - -LDFLAGS=' ' -export LDFLAGS - -LCXX_END_LIBS="-lgfortran " -export LCXX_END_LIBS - -EXTRA_LINK=" " -export EXTRA_LINK - -MAKE=gmake -export MAKE - -USE_SUNDIALS='y' -export USE_SUNDIALS -SUNDIALS_HOME="${HOME}/arch/linux64_gcc444/sundials-2.4.0_dbg" -export SUNDIALS_HOME - -./preconfig diff --git a/docs/install_examples/linux_rhel5_64_gcc424_dbg_python264_numpy b/docs/install_examples/linux_rhel5_64_gcc424_dbg_python264_numpy deleted file mode 100755 index a7608e776..000000000 --- a/docs/install_examples/linux_rhel5_64_gcc424_dbg_python264_numpy +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# -# This is currently the test base. Meaning that the blessed versions -# of all test problems are created from this configuration. -# -CANTERA_CONFIG_PREFIX=${HOME}/arch/linux64_gcc424/cantera-1.8_liquidTransportDevelop -export CANTERA_CONFIG_PREFIX - -SET_PYTHON_SITE_PACKAGE_TOPDIR=y -export SET_PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_SITE_PACKAGE_TOPDIR=$CANTERA_CONFIG_PREFIX -export PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_CMD=${HOME}/arch/linux64_gcc424/python-2.6.4/bin/python -export PYTHON_CMD - -PYTHON_PACKAGE='full' -#PYTHON_PACKAGE='minimal' -export PYTHON_PACKAGE - -DEBUG_MODE='y' -export DEBUG_MODE - -WITH_IDEAL_SOLUTIONS="y" -export WITH_IDEAL_SOLUTIONS - -WITH_ELECTROLYTES="y" -export WITH_ELECTROLYTES - -WITH_VCSNONIDEAL="y" -export WITH_VCSNONIDEAL - -WITH_H298MODIFY_CAPABILITY='y' -export WITH_H298MODIFY_CAPABILITY - -BUILD_MATLAB_TOOLBOX="y" -export BUILD_MATLAB_TOOLBOX - -INSTALL_BIN=config/install-sh -export INSTALL_BIN - -MATLAB_CMD="/usr/local/matlab/7.9/bin/matlab" -export MATLAB_CMD - -BUILD_F90_INTERFACE="y" -export BUILD_F90_INTERFACE - -NUMARRAY_HOME='' -export NUMARRAY_HOME - -USE_NUMPY='y' -export USE_NUMPY - -NUMPY_INC_DIR="${HOME}/arch/linux64_gcc424/python-2.6.4/lib/python2.6/site-packages/numpy/core/include" -export NUMPY_INC_DIR - -GRAPHVIZDIR=${HOME}'/arch/linux/bin' -export GRAPHVIZDIR - -# -# -USE_NUMERIC="n" -export USE_NUMERIC - -BUILD_WITH_F2C="n" -export BUILD_WITH_F2C - -BITCOMPILE="64" -export BITCOMPILE - -AFLAGS='DEBUG' - -CXX='/sierra/Sntools/extras/compilers/gcc-4.2.4/bin/g++' -export CXX - -CXX_DEPENDS='/sierra/Sntools/extras/compilers/gcc-4.2.4/bin/g++ -MM' -export CXX_DEPENDS - -CC='/sierra/Sntools/extras/compilers/gcc-4.2.4/bin/gcc' -export CC - -F77='/sierra/Sntools/extras/compilers/gcc-4.2.4/bin/gfortran' -export F77 - -CFLAGS="-g -Wall" -export CFLAGS - -CXXFLAGS="-g -Wall -Woverloaded-virtual -DDEBUG_HKM -DDEBUG_HKM_EPEQUIL" -export CXXFLAGS - -FFLAGS="-g -DDEBUG_HKM -fno-second-underscore" -export FFLAGS - -LDFLAGS=' ' -export LDFLAGS - -LCXX_END_LIBS="-lgfortran -lm -lstdc++" -export LCXX_END_LIBS - -EXTRA_LINK=" " -export EXTRA_LINK - -MAKE=gmake -export MAKE - -USE_SUNDIALS='y' -export USE_SUNDIALS -SUNDIALS_HOME="${HOME}/arch/linux64_gcc424/sundials-2.4.0_dbg" -export SUNDIALS_HOME - -./preconfig diff --git a/docs/install_examples/sol10_64bit_CC57_py24_numarray b/docs/install_examples/sol10_64bit_CC57_py24_numarray deleted file mode 100755 index 98d450e33..000000000 --- a/docs/install_examples/sol10_64bit_CC57_py24_numarray +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -# -# Sierra 64 bit setup: -# -xO4 -xtarget=native64 -xarch=native64 -xcode=pic32 -DSUN10 -library=stlport4 -# -# Sierra warnings setup: -# +w2 -errtags -erroff=doubunder,reftotemp,ppextraw,inllargeint,inllargeuse,wnoelseretvalue,truncwarn,diffenumtype,notused,wvarhid enmem,badcastw,hidef -errwarn=%all,no%wunreachable,no%partinit -# -# Notes: -# When you add flsgs with % in them python won't build, because there is an -# error in the python distutils routines. I am currently manually -# fixing these. -# -# Program Names: -# -MAKE=gmake -export MAKE - -# -# Pointers to the 64 bit python built with Sunpro compilers -PYTHON_DIR=${HOME}/arch/sol_py64 -export PYTHON_DIR -PYTHON_CMD=${HOME}/arch/sol_py64/bin/python -export PYTHON_CMD - -# -# Use the CC compiler for C++ code -CXX=CC -export CXX -# -# Specification of the c compiler -# -CC=cc -export CC - -CXX_DEPENDS='CC -xM1' -export CXX_DEPENDS - -USE_NUMERIC='n' -export USE_NUMERIC - -# -# HKM 7/22/09 -# The matlab option is currently not working. Matlab uses the gcc -# compiler. This setup uses the solaris compiler. I can get -# the matlab extensions to compile. But, when I run matlab -# I get an unsatisfied external -# When I add the commands: -# -l/opt/SUNWspro/lib/f9 -lCrun -lCstd -lfsu -# to the matlab build, I can get rid of the runtime unsatisfied -# external. However, I immediate crash dump matlab. This -# suggests that there are duplicate Cstd routines from gcc and -# from the solaris compilers fighting it out. -# I believe the solution will involve compiling everything -# with gcc in order to get matlab on solaris to work. -# -BUILD_MATLAB_TOOLBOX="n" -export BUILD_MATLAB_TOOLBOX - -DEBUG_MODE="y" -export DEBUG_MODE - -# -# Compiler Flags -# -BITCOMPILE="64" -export BITCOMPILE -# -# remember the issue with % and python -# -EFLAGS=" +w2 -errtags -erroff=doubunder,reftotemp,ppextraw,inllargeint,inllargeuse,wnoelseretvalue,truncwarn,diffenumtype,notused,wvarhidenmem,badcastw,hidef -errwarn=%all,no%wunreachable,no%partinit" -#AFLAGS=" -xtarget=native64 -xarch=native64 -xcode=pic32 -library=stlport4" -AFLAGS=" -xtarget=native64 -xarch=native64 -xcode=pic32" -export AFLAGS - -F77=f77 -export F77 - -F90=f95 -export F90 - -FFLAGS="-g -xtarget=native64 -xarch=native64 -xcode=pic32 " -export FFLAGS - -CFLAGS="-g -xtarget=native64 -xarch=native64 -xcode=pic32 -v " -export CFLAGS - -CXXFLAGS="-g $AFLAGS $EFLAGS -DDEBUG_HKM" -export CXXFLAGS - -LCXX_END_LIBS="-lm " -export LCXX_END_LIBS - -# other useful endlibs for solaris 64 bit are -# -mt -lsunmath -lfsu - -USE_SUNDIALS='n' -export USE_SUNDIALS - -WITH_VCSNONIDEAL='y' -export WITH_VCSNONIDEAL - -# -# Location Variables - set the directory to point to -# a 64-bit specific directory. -# -CANTERA_INSTALL_DIR=${HOME}/arch/sol_py64/cantera-1.8 -export CANTERA_INSTALL_DIR - -CANTERA_CONFIG_PREFIX=${HOME}/arch/sol_py64/cantera-1.8 -export CANTERA_CONFIG_PREFIX - -#CANTERA_PYTHON_HOME=${CANTERA_PYTHON_HOME:="$HOME/python_modules"} -#export CANTERA_PYTHON_HOME - -SET_PYTHON_SITE_PACKAGE_TOPDIR="y" -export SET_PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_SITE_PACKAGE_TOPDIR=${HOME}"/arch/sol_py64/cantera-1.8" -export PYTHON_SITE_PACKAGE_TOPDIR - -PYTHON_PACKAGE="full" -#PYTHON_PACKAGE="minimal" -#PYTHON_PACKAGE="none" -export PYTHON_PACKAGE - -BUILD_WITH_F2C="n" -export BUILD_WITH_F2C - -# -# Archive commands -# -ARCHIVE="CC -xar -xcode=pic32 -o " -export ARCHIVE - - -# -# Invoke the regular configure script -# -./preconfig - diff --git a/examples/Makefile.am b/examples/Makefile.am new file mode 100644 index 000000000..9b5df6b24 --- /dev/null +++ b/examples/Makefile.am @@ -0,0 +1,7 @@ +SUBDIRS = cxx + +EXTRA_DIST = + +dist-hook: + rm -rf `find $(distdir)/ -name .svn` + rm -rf `find $(distdir)/ -name .deps` \ No newline at end of file diff --git a/examples/cxx/Makefile.am b/examples/cxx/Makefile.am new file mode 100644 index 000000000..57263ec09 --- /dev/null +++ b/examples/cxx/Makefile.am @@ -0,0 +1,24 @@ +h_sources = example_utils.h + +cc_sources = examples.cpp kinetics_example1.cpp kinetics_example2.cpp \ + kinetics_example3.cpp equil_example1.cpp \ + transport_example1.cpp transport_example2.cpp \ + rxnpath_example1.cpp + +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) +AM_CPPFLAGS = -I. -I$(top_builddir)/build/include/ +AM_CXXFLAGS = $(AM_CPPFLAGS) + +bin_PROGRAMS = cxx_examples +library_includedir = $(includedir) -I$(top_builddir)/build/include/ + +#----------------------- +# Cantera cxx examples +#----------------------- + +cxx_examples_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +cxx_examples_SOURCES = $(cc_sources) $(h_sources) diff --git a/ext/cvode/Makefile.am b/ext/cvode/Makefile.am new file mode 100644 index 000000000..49208664e --- /dev/null +++ b/ext/cvode/Makefile.am @@ -0,0 +1,32 @@ +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 \ + cvode.h cvspgmr.h dense.h iterativ.h llnlmath.h \ + llnltyps.h nvector.h spgmr.h + +AM_CPPFLAGS = -I. +AM_CXXFLAGS = $(AM_CPPFLAGS) +AM_FCFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libcvode.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libcvode_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libcvode_la_SOURCES = $(fc_sources) $(cc_sources) + +__top_builddir__build_lib_libcvode_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libcvode_includedir = $(prefix)/include + +CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/ext/f2c_blas/Makefile.am b/ext/f2c_blas/Makefile.am new file mode 100644 index 000000000..15aaa52c9 --- /dev/null +++ b/ext/f2c_blas/Makefile.am @@ -0,0 +1,69 @@ +cc_sources = \ +dasum.c \ +daxpy.c \ +dcabs1.c \ +dcopy.c \ +ddot.c \ +dgbmv.c \ +dgemm.c \ +dgemv.c \ +dger.c \ +dnrm2.c \ +drot.c \ +drotg.c \ +drotm.c \ +drotmg.c \ +dsbmv.c \ +dscal.c \ +dsdot.c \ +dspmv.c \ +dspr.c \ +dspr2.c \ +dswap.c \ +dsymm.c \ +dsymv.c \ +dsyr.c \ +dsyr2.c \ +dsyr2k.c \ +dsyrk.c \ +dtbmv.c \ +dtbsv.c \ +dtpmv.c \ +dtpsv.c \ +dtrmm.c \ +dtrmv.c \ +dtrsm.c \ +dtrsv.c \ +dzasum.c \ +dznrm2.c \ +idamax.c \ +lsame.c \ +xerbla.c + +h_sources = blaswrap.h + +AM_CPPFLAGS = -I../f2c_libs +AM_CXXFLAGS = $(AM_CPPFLAGS) +AM_FCFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctblas.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libctblas_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctblas_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libctblas_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctblas_includedir = $(prefix)/include + + +CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/ext/f2c_lapack/Makefile.am b/ext/f2c_lapack/Makefile.am new file mode 100644 index 000000000..e3330e6c1 --- /dev/null +++ b/ext/f2c_lapack/Makefile.am @@ -0,0 +1,36 @@ +cc_sources = dbdsqr.c dgbtrf.c dgbtf2.c dgbtrs.c dgbsv.c dgebd2.c dgebrd.c \ + dgelq2.c dgelqf.c dgelss.c dgeqr2.c dgeqrf.c dgetf2.c dgetrf.c \ + dgetri.c dgetrs.c dlabad.c dlabrd.c dlacpy.c dlamch.c dlange.c \ + dlapy2.c dlarf.c dlarfb.c dlarfg.c dlarft.c dlartg.c dlas2.c \ + dlascl.c dlaset.c dlasq1.c dlasq2.c dlasq3.c dlasq4.c dlasq5.c \ + dlasq6.c dlasr.c dlasrt.c dlassq.c dlasv2.c dlaswp.c dorg2r.c \ + dorgbr.c dorgl2.c dorglq.c dorgqr.c dorm2r.c dormbr.c dorml2.c \ + dormlq.c dormqr.c drscl.c dtrtri.c dtrti2.c ieeeck.c ilaenv.c + +h_sources = blaswrap.h + +AM_CPPFLAGS = -I../f2c_libs +AM_CXXFLAGS = $(AM_CPPFLAGS) +AM_FCFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctlapack.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libctlapack_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctlapack_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libctlapack_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctlapack_includedir = $(prefix)/include + + +CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/ext/f2c_libs/Makefile.am b/ext/f2c_libs/Makefile.am new file mode 100644 index 000000000..717b494cf --- /dev/null +++ b/ext/f2c_libs/Makefile.am @@ -0,0 +1,67 @@ +cc_sources = abort_.c c_log.c d_atn2.c dfe.c d_prod.c \ + due.c exit_.c getenv_.c hl_le.c i_dim.c \ + inquire.c lread.c pow_ii.c r_acos.c \ + r_dim.c r_nint.c r_tan.c signbit.c \ + uninit.c z_abs.c close.c \ + d_cnjg.c d_imag.c d_sign.c ef1asc_.c \ + f77_aloc.c h_abs.c hl_lt.c i_dnnt.c \ + i_sign.c lwrite.c r_asin.c \ + rewind.c rsfe.c r_tanh.c s_paus.c util.c \ + z_cos.c backspac.c c_sin.c d_cos.c \ + d_int.c d_sin.c ef1cmc_.c f77vers.c \ + h_dim.c h_mod.c i_indx.c lbitbits.c \ + pow_ri.c r_atan.c r_exp.c r_sign.c \ + s_cat.c s_rnge.c wref.c z_div.c c_abs.c \ + c_sqrt.c d_cosh.c d_lg10.c d_sinh.c \ + endfile.c fmt.c h_dnnt.c h_nint.c iio.c \ + lbitshft.c open.c pow_zi.c r_atn2.c \ + r_imag.c r_sin.c s_cmp.c s_stop.c \ + wrtfmt.c z_exp.c cabs.c d_abs.c d_dim.c \ + d_log.c d_sqrt.c erf_.c fmtlib.c h_indx.c\ + h_sign.c i_len.c l_ge.c pow_ci.c pow_zz.c\ + r_cnjg.c r_int.c r_sinh.c s_copy.c sue.c \ + wsfe.c z_log.c c_cos.c d_acos.c derf_.c \ + d_mod.c d_tan.c erfc_.c \ + h_len.c i77vers.c ilnw.c l_gt.c pow_dd.c \ + r_cos.c r_lg10.c rsli.c sfe.c \ + system_.c wsle.c z_sin.c c_div.c d_asin.c\ + derfc_.c d_nint.c d_tanh.c err.c ftell_.c\ + hl_ge.c i_abs.c i_mod.c l_le.c pow_di.c \ + r_cosh.c r_log.c rsne.c \ + sig_die.c typesize.c wsne.c z_sqrt.c \ + c_exp.c d_atan.c d_exp.c dolio.c dtime_.c\ + etime_.c hl_gt.c \ + i_nint.c l_lt.c pow_hh.c r_abs.c rdfmt.c \ + r_mod.c r_sqrt.c signal_.c uio.c xwsne.c + +# arithchk.c getarg_.c iargc_.c + +h_sources = f2c.h sysdep1.h fio.h fmt.h fp.h lio.h rawio.h + +AM_CPPFLAGS = -I. +AM_CXXFLAGS = $(AM_CPPFLAGS) +AM_FCFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctf2c.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +# header file accumulation +all: + @echo copying headers $< + cp -p sysdep1.h0 sysdep1.h + cp -p signal1.h0 signal1.h + cp -p $(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) + +__top_builddir__build_lib_libctf2c_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctf2c_includedir = $(prefix)/include + + +CLEANFILES = *.o diff --git a/ext/f2c_math/Makefile.am b/ext/f2c_math/Makefile.am new file mode 100644 index 000000000..94a041f8a --- /dev/null +++ b/ext/f2c_math/Makefile.am @@ -0,0 +1,51 @@ +cc_sources = \ +daux.c \ +mach.cpp \ +ddaspk.c \ +dgbefa.c \ +dgbsl.c \ +dgefa.c \ +dgesl.c \ +dp1vlu.c \ +dpcoef.c \ +dpolft.c \ +fdump.c \ +j4save.c \ +pcoef.c \ +polfit.c \ +pvalue.c \ +xercnt.c \ +xerhlt.c \ +xermsg.c \ +xerprn.c \ +xersve.c \ +xgetua.c \ +printstring.c + +h_sources = cblas.h gmres.h mkl_cblas.h + +AM_CPPFLAGS = -I../f2c_libs +AM_CXXFLAGS = $(AM_CPPFLAGS) +AM_FCFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctmath.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libctmath_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctmath_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libctmath_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctmath_includedir = $(prefix)/include + + +CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/ext/math/gmres.h b/ext/math/gmres.h deleted file mode 100755 index 8bde197c2..000000000 --- a/ext/math/gmres.h +++ /dev/null @@ -1,143 +0,0 @@ -// -*- C++ -*- - -#ifndef GMRES_BLAS_H -#define GMRES_BLAS_H - -// ============================================================================ -// -// GMRES nach Saad, Schultz -// GMRES: a generalized minimal residual algorithm for solving nonsymmetric -// linear systems -// SIAM J Sci Stat Comput 7, 856-869 (1986) -// -// ---------------------------- -// Christian Badura, Mai 1998 -// -// ============================================================================ - - -template< class Matrix > -inline int -gmres( int m, int N, const Matrix &A, const doublereal *b, doublereal *x, doublereal eps ); - - -template< class Matrix > -inline int -gmres( int m, int N, const Matrix &A, const doublereal *b, doublereal *x, doublereal eps, - bool detailed ); - - -// ============================================================================ - -// #include "../../Cantera/src/blas.h" - -#include "cblas.h" -#include "../../Cantera/src/ctlapack.h" - -template< class Matrix > -inline int -gmres( int m, int n, const Matrix &A, const doublereal *b, doublereal *x, doublereal eps, - bool detailed ) { - if ( n<=0 ) - return -1; - typedef doublereal *doublerealP; - doublereal *V = new doublereal[n*(m+1)]; - doublereal *U = new doublereal[m*(m+1)/2]; - doublereal *r = new doublereal[n]; - doublereal *y = new doublereal[m+1]; - doublereal *c = new doublereal[m]; - doublereal *s = new doublereal[m]; - doublereal **v = new doublerealP[m+1]; - for ( int i=0; i<=m; ++i ) v[i]=V+i*n; - int its=-1; - { - doublereal beta, h, rd, dd, nrm2b; - int j, io, uij, u0j; - nrm2b=dnrm2(n,b,1); - cout << " norm = " << nrm2b << endl; - io=0; - do { // "aussere Iteration - ++io; - //mult(A,x,r); - A.mult(x,r); - daxpy(n,-1.,b,1,r,1); - beta=dnrm2(n,r,1); - dcopy(n,r,1,v[0],1); - dscal(n,1./beta,v[0],1); - - y[0]=beta; - j=0; - uij=0; - do { // innere Iteration j=0,...,m-1 - u0j=uij; - //mult(A,v[j],v[j+1]); - A.mult(v[j],v[j+1]); - - ct_dgemv(ctlapack::ColMajor, ctlapack::Transpose, n, j+1, 1.0, V, n, v[j+1], 1, 0.0, U+u0j, 1); - ct_dgemv(ctlapack::ColMajor, ctlapack::NoTranspose, n, j+1, -1.0, V, n, U+u0j, 1, 1.0, v[j+1], 1); - - //dgemv(Transpose,n,j+1,1.,V,n,v[j+1],1,0.,U+u0j,1); - //dgemv(NoTranspose,n,j+1,-1.,V,n,U+u0j,1,1.,v[j+1],1); - - h=dnrm2(n,v[j+1],1); - - dscal(n,1./h,v[j+1],1); - - for ( int i=0; i=eps*nrm2b ); - { // minimiere bzgl Y - dtpsv(UpperTriangle,NoTranspose,NotUnitTriangular,j,U,y,1); - // korrigiere X - dgemv(NoTranspose,n,j,-1.,V,n,y,1,1.,x,1); - } - } while ( fabs(y[j])>=eps*nrm2b ); - - // R"uckgabe: Zahl der inneren Iterationen - its = m*(io-1)+j; - } - - delete[] V; - delete[] U; - delete[] r; - delete[] y; - delete[] c; - delete[] s; - delete[] v; - return its; -} - - -// ============================================================================ - - -template< class Matrix > -inline int -gmres( int m, int n, const Matrix &A, const doublereal *b, doublereal *x, doublereal eps ){ - return gmres(m,n,A,b,x,eps,false); -} - -// ============================================================================ - - -#endif // GMRES_BLAS_H diff --git a/ext/tpx/Makefile.am b/ext/tpx/Makefile.am new file mode 100644 index 000000000..ab1a96b75 --- /dev/null +++ b/ext/tpx/Makefile.am @@ -0,0 +1,30 @@ +h_sources = Methane.h Nitrogen.h Oxygen.h Water.h Hydrogen.h RedlichKwong.h \ + CarbonDioxide.h Heptane.h lk.h Sub.h utils.h HFC134a.h + +cc_sources = Methane.cpp Nitrogen.cpp Oxygen.cpp Water.cpp Hydrogen.cpp RedlichKwong.cpp \ + CarbonDioxide.cpp Heptane.cpp lk.cpp Sub.cpp utils.cpp HFC134a.cpp + +AM_CPPFLAGS = +AM_CXXFLAGS = $(AM_CPPFLAGS) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libtpx.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libtpx_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libtpx_la_SOURCES = $(cc_sources) $(h_sources) + +__top_builddir__build_lib_libtpx_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libtpx_includedir = $(prefix)/include + + +CLEANFILES = *.o + +# header file accumulation +all: + @echo copying headers $< + cp -p *.h $(top_builddir)/build/include/ diff --git a/m4/common/ax_configure_args.m4 b/m4/common/ax_configure_args.m4 new file mode 100644 index 000000000..0726b1bc8 --- /dev/null +++ b/m4/common/ax_configure_args.m4 @@ -0,0 +1,70 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_configure_args.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CONFIGURE_ARGS +# +# DESCRIPTION +# +# Helper macro for AX_ENABLE_BUILDDIR. +# +# The traditional way of starting a subdir-configure is running the script +# with ${1+"$@"} but since autoconf 2.60 this is broken. Instead we have +# to rely on eval'ing $ac_configure_args however some old autoconf +# versions do not provide that. To ensure maximum portability of autoconf +# extension macros this helper can be AC_REQUIRE'd so that +# $ac_configure_args will alsways be present. +# +# Sadly, the traditional "exec $SHELL" of the enable_builddir macros is +# spoiled now and must be replaced by "eval + exit $?". +# +# Example: +# +# AC_DEFUN([AX_ENABLE_SUBDIR],[dnl +# AC_REQUIRE([AX_CONFIGURE_ARGS])dnl +# eval $SHELL $ac_configure_args || exit $? +# ...]) +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_CONFIGURE_ARGS],[ + # [$]@ is unsable in 2.60+ but earlier autoconf had no ac_configure_args + if test "${ac_configure_args+set}" != "set" ; then + ac_configure_args= + for ac_arg in ${1+"[$]@"}; do + ac_configure_args="$ac_configure_args '$ac_arg'" + done + fi +]) diff --git a/m4/common/ax_enable_builddir.m4 b/m4/common/ax_enable_builddir.m4 new file mode 100644 index 000000000..3fb87317d --- /dev/null +++ b/m4/common/ax_enable_builddir.m4 @@ -0,0 +1,300 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_enable_builddir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ENABLE_BUILDDIR [(dirstring-or-command [,Makefile.mk [,-all]])] +# +# DESCRIPTION +# +# If the current configure was run within the srcdir then we move all +# configure-files into a subdir and let the configure steps continue +# there. We provide an option --disable-builddir to suppress the move into +# a separate builddir. +# +# Defaults: +# +# $1 = $host (overridden with $HOST) +# $2 = Makefile.mk +# $3 = -all +# +# This macro must be called before AM_INIT_AUTOMAKE. It creates a default +# toplevel srcdir Makefile from the information found in the created +# toplevel builddir Makefile. It just copies the variables and +# rule-targets, each extended with a default rule-execution that recurses +# into the build directory of the current "HOST". You can override the +# auto-dection through `config.guess` and build-time of course, as in +# +# make HOST=i386-mingw-cross +# +# which can of course set at configure time as well using +# +# configure --host=i386-mingw-cross +# +# After the default has been created, additional rules can be appended +# that will not just recurse into the subdirectories and only ever exist +# in the srcdir toplevel makefile - these parts are read from the $2 = +# Makefile.mk file +# +# The automatic rules are usually scanning the toplevel Makefile for lines +# like '#### $host |$builddir' to recognize the place where to recurse +# into. Usually, the last one is the only one used. However, almost all +# targets have an additional "*-all" rule which makes the script to +# recurse into _all_ variants of the current HOST (!!) setting. The "-all" +# suffix can be overriden for the macro as well. +# +# a special rule is only given for things like "dist" that will copy the +# tarball from the builddir to the sourcedir (or $(PUB)) for reason of +# convenience. +# +# LICENSE +# +# Copyright (c) 2009 Guido U. Draheim +# Copyright (c) 2009 Alan Jenkins +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 23 + +AC_DEFUN([AX_ENABLE_BUILDDIR],[ +AC_REQUIRE([AC_CANONICAL_HOST])[]dnl +AC_REQUIRE([AX_CONFIGURE_ARGS])[]dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])[]dnl +AC_BEFORE([$0],[AM_INIT_AUTOMAKE])dnl +AS_VAR_PUSHDEF([SUB],[ax_enable_builddir])dnl +AS_VAR_PUSHDEF([AUX],[ax_enable_builddir_auxdir])dnl +AS_VAR_PUSHDEF([SED],[ax_enable_builddir_sed])dnl +SUB="." +AC_ARG_ENABLE([builddir], AS_HELP_STRING( + [--disable-builddir],[disable automatic build in subdir of sources]) + ,[SUB="$enableval"], [SUB="auto"]) +if test ".$ac_srcdir_defaulted" != ".no" ; then +if test ".$srcdir" = ".." ; then + if test -f config.status ; then + AC_MSG_NOTICE(toplevel srcdir already configured... skipping subdir build) + else + test ".$SUB" = "." && SUB="." + test ".$SUB" = ".no" && SUB="." + test ".$TARGET" = "." && TARGET="$target" + test ".$SUB" = ".auto" && SUB="m4_ifval([$1], [$1],[$TARGET])" + if test ".$SUB" != ".." ; then # we know where to go and + AS_MKDIR_P([$SUB]) + echo __.$SUB.__ > $SUB/conftest.tmp + cd $SUB + if grep __.$SUB.__ conftest.tmp >/dev/null 2>/dev/null ; then + rm conftest.tmp + AC_MSG_RESULT([continue configure in default builddir "./$SUB"]) + else + AC_MSG_ERROR([could not change to default builddir "./$SUB"]) + fi + srcdir=`echo "$SUB" | + sed -e 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g;s,[[/]]$,,;'` + # going to restart from subdirectory location + test -f $srcdir/config.log && mv $srcdir/config.log . + test -f $srcdir/confdefs.h && mv $srcdir/confdefs.h . + test -f $srcdir/conftest.log && mv $srcdir/conftest.log . + test -f $srcdir/$cache_file && mv $srcdir/$cache_file . + AC_MSG_RESULT(....exec $SHELL $srcdir/[$]0 "--srcdir=$srcdir" "--enable-builddir=$SUB" ${1+"[$]@"}) + case "[$]0" in # restart + [/\\]*) eval $SHELL "'[$]0'" "'--srcdir=$srcdir'" "'--enable-builddir=$SUB'" $ac_configure_args ;; + *) eval $SHELL "'$srcdir/[$]0'" "'--srcdir=$srcdir'" "'--enable-builddir=$SUB'" $ac_configure_args ;; + esac ; exit $? + fi + fi +fi fi +test ".$SUB" = ".auto" && SUB="." +dnl ac_path_prog uses "set dummy" to override $@ which would defeat the "exec" +AC_PATH_PROG(SED,gsed sed, sed) +AUX="$am_aux_dir" +AS_VAR_POPDEF([SED])dnl +AS_VAR_POPDEF([AUX])dnl +AS_VAR_POPDEF([SUB])dnl +AC_CONFIG_COMMANDS([buildir],[dnl .............. config.status .............. +AS_VAR_PUSHDEF([SUB],[ax_enable_builddir])dnl +AS_VAR_PUSHDEF([TOP],[top_srcdir])dnl +AS_VAR_PUSHDEF([SRC],[ac_top_srcdir])dnl +AS_VAR_PUSHDEF([AUX],[ax_enable_builddir_auxdir])dnl +AS_VAR_PUSHDEF([SED],[ax_enable_builddir_sed])dnl +pushdef([END],[Makefile.mk])dnl +pushdef([_ALL],[ifelse([$3],,[-all],[$3])])dnl + SRC="$ax_enable_builddir_srcdir" + if test ".$SUB" = ".." ; then + if test -f "$TOP/Makefile" ; then + AC_MSG_NOTICE([skipping TOP/Makefile - left untouched]) + else + AC_MSG_NOTICE([skipping TOP/Makefile - not created]) + fi + else + if test -f "$SRC/Makefile" ; then + a=`grep "^VERSION " "$SRC/Makefile"` ; b=`grep "^VERSION " Makefile` + test "$a" != "$b" && rm "$SRC/Makefile" + fi + if test -f "$SRC/Makefile" ; then + echo "$SRC/Makefile : $SRC/Makefile.in" > $tmp/conftemp.mk + echo " []@ echo 'REMOVED,,,' >\$[]@" >> $tmp/conftemp.mk + eval "${MAKE-make} -f $tmp/conftemp.mk 2>/dev/null >/dev/null" + if grep '^REMOVED,,,' "$SRC/Makefile" >/dev/null + then rm $SRC/Makefile ; fi + cp $tmp/conftemp.mk $SRC/makefiles.mk~ ## DEBUGGING + fi + if test ! -f "$SRC/Makefile" ; then + AC_MSG_NOTICE([create TOP/Makefile guessed from local Makefile]) + x='`' ; cat >$tmp/conftemp.sed <<_EOF +/^\$/n +x +/^\$/bS +x +/\\\\\$/{H;d;} +{H;s/.*//;x;} +bM +:S +x +/\\\\\$/{h;d;} +{h;s/.*//;x;} +:M +s/\\(\\n\\) /\\1 /g +/^ /d +/^[[ ]]*[[\\#]]/d +/^VPATH *=/d +s/^srcdir *=.*/srcdir = ./ +s/^top_srcdir *=.*/top_srcdir = ./ +/[[:=]]/!d +/^\\./d +dnl Now handle rules (i.e. lines containing ":" but not " = "). +/ = /b +/ .= /b +/:/!b +s/:.*/:/ +s/ / /g +s/ \\([[a-z]][[a-z-]]*[[a-zA-Z0-9]]\\)\\([[ :]]\\)/ \\1 \\1[]_ALL\\2/g +s/^\\([[a-z]][[a-z-]]*[[a-zA-Z0-9]]\\)\\([[ :]]\\)/\\1 \\1[]_ALL\\2/ +s/ / /g +/^all all[]_ALL[[ :]]/i\\ +all-configured : all[]_ALL +dnl dist-all exists... and would make for dist-all-all +s/ [[a-zA-Z0-9-]]*[]_ALL [[a-zA-Z0-9-]]*[]_ALL[]_ALL//g +/[]_ALL[]_ALL/d +a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\ + ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ + ; use=$x basename "\$\@" _ALL $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq "0" ; then : \\\\\\ + ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\ + ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ + ; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\ + ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; (cd "\$\$i" && test ! -f configure && \$(MAKE) \$\$use) || exit; done +dnl special rule add-on: "dist" copies the tarball to $(PUB). (source tree) +/dist[]_ALL *:/a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\ + ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ + ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).tar.*" \\\\\\ + ; if test "\$\$found" -eq "0" ; then : \\\\\\ + ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ + ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).tar.* \\\\\\ + ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done +dnl special rule add-on: "dist-foo" copies all the archives to $(PUB). (source tree) +/dist-[[a-zA-Z0-9]]*[]_ALL *:/a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh ./config.guess $x \\\\\\ + ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ + ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).*" \\\\\\ + ; if test "\$\$found" -eq "0" ; then : \\\\\\ + ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ + ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).* \\\\\\ + ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done +dnl special rule add-on: "distclean" removes all local builddirs completely +/distclean[]_ALL *:/a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\ + ; BUILD=$x grep "^#### .*|" Makefile | sed -e 's/.*|//' $x \\\\\\ + ; use=$x basename "\$\@" _ALL $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$n * \$\@ (all local builds)" \\\\\\ + ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ + ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; echo "# rm -r \$\$i"; done ; echo "# (sleep 3)" ; sleep 3 \\\\\\ + ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; echo "\$\$i" | grep "^/" > /dev/null && continue \\\\\\ + ; echo "\$\$i" | grep "^../" > /dev/null && continue \\\\\\ + ; echo "rm -r \$\$i"; (rm -r "\$\$i") ; done ; rm Makefile +_EOF + cp "$tmp/conftemp.sed" "$SRC/makefile.sed~" ## DEBUGGING + $SED -f $tmp/conftemp.sed Makefile >$SRC/Makefile + if test -f "$SRC/m4_ifval([$2],[$2],[END])" ; then + AC_MSG_NOTICE([extend TOP/Makefile with TOP/m4_ifval([$2],[$2],[END])]) + cat $SRC/END >>$SRC/Makefile + fi ; xxxx="####" + echo "$xxxx CONFIGURATIONS FOR TOPLEVEL MAKEFILE: " >>$SRC/Makefile + # sanity check + if grep '^; echo "MAKE ' $SRC/Makefile >/dev/null ; then + AC_MSG_NOTICE([buggy sed found - it deletes tab in "a" text parts]) + $SED -e '/^@ HOST=/s/^/ /' -e '/^; /s/^/ /' $SRC/Makefile \ + >$SRC/Makefile~ + (test -s $SRC/Makefile~ && mv $SRC/Makefile~ $SRC/Makefile) 2>/dev/null + fi + else + xxxx="\\#\\#\\#\\#" + # echo "/^$xxxx *$ax_enable_builddir_host /d" >$tmp/conftemp.sed + echo "s!^$xxxx [[^|]]* | *$SUB *\$!$xxxx ...... $SUB!" >$tmp/conftemp.sed + $SED -f "$tmp/conftemp.sed" "$SRC/Makefile" >$tmp/mkfile.tmp + cp "$tmp/conftemp.sed" "$SRC/makefiles.sed~" ## DEBUGGING + cp "$tmp/mkfile.tmp" "$SRC/makefiles.out~" ## DEBUGGING + if cmp -s "$SRC/Makefile" "$tmp/mkfile.tmp" 2>/dev/null ; then + AC_MSG_NOTICE([keeping TOP/Makefile from earlier configure]) + rm "$tmp/mkfile.tmp" + else + AC_MSG_NOTICE([reusing TOP/Makefile from earlier configure]) + mv "$tmp/mkfile.tmp" "$SRC/Makefile" + fi + fi + AC_MSG_NOTICE([build in $SUB (HOST=$ax_enable_builddir_host)]) + xxxx="####" + echo "$xxxx" "$ax_enable_builddir_host" "|$SUB" >>$SRC/Makefile + fi +popdef([END])dnl +AS_VAR_POPDEF([SED])dnl +AS_VAR_POPDEF([AUX])dnl +AS_VAR_POPDEF([SRC])dnl +AS_VAR_POPDEF([TOP])dnl +AS_VAR_POPDEF([SUB])dnl +],[dnl +ax_enable_builddir_srcdir="$srcdir" # $srcdir +ax_enable_builddir_host="$HOST" # $HOST / $host +ax_enable_builddir_version="$VERSION" # $VERSION +ax_enable_builddir_package="$PACKAGE" # $PACKAGE +ax_enable_builddir_auxdir="$ax_enable_builddir_auxdir" # $AUX +ax_enable_builddir_sed="$ax_enable_builddir_sed" # $SED +ax_enable_builddir="$ax_enable_builddir" # $SUB +])dnl +]) diff --git a/m4/common/ax_prog_doxygen.m4 b/m4/common/ax_prog_doxygen.m4 new file mode 100644 index 000000000..458e3a633 --- /dev/null +++ b/m4/common/ax_prog_doxygen.m4 @@ -0,0 +1,536 @@ +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/ax_prog_doxygen.html +# =========================================================================== +# +# SYNOPSIS +# +# DX_INIT_DOXYGEN(PROJECT-NAME, DOXYFILE-PATH, [OUTPUT-DIR]) +# DX_DOXYGEN_FEATURE(ON|OFF) +# DX_DOT_FEATURE(ON|OFF) +# DX_HTML_FEATURE(ON|OFF) +# DX_CHM_FEATURE(ON|OFF) +# DX_CHI_FEATURE(ON|OFF) +# DX_MAN_FEATURE(ON|OFF) +# DX_RTF_FEATURE(ON|OFF) +# DX_XML_FEATURE(ON|OFF) +# DX_PDF_FEATURE(ON|OFF) +# DX_PS_FEATURE(ON|OFF) +# +# DESCRIPTION +# +# The DX_*_FEATURE macros control the default setting for the given +# Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for +# generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML +# help (for MS users), 'CHI' for generating a seperate .chi file by the +# .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate +# output formats. The environment variable DOXYGEN_PAPER_SIZE may be +# specified to override the default 'a4wide' paper size. +# +# By default, HTML, PDF and PS documentation is generated as this seems to +# be the most popular and portable combination. MAN pages created by +# Doxygen are usually problematic, though by picking an appropriate subset +# and doing some massaging they might be better than nothing. CHM and RTF +# are specific for MS (note that you can't generate both HTML and CHM at +# the same time). The XML is rather useless unless you apply specialized +# post-processing to it. +# +# The macros mainly control the default state of the feature. The use can +# override the default by specifying --enable or --disable. The macros +# ensure that contradictory flags are not given (e.g., +# --enable-doxygen-html and --enable-doxygen-chm, +# --enable-doxygen-anything with --disable-doxygen, etc.) Finally, each +# feature will be automatically disabled (with a warning) if the required +# programs are missing. +# +# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN +# with the following parameters: a one-word name for the project for use +# as a filename base etc., an optional configuration file name (the +# default is 'Doxyfile', the same as Doxygen's default), and an optional +# output directory name (the default is 'doxygen-doc'). +# +# Automake Support +# +# The following is a template aminclude.am file for use with Automake. +# Make targets and variables values are controlled by the various +# DX_COND_* conditionals set by autoconf. +# +# The provided targets are: +# +# doxygen-doc: Generate all doxygen documentation. +# +# doxygen-run: Run doxygen, which will generate some of the +# documentation (HTML, CHM, CHI, MAN, RTF, XML) +# but will not do the post processing required +# for the rest of it (PS, PDF, and some MAN). +# +# doxygen-man: Rename some doxygen generated man pages. +# +# doxygen-ps: Generate doxygen PostScript documentation. +# +# doxygen-pdf: Generate doxygen PDF documentation. +# +# Note that by default these are not integrated into the automake targets. +# If doxygen is used to generate man pages, you can achieve this +# integration by setting man3_MANS to the list of man pages generated and +# then adding the dependency: +# +# $(man3_MANS): doxygen-doc +# +# This will cause make to run doxygen and generate all the documentation. +# +# The following variable is intended for use in Makefile.am: +# +# DX_CLEANFILES = everything to clean. +# +# Then add this variable to MOSTLYCLEANFILES. +# +# ----- begin aminclude.am ------------------------------------- +# +# ## --------------------------------- ## +# ## Format-independent Doxygen rules. ## +# ## --------------------------------- ## +# +# if DX_COND_doc +# +# ## ------------------------------- ## +# ## Rules specific for HTML output. ## +# ## ------------------------------- ## +# +# if DX_COND_html +# +# DX_CLEAN_HTML = @DX_DOCDIR@/html +# +# endif DX_COND_html +# +# ## ------------------------------ ## +# ## Rules specific for CHM output. ## +# ## ------------------------------ ## +# +# if DX_COND_chm +# +# DX_CLEAN_CHM = @DX_DOCDIR@/chm +# +# if DX_COND_chi +# +# DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi +# +# endif DX_COND_chi +# +# endif DX_COND_chm +# +# ## ------------------------------ ## +# ## Rules specific for MAN output. ## +# ## ------------------------------ ## +# +# if DX_COND_man +# +# DX_CLEAN_MAN = @DX_DOCDIR@/man +# +# endif DX_COND_man +# +# ## ------------------------------ ## +# ## Rules specific for RTF output. ## +# ## ------------------------------ ## +# +# if DX_COND_rtf +# +# DX_CLEAN_RTF = @DX_DOCDIR@/rtf +# +# endif DX_COND_rtf +# +# ## ------------------------------ ## +# ## Rules specific for XML output. ## +# ## ------------------------------ ## +# +# if DX_COND_xml +# +# DX_CLEAN_XML = @DX_DOCDIR@/xml +# +# endif DX_COND_xml +# +# ## ----------------------------- ## +# ## Rules specific for PS output. ## +# ## ----------------------------- ## +# +# if DX_COND_ps +# +# DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps +# +# DX_PS_GOAL = doxygen-ps +# +# doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps +# +# @DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag +# cd @DX_DOCDIR@/latex; \ +# rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ +# $(DX_LATEX) refman.tex; \ +# $(MAKEINDEX_PATH) refman.idx; \ +# $(DX_LATEX) refman.tex; \ +# countdown=5; \ +# while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ +# refman.log > /dev/null 2>&1 \ +# && test $$countdown -gt 0; do \ +# $(DX_LATEX) refman.tex; \ +# countdown=`expr $$countdown - 1`; \ +# done; \ +# $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi +# +# endif DX_COND_ps +# +# ## ------------------------------ ## +# ## Rules specific for PDF output. ## +# ## ------------------------------ ## +# +# if DX_COND_pdf +# +# DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf +# +# DX_PDF_GOAL = doxygen-pdf +# +# doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf +# +# @DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag +# cd @DX_DOCDIR@/latex; \ +# rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ +# $(DX_PDFLATEX) refman.tex; \ +# $(DX_MAKEINDEX) refman.idx; \ +# $(DX_PDFLATEX) refman.tex; \ +# countdown=5; \ +# while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ +# refman.log > /dev/null 2>&1 \ +# && test $$countdown -gt 0; do \ +# $(DX_PDFLATEX) refman.tex; \ +# countdown=`expr $$countdown - 1`; \ +# done; \ +# mv refman.pdf ../@PACKAGE@.pdf +# +# endif DX_COND_pdf +# +# ## ------------------------------------------------- ## +# ## Rules specific for LaTeX (shared for PS and PDF). ## +# ## ------------------------------------------------- ## +# +# if DX_COND_latex +# +# DX_CLEAN_LATEX = @DX_DOCDIR@/latex +# +# endif DX_COND_latex +# +# .PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) +# +# .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) +# +# doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag +# +# doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) +# +# @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) +# rm -rf @DX_DOCDIR@ +# $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) +# +# DX_CLEANFILES = \ +# @DX_DOCDIR@/@PACKAGE@.tag \ +# -r \ +# $(DX_CLEAN_HTML) \ +# $(DX_CLEAN_CHM) \ +# $(DX_CLEAN_CHI) \ +# $(DX_CLEAN_MAN) \ +# $(DX_CLEAN_RTF) \ +# $(DX_CLEAN_XML) \ +# $(DX_CLEAN_PS) \ +# $(DX_CLEAN_PDF) \ +# $(DX_CLEAN_LATEX) +# +# endif DX_COND_doc +# +# ----- end aminclude.am --------------------------------------- +# +# LICENSE +# +# Copyright (c) 2009 Oren Ben-Kiki +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +## ----------## +## Defaults. ## +## ----------## + +DX_ENV="" +AC_DEFUN([DX_FEATURE_doc], ON) +AC_DEFUN([DX_FEATURE_dot], ON) +AC_DEFUN([DX_FEATURE_man], OFF) +AC_DEFUN([DX_FEATURE_html], ON) +AC_DEFUN([DX_FEATURE_chm], OFF) +AC_DEFUN([DX_FEATURE_chi], OFF) +AC_DEFUN([DX_FEATURE_rtf], OFF) +AC_DEFUN([DX_FEATURE_xml], OFF) +AC_DEFUN([DX_FEATURE_pdf], ON) +AC_DEFUN([DX_FEATURE_ps], ON) + +## --------------- ## +## Private macros. ## +## --------------- ## + +# DX_ENV_APPEND(VARIABLE, VALUE) +# ------------------------------ +# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen. +AC_DEFUN([DX_ENV_APPEND], [AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])]) + +# DX_DIRNAME_EXPR +# --------------- +# Expand into a shell expression prints the directory part of a path. +AC_DEFUN([DX_DIRNAME_EXPR], + [[expr ".$1" : '\(\.\)[^/]*$' \| "x$1" : 'x\(.*\)/[^/]*$']]) + +# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) +# ------------------------------------- +# Expands according to the M4 (static) status of the feature. +AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) + +# DX_REQUIRE_PROG(VARIABLE, PROGRAM) +# ---------------------------------- +# Require the specified program to be found for the DX_CURRENT_FEATURE to work. +AC_DEFUN([DX_REQUIRE_PROG], [ +AC_PATH_TOOL([$1], [$2]) +if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then + AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) + AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +fi +]) + +# DX_TEST_FEATURE(FEATURE) +# ------------------------ +# Expand to a shell expression testing whether the feature is active. +AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) + +# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) +# ------------------------------------------------- +# Verify that a required features has the right state before trying to turn on +# the DX_CURRENT_FEATURE. +AC_DEFUN([DX_CHECK_DEPEND], [ +test "$DX_FLAG_$1" = "$2" \ +|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, + requires, contradicts) doxygen-DX_CURRENT_FEATURE]) +]) + +# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) +# ---------------------------------------------------------- +# Turn off the DX_CURRENT_FEATURE if the required feature is off. +AC_DEFUN([DX_CLEAR_DEPEND], [ +test "$DX_FLAG_$1" = "$2" || AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +]) + +# DX_FEATURE_ARG(FEATURE, DESCRIPTION, +# CHECK_DEPEND, CLEAR_DEPEND, +# REQUIRE, DO-IF-ON, DO-IF-OFF) +# -------------------------------------------- +# Parse the command-line option controlling a feature. CHECK_DEPEND is called +# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), +# otherwise CLEAR_DEPEND is called to turn off the default state if a required +# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional +# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and +# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature. +AC_DEFUN([DX_ARG_ABLE], [ + AC_DEFUN([DX_CURRENT_FEATURE], [$1]) + AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2]) + AC_ARG_ENABLE(doxygen-$1, + [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1], + [--enable-doxygen-$1]), + DX_IF_FEATURE([$1], [don't $2], [$2]))], + [ +case "$enableval" in +#( +y|Y|yes|Yes|YES) + AC_SUBST([DX_FLAG_$1], 1) + $3 +;; #( +n|N|no|No|NO) + AC_SUBST([DX_FLAG_$1], 0) +;; #( +*) + AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1]) +;; +esac +], [ +AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)]) +$4 +]) +if DX_TEST_FEATURE([$1]); then + $5 + : +fi +if DX_TEST_FEATURE([$1]); then + AM_CONDITIONAL(DX_COND_$1, :) + $6 + : +else + AM_CONDITIONAL(DX_COND_$1, false) + $7 + : +fi +]) + +## -------------- ## +## Public macros. ## +## -------------- ## + +# DX_XXX_FEATURE(DEFAULT_STATE) +# ----------------------------- +AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc], [$1])]) +AC_DEFUN([DX_MAN_FEATURE], [AC_DEFUN([DX_FEATURE_man], [$1])]) +AC_DEFUN([DX_HTML_FEATURE], [AC_DEFUN([DX_FEATURE_html], [$1])]) +AC_DEFUN([DX_CHM_FEATURE], [AC_DEFUN([DX_FEATURE_chm], [$1])]) +AC_DEFUN([DX_CHI_FEATURE], [AC_DEFUN([DX_FEATURE_chi], [$1])]) +AC_DEFUN([DX_RTF_FEATURE], [AC_DEFUN([DX_FEATURE_rtf], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_PDF_FEATURE], [AC_DEFUN([DX_FEATURE_pdf], [$1])]) +AC_DEFUN([DX_PS_FEATURE], [AC_DEFUN([DX_FEATURE_ps], [$1])]) + +# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR]) +# --------------------------------------------------------- +# PROJECT also serves as the base name for the documentation files. +# The default CONFIG-FILE is "Doxyfile" and OUTPUT-DOC-DIR is "doxygen-doc". +AC_DEFUN([DX_INIT_DOXYGEN], [ + +# Files: +AC_SUBST([DX_PROJECT], [$1]) +AC_SUBST([DX_CONFIG], [ifelse([$2], [], Doxyfile, [$2])]) +AC_SUBST([DX_DOCDIR], [ifelse([$3], [], doxygen-doc, [$3])]) + +# Environment variables used inside doxygen.cfg: +DX_ENV_APPEND(SRCDIR, $srcdir) +DX_ENV_APPEND(PROJECT, $DX_PROJECT) +DX_ENV_APPEND(DOCDIR, $DX_DOCDIR) +DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) + +# Additional variables for PECOS dev environment: +DX_ENV_APPEND(BUILDDATE,$BUILD_DATE) +DX_ENV_APPEND(BUILDHOST,$BUILD_HOST) +DX_ENV_APPEND(BUILDUSER,$USER) +DX_ENV_APPEND(BUILDDIR,$srcdir) + +# Doxygen itself: +DX_ARG_ABLE(doc, [generate any doxygen documentation], + [], + [], + [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen) + DX_REQUIRE_PROG([DX_PERL], perl)], + [DX_ENV_APPEND(PERL_PATH, $DX_PERL)]) + +# Dot for graphics: +DX_ARG_ABLE(dot, [generate graphics for doxygen documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_DOT], dot)], + [DX_ENV_APPEND(HAVE_DOT, YES) + DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])], + [DX_ENV_APPEND(HAVE_DOT, NO)]) + +# Man pages generation: +DX_ARG_ABLE(man, [generate doxygen manual pages], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_MAN, YES)], + [DX_ENV_APPEND(GENERATE_MAN, NO)]) + +# RTF file generation: +DX_ARG_ABLE(rtf, [generate doxygen RTF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_RTF, YES)], + [DX_ENV_APPEND(GENERATE_RTF, NO)]) + +# XML file generation: +DX_ARG_ABLE(xml, [generate doxygen XML documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_XML, YES)], + [DX_ENV_APPEND(GENERATE_XML, NO)]) + +# (Compressed) HTML help generation: +DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_HHC], hhc)], + [DX_ENV_APPEND(HHC_PATH, $DX_HHC) + DX_ENV_APPEND(GENERATE_HTML, YES) + DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], + [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) + +# Seperate CHI file generation. +DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file], + [DX_CHECK_DEPEND(chm, 1)], + [DX_CLEAR_DEPEND(chm, 1)], + [], + [DX_ENV_APPEND(GENERATE_CHI, YES)], + [DX_ENV_APPEND(GENERATE_CHI, NO)]) + +# Plain HTML pages generation: +DX_ARG_ABLE(html, [generate doxygen plain HTML documentation], + [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)], + [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)], + [], + [DX_ENV_APPEND(GENERATE_HTML, YES)], + [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)]) + +# PostScript file generation: +DX_ARG_ABLE(ps, [generate doxygen PostScript documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_LATEX], latex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_DVIPS], dvips) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# PDF file generation: +DX_ARG_ABLE(pdf, [generate doxygen PDF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# LaTeX generation for PS and/or PDF: +if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then + AM_CONDITIONAL(DX_COND_latex, :) + DX_ENV_APPEND(GENERATE_LATEX, YES) +else + AM_CONDITIONAL(DX_COND_latex, false) + DX_ENV_APPEND(GENERATE_LATEX, NO) +fi + +# Paper size for PS and/or PDF: +AC_ARG_VAR(DOXYGEN_PAPER_SIZE, + [a4wide (default), a4, letter, legal or executive]) +case "$DOXYGEN_PAPER_SIZE" in +#( +"") + AC_SUBST(DOXYGEN_PAPER_SIZE, "") +;; #( +a4wide|a4|letter|legal|executive) + DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE) +;; #( +*) + AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE']) +;; +esac + +#For debugging: +#echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_dot=$DX_FLAG_dot +#echo DX_FLAG_man=$DX_FLAG_man +#echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_chm=$DX_FLAG_chm +#echo DX_FLAG_chi=$DX_FLAG_chi +#echo DX_FLAG_rtf=$DX_FLAG_rtf +#echo DX_FLAG_xml=$DX_FLAG_xml +#echo DX_FLAG_pdf=$DX_FLAG_pdf +#echo DX_FLAG_ps=$DX_FLAG_ps +#echo DX_ENV=$DX_ENV +]) diff --git a/m4/common/ax_split_version.m4 b/m4/common/ax_split_version.m4 new file mode 100644 index 000000000..02737c392 --- /dev/null +++ b/m4/common/ax_split_version.m4 @@ -0,0 +1,38 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_split_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SPLIT_VERSION +# +# DESCRIPTION +# +# Splits a version number in the format MAJOR.MINOR.POINT into its +# separate components. +# +# Sets the variables. +# +# LICENSE +# +# Copyright (c) 2008 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_SPLIT_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AX_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'` + AX_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + AX_POINT_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'` + AC_MSG_CHECKING([Major version]) + AC_MSG_RESULT([$AX_MAJOR_VERSION]) + AC_MSG_CHECKING([Minor version]) + AC_MSG_RESULT([$AX_MINOR_VERSION]) + AC_MSG_CHECKING([Point version]) + AC_MSG_RESULT([$AX_POINT_VERSION]) +]) diff --git a/m4/config_summary.m4 b/m4/config_summary.m4 new file mode 100644 index 000000000..c1e691adc --- /dev/null +++ b/m4/config_summary.m4 @@ -0,0 +1,46 @@ +# SYNOPSIS +# +# Summarizes configuration settings. +# +# AX_SUMMARIZE_CONFIG([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# Outputs a summary of relevant configuration settings. +# +# LAST MODIFICATION +# +# $Id: config_summary.m4 22758 2011-08-05 22:05:54Z nick $ +# + +AC_DEFUN([AX_SUMMARIZE_CONFIG], +[ + +echo +echo '----------------------------------- SUMMARY -----------------------------------' +echo +echo Package version................. : $PACKAGE-$VERSION +echo +echo C++ compiler.................... : $CXX +echo C++ compiler flags.............. : $CXXFLAGS +echo C compiler...................... : $CC +echo C compiler flags................ : $CFLAGS +echo Fortran compiler................ : $FC +echo Fortran compiler flags.......... : $FCFLAGS +echo Install dir..................... : $prefix +echo Build user...................... : $USER +echo Build host...................... : $BUILD_HOST +echo Configure date.................. : $BUILD_DATE +echo Build architecture.............. : $BUILD_ARCH +echo SVN revision number............. : $BUILD_VERSION +echo +echo +echo '-------------------------------------------------------------------------------' + +echo +echo Configure complete, now type \'make\' and then \'make install\'. +echo +echo To verify your verification library, type \'make check\' +echo to run a suite of regression tests. + +]) diff --git a/test_problems/ChemEquil_gri_matrix/Makefile.am b/test_problems/ChemEquil_gri_matrix/Makefile.am new file mode 100644 index 000000000..a721a0195 --- /dev/null +++ b/test_problems/ChemEquil_gri_matrix/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = gri_matrix.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = gri_matrix +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +gri_matrix_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/ChemEquil_gri_pairs/Makefile.am b/test_problems/ChemEquil_gri_pairs/Makefile.am new file mode 100644 index 000000000..d8f17cfb2 --- /dev/null +++ b/test_problems/ChemEquil_gri_pairs/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = gri_pairs.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = gri_pairs +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +gri_pairs_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/ChemEquil_gri_pairs/runtest b/test_problems/ChemEquil_gri_pairs/runtest new file mode 100755 index 000000000..bf30f8fa3 --- /dev/null +++ b/test_problems/ChemEquil_gri_pairs/runtest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./gri_pairs > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "gri_pairs returned with bad status, $retnStat, check output" +fi + +../../bin/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on ChemEquil_gri_pairs test" + return 0 +else + echo "unsuccessful diff comparison on ChemEquil_gri_pairs test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/ChemEquil_ionizedGas/Makefile.am b/test_problems/ChemEquil_ionizedGas/Makefile.am new file mode 100644 index 000000000..fed67a386 --- /dev/null +++ b/test_problems/ChemEquil_ionizedGas/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = ionizedGasEquil.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = ionizedGasEquil +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +ionizedGasEquil_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/ChemEquil_ionizedGas/runtest b/test_problems/ChemEquil_ionizedGas/runtest new file mode 100755 index 000000000..aa1633138 --- /dev/null +++ b/test_problems/ChemEquil_ionizedGas/runtest @@ -0,0 +1,52 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt table.csv diff_out.txt diff_csv.txt +testName="ChemEquil_ionizedGas" + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./ionizedGasEquil > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="1" + echo "ERROR: $testName: ionizedGasEquil returned with bad status, $retnStat, check output" +fi + +diff -w output.txt output_blessed.txt > diff_out.txt +retnStat_txt=$? +${CANTERA_BIN}/csvdiff -a 1.0E-19 table.csv table_blessed.csv > diff_csv.txt +retnStat_csv=$? + +eCode=1 +if test $retnStat_csv = "0" +then + eCode=0 + echo "Successful test comparison on " $testName + if [ $retnStat_txt != "0" ] + then + echo " But, text output files have differences. See diff_out.txt" + return 1 + fi +else + echo "Unsuccessful test comparison on " $testName " test" + if test $retnStat_csv != "1" + then + echo " csv files are different - see diff_csv.txt" + return 1 + fi + if test $retnStat_txt != "0" + then + echo " And, text output files have differences. See diff_out.txt" + return 1 + fi +fi +# +# +exit 0 diff --git a/test_problems/ChemEquil_red1/Makefile.am b/test_problems/ChemEquil_red1/Makefile.am new file mode 100644 index 000000000..cf76ee85f --- /dev/null +++ b/test_problems/ChemEquil_red1/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = basopt_red1.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = basopt_red1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +basopt_red1_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/CpJump/Makefile.am b/test_problems/CpJump/Makefile.am new file mode 100644 index 000000000..8c631190b --- /dev/null +++ b/test_problems/CpJump/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = CpJump.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = CpJump +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +CpJump_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/Makefile.am b/test_problems/Makefile.am new file mode 100644 index 000000000..9d9eceb04 --- /dev/null +++ b/test_problems/Makefile.am @@ -0,0 +1,20 @@ + +SUBDIRS = cathermo mixGasTransport ChemEquil_gri_matrix ChemEquil_gri_pairs +SUBDIRS += ChemEquil_ionizedGas ChemEquil_red1 CpJump cxx_ex diamondSurf +SUBDIRS += diamondSurf_dupl fracCoeff multiGasTransport NASA9poly_test +SUBDIRS += negATest printUtilUnitTest pureFluidTest silane_equil +SUBDIRS += spectroscopy surfkin surfSolverTest VPsilane_test +SUBDIRS += VCSnonideal + +# skipped (uses ck2cti or python): +# ck2cti_test +# nasa9_reader (uses ck2cti) +# python +# rankine_democxx +# VCSnonideal (unsure of problem) + +EXTRA_DIST = + +dist-hook: + rm -rf `find $(distdir)/ -name .svn` + rm -rf `find $(distdir)/ -name .deps` \ No newline at end of file diff --git a/test_problems/NASA9poly_test/Makefile.am b/test_problems/NASA9poly_test/Makefile.am new file mode 100644 index 000000000..2861aa81d --- /dev/null +++ b/test_problems/NASA9poly_test/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = NASA9poly_test.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = NASA9poly_test +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +NASA9poly_test_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/VCSnonideal/Makefile.am b/test_problems/VCSnonideal/Makefile.am new file mode 100644 index 000000000..ce5c90005 --- /dev/null +++ b/test_problems/VCSnonideal/Makefile.am @@ -0,0 +1 @@ +#SUBDIRS = NaCl_equil \ No newline at end of file diff --git a/test_problems/VCSnonideal/NaCl_equil/Makefile.am b/test_problems/VCSnonideal/NaCl_equil/Makefile.am new file mode 100644 index 000000000..8906088b8 --- /dev/null +++ b/test_problems/VCSnonideal/NaCl_equil/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = nacl_equil.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = nacl_equil +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +nacl_equil_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/VPsilane_test/Makefile.am b/test_problems/VPsilane_test/Makefile.am new file mode 100644 index 000000000..efdc073c5 --- /dev/null +++ b/test_problems/VPsilane_test/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = silane_equil.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS =VPsilane_test +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +VPsilane_test_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/VPsilane_test/runtest b/test_problems/VPsilane_test/runtest new file mode 100755 index 000000000..ebace70ee --- /dev/null +++ b/test_problems/VPsilane_test/runtest @@ -0,0 +1,41 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +doDebug=@CANTERA_DEBUG_MODE@ +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./VPsilane_test > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "VPsilane_test returned with bad status, $retnStat, check output" +fi + +if test "x$doDebug" = "x1" +then +diff -w output.txt output_debug_blessed.txt > diff_test.out +retnStat=$? +else +diff -w output.txt output_blessed.txt > diff_test.out +retnStat=$? + +fi +if [ $retnStat = "0" ] +then + echo "successful diff comparison on VPsilane_test test" + return 0 +else + echo "unsuccessful diff comparison on VPsilane_test test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp index b67332ccd..878f4eeaa 100644 --- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp @@ -11,12 +11,13 @@ #include "kernel/logger.h" #include "kernel/DebyeHuckel.h" #endif - #include using namespace std; using namespace Cantera; +typedef double doublereal; + class fileLog: public Logger { public: fileLog(string fName) { diff --git a/test_problems/cathermo/DH_graph_1/Makefile.am b/test_problems/cathermo/DH_graph_1/Makefile.am new file mode 100644 index 000000000..7a05008fd --- /dev/null +++ b/test_problems/cathermo/DH_graph_1/Makefile.am @@ -0,0 +1,24 @@ +cc_sources = DH_graph_1.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = DH_graph_1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +DH_graph_1_SOURCES = $(cc_sources) + + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/DH_graph_1/runtest b/test_problems/cathermo/DH_graph_1/runtest new file mode 100755 index 000000000..9a6a5043d --- /dev/null +++ b/test_problems/cathermo/DH_graph_1/runtest @@ -0,0 +1,53 @@ +#!/bin/sh +# +# run_test +# +########################################################################## +# A couple of validity checks +if test ! $# -eq 0 ; then + echo 'usage: runtest' + echo ' ' + exit -1 +fi + +temp_success="0" +/bin/rm -f output.txt outputa.txt +########################################################################## +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} + +prog=DH_graph_1 +if test ! -x $prog ; then + echo $prog ' does not exist' + exit -1 +fi +########################################################################## +/bin/rm -f test.out test.diff DH_graph_1.csv + +# echo 'Testing the DH dilute act calculation - act vs I' +./$prog DH_NaCl_dilute.xml > DH_graph_1.csv +retnStat=$? +diff DH_graph_1.csv DH_NaCl_dilute_blessed.csv > diff.out +zres=$? +if test "$zres" = "0" -a "$retnStat" = "0"; then + echo "successful diff comparison on $prog dilute test" +else + echo "unsuccessful diff comparison on $prog dilute test" + temp_success="1" + if [ $retnStat != "0" ] + then + echo "$prog returned with bad status, $retnStat, check output" + fi +fi + + + +########################################################################## +if test $temp_success = "0" ; then + echo "PASSED" > csvCode.txt + return 0 +else + echo "FAILED" > csvCode.txt + return 1 +fi diff --git a/test_problems/cathermo/DH_graph_NM/Makefile.am b/test_problems/cathermo/DH_graph_NM/Makefile.am new file mode 100644 index 000000000..1182f8991 --- /dev/null +++ b/test_problems/cathermo/DH_graph_NM/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = DH_graph_1.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = DH_graph_1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +DH_graph_1_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/DH_graph_NM/runtest b/test_problems/cathermo/DH_graph_NM/runtest new file mode 100755 index 000000000..420212925 --- /dev/null +++ b/test_problems/cathermo/DH_graph_NM/runtest @@ -0,0 +1,42 @@ +#!/bin/sh +# +# run_test +# +########################################################################## +# A couple of validity checks +if test ! $# -eq 0 ; then + echo 'usage: runtest' + echo ' ' + exit -1 +fi + +temp_success="0" +/bin/rm -f output.txt outputa.txt +########################################################################## +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} + +prog=DH_graph_1 +if test ! -x $prog ; then + echo $prog ' does not exist' + exit -1 +fi + +########################################################################## +/bin/rm -f test.out test.diff DH_NaCl_NM.csv + +./$prog DH_NaCl_NM.xml > DH_NaCl_NM.csv +retnStat=$? +diff DH_NaCl_NM.csv DH_NaCl_NM_blessed.csv > output.txt +zres=$? +if test "$zres" = "0" -a "$retnStat" = "0"; then + echo "successful diff comparison on $prog NM test" + return 0 +else + echo "unsuccessful diff comparison on $prog NM test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/DH_graph_Pitzer/Makefile.am b/test_problems/cathermo/DH_graph_Pitzer/Makefile.am new file mode 100644 index 000000000..1182f8991 --- /dev/null +++ b/test_problems/cathermo/DH_graph_Pitzer/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = DH_graph_1.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = DH_graph_1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +DH_graph_1_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/DH_graph_Pitzer/runtest b/test_problems/cathermo/DH_graph_Pitzer/runtest new file mode 100755 index 000000000..8efb10075 --- /dev/null +++ b/test_problems/cathermo/DH_graph_Pitzer/runtest @@ -0,0 +1,42 @@ +#!/bin/sh +# +# run_test +# +########################################################################## +# A couple of validity checks +if test ! $# -eq 0 ; then + echo 'usage: runtest' + echo ' ' + exit -1 +fi + +temp_success="0" +/bin/rm -f output.txt outputa.txt +########################################################################## +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} + +prog=DH_graph_1 +if test ! -x $prog ; then + echo $prog ' does not exist' + exit -1 +fi + +########################################################################## +/bin/rm -f test.out test.diff DH_NaCl_Pitzer.csv + +./$prog DH_NaCl_Pitzer.xml > DH_NaCl_Pitzer.csv +retnStat=$? +diff DH_NaCl_Pitzer.csv DH_NaCl_Pitzer_blessed.csv > output.txt +zres=$? +if test "$zres" = "0" -a "$retnStat" = "0"; then + echo "successful diff comparison on $prog Pitzer test" + return 0 +else + echo "unsuccessful diff comparison on $prog Pitzer test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/DH_graph_acommon/Makefile.am b/test_problems/cathermo/DH_graph_acommon/Makefile.am new file mode 100644 index 000000000..3b1413de9 --- /dev/null +++ b/test_problems/cathermo/DH_graph_acommon/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = DH_graph_1.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = DH_graph_1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +DH_graph_1_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest \ No newline at end of file diff --git a/test_problems/cathermo/DH_graph_acommon/runtest b/test_problems/cathermo/DH_graph_acommon/runtest new file mode 100755 index 000000000..5d98da1d3 --- /dev/null +++ b/test_problems/cathermo/DH_graph_acommon/runtest @@ -0,0 +1,42 @@ +#!/bin/sh +# +# run_test +# +########################################################################## +# A couple of validity checks +if test ! $# -eq 0 ; then + echo 'usage: runtest' + echo ' ' + exit -1 +fi + +temp_success="0" +/bin/rm -f output.txt outputa.txt +########################################################################## +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} + +prog=DH_graph_1 +if test ! -x $prog ; then + echo $prog ' does not exist' + exit -1 +fi + +########################################################################## +/bin/rm -f test.out test.diff DH_NaCl_acommon.csv + +./$prog DH_NaCl_acommon.xml > DH_NaCl_acommon.csv +retnStat=$? +diff DH_NaCl_acommon.csv DH_NaCl_acommon_blessed.csv > output.txt +zres=$? +if test "$zres" = "0" -a "$retnStat" = "0"; then + echo "successful diff comparison on $prog _acommon test" + return 0 +else + echo "unsuccessful diff comparison on $prog _acommon test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/DH_graph_bdotak/Makefile.am b/test_problems/cathermo/DH_graph_bdotak/Makefile.am new file mode 100644 index 000000000..1182f8991 --- /dev/null +++ b/test_problems/cathermo/DH_graph_bdotak/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = DH_graph_1.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = DH_graph_1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +DH_graph_1_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/DH_graph_bdotak/runtest b/test_problems/cathermo/DH_graph_bdotak/runtest new file mode 100755 index 000000000..e5f3d5cf7 --- /dev/null +++ b/test_problems/cathermo/DH_graph_bdotak/runtest @@ -0,0 +1,42 @@ +#!/bin/sh +# +# run_test +# +########################################################################## +# A couple of validity checks +if test ! $# -eq 0 ; then + echo 'usage: runtest' + echo ' ' + exit -1 +fi + +temp_success="0" +/bin/rm -f output.txt outputa.txt +########################################################################## +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} + +prog=DH_graph_1 +if test ! -x $prog ; then + echo $prog ' does not exist' + exit -1 +fi + +########################################################################## +/bin/rm -f test.out test.diff DH_NaCl_bdotak.csv + +./$prog DH_NaCl_bdotak.xml > DH_NaCl_bdotak.csv +retnStat=$? +diff DH_NaCl_bdotak.csv DH_NaCl_bdotak_blessed.csv > output.txt +zres=$? +if test "$zres" = "0" -a "$retnStat" = "0"; then + echo "successful diff comparison on $prog bdotak test" + return 0 +else + echo "unsuccessful diff comparison on $prog bdotak test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/HMW_dupl_test/Makefile.am b/test_problems/cathermo/HMW_dupl_test/Makefile.am new file mode 100644 index 000000000..eed80551d --- /dev/null +++ b/test_problems/cathermo/HMW_dupl_test/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_dupl_test.cpp sortAlgorithms.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = HMW_dupl_test +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_dupl_test_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/HMW_dupl_test/runtest b/test_problems/cathermo/HMW_dupl_test/runtest new file mode 100755 index 000000000..522e697ea --- /dev/null +++ b/test_problems/cathermo/HMW_dupl_test/runtest @@ -0,0 +1,44 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +########################################################################## +prog=HMW_dupl_test +if test ! -x $prog ; then + echo $prog ' does not exist' + exit -1 +fi +########################################################################## +/bin/rm -f test.out test.diff output.txt + +################################################################# +# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA +CANTERA_BIN=${CANTERA_BIN:=../../../bin} + +################################################################# + +./$prog HMW_NaCl_sp1977_alt.xml > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$prog returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $prog test" + return 0 +else + echo "unsuccessful diff comparison on $prog test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/HMW_graph_CpvT/Makefile.am b/test_problems/cathermo/HMW_graph_CpvT/Makefile.am new file mode 100644 index 000000000..84f0e807e --- /dev/null +++ b/test_problems/cathermo/HMW_graph_CpvT/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_graph_CpvT.cpp sortAlgorithms.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = HMW_graph_CpvT +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_graph_CpvT_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/HMW_graph_GvI/Makefile.am b/test_problems/cathermo/HMW_graph_GvI/Makefile.am new file mode 100644 index 000000000..7dd653144 --- /dev/null +++ b/test_problems/cathermo/HMW_graph_GvI/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_graph_GvI.cpp sortAlgorithms.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = HMW_graph_GvI +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_graph_GvI_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/HMW_graph_GvT/Makefile.am b/test_problems/cathermo/HMW_graph_GvT/Makefile.am new file mode 100644 index 000000000..242b39ef5 --- /dev/null +++ b/test_problems/cathermo/HMW_graph_GvT/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_graph_GvT.cpp sortAlgorithms.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = HMW_graph_GvT +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_graph_GvT_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.am b/test_problems/cathermo/HMW_graph_HvT/Makefile.am new file mode 100644 index 000000000..1bae5df66 --- /dev/null +++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_graph_HvT.cpp sortAlgorithms.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = HMW_graph_HvT +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_graph_HvT_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.am b/test_problems/cathermo/HMW_graph_VvT/Makefile.am new file mode 100644 index 000000000..7cccd4a33 --- /dev/null +++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_graph_VvT.cpp sortAlgorithms.cpp + +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++ +LIBS = $(LINK) +AM_LDFLAGS = -L$(top_builddir)/build/lib/ + +bin_PROGRAMS = HMW_graph_VvT +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_graph_VvT_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/HMW_test_1/Makefile.am b/test_problems/cathermo/HMW_test_1/Makefile.am new file mode 100644 index 000000000..c02a37977 --- /dev/null +++ b/test_problems/cathermo/HMW_test_1/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_test_1.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = HMW_test_1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_test_1_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/HMW_test_3/Makefile.am b/test_problems/cathermo/HMW_test_3/Makefile.am new file mode 100644 index 000000000..d610dc6b5 --- /dev/null +++ b/test_problems/cathermo/HMW_test_3/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = HMW_test_3.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = HMW_test_3 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +HMW_test_3_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/Makefile.am b/test_problems/cathermo/Makefile.am new file mode 100644 index 000000000..43ebfb83a --- /dev/null +++ b/test_problems/cathermo/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = DH_graph_1 DH_graph_acommon DH_graph_bdotak DH_graph_Pitzer DH_graph_NM HMW_dupl_test HMW_graph_CpvT +SUBDIRS += HMW_graph_CpvT HMW_graph_GvT HMW_graph_VvT HMW_test_3 HMW_graph_GvI HMW_graph_HvT HMW_test_1 +SUBDIRS += issp/ stoichSubSSTP/ testIAPWSPres/ testWaterPDSS/ VPissp/ +SUBDIRS += ims/ testIAPWS/ testIAPWSTripP/ testWaterTP/ wtWater/ diff --git a/test_problems/cathermo/VPissp/Makefile.am b/test_problems/cathermo/VPissp/Makefile.am new file mode 100644 index 000000000..0a5e76384 --- /dev/null +++ b/test_problems/cathermo/VPissp/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = ISSPTester.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = ISSPTester +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +ISSPTester_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/VPissp/runtest b/test_problems/cathermo/VPissp/runtest new file mode 100755 index 000000000..c751b28db --- /dev/null +++ b/test_problems/cathermo/VPissp/runtest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./ISSPTester > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "ISSPTester returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on VPissp test" + return 0 +else + echo "unsuccessful diff comparison on VPissp test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/ims/Makefile.am b/test_problems/cathermo/ims/Makefile.am new file mode 100644 index 000000000..5df20349f --- /dev/null +++ b/test_problems/cathermo/ims/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = IMSTester.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = IMSTester +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +IMSTester_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/ims/runtest b/test_problems/cathermo/ims/runtest new file mode 100755 index 000000000..cbbd54163 --- /dev/null +++ b/test_problems/cathermo/ims/runtest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./IMSTester > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "IMSTester returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on IMSTester test" + return 0 +else + echo "unsuccessful diff comparison on IMSTester test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/issp/Makefile.am b/test_problems/cathermo/issp/Makefile.am new file mode 100644 index 000000000..0a5e76384 --- /dev/null +++ b/test_problems/cathermo/issp/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = ISSPTester.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = ISSPTester +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +ISSPTester_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/issp/runtest b/test_problems/cathermo/issp/runtest new file mode 100755 index 000000000..9e9352e18 --- /dev/null +++ b/test_problems/cathermo/issp/runtest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./ISSPTester > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "ISSPTester returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on issp test" + return 0 +else + echo "unsuccessful diff comparison on issp test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/stoichSubSSTP/Makefile.am b/test_problems/cathermo/stoichSubSSTP/Makefile.am new file mode 100644 index 000000000..a556f78fd --- /dev/null +++ b/test_problems/cathermo/stoichSubSSTP/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = stoichSubSSTP.cpp sortAlgorithms.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = stoichSubSSTP +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +stoichSubSSTP_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/stoichSubSSTP/runtest b/test_problems/cathermo/stoichSubSSTP/runtest new file mode 100755 index 000000000..f127200b3 --- /dev/null +++ b/test_problems/cathermo/stoichSubSSTP/runtest @@ -0,0 +1,44 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +########################################################################## +prog=stoichSubSSTP +if test ! -x $prog ; then + echo $prog ' does not exist' + exit -1 +fi +########################################################################## +/bin/rm -f test.out test.diff output.txt + +################################################################# +# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA +CANTERA_BIN=${CANTERA_BIN:=../../../bin} + +################################################################# + +./$prog > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$prog returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $prog test" + return 0 +else + echo "unsuccessful diff comparison on $prog test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/testIAPWS/Makefile.am b/test_problems/cathermo/testIAPWS/Makefile.am new file mode 100644 index 000000000..7f8c58791 --- /dev/null +++ b/test_problems/cathermo/testIAPWS/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = testIAPWSphi.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = testIAPWSphi +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +testIAPWSphi_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/testIAPWS/runtest b/test_problems/cathermo/testIAPWS/runtest new file mode 100755 index 000000000..6d543ced3 --- /dev/null +++ b/test_problems/cathermo/testIAPWS/runtest @@ -0,0 +1,35 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +testName=testIAPWSphi +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./testIAPWSphi > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/testIAPWSPres/Makefile.am b/test_problems/cathermo/testIAPWSPres/Makefile.am new file mode 100644 index 000000000..cb896d37a --- /dev/null +++ b/test_problems/cathermo/testIAPWSPres/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = testPress.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = testPress +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +testPress_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/testIAPWSPres/runtest b/test_problems/cathermo/testIAPWSPres/runtest new file mode 100755 index 000000000..328ce8373 --- /dev/null +++ b/test_problems/cathermo/testIAPWSPres/runtest @@ -0,0 +1,35 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +testName=testIAPWSPress +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./testPress > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/testIAPWSTripP/Makefile.am b/test_problems/cathermo/testIAPWSTripP/Makefile.am new file mode 100644 index 000000000..f99546fc9 --- /dev/null +++ b/test_problems/cathermo/testIAPWSTripP/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = testTripleP.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = testTripleP +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +testTripleP_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/testIAPWSTripP/runtest b/test_problems/cathermo/testIAPWSTripP/runtest new file mode 100755 index 000000000..be06f912d --- /dev/null +++ b/test_problems/cathermo/testIAPWSTripP/runtest @@ -0,0 +1,35 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +testName=testTripleP +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./testTripleP > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/testWaterPDSS/Makefile.am b/test_problems/cathermo/testWaterPDSS/Makefile.am new file mode 100644 index 000000000..afd2b04a8 --- /dev/null +++ b/test_problems/cathermo/testWaterPDSS/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = testWaterPDSS.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = testWaterPDSS +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +testWaterPDSS_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/testWaterPDSS/runtest b/test_problems/cathermo/testWaterPDSS/runtest new file mode 100755 index 000000000..92855379a --- /dev/null +++ b/test_problems/cathermo/testWaterPDSS/runtest @@ -0,0 +1,35 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +testName=testWaterPDSS +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./testWaterPDSS > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/testWaterTP/Makefile.am b/test_problems/cathermo/testWaterTP/Makefile.am new file mode 100644 index 000000000..60f65d466 --- /dev/null +++ b/test_problems/cathermo/testWaterTP/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = testWaterSSTP.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = testWaterSSTP +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +testWaterSSTP_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/testWaterTP/runtest b/test_problems/cathermo/testWaterTP/runtest new file mode 100755 index 000000000..c6bfcf1cb --- /dev/null +++ b/test_problems/cathermo/testWaterTP/runtest @@ -0,0 +1,35 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +testName=testWaterTP +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./testWaterSSTP > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/cathermo/wtWater/Makefile.am b/test_problems/cathermo/wtWater/Makefile.am new file mode 100644 index 000000000..5fc8f2821 --- /dev/null +++ b/test_problems/cathermo/wtWater/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = wtWater.cpp + +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = wtWater +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +wtWater_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cathermo/wtWater/runtest b/test_problems/cathermo/wtWater/runtest new file mode 100755 index 000000000..76018c121 --- /dev/null +++ b/test_problems/cathermo/wtWater/runtest @@ -0,0 +1,35 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +testName=wtWater +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../../bin} +./wtWater > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/ck2cti_test/Makefile.am b/test_problems/ck2cti_test/Makefile.am new file mode 100644 index 000000000..f54f8002e --- /dev/null +++ b/test_problems/ck2cti_test/Makefile.am @@ -0,0 +1,3 @@ + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/cxx_ex/Makefile.am b/test_problems/cxx_ex/Makefile.am new file mode 100644 index 000000000..1773e7087 --- /dev/null +++ b/test_problems/cxx_ex/Makefile.am @@ -0,0 +1 @@ +TESTS = runtest \ No newline at end of file diff --git a/test_problems/cxx_ex/examples.cpp b/test_problems/cxx_ex/examples.cpp index 6e2034b24..96d1d5af2 100755 --- a/test_problems/cxx_ex/examples.cpp +++ b/test_problems/cxx_ex/examples.cpp @@ -2,8 +2,6 @@ using namespace Cantera; using namespace std; -//#include "ctexceptions.h" - #define NUM_EXAMPLES 6 int kinetics_example1(int job); diff --git a/test_problems/diamondSurf/Makefile.am b/test_problems/diamondSurf/Makefile.am new file mode 100644 index 000000000..4c39cc948 --- /dev/null +++ b/test_problems/diamondSurf/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = runDiamond.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = runDiamond +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +runDiamond_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/diamondSurf_dupl/Makefile.am b/test_problems/diamondSurf_dupl/Makefile.am new file mode 100644 index 000000000..41485a59f --- /dev/null +++ b/test_problems/diamondSurf_dupl/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = runDiamondDupl.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = runDiamondDupl +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +runDiamondDupl_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/fracCoeff/Makefile.am b/test_problems/fracCoeff/Makefile.am new file mode 100644 index 000000000..96c8e3b78 --- /dev/null +++ b/test_problems/fracCoeff/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = fracCoeff.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = fracCoeff +library_includedir = $(INC) + +#----------------------- +# Cantera fraccoeff tests +#----------------------- + +fracCoeff_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/mixGasTransport/Makefile.am b/test_problems/mixGasTransport/Makefile.am new file mode 100644 index 000000000..1d99d54bd --- /dev/null +++ b/test_problems/mixGasTransport/Makefile.am @@ -0,0 +1,24 @@ +cc_sources = mixGasTransport.cpp + +INC = -I. -I$(top_builddir)/build/include/ -g +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = mixGasTransport +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +mixGasTransport_SOURCES = $(cc_sources) + + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/mixGasTransport/runtest b/test_problems/mixGasTransport/runtest new file mode 100755 index 000000000..422ba6580 --- /dev/null +++ b/test_problems/mixGasTransport/runtest @@ -0,0 +1,36 @@ +#!/bin/sh +# +# + +temp_success="1" +/bin/rm -f output.txt outputa.txt +tname="mixGasTransport" +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./mixGasTransport > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$tname ($tname test) returned with bad status, $retnStat, check output" + return 1 +fi + +../../bin/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $tname test" + return 0 +else + echo "unsuccessful diff comparison on $tname test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/multiGasTransport/Makefile.am b/test_problems/multiGasTransport/Makefile.am new file mode 100644 index 000000000..280b44c5c --- /dev/null +++ b/test_problems/multiGasTransport/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = multiGasTransport.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = multiGasTransport +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +multiGasTransport_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/nasa9_reader/Makefile.am b/test_problems/nasa9_reader/Makefile.am new file mode 100644 index 000000000..1773e7087 --- /dev/null +++ b/test_problems/nasa9_reader/Makefile.am @@ -0,0 +1 @@ +TESTS = runtest \ No newline at end of file diff --git a/test_problems/nasa9_reader/runtest b/test_problems/nasa9_reader/runtest new file mode 100755 index 000000000..a7df09c83 --- /dev/null +++ b/test_problems/nasa9_reader/runtest @@ -0,0 +1,43 @@ +#!/bin/sh +# $Id: runtest.in,v 1.1 2007/09/13 15:12:46 hkmoffa Exp $ +# +echo " " +echo "***************************************************" +echo " Testing CK2CTI on NASA9 Thermodynamics : using the build/bin version of ck2cti" +echo "***************************************************" +echo " " +BINDIR=@buildbin@ +CK2CTI=$BINDIR/ck2cti +/bin/rm -f sample.cti +echo "...Test 1: Converting file sample.inp..." +$CK2CTI -i ./sample.inp -id sample -t sampleData.inp +# +# strip out variably dated stuff +# +cat sample.cti | sed '1,5s/^#.*$/#/' > samplea.cti +# +# Change all 3 character exponent expressions starting with 0 +# into 2 character exponent expressions +# (MSVC++ defaults to 3, and I can't figure out how to change +# this behavior). +# +../../bin/exp3to2.sh samplea.cti > sampleb.cti +# +# +diff sampleb.cti sample_blessed.cti > diff_test.out +retnStat=$? +# +if [ $retnStat = "0" ] +then + echo "Successful diff comparison on ck2cti test (nasa9_reader/sample.inp)" + return 0 +else + echo "########################################################" + echo "Unsuccessful diff comparison on ck2cti test (nasa9_reader/sample.inp)" + echo " For more information, see files:" + echo " test_problems/nasa9_reader/diff_test.out" + echo " test_problems/nasa9_reader/sampleb.cti" + echo " test_problems/nasa9_reader/sample_blessed.cti" + echo "########################################################" + return 1 +fi diff --git a/test_problems/negATest/Makefile.am b/test_problems/negATest/Makefile.am new file mode 100644 index 000000000..4bb8ff193 --- /dev/null +++ b/test_problems/negATest/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = negATest.cpp + +INC = -I. -I$(top_builddir)/build/include/ -g +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$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = negATest +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +negATest_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/negATest/runtest b/test_problems/negATest/runtest new file mode 100755 index 000000000..922586252 --- /dev/null +++ b/test_problems/negATest/runtest @@ -0,0 +1,36 @@ +#!/bin/sh +# +# + +temp_success="0" +testName="negATest" +/bin/rm -f output.txt outputa.txt + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./negATest > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="1" + echo "$testName returned with bad status, $retnStat, check output" +fi + +../../bin/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt negATest_blessed.out > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="1" + return 1 +fi +# diff --git a/test_problems/printUtilUnitTest/Makefile.am b/test_problems/printUtilUnitTest/Makefile.am new file mode 100644 index 000000000..7b824815e --- /dev/null +++ b/test_problems/printUtilUnitTest/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = pUtest.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = pUtest +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +pUtest_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/printUtilUnitTest/runtest b/test_problems/printUtilUnitTest/runtest new file mode 100755 index 000000000..4e6b0bf6d --- /dev/null +++ b/test_problems/printUtilUnitTest/runtest @@ -0,0 +1,36 @@ +#!/bin/sh +# +# + +temp_success="1" +/bin/rm -f output.txt outputa.txt +tname="printUtilUnitTest" + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./pUtest > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$tname ($tname test) returned with bad status, $retnStat, check output" +fi + +../../bin/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $tname test" + return 0 +else + echo "unsuccessful diff comparison on $tname test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/pureFluidTest/Makefile.am b/test_problems/pureFluidTest/Makefile.am new file mode 100644 index 000000000..94d5fb54e --- /dev/null +++ b/test_problems/pureFluidTest/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = testPureWater.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = testPureWater +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +testPureWater_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/pureFluidTest/runtest b/test_problems/pureFluidTest/runtest new file mode 100755 index 000000000..5f00f43ef --- /dev/null +++ b/test_problems/pureFluidTest/runtest @@ -0,0 +1,35 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +testName=pureFluidTest_Water +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./testPureWater > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" +fi + +$CANTERA_BIN/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/rankine_democxx/Makefile.am b/test_problems/rankine_democxx/Makefile.am new file mode 100644 index 000000000..2c6362af4 --- /dev/null +++ b/test_problems/rankine_democxx/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = rankine.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = rankine +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +rankine_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/rankine_democxx/runtest b/test_problems/rankine_democxx/runtest new file mode 100755 index 000000000..f25678108 --- /dev/null +++ b/test_problems/rankine_democxx/runtest @@ -0,0 +1,36 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt +testName="rankine" + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:="../../data/inputs"} +export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./rankine > output.txt +retnStat=$? +if test $retnStat != "0" +then + temp_success="0" + echo "$testName returned with bad status, $retnStat, check output" + exit 1 +fi + +diff -w output.txt output_blessed.txt > diff_test.out +retnStat=$? +if test $retnStat = "0" +then + echo "successful diff comparison on $testName test" + return 0 +else + echo "unsuccessful diff comparison on $testName test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/silane_equil/Makefile.am b/test_problems/silane_equil/Makefile.am new file mode 100644 index 000000000..4b8e65eef --- /dev/null +++ b/test_problems/silane_equil/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = silane_equil.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = silane_equil +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +silane_equil_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/silane_equil/runtest b/test_problems/silane_equil/runtest new file mode 100755 index 000000000..b6fcd134f --- /dev/null +++ b/test_problems/silane_equil/runtest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# +temp_success="1" +/bin/rm -f output.txt outputa.txt + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./silane_equil > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "silane_equil returned with bad status, $retnStat, check output" +fi + +../../bin/exp3to2.sh output.txt > outputa.txt +diff -w outputa.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on silane_equil test" + return 0 +else + echo "unsuccessful diff comparison on silane_equil test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/test_problems/spectroscopy/Makefile.am b/test_problems/spectroscopy/Makefile.am new file mode 100644 index 000000000..e6e24fc42 --- /dev/null +++ b/test_problems/spectroscopy/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = spectratest.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = spectroscopy +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +spectroscopy_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = spectroscopy diff --git a/test_problems/spectroscopy/spectratest.cpp b/test_problems/spectroscopy/spectratest.cpp index 7157be329..8c4a55dd1 100644 --- a/test_problems/spectroscopy/spectratest.cpp +++ b/test_problems/spectroscopy/spectratest.cpp @@ -13,6 +13,11 @@ int main() { if (*a == *b) { cout << "a and b and indistinguishable" << endl; } + else + { + cout << "\nwhy are a and b not indistinguishable?\n"; + return 1; + } // test line broading classes double gam = 2.0e0; @@ -32,10 +37,42 @@ int main() { sumg += gaus->profile(nu)*dnu; sum += voig->profile(nu)*dnu; sumlor += lor->profile(nu)*dnu; - cout << nu << ", " << (*lor)(nu) << ", " << (*gaus)(nu) - << ", " << (*voig)(nu) << endl; + //cout << nu << ", " << (*lor)(nu) << ", " << (*gaus)(nu) + // << ", " << (*voig)(nu) << endl; } + + /* old output cout << "Voigt area = " << sum << endl; cout << "Gaussian area = " << sumg << endl; cout << "Lorentzian area = " << sumlor << endl; + */ + + // 'blessed' output: + // Voigt area = 0.99363 + // Gaussian area = 1 + // Lorentzian area = 0.993634 + + // guessing a sane tolerance + double TOL = .0001; + + if(abs(sum-.99363) > TOL) + { + cout << "\nVOIGT AREA REGRESSION TEST FAILURE\n"; + return 1; + } + + if(abs(sumg-1.0) > TOL) + { + cout << "\nGAUSSIAN AREA REGRESSION TEST FAILURE\n"; + return 1; + } + if(abs(sumlor-.993634) > TOL) + { + cout << "\nLORENTZIAN AREA REGRESSION TEST FAILURE\n"; + return 1; + } + + // steady as she goes + return 0; + } diff --git a/test_problems/surfSolverTest/Makefile.am b/test_problems/surfSolverTest/Makefile.am new file mode 100644 index 000000000..c7cf5b769 --- /dev/null +++ b/test_problems/surfSolverTest/Makefile.am @@ -0,0 +1,25 @@ +cc_sources = surfaceSolver.cpp +cc2_sources = surfaceSolver2.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = surfaceSolver surfaceSolver2 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +surfaceSolver_SOURCES = $(cc_sources) +surfaceSolver2_SOURCES = $(cc2_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest runtest2 diff --git a/test_problems/surfSolverTest/runtest b/test_problems/surfSolverTest/runtest new file mode 100755 index 000000000..b54b19154 --- /dev/null +++ b/test_problems/surfSolverTest/runtest @@ -0,0 +1,52 @@ +#!/bin/sh +# +# + +temp_success="1" +/bin/rm -f output.txt diff_test.txt results.txt diff_csv.txt +tname="surfaceSolver" + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./surfaceSolver haca2.xml > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "surfaceSolver ($tname test) returned with bad status, $retnStat, check output" +fi +diff results.txt results_blessed.txt > diff_csv.txt +retnStat_csv=$? + +diff -w output.txt surfaceSolver_blessed.out > diff_out.txt +retnStat_txt=$? + +if test $retnStat_csv = "0" +then + echo "Successful test comparison on "`pwd` + if [ $retnStat_txt != "0" ] + then + echo " But, text output files have differences. See diff_out.txt" + return 1 + fi +else + echo "Unsuccessful test comparison on "`pwd` " test" + if test $retnStat_csv != "0" + then + echo " results files are different - see diff_csv.txt" + return 1 + fi + if test $retnStat_txt != "0" + then + echo " And, text output files have differences. See diff_out.txt" + return 1 + fi +fi + +return 0 + + diff --git a/test_problems/surfSolverTest/runtest2 b/test_problems/surfSolverTest/runtest2 new file mode 100755 index 000000000..304d2cd0c --- /dev/null +++ b/test_problems/surfSolverTest/runtest2 @@ -0,0 +1,51 @@ +#!/bin/sh +# +# + +temp_success="1" +/bin/rm -f output2.txt diff_2test.txt results2.txt +tname="surfaceSolver" + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./surfaceSolver2 haca2.xml > output2.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "surfaceSolver ($tname test) returned with bad status, $retnStat, check output" +fi +diff results2.txt results2_blessed.txt > diff_2csv.txt +retnStat_csv=$? + +diff -w output2.txt surfaceSolver2_blessed.out > diff_2out.txt +retnStat_txt=$? + +if test $retnStat_csv = "0" +then + echo "Successful test comparison on "`pwd` + if [ $retnStat_txt != "0" ] + then + echo " But, text output files have differences. See diff_2out.txt" + return 1 + fi +else + echo "Unsuccessful test comparison on "`pwd` " test" + if test $retnStat_csv != "0" + then + echo " results files are different - see diff_2csv.txt" + return 1 + fi + if test $retnStat_txt != "0" + then + echo " And, text output files have differences. See diff_2out.txt" + return 1 + fi +fi + +return 0 + diff --git a/test_problems/surfkin/Makefile.am b/test_problems/surfkin/Makefile.am new file mode 100644 index 000000000..18d793ea6 --- /dev/null +++ b/test_problems/surfkin/Makefile.am @@ -0,0 +1,23 @@ +cc_sources = surfdemo.cpp + +INC = -I. -I$(top_builddir)/build/include/ +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++ +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = surfdemo +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +surfdemo_SOURCES = $(cc_sources) + +TESTS_ENVIRONMENT = +TESTS = runtest diff --git a/test_problems/surfkin/runtest b/test_problems/surfkin/runtest new file mode 100755 index 000000000..460789937 --- /dev/null +++ b/test_problems/surfkin/runtest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# + +temp_success="1" +/bin/rm -f output.txt + +################################################################# +# +################################################################# +CANTERA_DATA=${CANTERA_DATA:=../../data/inputs}; export CANTERA_DATA + +CANTERA_BIN=${CANTERA_BIN:=../../bin} +./surfdemo > output.txt +retnStat=$? +if [ $retnStat != "0" ] +then + temp_success="0" + echo "surfdemo returned with bad status, $retnStat, check output" +fi + +diff -w output.txt output_blessed.txt > diff_test.out +retnStat=$? +if [ $retnStat = "0" ] +then + echo "successful diff comparison on surfkin test" + return 0 +else + echo "unsuccessful diff comparison on surfkin test" + echo "FAILED" > csvCode.txt + temp_success="0" + return 1 +fi + diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 000000000..5cd375fe0 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = testtools \ No newline at end of file diff --git a/tools/testtools/Makefile.am b/tools/testtools/Makefile.am new file mode 100644 index 000000000..884cf1ef8 --- /dev/null +++ b/tools/testtools/Makefile.am @@ -0,0 +1,15 @@ +cc_sources = csvdiff.cpp mdp_allo.cpp tok_input_util.cpp +h_sources = mdp_allo.h + +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LIBS = $(LINK) +bin_PROGRAMS = $(top_builddir)/bin/csvdiff + +#--------------------------------------- +# Cantera comma sep value differ +#--------------------------------------- + +__top_builddir__bin_csvdiff_SOURCES = $(cc_sources) +