diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C index 80a609a2f..881deb92c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C @@ -254,59 +254,6 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs() } -Foam::tmp -Foam::totalPressureFvPatchScalarField::snGrad() const -{ - return tmp - ( - new scalarField(this->size(), 0.0) - ); -} - - -Foam::tmp -Foam::totalPressureFvPatchScalarField::valueInternalCoeffs -( - const tmp& -) const -{ - return tmp - ( - new scalarField(this->size(), 0.0) - ); -} - - -Foam::tmp -Foam::totalPressureFvPatchScalarField::valueBoundaryCoeffs -( - const tmp& -) const -{ - return *this; -} - - -Foam::tmp -Foam::totalPressureFvPatchScalarField::gradientInternalCoeffs() const -{ - return tmp - ( - new scalarField(this->size(), 0.0) - ); -} - - -Foam::tmp -Foam::totalPressureFvPatchScalarField::gradientBoundaryCoeffs() const -{ - return tmp - ( - new scalarField(this->size(), 0.0) - ); -} - - void Foam::totalPressureFvPatchScalarField::write(Ostream& os) const { fvPatchScalarField::write(os); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H index 5b3773ad5..51e354f28 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H @@ -207,30 +207,6 @@ public: //- Update the coefficients associated with the patch field virtual void updateCoeffs(); - //- Return patch-normal gradient - virtual tmp snGrad() const; - - //- Return the matrix diagonal coefficients corresponding to the - // evaluation of the value of this patchField with given weights - virtual tmp valueInternalCoeffs - ( - const tmp& - ) const; - - //- Return the matrix source coefficients corresponding to the - // evaluation of the value of this patchField with given weights - virtual tmp valueBoundaryCoeffs - ( - const tmp& - ) const; - - //- Return the matrix diagonal coefficients corresponding to the - // evaluation of the gradient of this patchField - virtual tmp gradientInternalCoeffs() const; - - //- Return the matrix source coefficients corresponding to the - // evaluation of the gradient of this patchField - virtual tmp gradientBoundaryCoeffs() const; //- Write virtual void write(Ostream&) const; diff --git a/src/foam/containers/Lists/UList/UListI.H b/src/foam/containers/Lists/UList/UListI.H index 61d8f664a..295cd25e8 100644 --- a/src/foam/containers/Lists/UList/UListI.H +++ b/src/foam/containers/Lists/UList/UListI.H @@ -90,7 +90,7 @@ inline void Foam::UList::checkStart(const label start) const if (start<0 || (start && start>=size_)) { FatalErrorIn("UList::checkStart(const label)") - << "start " << start << " out of range 0 ... " << max(label(size_-1), label(0)) + << "start " << start << " out of range 0 ... " << max(size_-1, 0) << abort(FatalError); } } diff --git a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.C b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.C index 49795cd65..be722ae8d 100644 --- a/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.C +++ b/src/foam/matrices/blockLduMatrix/BlockLduPrecons/BlockILUCpPrecon/BlockILUCpPrecon.C @@ -168,7 +168,7 @@ void Foam::BlockILUCpPrecon::calcActiveTypeFactorization // Update diagonal entry, inverting it for future use LDUType& diagRowI = diagPtr[rowI]; - diagRowI = mult.inv(zDiagI); + diagRowI = mult.inverse(zDiag); // Index for updating L and U register label zwIndex; diff --git a/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C b/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C index 12101d630..a90c9a1c1 100644 --- a/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C @@ -295,7 +295,7 @@ void coupledKEpsilon::correct() + fvm::div(phi_, k_) + fvm::SuSp(-fvc::div(phi_), k_) - fvm::laplacian(DkEff(), k_) - + fvm::Sp(Cmu_*k_/(nut_ + nutSmall_), k_) + + fvm::Sp(Cmu_*k_/(nut_ + nutSmall), k_) - G );