From ce0d92c6215e546dfa36388b620600a143e064af Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Wed, 24 Nov 2004 03:08:06 +0000 Subject: [PATCH] changed buildSolutionFromXML to use get_XML_NameID instead of get_XML_Node --- Cantera/src/importCTML.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Cantera/src/importCTML.cpp b/Cantera/src/importCTML.cpp index 933173cac..065a7b961 100755 --- a/Cantera/src/importCTML.cpp +++ b/Cantera/src/importCTML.cpp @@ -159,12 +159,12 @@ namespace Cantera { XML_Node *db, *doc; split(file_ID, fname, idTarget); if (fname == "") { - if (!root) return 0; - db = root->findNameID(nameTarget, idTarget); + if (!root) return 0; + db = root->findNameID(nameTarget, idTarget); } else { - doc = get_XML_File(fname); - if (!doc) return 0; - db = doc->findNameID(nameTarget, idTarget); + doc = get_XML_File(fname); + if (!doc) return 0; + db = doc->findNameID(nameTarget, idTarget); } return db; } @@ -1361,7 +1361,9 @@ next: ThermoPhase* th, Kinetics* k) { XML_Node* x; try { - x = get_XML_Node(string("#")+id, &root); + + x = get_XML_NameID(nm, string("#")+id, &root); + // x = get_XML_Node(string("#")+id, &root); /* * Fill in the ThermoPhase object by querying the