Committing a few more files to get vcsnonideal test problem to work.

This commit is contained in:
Harry Moffat 2007-12-20 23:47:41 +00:00
parent 151bdcaa22
commit a6163b96a9
4 changed files with 46 additions and 1 deletions

View file

@ -8,6 +8,7 @@ test_python=@BUILD_PYTHON@
test_ck=@BUILD_CK@
test_cathermo=@NEED_CATHERMO@
test_pure_fluids=@COMPILE_PURE_FLUIDS@
test_vcs_nonideal=@COMPILE_VCSNONIDEAL@
all:
cd cxx_ex; @MAKE@ all
@ -40,6 +41,9 @@ endif
ifeq ($(test_cathermo),1)
cd cathermo; @MAKE@ all
endif
ifeq ($(test_vcs_nonideal),1)
cd VCSnonideal; @MAKE@ all
endif
test:
@ cd cxx_ex; @MAKE@ -s test
@ -74,6 +78,9 @@ endif
ifeq ($(test_cathermo),1)
cd cathermo; @MAKE@ -s test
endif
ifeq ($(test_vcs_nonideal),1)
cd VCSnonideal; @MAKE@ -s test
endif
clean:
$(RM) *.*~
@ -98,6 +105,7 @@ clean:
cd min_python; @MAKE@ clean
cd python; @MAKE@ clean
cd cathermo; @MAKE@ clean
cd VCSnonideal; @MAKE@ clean
depends:
cd cxx_ex; @MAKE@ depends
@ -132,3 +140,6 @@ endif
ifeq ($(test_cathermo),1)
cd cathermo; @MAKE@ depends
endif
ifeq ($(test_vcs_nonideal),1)
cd VCSnonideal; @MAKE@ depends
endif

View file

@ -0,0 +1 @@
Makefile

View file

@ -0,0 +1,33 @@
#
# $Revision$
# $Author$
# $Date$
#
#
test_vcs_nonideal=@COMPILE_VCSNONIDEAL@
all:
ifeq ($(test_vcs_nonideal),1)
cd NaCl_equil; @MAKE@ all
endif
test:
ifeq ($(test_vcs_nonideal),1)
cd NaCl_equil; @MAKE@ -s test
endif
#
# Have to remove .depends before calling make, because
# the rule for updating .depends is invoked, before the clean rule,
# if .depends exists in the directory.
#
clean:
$(RM) *.*~
cd NaCl_equil; $(RM) .depends ; @MAKE@ clean
depends:
ifeq ($(test_vcs_nonideal),1)
cd NaCl_equil; @MAKE@ depends
endif

View file

@ -9,7 +9,7 @@
O H C Fe Ca N Na Cl
</elementArray>
<speciesArray datasrc="#species_NaCl(S)"> NaCl(S) </speciesArray>
<thermo model="StoichSubstanceSSTP">
<thermo model="StoichSubstance">
<density units="g/cm3">2.165</density>
</thermo>
<transport model="None"/>