From 25953f94d4c592858bc481c3bd9d960277e2b5be Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 20 Apr 2015 21:03:19 -0400 Subject: [PATCH] [Transport] Make transport XML node optional The default is equivalent to specifying --- src/transport/TransportFactory.cpp | 17 ++++------------- test/data/air-no-reactions.xml | 2 -- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp index 65d6bbfbf..83fc187bc 100644 --- a/src/transport/TransportFactory.cpp +++ b/src/transport/TransportFactory.cpp @@ -269,19 +269,10 @@ Transport* TransportFactory::newTransport(const std::string& transportModel, Transport* TransportFactory::newTransport(thermo_t* phase, int log_level) { - XML_Node& phaseNode=phase->xml(); - /* - * Find the Thermo XML node - */ - if (!phaseNode.hasChild("transport")) { - throw CanteraError("TransportFactory::newTransport", - "no transport XML node"); - } - XML_Node& transportNode = phaseNode.child("transport"); - std::string transportModel = transportNode.attrib("model"); - if (transportModel == "") { - throw CanteraError("TransportFactory::newTransport", - "transport XML node doesn't have a model string"); + std::string transportModel = "None"; + XML_Node& phaseNode = phase->xml(); + if (phaseNode.hasChild("transport")) { + transportModel = phaseNode.child("transport").attrib("model"); } return newTransport(transportModel, phase,log_level); } diff --git a/test/data/air-no-reactions.xml b/test/data/air-no-reactions.xml index 5c1b8660c..6f20b0b7a 100644 --- a/test/data/air-no-reactions.xml +++ b/test/data/air-no-reactions.xml @@ -13,7 +13,6 @@ - @@ -28,7 +27,6 @@ This phase contains no Argon. -