From 338a38b87c280c06b439f89ccc0c4327abbcdda1 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 24 Jan 2019 15:39:33 -0500 Subject: [PATCH] [Input] Store additional species transport data in TransportData object --- include/cantera/transport/TransportData.h | 5 ++++- src/transport/TransportData.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/cantera/transport/TransportData.h b/include/cantera/transport/TransportData.h index 2ce7d244a..a3fb79a41 100644 --- a/include/cantera/transport/TransportData.h +++ b/include/cantera/transport/TransportData.h @@ -7,13 +7,13 @@ #define CT_TRANSPORTDATA_H #include "cantera/base/ct_defs.h" +#include "cantera/base/AnyMap.h" namespace Cantera { class Species; class XML_Node; -class AnyMap; //! Base class for transport data for a single species class TransportData @@ -23,6 +23,9 @@ public: virtual ~TransportData() {} virtual void validate(const Species& species) {} + + //! Input data used for specific models + AnyMap input; }; //! Transport data for a single gas-phase species which can be used in diff --git a/src/transport/TransportData.cpp b/src/transport/TransportData.cpp index d3a9a8c7b..abfcb5784 100644 --- a/src/transport/TransportData.cpp +++ b/src/transport/TransportData.cpp @@ -9,6 +9,8 @@ #include "cantera/base/stringUtils.h" #include "cantera/base/ctml.h" +#include + namespace Cantera { GasTransportData::GasTransportData() @@ -168,6 +170,8 @@ void setupGasTransportData(GasTransportData& tr, const AnyMap& node) tr.setCustomaryUnits(geometry, diameter, welldepth, dipole, polar, rot, acentric, dispersion, quad); + + tr.input = node; } shared_ptr newTransportData(const XML_Node& transport_node) @@ -191,7 +195,9 @@ unique_ptr newTransportData(const AnyMap& node) return unique_ptr(move(tr)); } else { // Transport model not handled here - return unique_ptr(new TransportData()); + unique_ptr tr(new TransportData()); + tr->input = node; + return tr; } }