From 60eb2c29684774935549a9d6d0fbd81413b1d757 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 24 Oct 2005 17:03:13 +0000
Subject: [PATCH] Moved the getActivities and getActivityCoefficients()
 functions to the activities member group.

---
 Cantera/src/ThermoPhase.h | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/Cantera/src/ThermoPhase.h b/Cantera/src/ThermoPhase.h
index d6b2b4492..a66968029 100755
--- a/Cantera/src/ThermoPhase.h
+++ b/Cantera/src/ThermoPhase.h
@@ -361,6 +361,24 @@ namespace Cantera {
 	virtual void getUnitsStandardConc(double *uA, int k = 0,
 					  int sizeUA = 6);
 
+	/*
+	 * Return a vector of activities.
+	 */
+        void getActivities(doublereal* a);
+
+	/**
+         * Get the array of non-dimensional molar-based
+	 * activity coefficients at
+         * the current solution temperature, pressure, and
+         * solution concentration.
+         */
+        virtual void getActivityCoefficients(doublereal* ac) const {
+            if (m_kk == 1) {
+              ac[0] = 1.0;
+            } else {
+              err("getActivityCoefficients");
+            }
+        }
 
         //@}
         /// @name  Partial Molar Properties of the Solution
@@ -400,25 +418,6 @@ namespace Cantera {
             }
         }
 
-	/*
-	 * Return a vector of activities.
-	 */
-        void getActivities(doublereal* a);
-
-	/**
-         * Get the array of non-dimensional molar-based
-	 * activity coefficients at
-         * the current solution temperature, pressure, and
-         * solution concentration.
-         */
-        virtual void getActivityCoefficients(doublereal* ac) const {
-            if (m_kk == 1) {
-              ac[0] = 1.0;
-            } else {
-              err("getActivityCoefficients");
-            }
-        }
-
         /**
          * Get the species partial molar enthalpies. Units: J/kmol.
          */