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

[cantera+autotools]: fixing small error in local files

Browse source
This commit is contained in:
Nicholas Malaya 2011-12-09 06:04:37 +00:00
parent 86c3f8dd92
commit 681ed777a8
6 changed files with 26 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cantera/src/oneD/Makefile.am
View file

@ -1,11 +1,9 @@
h_sources = Domain1D.h Inlet1D.h MultiJac.h MultiNewton.h \
OneDim.h refine.h Resid1D.h Sim1D.h Solid1D.h \
StFlow.h Surf1D.h
cc_sources = MultiJac.cpp MultiNewton.cpp newton_utils.cpp OneDim.cpp \
StFlow.cpp boundaries1D.cpp refine.cpp Sim1D.cpp Domain1D.cpp
cc_sources = boundaries1D.cpp Domain1D.cpp MultiJac.cpp \
MultiNewton.cpp newton_utils.cpp oneD_files.cpp \
OneDim.cpp refine.cpp Sim1D.cpp Solid1D.cpp \
StFlow.cpp
h_sources = Inlet1D.h MultiJac.h Sim1D.h StFlow.h \
Surf1D.h Domain1D.h MultiNewton.h OneDim.h \
Resid1D.h Solid1D.h efine.h
INCLUDES = -I../base -I../thermo -I../kinetics -I../transport -I../numerics -I../../../
AM_CXXFLAGS = $(INCLUDES) -fPIC

19
Cantera/src/oneD/Makefile.in
View file

@ -69,9 +69,8 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
liboneD_la_LIBADD =
am__objects_1 = boundaries1D.lo Domain1D.lo MultiJac.lo MultiNewton.lo \
newton_utils.lo oneD_files.lo OneDim.lo refine.lo Sim1D.lo \
Solid1D.lo StFlow.lo
am__objects_1 = MultiJac.lo MultiNewton.lo newton_utils.lo OneDim.lo \
StFlow.lo boundaries1D.lo refine.lo Sim1D.lo Domain1D.lo
am__objects_2 =
am_liboneD_la_OBJECTS = $(am__objects_1) $(am__objects_2)
liboneD_la_OBJECTS = $(am_liboneD_la_OBJECTS)
@ -233,14 +232,12 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
h_sources = Domain1D.h Inlet1D.h MultiJac.h MultiNewton.h \
OneDim.h refine.h Resid1D.h Sim1D.h Solid1D.h \
StFlow.h Surf1D.h
cc_sources = MultiJac.cpp MultiNewton.cpp newton_utils.cpp OneDim.cpp \
StFlow.cpp boundaries1D.cpp refine.cpp Sim1D.cpp Domain1D.cpp
cc_sources = boundaries1D.cpp Domain1D.cpp MultiJac.cpp \
MultiNewton.cpp newton_utils.cpp oneD_files.cpp \
OneDim.cpp refine.cpp Sim1D.cpp Solid1D.cpp \
StFlow.cpp
h_sources = Inlet1D.h MultiJac.h Sim1D.h StFlow.h \
Surf1D.h Domain1D.h MultiNewton.h OneDim.h \
Resid1D.h Solid1D.h efine.h
INCLUDES = -I../base -I../thermo -I../kinetics -I../transport -I../numerics -I../../../
AM_CXXFLAGS = $(INCLUDES) -fPIC
@ -331,11 +328,9 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiNewton.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OneDim.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sim1D.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Solid1D.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StFlow.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boundaries1D.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newton_utils.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oneD_files.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refine.Plo@am__quote@
.cpp.o:

4
Cantera/src/oneD/Resid1D.h
View file

@ -15,8 +15,8 @@
/*
* NOTE: I don't think this file is used any longer. Thus, this is deprecated.
*/
#include "ctexceptions.h"
#include "xml.h"
#include "../ctexceptions.h"
#include "../xml.h"
#include "refine.h"

8
Cantera/src/oneD/Solid1D.cpp
View file

@ -21,17 +21,15 @@
#include <time.h>
#include "Solid1D.h"
#include "ArrayViewer.h"
#include "ctml.h"
#include "../ArrayViewer.h"
#include "../ctml.h"
#include "MultiJac.h"
//nick adding
#include "StFlow.h"
using namespace ctml;
namespace Cantera {
int Solid1D::c_T_loc = 0;
int Solid1D::c_C_loc = 1;

17
Cantera/src/oneD/Solid1D.h
View file

@ -14,17 +14,14 @@
#ifndef CT_SOLID1D_H
#define CT_SOLID1D_H
#include "TransportBase.h"
#include "../transport/TransportBase.h"
#include "Domain1D.h"
#include "Array.h"
#include "sort.h"
#include "ThermoPhase.h"
#include "Kinetics.h"
#include "funcs.h"
#include "../Array.h"
#include "../sort.h"
#include "../ThermoPhase.h"
#include "../Kinetics.h"
#include "../funcs.h"
// nick hack
#include <fstream>
#include <iostream>
namespace Cantera {
@ -195,7 +192,7 @@ namespace Cantera {
* Write a Tecplot zone corresponding to the current solution.
* May be called multiple times to generate animation.
*/
void outputTEC(std::ostream &s, const doublereal* x,
void outputTEC(ostream &s, const doublereal* x,
std::string title, int zone);
virtual void showSolution(const doublereal* x);

2
Cantera/src/oneD/StFlow.h
View file

@ -20,6 +20,8 @@
#include "IdealGasPhase.h"
#include "Kinetics.h"
#include "funcs.h"
//#include "../flowBoundaries.h"
namespace Cantera {