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

Fixed Jacobian evaluation problems in AxiStagnFlow::eval

Browse source
This commit is contained in:
Ray Speth 2012-03-05 20:44:46 +00:00
parent 38322d720a
commit 21100f1cb0
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/oneD/StFlow.cpp
View file

@ -358,32 +358,31 @@ void AxiStagnFlow::eval(size_t jg, doublereal* xg,
doublereal* rsd = rg + loc();
integer* diag = diagg + loc();
size_t jmin, jmax, jpt;
jpt = jg - firstPoint();
size_t jmin, jmax;
if (jg == npos) { // evaluate all points
jmin = 0;
jmax = m_points - 1;
} else { // evaluate points for Jacobian
jmin = std::max<size_t>(jpt-1, 0);
size_t jpt = (jg == 0) ? 0 : jg - firstPoint();
jmin = std::max<size_t>(jpt, 1) - 1;
jmax = std::min(jpt+1,m_points-1);
}
// properties are computed for grid points from j0 to j1
size_t j0 = std::max<size_t>(jmin-1,0);
size_t j0 = std::max<size_t>(jmin, 1) - 1;
size_t j1 = std::min(jmax+1,m_points-1);
size_t j, k;
//-----------------------------------------------------
// update properties
//-----------------------------------------------------
// update thermodynamic properties only if a Jacobian is not
// being evaluated
if (jpt == npos) { //if (jpt < 0 || (m_transport_option == c_Multi_Transport)) {
if (jg == npos) {
updateThermo(x, j0, j1);
// update transport properties only if a Jacobian is not being