Commit c4ac52e6 authored by Andrew Heather's avatar Andrew Heather
Browse files

fix: taking carrier specie id

parent f2f7b74f
...@@ -81,7 +81,7 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation ...@@ -81,7 +81,7 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
) )
), ),
activeLiquids_(this->coeffDict().lookup("activeLiquids")), activeLiquids_(this->coeffDict().lookup("activeLiquids")),
liqToGasMap_(activeLiquids_.size(), -1), liqToCarrierMap_(activeLiquids_.size(), -1),
liqToLiqMap_(activeLiquids_.size(), -1) liqToLiqMap_(activeLiquids_.size(), -1)
{ {
if (activeLiquids_.size() == 0) if (activeLiquids_.size() == 0)
...@@ -98,14 +98,14 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation ...@@ -98,14 +98,14 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
} }
// Determine mapping between liquid and carrier phase species // Determine mapping between liquid and carrier phase species
label idLiquid = owner.composition().idLiquid();
forAll(activeLiquids_, i) forAll(activeLiquids_, i)
{ {
liqToGasMap_[i] = liqToCarrierMap_[i] =
owner.composition().globalId(idLiquid, activeLiquids_[i]); owner.composition().globalCarrierId(activeLiquids_[i]);
} }
// Determine mapping between local and global liquids // Determine mapping between local and global liquids
label idLiquid = owner.composition().idLiquid();
forAll(activeLiquids_, i) forAll(activeLiquids_, i)
{ {
liqToLiqMap_[i] = liqToLiqMap_[i] =
...@@ -159,7 +159,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate ...@@ -159,7 +159,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate
// calculate mass transfer of each specie in liquid // calculate mass transfer of each specie in liquid
forAll(activeLiquids_, i) forAll(activeLiquids_, i)
{ {
label gid = liqToGasMap_[i]; label gid = liqToCarrierMap_[i];
label lid = liqToLiqMap_[i]; label lid = liqToLiqMap_[i];
// vapour diffusivity [m2/s] // vapour diffusivity [m2/s]
......
...@@ -60,8 +60,8 @@ protected: ...@@ -60,8 +60,8 @@ protected:
//- List of active liquid names //- List of active liquid names
List<word> activeLiquids_; List<word> activeLiquids_;
//- Mapping between liquid and carrier gas species //- Mapping between liquid and carrier species
List<label> liqToGasMap_; List<label> liqToCarrierMap_;
//- Mapping between local and global liquid species //- Mapping between local and global liquid species
List<label> liqToLiqMap_; List<label> liqToLiqMap_;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment