From 0085115f0bc5228bb9ed9e243250d9796ba12411 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Fri, 30 Jul 2010 18:34:08 +0000
Subject: [PATCH] Incremental update

---
 Cantera/src/equil/vcs_VolPhase.cpp       | 14 ++++++++++----
 Cantera/src/equil/vcs_VolPhase.h         |  8 +++++++-
 Cantera/src/equil/vcs_phaseStability.cpp |  4 ++--
 Cantera/src/equil/vcs_util.cpp           |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp
index 47a3f1d7c..afd547563 100644
--- a/Cantera/src/equil/vcs_VolPhase.cpp
+++ b/Cantera/src/equil/vcs_VolPhase.cpp
@@ -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 {
diff --git a/Cantera/src/equil/vcs_VolPhase.h b/Cantera/src/equil/vcs_VolPhase.h
index 2ea6349c2..ce763402f 100644
--- a/Cantera/src/equil/vcs_VolPhase.h
+++ b/Cantera/src/equil/vcs_VolPhase.h
@@ -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.
diff --git a/Cantera/src/equil/vcs_phaseStability.cpp b/Cantera/src/equil/vcs_phaseStability.cpp
index 3a370809b..c055c76e9 100644
--- a/Cantera/src/equil/vcs_phaseStability.cpp
+++ b/Cantera/src/equil/vcs_phaseStability.cpp
@@ -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));
 
       }
 
diff --git a/Cantera/src/equil/vcs_util.cpp b/Cantera/src/equil/vcs_util.cpp
index ae34e3a12..463c383d0 100644
--- a/Cantera/src/equil/vcs_util.cpp
+++ b/Cantera/src/equil/vcs_util.cpp
@@ -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)
    
     /**************************************************************************
      *