diff --git a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C index 014ef3da510e3a7a24d89185332ec589cde986d9..8c698065a1849d9ab11ea7c96956ad976e5012c9 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C @@ -50,9 +50,9 @@ Foam::dieselMixture<ThermoType>::dieselMixture stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")), - fuel_(thermoDict.lookup("fuel")), - oxidant_(thermoDict.lookup("oxidant")), - products_(thermoDict.lookup("burntProducts")), + fuel_(thermoDict.subDict("fuel")), + oxidant_(thermoDict.subDict("oxidant")), + products_(thermoDict.subDict("burntProducts")), mixture_("mixture", fuel_), @@ -91,9 +91,9 @@ const ThermoType& Foam::dieselMixture<ThermoType>::mixture template<class ThermoType> void Foam::dieselMixture<ThermoType>::read(const dictionary& thermoDict) { - fuel_ = ThermoType(thermoDict.lookup("fuel")); - oxidant_ = ThermoType(thermoDict.lookup("oxidant")); - products_ = ThermoType(thermoDict.lookup("burntProducts")); + fuel_ = ThermoType(thermoDict.subDict("fuel")); + oxidant_ = ThermoType(thermoDict.subDict("oxidant")); + products_ = ThermoType(thermoDict.subDict("burntProducts")); } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C index 06cf80a47f4226b5e77c3e91636856499a9fda94..7550ebf4421842354c24850c9ccf3173af981dce 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C @@ -50,9 +50,9 @@ Foam::egrMixture<ThermoType>::egrMixture stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")), - fuel_(thermoDict.lookup("fuel")), - oxidant_(thermoDict.lookup("oxidant")), - products_(thermoDict.lookup("burntProducts")), + fuel_(thermoDict.subDict("fuel")), + oxidant_(thermoDict.subDict("oxidant")), + products_(thermoDict.subDict("burntProducts")), mixture_("mixture", fuel_), @@ -101,9 +101,9 @@ void Foam::egrMixture<ThermoType>::read(const dictionary& thermoDict) { stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio"); - fuel_ = ThermoType(thermoDict.lookup("fuel")); - oxidant_ = ThermoType(thermoDict.lookup("oxidant")); - products_ = ThermoType(thermoDict.lookup("burntProducts")); + fuel_ = ThermoType(thermoDict.subDict("fuel")); + oxidant_ = ThermoType(thermoDict.subDict("oxidant")); + products_ = ThermoType(thermoDict.subDict("burntProducts")); } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C index e72edf4b242f1fb934b31dec09d956e10f6d301c..51705086b259f85f8dde472496a252f940a04172 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C @@ -84,8 +84,8 @@ const ThermoType& Foam::homogeneousMixture<ThermoType>::mixture template<class ThermoType> void Foam::homogeneousMixture<ThermoType>::read(const dictionary& thermoDict) { - reactants_ = ThermoType(thermoDict.lookup("reactants")); - products_ = ThermoType(thermoDict.lookup("products")); + reactants_ = ThermoType(thermoDict.subDict("reactants")); + products_ = ThermoType(thermoDict.subDict("products")); } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C index 2ef52c112d097533aa13f2a0c21fbfdcc0b810c1..a4cfa2e9c0bf1e28627ada80d2e8522b9cbf348d 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C @@ -51,9 +51,9 @@ Foam::inhomogeneousMixture<ThermoType>::inhomogeneousMixture stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")), - fuel_(thermoDict.lookup("fuel")), - oxidant_(thermoDict.lookup("oxidant")), - products_(thermoDict.lookup("burntProducts")), + fuel_(thermoDict.subDict("fuel")), + oxidant_(thermoDict.subDict("oxidant")), + products_(thermoDict.subDict("burntProducts")), mixture_("mixture", fuel_), @@ -95,9 +95,9 @@ void Foam::inhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict) { stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio"); - fuel_ = ThermoType(thermoDict.lookup("fuel")); - oxidant_ = ThermoType(thermoDict.lookup("oxidant")); - products_ = ThermoType(thermoDict.lookup("burntProducts")); + fuel_ = ThermoType(thermoDict.subDict("fuel")); + oxidant_ = ThermoType(thermoDict.subDict("oxidant")); + products_ = ThermoType(thermoDict.subDict("burntProducts")); } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C index a30dd5dd1ba1defba758f5fcd8de5fbbbf7c6a6b..19f78a00c556f39552c0d23609630d912f4ced1e 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C @@ -38,7 +38,7 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData speciesData_.set ( i, - new ThermoType(thermoDict.lookup(species_[i])) + new ThermoType(thermoDict.subDict(species_[i])) ); } @@ -155,7 +155,7 @@ void Foam::multiComponentMixture<ThermoType>::read { forAll(species_, i) { - speciesData_[i] = ThermoType(thermoDict.lookup(species_[i])); + speciesData_[i] = ThermoType(thermoDict.subDict(species_[i])); } } diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C index 3684fc3e094be4bf6a1f45da1bc7e9385af5d386..942f98cc7b6164b16e70e9df1ba97dd96cbae894 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C @@ -51,9 +51,9 @@ Foam::veryInhomogeneousMixture<ThermoType>::veryInhomogeneousMixture stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")), - fuel_(thermoDict.lookup("fuel")), - oxidant_(thermoDict.lookup("oxidant")), - products_(thermoDict.lookup("burntProducts")), + fuel_(thermoDict.subDict("fuel")), + oxidant_(thermoDict.subDict("oxidant")), + products_(thermoDict.subDict("burntProducts")), mixture_("mixture", fuel_), @@ -96,9 +96,9 @@ void Foam::veryInhomogeneousMixture<ThermoType>::read const dictionary& thermoDict ) { - fuel_ = ThermoType(thermoDict.lookup("fuel")); - oxidant_ = ThermoType(thermoDict.lookup("oxidant")); - products_ = ThermoType(thermoDict.lookup("burntProducts")); + fuel_ = ThermoType(thermoDict.subDict("fuel")); + oxidant_ = ThermoType(thermoDict.subDict("oxidant")); + products_ = ThermoType(thermoDict.subDict("burntProducts")); }