From f2bf58281c999a8ca1d2c72fad543522814b8197 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sun, 11 Jan 2009 21:43:20 +0000 Subject: [PATCH] Allowed theta and Theta for the name of XML nodes. Also Psi and psi work as well. --- Cantera/src/thermo/HMWSoln_input.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cantera/src/thermo/HMWSoln_input.cpp b/Cantera/src/thermo/HMWSoln_input.cpp index 80dc8aa22..fa952439e 100644 --- a/Cantera/src/thermo/HMWSoln_input.cpp +++ b/Cantera/src/thermo/HMWSoln_input.cpp @@ -266,7 +266,7 @@ namespace Cantera { } /** - * Process an XML node called "ThetaAnion". + * Process an XML node called "thetaAnion". * This node contains all of the parameters necessary to describe * the binary interactions between two anions. */ @@ -315,7 +315,7 @@ namespace Cantera { stemp = xmlChild.name(); string nodeName = lowercase(stemp); if (nodeName == "theta") { - getFloatArray(xmlChild, vParams, false, "", "Theta"); + getFloatArray(xmlChild, vParams, false, "", stemp); nParamsFound = vParams.size(); if (m_formPitzerTemp == PITZER_TEMP_CONSTANT) { if (nParamsFound != 1) { @@ -353,7 +353,7 @@ namespace Cantera { } /** - * Process an XML node called "ThetaCation". + * Process an XML node called "thetaCation". * This node contains all of the parameters necessary to describe * the binary interactions between two cation. */ @@ -402,7 +402,7 @@ namespace Cantera { stemp = xmlChild.name(); string nodeName = lowercase(stemp); if (nodeName == "theta") { - getFloatArray(xmlChild, vParams, false, "", "Theta"); + getFloatArray(xmlChild, vParams, false, "", stemp); nParamsFound = vParams.size(); if (m_formPitzerTemp == PITZER_TEMP_CONSTANT) { if (nParamsFound != 1) { @@ -514,7 +514,7 @@ namespace Cantera { } } if (nodeName == "psi") { - getFloatArray(xmlChild, vParams, false, "", "Psi"); + getFloatArray(xmlChild, vParams, false, "", stemp); nParamsFound = vParams.size(); n = iSpecies * m_kk *m_kk + jSpecies * m_kk + kSpecies ; @@ -660,7 +660,7 @@ namespace Cantera { } if (nodeName == "psi") { - getFloatArray(xmlChild, vParams, false, "", "Psi"); + getFloatArray(xmlChild, vParams, false, "", stemp); nParamsFound = vParams.size(); n = iSpecies * m_kk *m_kk + jSpecies * m_kk + kSpecies ;