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

[1D] Deprecate vector version of Domain1D::setBounds

Browse source 
The scalar version is actually easier to use in most cases.
This commit is contained in:
Ray Speth 2013-06-24 15:22:45 +00:00
parent 3e4c944416
commit e7754fbcf2
3 changed files with 16 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/oneD/Domain1D.h
View file

@ -236,8 +236,10 @@ public:
}
//! Set the lower and upper bounds for each solution component.
//! @deprecated Use the scalar version
void setBounds(size_t nl, const doublereal* lower,
size_t nu, const doublereal* upper) {
warn_deprecated("setBounds", "Use the scalar version.");
if (nl < m_nv || nu < m_nv)
throw CanteraError("Domain1D::setBounds",
"wrong array size for solution bounds. "

26
src/oneD/StFlow.cpp
View file

@ -134,31 +134,15 @@ StFlow::StFlow(IdealGasPhase* ph, size_t nsp, size_t points) :
//-------------- default solution bounds --------------------
vector_fp vmin(m_nv), vmax(m_nv);
// no bounds on u
vmin[0] = -1.e20;
vmax[0] = 1.e20;
// V
vmin[1] = -1.e20;
vmax[1] = 1.e20;
// temperature bounds
vmin[2] = 200.0;
vmax[2]= 1.e9;
// lamda should be negative
vmin[3] = -1.e20;
vmax[3] = 1.e20;
setBounds(0, -1e20, 1e20); // no bounds on u
setBounds(1, -1e20, 1e20); // V
setBounds(2, 200.0, 1e9); // temperature bounds
setBounds(3, -1e20, 1e20); // lamda should be negative
// mass fraction bounds
for (size_t k = 0; k < m_nsp; k++) {
vmin[4+k] = -1.0e-5;
vmax[4+k] = 1.0e5;
setBounds(4+k, -1.0e-5, 1.0e5);
}
setBounds(vmin.size(), DATA_PTR(vmin), vmax.size(), DATA_PTR(vmax));
//-------------------- default error tolerances ----------------
setTransientTolerances(1.0e-8, 1.0e-15);

38
src/oneD/boundaries1D.cpp
View file

@ -116,10 +116,8 @@ init()
{
_init(2);
// set bounds (mdot, T)
const doublereal lower[2] = {-1.0e5, 200.0};
const doublereal upper[2] = {1.0e5, 1.e5};
setBounds(2, lower, 2, upper);
setBounds(0, -1e5, 1e5); // mdot
setBounds(1, 200.0, 1e5); // T
// set tolerances
setSteadyTolerances(1e-4, 1e-5);
@ -281,10 +279,7 @@ string Empty1D::componentName(size_t n) const
void Empty1D::
init() //_init(1);
{
// set bounds (T)
const doublereal lower = -1.0;
const doublereal upper = 1.0;
setBounds(1, &lower, 1, &upper);
setBounds(0, -1.0, 1.0);
// set tolerances
setSteadyTolerances(1e-4, 1e-4);
@ -343,10 +338,7 @@ void Symm1D::
init()
{
_init(1);
// set bounds (T)
const doublereal lower = -1.0;
const doublereal upper = 1.0;
setBounds(1, &lower, 1, &upper);
setBounds(0, -1.0, 1.0);
// set tolerances
setSteadyTolerances(1e-4, 1e-4);
@ -429,10 +421,7 @@ void Outlet1D::
init()
{
_init(1);
// set bounds (T)
const doublereal lower = -1.0;
const doublereal upper = 1.0;
setBounds(1, &lower, 1, &upper);
setBounds(0, -1.0, 1.0);
// set tolerances
setSteadyTolerances(1e-4, 1e-4);
@ -556,9 +545,7 @@ init()
{
_init(1);
// set bounds (dummy)
const doublereal lower = -1.0;
const doublereal upper = 1.0;
setBounds(1, &lower, 1, &upper);
setBounds(0, -1.0, 1.0);
// set tolerances
setSteadyTolerances(1e-4, 1e-4);
@ -694,9 +681,7 @@ init()
{
_init(1);
// set bounds (T)
const doublereal lower = 200.0;
const doublereal upper = 1.e5;
setBounds(1, &lower, 1, &upper);
setBounds(0, 200.0, 1e5);
// set tolerances
setSteadyTolerances(1e-4, 1e-4);
@ -780,15 +765,10 @@ init()
m_fixed_cov[0] = 1.0;
m_work.resize(m_kin->nTotalSpecies(), 0.0);
// set bounds
vector_fp lower(m_nv), upper(m_nv);
lower[0] = 200.0;
upper[0] = 1.e5;
setBounds(0, 200.0, 1e5);
for (size_t n = 0; n < m_nsp; n++) {
lower[n+1] = -1.0e-5;
upper[n+1] = 2.0;
setBounds(n+1, -1.0e-5, 2.0);
}
setBounds(m_nv, DATA_PTR(lower), m_nv, DATA_PTR(upper));
setSteadyTolerances(1.0e-5, 1.0e-9);
setTransientTolerances(1.0e-5, 1.0e-9);
setSteadyTolerances(1.0e-5, 1.0e-4, 0);