From a6163b96a9c0a8819b495ef73d4b507ebdda0f12 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Thu, 20 Dec 2007 23:47:41 +0000
Subject: [PATCH] Committing a few more files to get vcsnonideal test problem
 to work.

---
 test_problems/Makefile.in                     | 11 +++++++
 test_problems/VCSnonideal/.cvsignore          |  1 +
 test_problems/VCSnonideal/Makefile.in         | 33 +++++++++++++++++++
 .../cathermo/stoichSubSSTP/NaCl_Solid.xml     |  2 +-
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test_problems/VCSnonideal/.cvsignore
 create mode 100644 test_problems/VCSnonideal/Makefile.in

diff --git a/test_problems/Makefile.in b/test_problems/Makefile.in
index 0795278ad..fd200f824 100644
--- a/test_problems/Makefile.in
+++ b/test_problems/Makefile.in
@@ -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
diff --git a/test_problems/VCSnonideal/.cvsignore b/test_problems/VCSnonideal/.cvsignore
new file mode 100644
index 000000000..f3c7a7c5d
--- /dev/null
+++ b/test_problems/VCSnonideal/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/test_problems/VCSnonideal/Makefile.in b/test_problems/VCSnonideal/Makefile.in
new file mode 100644
index 000000000..f5ea312c3
--- /dev/null
+++ b/test_problems/VCSnonideal/Makefile.in
@@ -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
diff --git a/test_problems/cathermo/stoichSubSSTP/NaCl_Solid.xml b/test_problems/cathermo/stoichSubSSTP/NaCl_Solid.xml
index d7d1fdc96..d711be8ff 100644
--- a/test_problems/cathermo/stoichSubSSTP/NaCl_Solid.xml
+++ b/test_problems/cathermo/stoichSubSSTP/NaCl_Solid.xml
@@ -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"/>