From 2653c0a16bfad2948358934008ec78313c028d8f Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 6 Jan 2014 18:46:03 +0000 Subject: [PATCH] [1D] Move OneDim::needJacUpdate to the correct source file --- include/cantera/oneD/Domain1D.h | 1 - src/oneD/Domain1D.cpp | 12 +++++++++++- src/oneD/OneDim.cpp | 8 -------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h index dbbe19924..947448ddc 100644 --- a/include/cantera/oneD/Domain1D.h +++ b/include/cantera/oneD/Domain1D.h @@ -344,7 +344,6 @@ public: * Set this if something has changed in the governing * equations (e.g. the value of a constant has been changed, * so that the last-computed Jacobian is no longer valid. - * Note: see file OneDim.cpp for the implementation of this method. */ void needJacUpdate(); diff --git a/src/oneD/Domain1D.cpp b/src/oneD/Domain1D.cpp index f68757555..a39fb5992 100644 --- a/src/oneD/Domain1D.cpp +++ b/src/oneD/Domain1D.cpp @@ -3,7 +3,9 @@ */ #include "cantera/oneD/Domain1D.h" - #include "cantera/base/ctml.h" +#include "cantera/oneD/OneDim.h" +#include "cantera/oneD/MultiJac.h" +#include "cantera/base/ctml.h" #include @@ -105,6 +107,14 @@ void Domain1D::setTolerancesSS(doublereal rtol, doublereal atol, size_t n) setSteadyTolerances(rtol, atol, n); } +void Domain1D::needJacUpdate() +{ + if (m_container) { + m_container->jacobian().setAge(10000); + m_container->saveStats(); + } +} + void Domain1D:: eval(size_t jg, doublereal* xg, doublereal* rg, integer* mask, doublereal rdt) diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp index 8a15ac252..c438ea024 100644 --- a/src/oneD/OneDim.cpp +++ b/src/oneD/OneDim.cpp @@ -320,14 +320,6 @@ void OneDim::init() m_init = true; } -void Domain1D::needJacUpdate() -{ - if (m_container) { - m_container->jacobian().setAge(10000); - m_container->saveStats(); - } -} - doublereal OneDim::timeStep(int nsteps, doublereal dt, doublereal* x, doublereal* r, int loglevel) {