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.
This commit is contained in:
Harry Moffat
2007-04-17 21:10:14 +00:00
parent 05e16e8e35
commit a15b30e7ba
3 changed files with 6 additions and 11 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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)