From e08395c045af84a48c8eeeadfe4742ff4e20a14b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 17 Dec 2010 16:49:49 +0100
Subject: [PATCH] COMP: avoid ambiguous construct from tmp -
finiteVolume/cfdTools
---
.../cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C | 7 +++++--
.../actuationDiskSource/actuationDiskSourceTemplates.C | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index c714c6a83d6..21ee073fef9 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -162,7 +162,10 @@ Foam::vectorField Foam::SRF::SRFModel::velocity
const vectorField& positions
) const
{
- return omega_.value() ^ (positions - axis_*(axis_ & positions));
+ tmp<vectorField> tfld =
+ omega_.value() ^ (positions - axis_*(axis_ & positions));
+
+ return tfld();
}
@@ -188,7 +191,7 @@ Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::U() const
Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::Uabs() const
{
- const volVectorField Usrf = U();
+ tmp<volVectorField> Usrf = U();
tmp<volVectorField> tUabs
(
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C
index 971b8edfcdd..dde7ffc3c23 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C
@@ -49,7 +49,7 @@ void Foam::actuationDiskSource::addActuationDiskAxialInertialResistance
E.xx() = uniDiskDir.x();
E.yy() = uniDiskDir.y();
E.zz() = uniDiskDir.z();
- vectorField U1 = (1.0 - a)*U;
+ const vectorField U1((1.0 - a)*U);
forAll(cells, i)
{
totVol += V[cells[i]];
--
GitLab