Skip to content
Snippets Groups Projects
Commit dfaefb75 authored by andy's avatar andy
Browse files

BUG: Corrected particle local interaction model

parent 3dba6cfc
Branches
Tags
No related merge requests found
...@@ -27,24 +27,6 @@ License ...@@ -27,24 +27,6 @@ License
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
template<class CloudType>
Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
(
const label globalPatchI
) const
{
forAll(patchIDs_, patchI)
{
if (patchIDs_[patchI] == globalPatchI)
{
return patchI;
}
}
return -1;
}
template<class CloudType> template<class CloudType>
void Foam::LocalInteraction<CloudType>::readProps() void Foam::LocalInteraction<CloudType>::readProps()
{ {
...@@ -131,7 +113,6 @@ Foam::LocalInteraction<CloudType>::LocalInteraction ...@@ -131,7 +113,6 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
: :
PatchInteractionModel<CloudType>(dict, cloud, typeName), PatchInteractionModel<CloudType>(dict, cloud, typeName),
patchData_(cloud.mesh(), this->coeffDict()), patchData_(cloud.mesh(), this->coeffDict()),
patchIDs_(patchData_.size()),
nEscape0_(patchData_.size(), 0), nEscape0_(patchData_.size(), 0),
massEscape0_(patchData_.size(), 0.0), massEscape0_(patchData_.size(), 0.0),
nStick0_(patchData_.size(), 0), nStick0_(patchData_.size(), 0),
...@@ -173,7 +154,6 @@ Foam::LocalInteraction<CloudType>::LocalInteraction ...@@ -173,7 +154,6 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
: :
PatchInteractionModel<CloudType>(pim), PatchInteractionModel<CloudType>(pim),
patchData_(pim.patchData_), patchData_(pim.patchData_),
patchIDs_(pim.patchIDs_),
nEscape0_(pim.nEscape0_), nEscape0_(pim.nEscape0_),
massEscape0_(pim.massEscape0_), massEscape0_(pim.massEscape0_),
nStick0_(pim.nStick0_), nStick0_(pim.nStick0_),
...@@ -208,7 +188,7 @@ bool Foam::LocalInteraction<CloudType>::correct ...@@ -208,7 +188,7 @@ bool Foam::LocalInteraction<CloudType>::correct
bool& active = p.active(); bool& active = p.active();
label patchI = applyToPatch(pp.index()); label patchI = patchData_.applyToPatch(pp.index());
if (patchI >= 0) if (patchI >= 0)
{ {
......
...@@ -53,9 +53,6 @@ class LocalInteraction ...@@ -53,9 +53,6 @@ class LocalInteraction
//- List of participating patches //- List of participating patches
const patchInteractionDataList patchData_; const patchInteractionDataList patchData_;
//- List of participating patch ids
List<label> patchIDs_;
// Counters for initial particle fates // Counters for initial particle fates
...@@ -89,9 +86,6 @@ class LocalInteraction ...@@ -89,9 +86,6 @@ class LocalInteraction
// Private Member Functions // Private Member Functions
//- Returns local patchI if patch is in patchIds_ list
label applyToPatch(const label globalPatchI) const;
//- Read interaction properties from file //- Read interaction properties from file
void readProps(); void readProps();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment