From f50e48e54f94479bec496d73139b4166d4d4480e Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Sat, 10 Feb 2007 13:54:30 +0000
Subject: [PATCH] updated equilibrate to use 2-character string rather than an
 integer.

---
 Cantera/fortran/src/cantera_thermo.f90 | 30 +++++++++++++-------------
 Cantera/fortran/src/fct_interface.f90  |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cantera/fortran/src/cantera_thermo.f90 b/Cantera/fortran/src/cantera_thermo.f90
index 8b0edffdd..ee5074a3a 100644
--- a/Cantera/fortran/src/cantera_thermo.f90
+++ b/Cantera/fortran/src/cantera_thermo.f90
@@ -14,21 +14,21 @@ module cantera_thermo
   end type phase_t
 
 ! these definitions are for use with the equilibrate function.
-  integer, parameter :: TV = 100
-  integer, parameter :: HP = 101
-  integer, parameter :: SP = 102
-  integer, parameter :: PV = 103
-  integer, parameter :: TP = 104
-  integer, parameter :: UV = 105
-  integer, parameter :: SV = 107
+!  integer, parameter :: TV = 100
+!  integer, parameter :: HP = 101
+!  integer, parameter :: SP = 102
+!  integer, parameter :: PV = 103
+!  integer, parameter :: TP = 104
+!  integer, parameter :: UV = 105
+!  integer, parameter :: SV = 107
 
-  integer, parameter :: VT = -100
-  integer, parameter :: PH = -101
-  integer, parameter :: PS = -102
-  integer, parameter :: VP = -103
-  integer, parameter :: PT = -104
-  integer, parameter :: VU = -105
-  integer, parameter :: VS = -107
+!  integer, parameter :: VT = -100
+!  integer, parameter :: PH = -101
+!  integer, parameter :: PS = -102
+!  integer, parameter :: VP = -103
+!  integer, parameter :: PT = -104
+!  integer, parameter :: VU = -105
+!  integer, parameter :: VS = -107
 
 contains
 
@@ -402,7 +402,7 @@ contains
     subroutine ctthermo_equilibrate(self, XY)
       implicit none
       type(phase_t), intent(inout) :: self
-      integer, intent(in) :: XY
+      character*(*), intent(in) :: XY
       self%err = th_equil(self%thermo_id, XY)
     end subroutine ctthermo_equilibrate
 
diff --git a/Cantera/fortran/src/fct_interface.f90 b/Cantera/fortran/src/fct_interface.f90
index fb580a7d9..c36ce38a7 100644
--- a/Cantera/fortran/src/fct_interface.f90
+++ b/Cantera/fortran/src/fct_interface.f90
@@ -216,7 +216,7 @@ interface
 
     integer function th_equil(n, XY)
         integer, intent(in) :: n
-        integer, intent(in) :: XY
+        character*(*), intent(in) :: XY
     end function th_equil
 
     double precision function th_refpressure(n)