From 85713b3c1fb8d1391291376610e3fc37a9b733f2 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 13 Jun 2006 16:04:26 +0000 Subject: [PATCH] Changed importPhase to call initThermoXML, not initThermo at the end of its execution. --- Cantera/src/importCTML.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Cantera/src/importCTML.cpp b/Cantera/src/importCTML.cpp index 055294450..fbb823efc 100755 --- a/Cantera/src/importCTML.cpp +++ b/Cantera/src/importCTML.cpp @@ -932,16 +932,11 @@ namespace Cantera { // done adding species. th->freezeSpecies(); - // perform any required subclass-specific initialization. - th->initThermo(); - th->saveSpeciesData(db); - // set the state of the phase from the XML specification - if (phase.hasChild("state")) { - XML_Node& state = phase.child("state"); - th->setStateFromXML(state); - } + // perform any required subclass-specific initialization. + string id = ""; + th->initThermoXML(phase, id); return true; } @@ -1358,7 +1353,11 @@ next: * * @param th This is a list of ThermoPhase pointers containing * the phases that participate in the kinetics - * reactions. + * reactions. All of the phases must have already + * been initialized and formed within Cantera. + * However, their pointers should not have been + * added to the Kinetics object; this addition + * is carried out here. * * @param k This is a pointer to the kinetics manager class * that will be initialized with a kinetics