*** empty log message ***
This commit is contained in:
Dave Goodwin
parent
85c163a6d0
commit
711c3c7214
15 changed files with 760 additions and 49 deletions
|
|
@ -14,7 +14,7 @@ SUFFIXES= .cpp .d .o
|
|||
|
||||
CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
|
||||
|
||||
OBJS = ct.o Storage.o ctsurf.o ctrpath.o ctbdry.o \
|
||||
OBJS = ct.o Storage.o ctsurf.o ctrpath.o \
|
||||
ctreactor.o ctfunc.o ctxml.o ctonedim.o
|
||||
|
||||
DEPENDS = $(OBJS:.o=.d)
|
||||
|
|
|
|||
|
|
@ -244,6 +244,14 @@ extern "C" {
|
|||
catch (CanteraError) { return -1; }
|
||||
}
|
||||
|
||||
int DLL_EXPORT outletres_new() {
|
||||
try {
|
||||
OutletRes1D* i = new OutletRes1D();
|
||||
return Cabinet<Domain1D>::cabinet()->add(i);
|
||||
}
|
||||
catch (CanteraError) { return -1; }
|
||||
}
|
||||
|
||||
int DLL_EXPORT bdry_setMdot(int i, double mdot) {
|
||||
try {
|
||||
_bdry(i)->setMdot(mdot);
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ extern "C" {
|
|||
|
||||
int DLL_IMPORT inlet_new();
|
||||
int DLL_IMPORT outlet_new();
|
||||
int DLL_IMPORT outletres_new();
|
||||
int DLL_IMPORT symm_new();
|
||||
int DLL_IMPORT surf_new();
|
||||
int DLL_IMPORT reactingsurf_new();
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ The classes in this package implement one-dimensional reacting flow problems.
|
|||
"""
|
||||
from onedim import *
|
||||
from BurnerFlame import BurnerFlame
|
||||
from BurnerDiffFlame import BurnerDiffFlame
|
||||
from CounterFlame import CounterFlame
|
||||
from StagnationFlow import StagnationFlow
|
||||
|
||||
|
|
|
|||
|
|
@ -305,6 +305,15 @@ class Outlet(Bdry1D):
|
|||
Bdry1D.__init__(self)
|
||||
self._hndl = _cantera.outlet_new()
|
||||
if id: self.setID(id)
|
||||
|
||||
class OutletRes(Bdry1D):
|
||||
"""A one-dimensional outlet into a reservoir."""
|
||||
|
||||
def __init__(self, id = 'outletres'):
|
||||
Bdry1D.__init__(self)
|
||||
self._hndl = _cantera.outletres_new()
|
||||
if id: self.setID(id)
|
||||
|
||||
|
||||
class SymmPlane(Bdry1D):
|
||||
"""A symmetry plane."""
|
||||
|
|
|
|||
|
|
@ -428,6 +428,15 @@ py_outlet_new(PyObject *self, PyObject *args)
|
|||
return Py_BuildValue("i",_val);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
py_outletres_new(PyObject *self, PyObject *args)
|
||||
{
|
||||
int _val;
|
||||
_val = outletres_new();
|
||||
if (int(_val) == -1) return reportCanteraError();
|
||||
return Py_BuildValue("i",_val);
|
||||
}
|
||||
|
||||
|
||||
static PyObject *
|
||||
py_symm_new(PyObject *self, PyObject *args)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ static PyObject *ErrorObject;
|
|||
#include "ctxml_methods.cpp"
|
||||
#include "ctfuncs.cpp"
|
||||
#include "ctsurf_methods.cpp"
|
||||
#include "ctbndry_methods.cpp"
|
||||
//#include "ctbndry_methods.cpp"
|
||||
#include "ctrpath_methods.cpp"
|
||||
#include "ctreactor_methods.cpp"
|
||||
#include "ctfunc_methods.cpp"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
###############################################################
|
||||
|
||||
SUFFIXES=
|
||||
SUFFIXES= .cpp .d .o
|
||||
SUFFIXES= .cpp .d .o .dh
|
||||
|
||||
OBJDIR = .
|
||||
|
||||
|
|
@ -56,6 +56,7 @@ EVERYTHING = $(KINETICS) $(HETEROKIN) $(ELECTROCHEM) $(EQUIL) $(CK) \
|
|||
|
||||
|
||||
PCH = ct_defs.h.gch utilities.h.gch ThermoPhase.h.gch Kinetics.h.gch
|
||||
PCHSRC = ($PCH:.h.gch=.h)
|
||||
|
||||
all: config.h $(PCH) @KERNEL@ lib
|
||||
|
||||
|
|
@ -109,10 +110,14 @@ CXX_LIBS = @LIBS@
|
|||
CXX_INCLUDES = -I.
|
||||
CANTERA_LIB = @buildlib@/libcantera.a
|
||||
|
||||
DEPENDS = $(EVERYTHING:.o=.d) $(PCH:.gch=.d)
|
||||
DEPENDS = $(EVERYTHING:.o=.d) $(PCH:.h.gch=.dh)
|
||||
SRCS = $(EVERYTHING:.o=.cpp) $(PCH:.gch=)
|
||||
|
||||
%.d:
|
||||
g++ -MM $*.cpp > $*.d
|
||||
.cpp.d:
|
||||
g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d
|
||||
|
||||
.h.dh:
|
||||
g++ -MM $(CXX_INCLUDES) $*.h > $*.dh
|
||||
|
||||
.cpp.o:
|
||||
@CXX@ -c $< $(CXX_FLAGS)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,10 @@
|
|||
// Copyright 2001 California Institute of Technology
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.10 2004-07-23 00:15:15 dggoodwin
|
||||
// Revision 1.11 2004-07-27 14:22:31 dggoodwin
|
||||
// *** empty log message ***
|
||||
//
|
||||
// Revision 1.10 2004/07/23 00:15:15 dggoodwin
|
||||
// *** empty log message ***
|
||||
//
|
||||
// Revision 1.9 2004/07/14 11:24:13 dggoodwin
|
||||
|
|
@ -260,6 +263,7 @@ namespace ckr {
|
|||
m_ckfilename = fname;
|
||||
m_log = log;
|
||||
m_nasafmt = false;
|
||||
m_last_eol = '\n';
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -319,10 +323,20 @@ namespace ckr {
|
|||
|
||||
// if an end-of-line character is seen, then break.
|
||||
// Check for all common end-of-line characters.
|
||||
if (ch == '\n' || ch == char10 || ch == char13) break;
|
||||
if (ch == char13 || (ch == char10 && (m_last_eol != char13))) {
|
||||
#undef DEBUG_EOL
|
||||
#ifdef DEBUG_EOL
|
||||
cout << "EOL: found character " << int(ch) << " ending line:" << endl;
|
||||
cout << line << endl;
|
||||
cout << int(m_last_eol) << " " << int('\n') << " " << int(ch) << endl;
|
||||
#endif
|
||||
m_last_eol = ch;
|
||||
break;
|
||||
}
|
||||
if (isprint(ch)) line += ch;
|
||||
}
|
||||
string::size_type icom = line.find(commentChar);
|
||||
|
||||
string::size_type icom = line.find(commentChar);
|
||||
|
||||
// lines that begin with !% are not comments for Cantera
|
||||
if (icom == 0 && line[1] == undoCommentChar) {
|
||||
|
|
@ -333,7 +347,7 @@ namespace ckr {
|
|||
int len = static_cast<int>(line.size());
|
||||
|
||||
for (int i = 0; i < len; i++) if (!isprint(line[i])) line[i] = ' ';
|
||||
if (icom >= 0) {
|
||||
if (icom != string::npos) {
|
||||
s = line.substr(0, icom);
|
||||
comment = line.substr(icom+1,len-icom-1);
|
||||
}
|
||||
|
|
@ -860,6 +874,10 @@ next:
|
|||
}
|
||||
while (s == "" && comment[0] != '%');
|
||||
|
||||
#undef DEBUG_LINE
|
||||
#ifdef DEBUG_LINE
|
||||
cout << "Line: " << s << endl;
|
||||
#endif
|
||||
// end of REACTION section or EOF
|
||||
/// @todo does this handle case of 1 reaction correctly?
|
||||
if (isKeyword(s) || s == "<EOF>") {
|
||||
|
|
@ -873,7 +891,8 @@ next:
|
|||
}
|
||||
|
||||
// rxn line
|
||||
string::size_type eqloc;
|
||||
//string::size_type eqloc;
|
||||
int eqloc;
|
||||
string sleft, sright;
|
||||
bool auxDataLine, metaDataLine;
|
||||
|
||||
|
|
@ -968,7 +987,7 @@ next:
|
|||
else throw CK_SyntaxError(*m_log,
|
||||
"expected <=>, =>, or =", m_line);
|
||||
|
||||
string::size_type mloc, mloc2;
|
||||
string::size_type mloc, mloc2;
|
||||
|
||||
// process reactants
|
||||
removeWhiteSpace(sleft);
|
||||
|
|
@ -977,10 +996,10 @@ next:
|
|||
string sm, mspecies;
|
||||
|
||||
mloc = sleft.find("(+");
|
||||
if (mloc >= 0) {
|
||||
if (mloc != string::npos) {
|
||||
sm = sleft.substr(mloc+2, 1000);
|
||||
mloc2 = sm.find(")");
|
||||
if (mloc2 >= 0) {
|
||||
if (mloc2 != string::npos) {
|
||||
mspecies = sm.substr(0,mloc2);
|
||||
rxn.isFalloffRxn = true;
|
||||
rxn.type = Falloff;
|
||||
|
|
@ -996,8 +1015,8 @@ next:
|
|||
"missing )", m_line);
|
||||
}
|
||||
|
||||
else if ((mloc = sleft.find("+M"), mloc >= 0) ||
|
||||
(mloc = sleft.find("+m"), mloc >= 0)) {
|
||||
else if ((mloc = sleft.find("+M"), mloc != string::npos) ||
|
||||
(mloc = sleft.find("+m"), mloc != string::npos)) {
|
||||
|
||||
if (static_cast<int>(mloc) ==
|
||||
static_cast<int>(sleft.size()) - 2) {
|
||||
|
|
@ -1040,12 +1059,11 @@ next:
|
|||
sright = sright.substr(0, sright.find(toks[ntoks - 3]) - 1 );
|
||||
|
||||
removeWhiteSpace(sright);
|
||||
|
||||
mloc = sright.find("(+");
|
||||
if (mloc >= 0) {
|
||||
if (mloc != string::npos) {
|
||||
sm = sright.substr(mloc+2, 1000);
|
||||
mloc2 = sm.find(")");
|
||||
if (mloc2 >= 0) {
|
||||
if (mloc2 != string::npos) {
|
||||
mspecies = sm.substr(0,mloc2);
|
||||
|
||||
if (rxn.type == ThreeBody)
|
||||
|
|
@ -1071,8 +1089,8 @@ next:
|
|||
}
|
||||
}
|
||||
|
||||
else if ((mloc = sright.find("+M"), mloc >= 0) ||
|
||||
(mloc = sright.find("+m"), mloc >= 0)) {
|
||||
else if ((mloc = sright.find("+M"), mloc != string::npos) ||
|
||||
(mloc = sright.find("+m"), mloc != string::npos)) {
|
||||
|
||||
if (static_cast<int>(mloc) ==
|
||||
static_cast<int>(sright.size()) - 2) {
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ namespace ckr {
|
|||
string m_ckfilename;
|
||||
ostream* m_log;
|
||||
bool m_nasafmt;
|
||||
char m_last_eol;
|
||||
void readThermoRecord(Species& sp);
|
||||
void getCKLine(string& s, string& comment);
|
||||
void putCKLine(string& s, string& comment);
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ namespace Cantera {
|
|||
const int cSymmType = 105;
|
||||
const int cOutletType = 106;
|
||||
const int cEmptyType = 107;
|
||||
const int cOutletResType = 108;
|
||||
|
||||
class MultiJac;
|
||||
class OneDim;
|
||||
|
|
|
|||
|
|
@ -287,6 +287,52 @@ namespace Cantera {
|
|||
};
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* An outlet with specified composition.
|
||||
*/
|
||||
class OutletRes1D : public Bdry1D {
|
||||
|
||||
public:
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
OutletRes1D() : Bdry1D(), m_nsp(0), m_flow(0) {
|
||||
m_type = cOutletResType;
|
||||
m_xstr = "";
|
||||
}
|
||||
virtual ~OutletRes1D(){}
|
||||
|
||||
virtual void showSolution(const doublereal* x) {}
|
||||
|
||||
virtual void _getInitialSoln(doublereal* x) {
|
||||
x[0] = m_temp;
|
||||
}
|
||||
|
||||
virtual void _finalize(const doublereal* x) {
|
||||
;
|
||||
}
|
||||
|
||||
virtual void setMoleFractions(string xin);
|
||||
virtual void setMoleFractions(doublereal* xin);
|
||||
virtual doublereal massFraction(int k) {return m_yres[k];}
|
||||
virtual string componentName(int n) const;
|
||||
virtual void init();
|
||||
virtual void eval(int jg, doublereal* xg, doublereal* rg,
|
||||
integer* diagg, doublereal rdt);
|
||||
virtual void save(XML_Node& o, doublereal* soln);
|
||||
virtual void restore(XML_Node& dom, doublereal* soln);
|
||||
|
||||
protected:
|
||||
|
||||
int m_nsp;
|
||||
vector_fp m_yres;
|
||||
string m_xstr;
|
||||
StFlow *m_flow;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* A non-reacting surface. The axial velocity is zero
|
||||
* (impermeable), as is the transverse velocity (no slip). The
|
||||
|
|
|
|||
|
|
@ -436,12 +436,12 @@ namespace Cantera {
|
|||
xb = x - nc;
|
||||
rb = r - nc;
|
||||
db = diag - nc;
|
||||
rb[0] = xb[3];
|
||||
rb[2] = xb[2] - xb[2 - nc];
|
||||
|
||||
// zero Lambda
|
||||
rb[0] = xb[3]; // zero Lambda
|
||||
rb[2] = xb[2] - xb[2 - nc]; // zero T gradient
|
||||
for (k = 5; k < nc; k++) {
|
||||
// if (m_flow_left->doSpecies(k-4)) {
|
||||
rb[k] = xb[k] - xb[k - nc];
|
||||
//}
|
||||
rb[k] = xb[k] - xb[k - nc]; // zero mass fraction gradient
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -462,6 +462,139 @@ namespace Cantera {
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//--------------------------------------------------
|
||||
// OutletRes1D
|
||||
//--------------------------------------------------
|
||||
|
||||
|
||||
void OutletRes1D::
|
||||
setMoleFractions(string xres) {
|
||||
m_xstr = xres;
|
||||
if (m_flow) {
|
||||
m_flow->phase().setMoleFractionsByName(xres);
|
||||
m_flow->phase().getMassFractions(m_yres.begin());
|
||||
needJacUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
void OutletRes1D::
|
||||
setMoleFractions(doublereal* xres) {
|
||||
if (m_flow) {
|
||||
m_flow->phase().setMoleFractions(xres);
|
||||
m_flow->phase().getMassFractions(m_yres.begin());
|
||||
needJacUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
string OutletRes1D::componentName(int n) const {
|
||||
switch (n) {
|
||||
case 0: return "dummy"; break;
|
||||
default: return "<unknown>";
|
||||
}
|
||||
}
|
||||
|
||||
void OutletRes1D::
|
||||
init() {
|
||||
_init(1);
|
||||
// set bounds (dummy)
|
||||
const doublereal lower = -1.0;
|
||||
const doublereal upper = 1.0;
|
||||
setBounds(1, &lower, 1, &upper);
|
||||
|
||||
// set tolerances
|
||||
const doublereal rtol = 1e-4;
|
||||
const doublereal atol = 1.e-4;
|
||||
setTolerances(1, &rtol, 1, &atol);
|
||||
|
||||
if (m_flow_left) {
|
||||
m_flow = m_flow_left;
|
||||
}
|
||||
else if (m_flow_right) {
|
||||
m_flow = m_flow_right;
|
||||
}
|
||||
else {
|
||||
throw CanteraError("OutletRes1D::init","no flow!");
|
||||
}
|
||||
|
||||
m_nsp = m_flow->nComponents() - 4;
|
||||
m_yres.resize(m_nsp, 0.0);
|
||||
if (m_xstr != "")
|
||||
setMoleFractions(m_xstr);
|
||||
else
|
||||
m_yres[0] = 1.0;
|
||||
}
|
||||
|
||||
|
||||
void OutletRes1D::
|
||||
eval(int jg, doublereal* xg, doublereal* rg,
|
||||
integer* diagg, doublereal rdt) {
|
||||
|
||||
if (jg >= 0 && (jg < firstPoint() - 2 || jg > lastPoint() + 2)) return;
|
||||
|
||||
// start of local part of global arrays
|
||||
doublereal* x = xg + loc();
|
||||
doublereal* r = rg + loc();
|
||||
integer* diag = diagg + loc();
|
||||
doublereal *xb, *rb;
|
||||
integer *db;
|
||||
|
||||
// drive dummy component to zero
|
||||
r[0] = x[0];
|
||||
diag[0] = 0;
|
||||
int nc, k;
|
||||
|
||||
if (m_flow_right) {
|
||||
nc = m_flow_right->nComponents();
|
||||
xb = x + 1;
|
||||
rb = r + 1;
|
||||
db = diag + 1;
|
||||
|
||||
// this seems wrong...
|
||||
// zero Lambda
|
||||
rb[0] = xb[3];
|
||||
|
||||
// zero gradient for T
|
||||
rb[2] = xb[2] - xb[2 + nc];
|
||||
|
||||
// specified mass fractions
|
||||
for (k = 4; k < nc; k++) {
|
||||
rb[k] = xb[k] - m_yres[k-4];
|
||||
}
|
||||
}
|
||||
|
||||
if (m_flow_left) {
|
||||
|
||||
nc = m_flow_left->nComponents();
|
||||
xb = x - nc;
|
||||
rb = r - nc;
|
||||
db = diag - nc;
|
||||
|
||||
rb[0] = xb[3]; // zero Lambda
|
||||
rb[2] = xb[2] - xb[2 - nc]; // zero dT/dz
|
||||
for (k = 5; k < nc; k++) {
|
||||
rb[k] = xb[k] - m_yres[k-4]; // fixed Y
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void OutletRes1D::
|
||||
save(XML_Node& o, doublereal* soln) {
|
||||
XML_Node& outlt = o.addChild("domain");
|
||||
outlt.addAttribute("id",id());
|
||||
outlt.addAttribute("points",1);
|
||||
outlt.addAttribute("type","outletcomp");
|
||||
outlt.addAttribute("components",nComponents());
|
||||
}
|
||||
|
||||
void OutletRes1D::
|
||||
restore(XML_Node& dom, doublereal* soln) {
|
||||
resize(1,1);
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------
|
||||
//
|
||||
// Surf1D
|
||||
|
|
|
|||
500
ChangeLog
500
ChangeLog
|
|
@ -1,3 +1,493 @@
|
|||
2004-07-21 13:41 hkmoffa
|
||||
|
||||
* Cantera/src/: ThermoFactory.h, misc.cpp: Took the deletion of a
|
||||
static pointer out of destructor.
|
||||
|
||||
2004-07-16 17:18 hkmoffa
|
||||
|
||||
* Cantera/src/: ConstDensityThermo.h, NasaPoly1.h, NasaThermo.h,
|
||||
PolyThermoMgr.h, ShomatePoly.h, ShomateThermo.h, SimpleThermo.h,
|
||||
SpeciesThermo.h, SpeciesThermoMgr.h, StoichSubstance.cpp,
|
||||
StoichSubstance.h, ThermoPhase.h: Added "getParameter" routines
|
||||
to most of the species and phase
|
||||
thermo objects.
|
||||
|
||||
Fixed a bug in NasaThermo::update_one() and
|
||||
ShomateThermo::update_one()
|
||||
that occurred because m_low_map and m_high_map contained bad
|
||||
information. They were maps to fixed pointers, but the location
|
||||
of the
|
||||
objects that they referred to changed during vector resizing
|
||||
operations.
|
||||
|
||||
2004-07-12 07:58 hkmoffa
|
||||
|
||||
* Cantera/clib/src/: ct.cpp, ctonedim.cpp: static_cast to eliminate
|
||||
warnings from msvc.
|
||||
|
||||
2004-07-12 07:57 hkmoffa
|
||||
|
||||
* Cantera/clib/src/Storage.cpp: Static casts to eliminates warnings
|
||||
from msvc
|
||||
|
||||
2004-07-12 07:57 hkmoffa
|
||||
|
||||
* Cantera/clib/src/Cabinet.h: Static_casts to eliminate warnings
|
||||
from msvc.
|
||||
|
||||
2004-07-08 13:32 hkmoffa
|
||||
|
||||
* Cantera/src/StoichSubstance.cpp: Fixed an error that was making
|
||||
the diamond test problem fail.
|
||||
|
||||
2004-07-08 13:32 hkmoffa
|
||||
|
||||
* test_problems/diamondSurf/diamond_blessed.xml: Updated file so
|
||||
test would pass
|
||||
|
||||
2004-07-08 13:14 hkmoffa
|
||||
|
||||
* test_problems/silane_equil/output_blessed.txt: Updated blessed
|
||||
file.
|
||||
|
||||
2004-07-08 11:14 hkmoffa
|
||||
|
||||
* Cantera/src/: InterfaceKinetics.cpp, InterfaceKinetics.h: Added
|
||||
more comments. -> only formatting.
|
||||
|
||||
2004-07-08 11:12 hkmoffa
|
||||
|
||||
* Cantera/src/Group.cpp: only formatting.
|
||||
|
||||
2004-07-08 11:11 hkmoffa
|
||||
|
||||
* Cantera/src/units.h: Fixed an error that I recently introduced in
|
||||
using size_types.
|
||||
|
||||
2004-07-08 11:10 hkmoffa
|
||||
|
||||
* Cantera/src/ctml.cpp: Fixed errors that I recently introduced in
|
||||
using size_types.
|
||||
|
||||
2004-07-08 11:09 hkmoffa
|
||||
|
||||
* Cantera/src/misc.cpp: Fixed an error that I recently introduced
|
||||
in using size_types
|
||||
|
||||
2004-07-08 11:07 hkmoffa
|
||||
|
||||
* Cantera/src/stringUtils.cpp: Fixed an error that I recently
|
||||
introduced in using size_types.
|
||||
|
||||
2004-07-08 11:03 hkmoffa
|
||||
|
||||
* Cantera/src/GasKinetics.h: Added more initializations
|
||||
|
||||
2004-07-08 09:08 hkmoffa
|
||||
|
||||
* Cantera/src/misc.cpp: Fixed an error that I introduced. Must
|
||||
always check string::size_type against string::npos.
|
||||
|
||||
2004-07-02 10:34 hkmoffa
|
||||
|
||||
* Cantera/src/converters/CKParser.cpp: Eliminated warnings due to
|
||||
signed and unsigned comparisons.
|
||||
|
||||
2004-07-02 10:28 hkmoffa
|
||||
|
||||
* Cantera/src/converters/CKReader.cpp: static_cast to eliminate
|
||||
VC++ warnings.
|
||||
|
||||
2004-07-02 10:27 hkmoffa
|
||||
|
||||
* Cantera/src/converters/CKParser.cpp: static_casts to eliminate
|
||||
VC++ warnings.
|
||||
|
||||
2004-07-02 10:25 hkmoffa
|
||||
|
||||
* Cantera/src/converters/ck2ct.cpp: fixed file names for include
|
||||
files. static_cast to eliminate VC++ warnigns.
|
||||
|
||||
2004-07-02 10:24 hkmoffa
|
||||
|
||||
* Cantera/src/converters/ckr_utils.cpp: static_cast to eliminate
|
||||
VC++ warnings.
|
||||
|
||||
2004-07-02 10:23 hkmoffa
|
||||
|
||||
* Cantera/src/converters/ckr_defs.h: Corrected file locations for
|
||||
include files.
|
||||
|
||||
2004-07-02 10:21 hkmoffa
|
||||
|
||||
* Cantera/src/converters/: writelog.cpp, filter.cpp, Reaction.cpp:
|
||||
static_cast to eliminate VC++ warnings.
|
||||
|
||||
2004-07-02 10:20 hkmoffa
|
||||
|
||||
* Cantera/src/converters/ck2ctml.cpp: Corrected file locations of
|
||||
include files. static_cast to eliminate VC++ warnings.
|
||||
|
||||
2004-07-02 10:19 hkmoffa
|
||||
|
||||
* Cantera/src/converters/ck2ctml.h: Corrected file locations of
|
||||
include files.
|
||||
|
||||
2004-07-02 09:48 hkmoffa
|
||||
|
||||
* Cantera/src/converters/: CKParser.cpp, CKParser.h: Moved
|
||||
CK_SyntaxError definition to the .h file. It's used in more than
|
||||
one .cpp file.
|
||||
|
||||
2004-07-02 09:47 hkmoffa
|
||||
|
||||
* Cantera/src/converters/filter.cpp: split long lines.
|
||||
|
||||
2004-07-02 09:14 hkmoffa
|
||||
|
||||
* Cantera/src/zeroD/FlowDevice.cpp: Corrected file location of
|
||||
include file.
|
||||
|
||||
2004-07-02 09:13 hkmoffa
|
||||
|
||||
* Cantera/src/zeroD/ReactorBase.cpp: static_cast to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-02 09:12 hkmoffa
|
||||
|
||||
* Cantera/src/zeroD/Wall.cpp: Correct file location of include
|
||||
file.
|
||||
|
||||
2004-07-02 09:05 hkmoffa
|
||||
|
||||
* Cantera/src/transport/TransportFactory.cpp: Corrected file
|
||||
locations of include files. static_cast to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-02 09:04 hkmoffa
|
||||
|
||||
* Cantera/src/transport/MultiTransport.cpp: static_cast to
|
||||
eliminate VC++ warnings.
|
||||
|
||||
2004-07-02 09:02 hkmoffa
|
||||
|
||||
* Cantera/src/transport/MMCollisionInt.cpp: commented out a
|
||||
variable that wasn't used.
|
||||
|
||||
2004-07-02 09:01 hkmoffa
|
||||
|
||||
* Cantera/src/transport/: L_matrix.h, MixTransport.cpp: Corrected
|
||||
the file location of include files.
|
||||
|
||||
2004-07-02 08:59 hkmoffa
|
||||
|
||||
* Cantera/src/transport/: TransportParams.h, SolidTransport.cpp:
|
||||
Corrected the file locations of include files.
|
||||
|
||||
2004-07-02 08:29 hkmoffa
|
||||
|
||||
* Cantera/src/oneD/MultiNewton.cpp: static_cast to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-02 08:27 hkmoffa
|
||||
|
||||
* Cantera/src/oneD/OneDim.cpp: Static_cast to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-02 08:26 hkmoffa
|
||||
|
||||
* Cantera/src/oneD/: Sim1D.cpp, StFlow.cpp: static_cast to
|
||||
eliminate VC++ warnings.
|
||||
|
||||
2004-07-02 08:23 hkmoffa
|
||||
|
||||
* Cantera/src/oneD/refine.cpp: Static_cast to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-02 08:21 hkmoffa
|
||||
|
||||
* Cantera/src/oneD/refine.h: static_cast to eliminate warning in
|
||||
VC++
|
||||
|
||||
2004-07-02 08:20 hkmoffa
|
||||
|
||||
* Cantera/src/oneD/Solid1D.cpp: Fixed one Error in file not part of
|
||||
the distribution
|
||||
|
||||
2004-07-02 08:19 hkmoffa
|
||||
|
||||
* Cantera/src/oneD/Solid1D.h: Fixed one error in a file not yet
|
||||
part of distribution.
|
||||
|
||||
2004-07-02 07:58 hkmoffa
|
||||
|
||||
* Cantera/src/DASPK.cpp: Fixed an error in a calling routine.
|
||||
|
||||
Fixed an error involving passing a pointer through an integer
|
||||
array, when the length of the pointer is longer than the length
|
||||
of a single integer. Basically, you have to cast first to the
|
||||
longer variable, before assigning.
|
||||
|
||||
2004-07-02 07:48 hkmoffa
|
||||
|
||||
* Cantera/src/SpeciesThermoFactory.cpp: static_cast to eliminate
|
||||
VC++ warnings.
|
||||
|
||||
2004-07-02 07:47 hkmoffa
|
||||
|
||||
* Cantera/src/misc.cpp: static_cast and size_type to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-02 07:46 hkmoffa
|
||||
|
||||
* Cantera/src/importCTML.cpp: static_cast to eliminate VC++ warning
|
||||
messages.
|
||||
|
||||
2004-07-02 07:45 hkmoffa
|
||||
|
||||
* Cantera/src/ImplicitSurfChem.cpp: static_cast to eliminate VC++
|
||||
warning message.
|
||||
|
||||
2004-07-02 07:44 hkmoffa
|
||||
|
||||
* Cantera/src/ImplicitChem.h: Changed the name of a routine, to get
|
||||
it to compile. However, I don't think this is part of the
|
||||
distribution.
|
||||
|
||||
2004-07-02 07:43 hkmoffa
|
||||
|
||||
* Cantera/src/surfKinetics.h: changed the name of an include file.
|
||||
however, I think this is no longer part of the distribution.
|
||||
|
||||
2004-07-02 07:42 hkmoffa
|
||||
|
||||
* Cantera/src/ReactionPath.cpp: static_cast to eliminate warning
|
||||
messages.
|
||||
|
||||
2004-07-02 07:41 hkmoffa
|
||||
|
||||
* Cantera/src/ctml.cpp: static cast and size_type to eliminate VC++
|
||||
warning messages.
|
||||
|
||||
2004-07-02 07:39 hkmoffa
|
||||
|
||||
* Cantera/src/: stringUtils.cpp, ReactionPath.h: static_cast to
|
||||
eliminate VC++ warning messages.
|
||||
|
||||
2004-07-01 16:58 hkmoffa
|
||||
|
||||
* Cantera/src/GasKinetics.cpp: static_cast to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-01 16:54 hkmoffa
|
||||
|
||||
* Cantera/src/: ArrayViewer.h, Kinetics.h: static_cast to eliminate
|
||||
VC++ warnings.
|
||||
|
||||
2004-07-01 16:50 hkmoffa
|
||||
|
||||
* Cantera/src/StoichManager.h: static_cast to eliminate VC++
|
||||
warnings.
|
||||
|
||||
2004-07-01 16:47 hkmoffa
|
||||
|
||||
* Cantera/src/: NasaThermo.h, ShomateThermo.h, RateCoeffMgr.h,
|
||||
ThirdBodyMgr.h: static_cast to eliminate VC++ warnings.
|
||||
|
||||
2004-07-01 16:46 hkmoffa
|
||||
|
||||
* Cantera/src/plots.cpp: static_casts to eliminate VC++ warnings.
|
||||
|
||||
2004-07-01 16:46 hkmoffa
|
||||
|
||||
* Cantera/src/units.h: small changes to eliminate VC++ warnings.
|
||||
|
||||
2004-07-01 16:40 hkmoffa
|
||||
|
||||
* Cantera/src/DenseMatrix.cpp: static_cast to eliminate VC++
|
||||
warnings
|
||||
|
||||
2004-07-01 16:35 hkmoffa
|
||||
|
||||
* Cantera/src/: Group.cpp, Group.h: Fixed an error that turned up
|
||||
in VC++. I think the problem was that VC++ didn't allow friend
|
||||
functions to be defined in the body of declarations in .h files.
|
||||
|
||||
2004-07-01 16:26 hkmoffa
|
||||
|
||||
* Cantera/src/Elements.cpp: static cast added to avoid VC++
|
||||
compiler warning.
|
||||
|
||||
2004-07-01 16:25 hkmoffa
|
||||
|
||||
* Cantera/src/Array.h: static_cast added to avoid VC++ compiler
|
||||
issues.
|
||||
|
||||
2004-07-01 16:22 hkmoffa
|
||||
|
||||
* Cantera/src/xml.cpp: VC++ warnings were taken out
|
||||
|
||||
2004-07-01 16:12 hkmoffa
|
||||
|
||||
* Cantera/src/xml.h: Added static_cast to remove VC++ compiler
|
||||
warning.
|
||||
|
||||
2004-06-30 15:30 hkmoffa
|
||||
|
||||
* Cantera/src/ImplicitChem.cpp: Fixed an error with a calling
|
||||
statement.
|
||||
|
||||
2004-06-30 14:08 hkmoffa
|
||||
|
||||
* Cantera/src/ResidEval.h: Fixed a compiler error that showed up
|
||||
VC++
|
||||
|
||||
2004-06-28 16:51 hkmoffa
|
||||
|
||||
* Cantera/src/Phase.h: Set m_xml to zero after deletion.
|
||||
|
||||
2004-06-28 16:49 hkmoffa
|
||||
|
||||
* Cantera/src/importCTML.h: Added the installSpecies() declaration
|
||||
back in. This is needed for the particle species thermo object.
|
||||
It's in the cpp file, but just not declared here.
|
||||
|
||||
2004-06-28 16:47 hkmoffa
|
||||
|
||||
* Cantera/src/SpeciesThermoFactory.cpp: Added a few throw
|
||||
statements that was missing. Added a throw UnknownSpeciesThermo
|
||||
statement for cases where the complete thermo block is missing.
|
||||
This is necessary for particle species object to function.
|
||||
|
||||
2004-06-17 10:49 dggoodwin
|
||||
|
||||
* Cantera/src/PureFluidPhase.cpp: initial import
|
||||
|
||||
2004-06-16 14:55 dggoodwin
|
||||
|
||||
* Cantera/src/GasKinetics.cpp: changed call to
|
||||
ReactionStoichMgr::add so that non-integral reaction orders are
|
||||
correctly processed.
|
||||
|
||||
2004-06-08 17:59 dggoodwin
|
||||
|
||||
* Cantera/src/: ConstDensityThermo.cpp, ConstDensityThermo.h,
|
||||
Constituents.cpp, Constituents.h, EdgePhase.h, Elements.h,
|
||||
Makefile.in, PureFluidPhase.h, SpeciesThermoFactory.cpp,
|
||||
SpeciesThermoFactory.h, StoichSubstance.cpp, StoichSubstance.h,
|
||||
SurfPhase.cpp, SurfPhase.h, ThermoFactory.cpp, ThermoPhase.cpp,
|
||||
ThermoPhase.h, importCTML.cpp, importCTML.h, xml.cpp, xml.h,
|
||||
zeroD/Wall.h: moved functions to read XML input files out of
|
||||
importCTML.cpp and into specific classes
|
||||
|
||||
2004-06-06 15:02 dggoodwin
|
||||
|
||||
* Cantera/src/Elements.cpp: moved reading of xml element data to
|
||||
Elements.cpp
|
||||
|
||||
2004-06-03 22:19 dggoodwin
|
||||
|
||||
* Makefile.in, configure, Cantera/matlab/setup_winmatlab.py,
|
||||
Cantera/python/Cantera/DustyGasTransport.py,
|
||||
Cantera/python/Cantera/Func.py,
|
||||
Cantera/python/Cantera/Interface.py,
|
||||
Cantera/python/Cantera/Phase.py,
|
||||
Cantera/python/Cantera/Reactor.py,
|
||||
Cantera/python/Cantera/ThermoPhase.py,
|
||||
Cantera/python/Cantera/Transport.py,
|
||||
Cantera/python/Cantera/importFromFile.py,
|
||||
Cantera/python/src/ctreactor_methods.cpp,
|
||||
Cantera/src/ct2ctml.cpp, config/configure, config/configure.in,
|
||||
test_problems/cxx_ex/gri30.xml, test_problems/cxx_ex/silane.xml:
|
||||
added comments
|
||||
|
||||
2004-06-02 21:01 dggoodwin
|
||||
|
||||
* Cantera/python/Cantera/importFromFile.py: added comments
|
||||
|
||||
2004-06-02 20:44 dggoodwin
|
||||
|
||||
* Cantera/python/Cantera/Interface.py: added comments
|
||||
|
||||
2004-06-02 05:57 dggoodwin
|
||||
|
||||
* Cantera/python/: Cantera/Func.py, Cantera/Phase.py,
|
||||
Cantera/ThermoPhase.py, examples/reactor1.py,
|
||||
examples/reactor2.py: minor cleanup
|
||||
|
||||
2004-06-01 21:39 dggoodwin
|
||||
|
||||
* Cantera/python/: Makefile.in, ctml_writer.py, setup.py.in: moved
|
||||
ctml_writer.py out of Cantera package
|
||||
|
||||
2004-05-29 21:04 dggoodwin
|
||||
|
||||
* Cantera/src/oneD/: Sim1D.cpp, refine.cpp: fixed problem with
|
||||
continuing beyond max number of points
|
||||
|
||||
2004-05-29 21:02 dggoodwin
|
||||
|
||||
* Cantera/python/Cantera/ctml_writer.py: converted to pure python
|
||||
|
||||
2004-05-23 17:08 dggoodwin
|
||||
|
||||
* Cantera/matlab/cantera/: @Reactor/private/reactormethods.cpp,
|
||||
@Transport/private/newTransport.cpp,
|
||||
@Transport/private/trans_methods.cpp,
|
||||
@Wall/private/wallmethods.cpp, @XML_Node/private/newxml.cpp,
|
||||
@XML_Node/private/xmlmethods.cpp: removed unused files
|
||||
|
||||
2004-05-23 17:05 dggoodwin
|
||||
|
||||
* Cantera/matlab/cantera/@Kinetics/private/: delkinetics.cpp,
|
||||
isrev.cpp, kin_get.cpp, kin_set.cpp, newkinetics.cpp,
|
||||
production.cpp, pstoich.cpp, rop.cpp, rstoich.cpp, rxnstring.cpp:
|
||||
removed unused files
|
||||
|
||||
2004-05-21 20:52 dggoodwin
|
||||
|
||||
* Cantera/python/tutorial/: tut2.py, tut3.py, tut4.py: updated
|
||||
tutorials
|
||||
|
||||
2004-05-21 11:09 dggoodwin
|
||||
|
||||
* Cantera/src/transport/MMCollisionInt.cpp: fixed bug in which
|
||||
upper T* limit was incorrect in fits if T*max > 100, as with
|
||||
helium.
|
||||
|
||||
2004-05-17 16:22 dggoodwin
|
||||
|
||||
* config/configure.in: added test for sstream
|
||||
|
||||
2004-05-17 15:59 dggoodwin
|
||||
|
||||
* Cantera/matlab/cantera/@ReactorNet/: addReactor.m, atol.m,
|
||||
rtol.m, setInitialTime.m, setMaxTimeStep.m, setTolerances.m,
|
||||
time.m: initial import
|
||||
|
||||
2004-05-17 09:23 dggoodwin
|
||||
|
||||
* test_problems/cxx_ex/: kin1_blessed.csv, kin2_blessed.csv:
|
||||
reverted to previus version due to error in last versions
|
||||
|
||||
2004-05-16 06:54 dggoodwin
|
||||
|
||||
* Cantera/src/: CVode.cpp, CVode.h, Integrator.h: changed
|
||||
setMaxStep to setMaxStepSize, setMinStep to setMinStepSize, and
|
||||
added setMaxSteps to set the maximum number of steps that will be
|
||||
taken.
|
||||
|
||||
2004-05-14 20:19 dggoodwin
|
||||
|
||||
* Cantera/python/examples/critProperties.py: added example of
|
||||
computing critical-state properties
|
||||
|
||||
2004-05-14 14:15 dggoodwin
|
||||
|
||||
* Cantera/src/transport/: MultiTransport.h, MultiTransport.cpp:
|
||||
added ability to compute mixture-averaged diffusion coefficients
|
||||
in class MultiTransport.
|
||||
|
||||
2004-05-13 10:52 dggoodwin
|
||||
|
||||
* ChangeLog: log file generated from CVS log output by perl script
|
||||
|
|
@ -25,8 +515,10 @@
|
|||
|
||||
2004-04-24 05:55 dggoodwin
|
||||
|
||||
* Cantera/matlab/cantera/private/reactornetmethods.cpp: initial
|
||||
import
|
||||
* Cantera/matlab/cantera/: @ReactorNet/ReactorNet.m,
|
||||
@ReactorNet/advance.m, @ReactorNet/reactornet_hndl.m,
|
||||
@ReactorNet/step.m, @ReactorNet/private/reactornetmethods.m,
|
||||
private/reactornetmethods.cpp: initial import
|
||||
|
||||
2004-04-24 05:50 dggoodwin
|
||||
|
||||
|
|
@ -514,10 +1006,6 @@
|
|||
* Cantera/python/Cantera/ctml_writer.py: added capability to have
|
||||
species names with embedded commas
|
||||
|
||||
2003-10-24 03:11 dggoodwin
|
||||
|
||||
* tools/doc/html/banner4.jpg: initial import
|
||||
|
||||
2003-10-21 17:33 dggoodwin
|
||||
|
||||
* Cantera/src/: State.h, State.cpp: minor cleanup
|
||||
|
|
|
|||
|
|
@ -1,28 +1,19 @@
|
|||
#!/bin/sh
|
||||
|
||||
INSTALL=@INSTALL@
|
||||
INSTALL='@INSTALL@'
|
||||
|
||||
PKGDIR=$HOME/Packages
|
||||
CTDIR=$PKGDIR/Cantera/root_dir/Applications/Cantera
|
||||
PYDIR=$PKGDIR/Cantera/root_dir/Library/Python
|
||||
|
||||
instdir=@ct_dir@
|
||||
|
||||
$INSTALL -d $CTDIR
|
||||
$INSTALL -d $PYDIR
|
||||
$INSTALL -d $PKGDIR/Cantera/resources_dir
|
||||
|
||||
$INSTALL -d $CTDIR/Data
|
||||
$INSTALL -d $CTDIR/Demos
|
||||
$INSTALL -d $CTDIR/Demos/Python
|
||||
$INSTALL -d $CTDIR/Demos/Matlab
|
||||
#$INSTALL -d $CTDIR/Demos/Fortran77
|
||||
#$INSTALL -d $CTDIR/Demos/C++
|
||||
#$INSTALL -d $CTDIR/Templates/Fortran77
|
||||
#$INSTALL -d $CTDIR/Templates/C++
|
||||
|
||||
$INSTALL $instdir/demos/python/*.py $CTDIR/Demos/Python
|
||||
$INSTALL $instdir/demos/matlab/*.m $CTDIR/Demos/Matlab
|
||||
#$INSTALL $instdir/demos/f77/*.* $CTDIR/Demos/Fortran77
|
||||
#$INSTALL $instdir/demos/c++/*.* $CTDIR/Demos/C++
|
||||
$INSTALL $instdir/data/*.cti $CTDIR/Data
|
||||
#$INSTALL $instdir/templates/f77/*.* $CTDIR/Templates/Fortran77
|
||||
#$INSTALL $instdir/templates/cxx/*.* $CTDIR/Templates/C++
|
||||
cp -r -f $instdir/* $CTDIR
|
||||
cp -r -f /Library/Python/2.3 $PYDIR
|
||||
|
||||
cp -f @ctroot@/License.* $PKGDIR/Cantera/resources_dir
|
||||
chown -R $USER $PKGDIR
|
||||
Loading…
Add table
Reference in a new issue