diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h index fde05d205..d00fe5c99 100644 --- a/include/cantera/oneD/Domain1D.h +++ b/include/cantera/oneD/Domain1D.h @@ -238,15 +238,12 @@ public: /// set the error tolerances for solution component \a n. void setTolerances(size_t n, doublereal rtol, doublereal atol, int ts = 0); - //added by Karl Meredith /// set scalar error tolerances. All solution components will /// have the same relative and absolute error tolerances. void setTolerances(doublereal rtol, doublereal atol,int ts=0); - //added by Karl Meredith void setTolerancesTS(doublereal rtol, doublereal atol); - //added by Karl Meredith void setTolerancesSS(doublereal rtol, doublereal atol); /// Relative tolerance of the nth component. @@ -566,7 +563,6 @@ public: */ virtual void _finalize(const doublereal* x) {} - //added by Karl Meredith doublereal m_zfixed; doublereal m_tfixed; diff --git a/include/cantera/oneD/Sim1D.h b/include/cantera/oneD/Sim1D.h index 6b7982035..2649ca5d1 100644 --- a/include/cantera/oneD/Sim1D.h +++ b/include/cantera/oneD/Sim1D.h @@ -52,7 +52,6 @@ public: //@{ /// Set initial guess based on equilibrium - //added by Karl Meredith void setInitialGuess(std::string component, vector_fp& locs, vector_fp& vals); /// Set one entry in the solution vector. @@ -95,9 +94,7 @@ public: /// Refine the grid in all domains. int refine(int loglevel=0); - //added by Karl Meredith int setFixedTemperature(doublereal t); - //added by Karl Meredith void setAdiabaticFlame(void); /// Set the criteria for grid refinement. diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h index e1c2a6d38..b9810fa77 100644 --- a/include/cantera/oneD/StFlow.h +++ b/include/cantera/oneD/StFlow.h @@ -185,7 +185,6 @@ public: virtual std::string componentName(size_t n) const; - //added by Karl Meredith size_t componentIndex(std::string name) const; @@ -276,10 +275,6 @@ public: void setGas(const doublereal* x, size_t j); void setGasAtMidpoint(const doublereal* x, size_t j); - //Karl Meredith - // doublereal density_unprotected(int j) const { - // return m_rho[j]; - // } doublereal density(size_t j) const { return m_rho[j]; } diff --git a/samples/cxx/bvp/stagnation.cpp b/samples/cxx/bvp/stagnation.cpp index 1bd11017e..cf321dee1 100644 --- a/samples/cxx/bvp/stagnation.cpp +++ b/samples/cxx/bvp/stagnation.cpp @@ -953,7 +953,6 @@ string AxiStagnBVP::componentName(int n) const } -//added by Karl Meredith int AxiStagnBVP::componentIndex(string name) const { diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp index 128933e37..6c0b980be 100644 --- a/src/oneD/Sim1D.cpp +++ b/src/oneD/Sim1D.cpp @@ -51,7 +51,6 @@ Sim1D::Sim1D(vector& domains) : } //==================================================================================================================== -// added by Karl Meredith void Sim1D::setInitialGuess(string component, vector_fp& locs, vector_fp& vals) { @@ -456,7 +455,6 @@ int Sim1D::refine(int loglevel) /** * Add node for fixed temperature point of freely propagating flame */ -//added by Karl Meredith int Sim1D::setFixedTemperature(doublereal t) { int np = 0; @@ -562,7 +560,6 @@ int Sim1D::setFixedTemperature(doublereal t) return np; } -//added by Karl Meredith void Sim1D::setAdiabaticFlame(void) { for (size_t n = 0; n < m_nd; n++) { diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp index c582c1f2c..710259c7e 100644 --- a/src/oneD/StFlow.cpp +++ b/src/oneD/StFlow.cpp @@ -1010,7 +1010,6 @@ string StFlow::componentName(size_t n) const } -//added by Karl Meredith size_t StFlow::componentIndex(string name) const {