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

another trial

Browse source
This commit is contained in:
Harry Moffat 2012-01-03 15:51:02 +00:00
parent 12a7f447fc
commit 267ac5b0e7
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cantera/src/oneD/OneDim.h
View file

@ -32,8 +32,8 @@ namespace Cantera {
/// Add a domain.
void addDomain(Domain1D* d);
/// Return a reference to the Jacobian evaluator.
MultiJac& jacobian();
//! Return a reference to the Jacobian evaluator.
MultiJac& jacobian();
/// Return a reference to the Newton iterator.
MultiNewton& newton();
@ -173,7 +173,10 @@ namespace Cantera {
MultiNewton* m_newt; // Newton iterator
doublereal m_rdt; // reciprocal of time step
bool m_jac_ok; // if true, Jacobian is current
int m_nd; // number of domains
//! number of domains
int m_nd;
int m_bw; // Jacobian bandwidth
int m_size; // solution vector size

14
Cantera/src/oneD/Sim1D.cpp
View file

@ -22,12 +22,16 @@ namespace Cantera {
s += '\n';
writelog(s.c_str());
}
Sim1D::Sim1D() : OneDim() {
//====================================================================================================================
Sim1D::Sim1D() :
OneDim()
{
//writelog("Sim1D default constructor\n");
}
Sim1D::Sim1D(vector<Domain1D*>& domains) : OneDim(domains) {
//====================================================================================================================
Sim1D::Sim1D(vector<Domain1D*>& domains) :
OneDim(domains)
{
// resize the internal solution vector and the wprk array,
// and perform domain-specific initialization of the
@ -49,7 +53,7 @@ namespace Cantera {
m_steps.push_back(10);
}
//====================================================================================================================
// added by Karl Meredith
void Sim1D::setInitialGuess(string component, vector_fp& locs, vector_fp& vals){

15
Cantera/src/oneD/Sim1D.h
View file

@ -23,13 +23,14 @@ namespace Cantera {
public:
/**
* Default constructor. This constructor is provided to make
* the class default-constructible, but is not meant to be
* used in most applications. Use the next constructor
* instead.
*/
Sim1D();
//! Default constructor.
/*!
* This constructor is provided to make
* the class default-constructible, but is not meant to be
* used in most applications. Use the next constructor
*/
Sim1D();
/**