*** empty log message ***
This commit is contained in:
parent
653effb9c5
commit
542c890db6
5 changed files with 10 additions and 5 deletions
|
|
@ -410,7 +410,7 @@ namespace Cantera {
|
|||
values.begin()); }
|
||||
|
||||
|
||||
void MMCollisionInt::fit_omega22(int degree,
|
||||
void MMCollisionInt::fit_omega22(ostream& logfile, int degree,
|
||||
doublereal deltastar, doublereal* o22)
|
||||
{
|
||||
|
||||
|
|
@ -429,8 +429,9 @@ namespace Cantera {
|
|||
rmserr = polyfit(n, logT, values.begin(),
|
||||
w.begin(), degree, ndeg, 0.0, o22);
|
||||
if (rmserr > 0.01) {
|
||||
cerr << "Warning: RMS error = " << rmserr << " for omega_22 fit "
|
||||
<< "with delta* = " << deltastar << endl;
|
||||
char p[100];
|
||||
sprintf(p, "Warning: RMS error = %12.6g in omega_22 fit with delta* = %12.6g\n", rmserr, deltastar);
|
||||
m_xml->XML_comment(logfile, p);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ namespace Cantera {
|
|||
void fit(ostream& logfile, int degree, doublereal deltastar,
|
||||
doublereal* astar, doublereal* bstar, doublereal* cstar);
|
||||
|
||||
void fit_omega22(int degree, doublereal deltastar, doublereal* om22);
|
||||
void fit_omega22(ostream& logfile, int degree, doublereal deltastar, doublereal* om22);
|
||||
doublereal omega11(double tstar, double deltastar) {
|
||||
return omega22(tstar, deltastar)/astar(tstar, deltastar);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -510,7 +510,7 @@ namespace Cantera {
|
|||
vector_fp co22(degree+1);
|
||||
m_integrals->fit(logfile, degree, dstar,
|
||||
ca.begin(), cb.begin(), cc.begin());
|
||||
m_integrals->fit_omega22(degree, dstar,
|
||||
m_integrals->fit_omega22(logfile, degree, dstar,
|
||||
co22.begin());
|
||||
tr.omega22_poly.push_back(co22);
|
||||
tr.astar_poly.push_back(ca);
|
||||
|
|
|
|||
|
|
@ -216,6 +216,9 @@ test: example_codes datafiles
|
|||
run-matlab-demo:
|
||||
cd Cantera/matlab; @MAKE@ run-demo
|
||||
|
||||
run-python-demo:
|
||||
cd Cantera/python; @MAKE@ run-demo
|
||||
|
||||
datafiles:
|
||||
cd data/inputs; @MAKE@
|
||||
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ fm.write("""ctpath;\n""")
|
|||
fm.write("""cd demos/matlab;\n""")
|
||||
fm.write("""run_examples;\n""")
|
||||
fm.close()
|
||||
|
||||
print """
|
||||
|
||||
Cantera has been successfully installed.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue