From 44d17bd4aee3988654d75da86c7a92dd7d08bb43 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 2 Oct 2007 00:50:52 +0000
Subject: [PATCH] Changed the xml files to be update to date with the new
 PITZER_TEMP_COMPLEX1 format.

---
 .../cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml   | 12 ++++++------
 .../cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml  | 12 ++++++------
 test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml    | 12 ++++++------
 .../cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml   | 12 ++++++------
 .../cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml   | 12 ++++++------
 .../cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml   | 12 ++++++------
 test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml    | 12 ++++++------
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml
index a42c8cb9a..adaff9c71 100644
--- a/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml
@@ -48,8 +48,8 @@
                   <beta0> 0.0765, 0.008946, -3.3158E-6,
                           -777.03, -4.4706
                   </beta0>
-                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 , 0.0, 0.0</beta1>
+                  <beta2> 0.0 , 0.0, 0.0, 0.0, 0.0   </beta2>
                   <Cphi> 0.00127, -4.655E-5, 0.0,
                          33.317, 0.09421
                   </Cphi>
@@ -58,16 +58,16 @@
 
                 <binarySaltParameters cation="H+" anion="Cl-">
                   <beta0> 0.1775, 0.0, 0.0, 0.0, 0.0</beta0>
-                  <beta1> 0.2945, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2945, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0    </beta2>
                   <Cphi> 0.0008, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
 
                 <binarySaltParameters cation="Na+" anion="OH-">
                   <beta0> 0.0864, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.253, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.253, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.0044, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
index a42c8cb9a..adaff9c71 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
@@ -48,8 +48,8 @@
                   <beta0> 0.0765, 0.008946, -3.3158E-6,
                           -777.03, -4.4706
                   </beta0>
-                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 , 0.0, 0.0</beta1>
+                  <beta2> 0.0 , 0.0, 0.0, 0.0, 0.0   </beta2>
                   <Cphi> 0.00127, -4.655E-5, 0.0,
                          33.317, 0.09421
                   </Cphi>
@@ -58,16 +58,16 @@
 
                 <binarySaltParameters cation="H+" anion="Cl-">
                   <beta0> 0.1775, 0.0, 0.0, 0.0, 0.0</beta0>
-                  <beta1> 0.2945, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2945, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0    </beta2>
                   <Cphi> 0.0008, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
 
                 <binarySaltParameters cation="Na+" anion="OH-">
                   <beta0> 0.0864, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.253, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.253, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.0044, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml b/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
index da411599d..93ff16c87 100644
--- a/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
+++ b/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
@@ -41,8 +41,8 @@
                   <beta0> 0.0765, 0.008946, -3.3158E-6,
                           -777.03, -4.4706
                   </beta0>
-                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.00127, -4.655E-5, 0.0,
                          33.317, 0.09421
                   </Cphi>
@@ -51,16 +51,16 @@
 
                 <binarySaltParameters cation="H+" anion="Cl-">
                   <beta0> 0.1775, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.2945, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2945, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0    </beta2>
                   <Cphi> 0.0008, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
 
                 <binarySaltParameters cation="Na+" anion="OH-">
                   <beta0> 0.0864, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.253, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.253, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.0044, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
index a42c8cb9a..adaff9c71 100644
--- a/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
@@ -48,8 +48,8 @@
                   <beta0> 0.0765, 0.008946, -3.3158E-6,
                           -777.03, -4.4706
                   </beta0>
-                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 , 0.0, 0.0</beta1>
+                  <beta2> 0.0 , 0.0, 0.0, 0.0, 0.0   </beta2>
                   <Cphi> 0.00127, -4.655E-5, 0.0,
                          33.317, 0.09421
                   </Cphi>
@@ -58,16 +58,16 @@
 
                 <binarySaltParameters cation="H+" anion="Cl-">
                   <beta0> 0.1775, 0.0, 0.0, 0.0, 0.0</beta0>
-                  <beta1> 0.2945, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2945, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0    </beta2>
                   <Cphi> 0.0008, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
 
                 <binarySaltParameters cation="Na+" anion="OH-">
                   <beta0> 0.0864, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.253, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.253, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.0044, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
index a42c8cb9a..adaff9c71 100644
--- a/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
@@ -48,8 +48,8 @@
                   <beta0> 0.0765, 0.008946, -3.3158E-6,
                           -777.03, -4.4706
                   </beta0>
-                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 , 0.0, 0.0</beta1>
+                  <beta2> 0.0 , 0.0, 0.0, 0.0, 0.0   </beta2>
                   <Cphi> 0.00127, -4.655E-5, 0.0,
                          33.317, 0.09421
                   </Cphi>
@@ -58,16 +58,16 @@
 
                 <binarySaltParameters cation="H+" anion="Cl-">
                   <beta0> 0.1775, 0.0, 0.0, 0.0, 0.0</beta0>
-                  <beta1> 0.2945, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2945, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0    </beta2>
                   <Cphi> 0.0008, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
 
                 <binarySaltParameters cation="Na+" anion="OH-">
                   <beta0> 0.0864, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.253, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.253, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.0044, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
index a42c8cb9a..adaff9c71 100644
--- a/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
@@ -48,8 +48,8 @@
                   <beta0> 0.0765, 0.008946, -3.3158E-6,
                           -777.03, -4.4706
                   </beta0>
-                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 , 0.0, 0.0</beta1>
+                  <beta2> 0.0 , 0.0, 0.0, 0.0, 0.0   </beta2>
                   <Cphi> 0.00127, -4.655E-5, 0.0,
                          33.317, 0.09421
                   </Cphi>
@@ -58,16 +58,16 @@
 
                 <binarySaltParameters cation="H+" anion="Cl-">
                   <beta0> 0.1775, 0.0, 0.0, 0.0, 0.0</beta0>
-                  <beta1> 0.2945, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2945, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0    </beta2>
                   <Cphi> 0.0008, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
 
                 <binarySaltParameters cation="Na+" anion="OH-">
                   <beta0> 0.0864, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.253, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.253, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.0044, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>
diff --git a/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml b/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml
index fc5cb0e16..2da3d2654 100644
--- a/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml
+++ b/test_problems/cathermo/HMW_test_3/HMW_NaCl_tc.xml
@@ -35,8 +35,8 @@
                   <beta0> 0.0765, 0.008946, -3.3158E-6, 
                           -777.03, -4.4706
                   </beta0>
-                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2664, 6.1608E-5, 1.0715E-6, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0  </beta2>
                   <Cphi> 0.00127, -4.655E-5, 0.0, 
                          33.317, 0.09421
                   </Cphi>
@@ -47,8 +47,8 @@
                   <beta0> 0.1775, 0.0, 0.0,
                           0.0, 0.0
                   </beta0>
-                  <beta1> 0.2945, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.2945, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0 </beta2>
                   <Cphi> 0.0008, 0.0, 0.0,
                          0.0, 0.0
                   </Cphi>
@@ -57,8 +57,8 @@
 
                 <binarySaltParameters cation="Na+" anion="OH-">
                   <beta0> 0.0864, 0.0, 0.0, 0.0, 0.0 </beta0>
-                  <beta1> 0.253, 0.0, 0.0 </beta1>
-                  <beta2> 0.0    </beta2>
+                  <beta1> 0.253, 0.0, 0.0, 0.0, 0.0 </beta1>
+                  <beta2> 0.0, 0.0, 0.0, 0.0, 0.0    </beta2>
                   <Cphi> 0.0044, 0.0, 0.0, 0.0, 0.0 </Cphi>
                   <Alpha1> 2.0 </Alpha1>
                 </binarySaltParameters>