From c095b5b89f9df55fcdfe324f358ebef8d420caa6 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Mon, 2 Oct 2017 11:00:47 +0100 Subject: [PATCH] waves: Fixed compilation with Clang --- .../wavePressure/wavePressureFvPatchScalarField.C | 6 ++++-- .../waveVelocity/waveVelocityFvPatchVectorField.C | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/waves/derivedFvPatchFields/wavePressure/wavePressureFvPatchScalarField.C b/src/waves/derivedFvPatchFields/wavePressure/wavePressureFvPatchScalarField.C index 951491cdb2..a75eb70c40 100644 --- a/src/waves/derivedFvPatchFields/wavePressure/wavePressureFvPatchScalarField.C +++ b/src/waves/derivedFvPatchFields/wavePressure/wavePressureFvPatchScalarField.C @@ -151,7 +151,8 @@ Foam::tmp Foam::wavePressureFvPatchScalarField::pn() const const fvMesh& meshs = subset.subMesh(); const label patchis = findIndex(subset.patchMap(), patch().index()); - const scalarField ps = + const scalarField ps + ( levelSetAverage ( meshs, @@ -161,7 +162,8 @@ Foam::tmp Foam::wavePressureFvPatchScalarField::pn() const Up.waves().pGas(t, meshs.points())(), Up.waves().pLiquid(t, meshs.cellCentres())(), Up.waves().pLiquid(t, meshs.points())() - ); + ) + ); tmp tResult(new scalarField(patch().size())); scalarField& result = tResult.ref(); diff --git a/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C index 7a6a278f9c..b3ebd1b9e5 100644 --- a/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C +++ b/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C @@ -180,7 +180,8 @@ Foam::tmp Foam::waveVelocityFvPatchVectorField::Un() const const fvMesh& meshs = subset.subMesh(); const label patchis = findIndex(subset.patchMap(), patch().index()); - const vectorField Us = + const vectorField Us + ( levelSetAverage ( meshs, @@ -190,7 +191,8 @@ Foam::tmp Foam::waveVelocityFvPatchVectorField::Un() const waves_.UGas(t, meshs.points())(), waves_.ULiquid(t, meshs.cellCentres())(), waves_.ULiquid(t, meshs.points())() - ); + ) + ); tmp tResult(new vectorField(patch().size())); vectorField& result = tResult.ref();