From 7f7cbddd01d04096fff6b8d1b196da2242071219 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 16 Feb 2011 14:42:35 +0100
Subject: [PATCH] COMP: adjustments to compile with clang
---
.../mesh/generation/extrude/extrudeMesh/extrudeMesh.C | 2 +-
.../PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt | 1 +
.../ForceTypes/ParticleForceList/ParticleForceList.C | 6 +++++-
.../PressureGradient/PressureGradientForceI.H | 2 +-
.../ParticleForces/BrownianMotion/BrownianMotionForce.C | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 5804d962c81..3a690cba2de 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
// Layers per point
labelList nPointLayers(extrudePatch.nPoints(), model().nLayers());
// Displacement for first layer
- vectorField firstLayerDisp = displacement*model().sumThickness(1);
+ vectorField firstLayerDisp(displacement*model().sumThickness(1));
// Expansion ratio not used.
scalarField ratio(extrudePatch.nPoints(), 1.0);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
index 93dc9f702ef..2c4be8d2d01 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
@@ -18,6 +18,7 @@ LINK_DIRECTORIES(
)
INCLUDE_DIRECTORIES(
+ $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
$ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
$ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
${PROJECT_SOURCE_DIR}/../vtkPV3Foam
diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
index 452ef6690d3..710ecdbb62b 100644
--- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
+++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
@@ -71,7 +71,11 @@ Foam::ParticleForceList<CloudType>::ParticleForceList
forAllConstIter(wordHashSet, models, iter)
{
const word& model = iter.key();
- set(i, ParticleForce<CloudType>::New(owner, mesh, dict, model));
+ this->set
+ (
+ i,
+ ParticleForce<CloudType>::New(owner, mesh, dict, model)
+ );
i++;
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
index ac81740903e..07b3d244be0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForceI.H
@@ -41,7 +41,7 @@ const
"const"
) << "gradU field not allocated" << abort(FatalError);
- return reinterpret_cast<const volTensorField>(0);
+ return *reinterpret_cast<const volTensorField*>(0);
}
}
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 5d2c759b941..71c0378e7c9 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -72,7 +72,7 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
if (turbulence_)
{
HashTable<const compressible::turbulenceModel*> models =
- this->mesh().objectRegistry::lookupClass
+ this->mesh().objectRegistry::template lookupClass
<
compressible::turbulenceModel
>();
--
GitLab