diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C index d583a551c1..fa37b022ed 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C @@ -30,6 +30,14 @@ Description // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +template +Foam::DispersionModel::DispersionModel(CloudType& owner) +: + dict_(dictionary::null), + owner_(owner) +{} + + template Foam::DispersionModel::DispersionModel ( diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H index 5cd9eaab2f..085ff97b8a 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H @@ -81,6 +81,9 @@ public: // Constructors + //- Construct null from owner + DispersionModel(CloudType& owner); + //- Construct from components DispersionModel ( diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C index 5a41d3f39e..221eb2b229 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C @@ -33,11 +33,11 @@ Description template Foam::NoDispersion::NoDispersion ( - const dictionary& dict, + const dictionary&, CloudType& owner ) : - DispersionModel(dict, owner) + DispersionModel(owner) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H index 48af46260e..48e938cc03 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H @@ -26,7 +26,7 @@ Class Foam::NoDispersion Description - No turbulent dispersion of the parcels + Place holder for 'none' option \*---------------------------------------------------------------------------*/ @@ -41,7 +41,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class NoDispersion Declaration + Class NoDispersion Declaration \*---------------------------------------------------------------------------*/ template @@ -52,7 +52,7 @@ class NoDispersion public: //- Runtime type information - TypeName("NoDispersion"); + TypeName("none"); // Constructors diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C index a9f6e5738a..d0afb84cb0 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C @@ -81,7 +81,7 @@ Foam::LiquidEvaporation::LiquidEvaporation ) ), activeLiquids_(this->coeffDict().lookup("activeLiquids")), - liqToGasMap_(activeLiquids_.size(), -1), + liqToCarrierMap_(activeLiquids_.size(), -1), liqToLiqMap_(activeLiquids_.size(), -1) { if (activeLiquids_.size() == 0) @@ -98,14 +98,14 @@ Foam::LiquidEvaporation::LiquidEvaporation } // Determine mapping between liquid and carrier phase species - label idLiquid = owner.composition().idLiquid(); forAll(activeLiquids_, i) { - liqToGasMap_[i] = - owner.composition().globalId(idLiquid, activeLiquids_[i]); + liqToCarrierMap_[i] = + owner.composition().globalCarrierId(activeLiquids_[i]); } // Determine mapping between local and global liquids + label idLiquid = owner.composition().idLiquid(); forAll(activeLiquids_, i) { liqToLiqMap_[i] = @@ -159,7 +159,7 @@ void Foam::LiquidEvaporation::calculate // calculate mass transfer of each specie in liquid forAll(activeLiquids_, i) { - label gid = liqToGasMap_[i]; + label gid = liqToCarrierMap_[i]; label lid = liqToLiqMap_[i]; // vapour diffusivity [m2/s] diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H index d2a1f903da..9c650f1c2e 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H @@ -60,8 +60,8 @@ protected: //- List of active liquid names List activeLiquids_; - //- Mapping between liquid and carrier gas species - List