From a15b30e7bae5f09f1b97ec61a55cca5e63ff792e Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 17 Apr 2007 21:10:14 +0000
Subject: [PATCH] Fixed an error in the test suite. Changed some files around
 in caThermo so that requesting the ideal solution option but not the
 electrochemistry option will now pass the test suite.

---
 Cantera/src/thermo/Makefile.in | 11 +++++------
 ext/f2c_libs/arith.h           |  4 ----
 test_problems/Makefile.in      |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Cantera/src/thermo/Makefile.in b/Cantera/src/thermo/Makefile.in
index 21bce9fea..34c477bf1 100644
--- a/Cantera/src/thermo/Makefile.in
+++ b/Cantera/src/thermo/Makefile.in
@@ -32,24 +32,23 @@ CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) $(CXX_OPT) $(PIC_FLAG) $(DEBUG_FLAG)
 # Extended Cantera Thermodynamics Object Files
 
 ifeq ($(do_electro),1)
-ELECTRO_OBJ = SingleSpeciesTP.o StoichSubstanceSSTP.o \
-              MolalityVPSSTP.o  VPStandardStateTP.o \
+do_issp = 1
+ELECTRO_OBJ = MolalityVPSSTP.o  VPStandardStateTP.o \
               IdealSolidSolnPhase.o IdealMolalSoln.o \
               WaterPropsIAPWSphi.o WaterPropsIAPWS.o WaterProps.o \
               PDSS.o WaterPDSS.o \
 	      HMWSoln.o HMWSoln_input.o DebyeHuckel.o \
               IdealGasPDSS.o WaterSSTP.o
 
-ELECTRO_H =  SingleSpeciesTP.h StoichSubstanceSSTP.h \
-               MolalityVPSSTP.h  VPStandardStateTP.h \
+ELECTRO_H = MolalityVPSSTP.h  VPStandardStateTP.h \
                IdealSolidSolnPhase.h IdealMolalSoln.h \
                WaterPropsIAPWSphi.h WaterPropsIAPWS.h WaterProps.h \
                PDSS.h WaterPDSS.h HMWSoln.h electrolytes.h \
 	       DebyeHuckel.h IdealGasPDSS.h WaterSSTP.h
 endif
 ifeq ($(do_issp),1)
-ISSP_OBJ = IdealSolidSolnPhase.o
-ISSP_H   = IdealSolidSolnPhase.h
+ISSP_OBJ = IdealSolidSolnPhase.o  StoichSubstanceSSTP.o SingleSpeciesTP.o 
+ISSP_H   = IdealSolidSolnPhase.h  StoichSubstanceSSTP.h SingleSpeciesTP.h
 endif
 
 CATHERMO_OBJ = $(ELECTRO_OBJ) $(ISSP_OBJ) 
diff --git a/ext/f2c_libs/arith.h b/ext/f2c_libs/arith.h
index 32513b96e..76539f82b 100644
--- a/ext/f2c_libs/arith.h
+++ b/ext/f2c_libs/arith.h
@@ -1,6 +1,2 @@
 #define IEEE_8087
 #define Arith_Kind_ASL 1
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#define X64_bit_pointers
diff --git a/test_problems/Makefile.in b/test_problems/Makefile.in
index 65493ddae..cc218b74c 100644
--- a/test_problems/Makefile.in
+++ b/test_problems/Makefile.in
@@ -19,7 +19,7 @@ all:
 	cd ChemEquil_gri_pairs; @MAKE@ all
 	cd ChemEquil_ionizedGas; @MAKE@ all
 	cd ChemEquil_red1; @MAKE@ all
-ifeq ($(test_cathermo),1)
+ifeq ($(test_pure_fluids),1)
 	cd pureFluidTest;     @MAKE@ all
 endif
 ifeq ($(test_python),1)