Commit 39fd82ea authored by Henry Weller's avatar Henry Weller
Browse files

fvPatchField, cyclicACMI: Renamed weighted updateCoeffs

updateCoeffs(const scalarField&) -> updateWeightedCoeffs(const scalarField&)

to avoid confusion with other specialized forms of updateCoeffs.

Patch contributed by Mattijs Janssens
parent 1e2bba05
......@@ -445,7 +445,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs()
}
void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs
void Foam::epsilonWallFunctionFvPatchScalarField::updateWeightedCoeffs
(
const scalarField& weights
)
......
......@@ -257,7 +257,7 @@ public:
virtual void updateCoeffs();
//- Update the coefficients associated with the patch field
virtual void updateCoeffs(const scalarField& weights);
virtual void updateWeightedCoeffs(const scalarField& weights);
//- Manipulate matrix
virtual void manipulateMatrix(fvMatrix<scalar>& matrix);
......
......@@ -455,7 +455,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
}
void omegaWallFunctionFvPatchScalarField::updateCoeffs
void omegaWallFunctionFvPatchScalarField::updateWeightedCoeffs
(
const scalarField& weights
)
......
......@@ -264,7 +264,7 @@ public:
virtual void updateCoeffs();
//- Update the coefficients associated with the patch field
virtual void updateCoeffs(const scalarField& weights);
virtual void updateWeightedCoeffs(const scalarField& weights);
//- Manipulate matrix
virtual void manipulateMatrix(fvMatrix<scalar>& matrix);
......
......@@ -270,6 +270,21 @@ void Foam::cyclicACMIFvPatchField<Type>::manipulateMatrix
}
template<class Type>
void Foam::cyclicACMIFvPatchField<Type>::updateCoeffs()
{
// Update non-overlap patch - some will implement updateCoeffs, and
// others will implement evaluate
// Pass in (1 - mask) to give non-overlap patch the chance to do
// manipulation of non-face based data
const scalarField& mask = cyclicACMIPatch_.cyclicACMIPatch().mask();
const fvPatchField<Type>& npf = nonOverlapPatchField();
const_cast<fvPatchField<Type>&>(npf).updateWeightedCoeffs(1.0 - mask);
}
template<class Type>
void Foam::cyclicACMIFvPatchField<Type>::write(Ostream& os) const
{
......
......@@ -221,6 +221,9 @@ public:
//- Manipulate matrix
virtual void manipulateMatrix(fvMatrix<Type>& matrix);
//- Update the coefficients associated with the patch field
void updateCoeffs();
// Cyclic AMI coupled interface functions
......
......@@ -315,15 +315,13 @@ void Foam::fvPatchField<Type>::updateCoeffs()
template<class Type>
void Foam::fvPatchField<Type>::updateCoeffs(const scalarField& weights)
void Foam::fvPatchField<Type>::updateWeightedCoeffs(const scalarField& weights)
{
// Default behaviour ignores the weights
if (!updated_)
{
updateCoeffs();
Field<Type>& fld = *this;
fld *= weights;
updated_ = true;
}
}
......
......@@ -417,9 +417,10 @@ public:
virtual void updateCoeffs();
//- Update the coefficients associated with the patch field
// and apply weight field
// Sets Updated to true
virtual void updateCoeffs(const scalarField& weights);
// with a weight field (0..1). This weight field is ususally
// provided as the amount of geometric overlap for 'duplicate'
// patches. Sets Updated to true
virtual void updateWeightedCoeffs(const scalarField& weights);
//- Return internal field next to patch as patch field
virtual tmp<Field<Type>> patchInternalField() const;
......
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