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

Incremental update

Browse source
This commit is contained in:
Harry Moffat 2010-07-30 18:34:08 +00:00
parent 43798deb62
commit 0085115f0b
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cantera/src/equil/vcs_VolPhase.cpp
View file

@ -1159,11 +1159,17 @@ namespace VCSnonideal {
}
/***************************************************************************/
void vcs_VolPhase::setFractionCreationDeltas(const double * const F_k) {
for (int k = 0; k < m_numSpecies; k++) {
fractionCreationDelta_[k] = F_k[k];
}
void vcs_VolPhase::setCreationMoleNumbers(const double * const n_k,
const std::vector<int> &creationGlobalRxnNumbers) {
vcs_dcopy(VCS_DATA_PTR(fractionCreationDelta_), n_k, m_numSpecies);
// vcs_icopy(VCS_DATA_PTR(creationGlobalRxnNumbers_), VCS_DATA_PTR(creationGlobalRxnNumbers), m_numSpecies);
}
// void vcs_VolPhase::setFractionCreationDeltas(const double * const F_k) {
// for (int k = 0; k < m_numSpecies; k++) {
// fractionCreationDelta_[k] = F_k[k];
// }
//}
/***************************************************************************/
const std::vector<double> & vcs_VolPhase::fractionCreationDeltas() const {

8
Cantera/src/equil/vcs_VolPhase.h
View file

@ -419,11 +419,17 @@ namespace VCSnonideal {
//! object.
const std::vector<double> & moleFractions() const;
//! Sets the creationMoleNum's within the phase object
/*!
* @param F_k Pointer to a vector of n_k's
*/
void setCreationMoleNumbers(const double * const n_k, const std::vector<int> &creationGlobalRxnNumbers);
//! Sets the fractionCreationDelta's within the phase object
/*!
* @param F_k Pointer to a vector of F_k's
*/
void setFractionCreationDeltas( const double * const F_k);
// void setFractionCreationDeltas( const double * const F_k);
//! Return a const reference to the fractionCreationDeltas storred in the
//! object.

4
Cantera/src/equil/vcs_phaseStability.cpp
View file

@ -792,8 +792,8 @@ namespace VCSnonideal {
if (converged) {
Vphase->setMoleFractionsState(0.0, VCS_DATA_PTR(X_est),
VCS_STATECALC_PHASESTABILITY);
// Vphase->setCreationMoleNumbers(VCS_DATA_PTR(fracDelta_new), creationGlobalRxnNumbers);
Vphase->setFractionCreationDeltas(VCS_DATA_PTR(fracDelta_new));
Vphase->setCreationMoleNumbers(VCS_DATA_PTR(fracDelta_new), creationGlobalRxnNumbers);
//Vphase->setFractionCreationDeltas(VCS_DATA_PTR(fracDelta_new));
}

2
Cantera/src/equil/vcs_util.cpp
View file

@ -61,7 +61,7 @@ namespace VCSnonideal {
/***************************************************************************/
#ifndef USE_MEMSET
void vcs_dcopy(double *vec_to, double *vec_from, int length)
void vcs_dcopy(double *const vec_to, const double * const vec_from, int length)
/**************************************************************************
*