COMP: avoid operator= masking (gcc-13)

This commit is contained in:
Mark Olesen
2023-06-27 09:14:35 +02:00
parent 8394e45c13
commit 1a1322a2b0
5 changed files with 36 additions and 15 deletions

View File

@ -119,16 +119,19 @@ public:
} }
// Member functions // Member Functions
// Evaluation functions //- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
);
//- Update the patch field
virtual void evaluate // Member Operators
(
const Pstream::commsTypes commsType = //- Inherit assignment operators
Pstream::commsTypes::blocking using pointPatchField<Type>::operator=;
);
}; };

View File

@ -124,7 +124,7 @@ public:
} }
// Member functions // Member Functions
// Evaluation functions // Evaluation functions
@ -141,6 +141,12 @@ public:
//- Return face-gradient transform diagonal //- Return face-gradient transform diagonal
virtual tmp<Field<Type>> snGradTransformDiag() const; virtual tmp<Field<Type>> snGradTransformDiag() const;
// Member Operators
//- Inherit assignment operators
using transformFaPatchField<Type>::operator=;
}; };

View File

@ -122,7 +122,7 @@ public:
} }
// Member functions // Member Functions
//- Return gradient at boundary //- Return gradient at boundary
virtual tmp<Field<Type>> snGrad() const; virtual tmp<Field<Type>> snGrad() const;
@ -135,6 +135,12 @@ public:
//- Return face-gradient transform diagonal //- Return face-gradient transform diagonal
virtual tmp<Field<Type>> snGradTransformDiag() const; virtual tmp<Field<Type>> snGradTransformDiag() const;
// Member Operators
//- Inherit assignment operators
using transformFvPatchField<Type>::operator=;
}; };

View File

@ -55,7 +55,7 @@ alphaContactAngleTwoPhaseFvPatchScalarField
) )
: :
fixedGradientFvPatchScalarField(p, iF), fixedGradientFvPatchScalarField(p, iF),
limit_(lcZeroGradient) limit_(limitControls::lcZeroGradient)
{} {}
@ -128,7 +128,7 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
const Pstream::commsTypes const Pstream::commsTypes
) )
{ {
if (limit_ == lcGradient) if (limit_ == limitControls::lcGradient)
{ {
gradient() = gradient() =
patch().deltaCoeffs() patch().deltaCoeffs()
@ -137,14 +137,14 @@ void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
- *this - *this
); );
} }
else if (limit_ == lcZeroGradient) else if (limit_ == limitControls::lcZeroGradient)
{ {
gradient() = Zero; gradient() = Zero;
} }
fixedGradientFvPatchScalarField::evaluate(); fixedGradientFvPatchScalarField::evaluate();
if (limit_ == lcAlpha) if (limit_ == limitControls::lcAlpha)
{ {
scalarField::operator=(clamp(*this, zero_one{})); scalarField::operator=(clamp(*this, zero_one{}));
} }

View File

@ -136,7 +136,7 @@ public:
); );
// Member functions // Member Functions
//- Return the contact angle //- Return the contact angle
virtual tmp<scalarField> theta virtual tmp<scalarField> theta
@ -153,6 +153,12 @@ public:
//- Write //- Write
virtual void write(Ostream& os) const; virtual void write(Ostream& os) const;
// Member Operators
//- Inherit assignment operators
using fvPatchField<scalar>::operator=;
}; };