From b31e9a1bf18cbb2ff384ce17ecb6b05c53475829 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Tue, 28 Jun 2016 18:03:04 -0400
Subject: [PATCH] Miscellaneous cleanup

---
 include/cantera/base/Array.h            | 19 ++++++-------------
 include/cantera/equil/MultiPhase.h      |  3 +--
 include/cantera/equil/MultiPhaseEquil.h |  3 +--
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/include/cantera/base/Array.h b/include/cantera/base/Array.h
index ab86212b0..8f7636f39 100644
--- a/include/cantera/base/Array.h
+++ b/include/cantera/base/Array.h
@@ -62,8 +62,7 @@ public:
      */
     Array2D(const size_t m, const size_t n, const doublereal v = 0.0)
         :  m_data(0), m_nrows(m), m_ncols(n) {
-        m_data.resize(n*m);
-        std::fill(m_data.begin(), m_data.end(), v);
+        m_data.assign(n*m, v);
     }
 
     //! Constructor.
@@ -78,8 +77,7 @@ public:
      */
     Array2D(const size_t m, const size_t n, const doublereal* values)
         :  m_data(0), m_nrows(m), m_ncols(n) {
-        m_data.resize(n*m);
-        std::copy(values, values + m_nrows*m_ncols, m_data.begin());
+        m_data.assign(values, values + n*m);
     }
 
     Array2D(const Array2D& y) :
@@ -88,7 +86,6 @@ public:
         m_ncols(0) {
         m_nrows = y.m_nrows;
         m_ncols = y.m_ncols;
-        m_data.resize(m_nrows*m_ncols);
         m_data = y.m_data;
     }
 
@@ -100,7 +97,6 @@ public:
         }
         m_nrows = y.m_nrows;
         m_ncols = y.m_ncols;
-        m_data.resize(m_nrows*m_ncols);
         m_data = y.m_data;
         return *this;
     }
@@ -127,8 +123,7 @@ public:
     void appendColumn(const vector_fp& c) {
         m_ncols++;
         m_data.resize(m_nrows*m_ncols);
-        size_t m;
-        for (m = 0; m < m_nrows; m++) {
+        for (size_t m = 0; m < m_nrows; m++) {
             value(m_ncols, m) = c[m];
         }
     }
@@ -143,8 +138,7 @@ public:
     void appendColumn(const doublereal* const c) {
         m_ncols++;
         m_data.resize(m_nrows*m_ncols);
-        size_t m;
-        for (m = 0; m < m_nrows; m++) {
+        for (size_t m = 0; m < m_nrows; m++) {
             value(m_ncols, m) = c[m];
         }
     }
@@ -353,9 +347,8 @@ inline std::ostream& operator<<(std::ostream& s, const Array2D& m)
 {
     size_t nr = m.nRows();
     size_t nc = m.nColumns();
-    size_t i,j;
-    for (i = 0; i < nr; i++) {
-        for (j = 0; j < nc; j++) {
+    for (size_t i = 0; i < nr; i++) {
+        for (size_t j = 0; j < nc; j++) {
             s << m(i,j) << ", ";
         }
         s << std::endl;
diff --git a/include/cantera/equil/MultiPhase.h b/include/cantera/equil/MultiPhase.h
index 93456f753..09032ed6a 100644
--- a/include/cantera/equil/MultiPhase.h
+++ b/include/cantera/equil/MultiPhase.h
@@ -671,8 +671,7 @@ private:
 inline std::ostream& operator<<(std::ostream& s, MultiPhase& x)
 {
     x.updatePhases();
-    size_t ip;
-    for (ip = 0; ip < x.nPhases(); ip++) {
+    for (size_t ip = 0; ip < x.nPhases(); ip++) {
         if (x.phase(ip).name() != "") {
             s << "*************** " << x.phase(ip).name() << " *****************" << std::endl;
         } else {
diff --git a/include/cantera/equil/MultiPhaseEquil.h b/include/cantera/equil/MultiPhaseEquil.h
index bfb6a60d2..afee59119 100644
--- a/include/cantera/equil/MultiPhaseEquil.h
+++ b/include/cantera/equil/MultiPhaseEquil.h
@@ -48,12 +48,11 @@ public:
     }
 
     void getStoichVector(size_t rxn, vector_fp& nu) {
-        size_t k;
         nu.resize(m_nsp, 0.0);
         if (rxn > nFree()) {
             return;
         }
-        for (k = 0; k < m_nsp; k++) {
+        for (size_t k = 0; k < m_nsp; k++) {
             nu[m_order[k]] = m_N(k, rxn);
         }
     }