From 6180e0db8b7161f0cbb1b366c3cf618d29aaf751 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 18 May 2018 10:49:10 +0100
Subject: [PATCH] INT: Additional integration updates/clean-up
---
applications/solvers/compressible/rhoPimpleFoam/Make/options | 3 ++-
applications/solvers/compressible/rhoSimpleFoam/Make/options | 3 ++-
.../heatTransfer/buoyantBoussinesqPimpleFoam/Make/options | 3 ++-
.../heatTransfer/buoyantBoussinesqSimpleFoam/Make/options | 3 ++-
.../solvers/heatTransfer/buoyantPimpleFoam/Make/options | 3 ++-
.../solvers/heatTransfer/buoyantSimpleFoam/Make/options | 3 ++-
applications/solvers/incompressible/pimpleFoam/Make/options | 3 ++-
applications/solvers/incompressible/simpleFoam/Make/options | 3 ++-
src/atmosphericModels/Make/options | 4 ++--
.../derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H | 5 ++---
.../atmBoundaryLayerInletEpsilonFvPatchScalarField.C | 2 +-
.../atmBoundaryLayerInletKFvPatchScalarField.C | 2 +-
.../atmBoundaryLayerInletVelocityFvPatchVectorField.C | 2 +-
.../kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H | 2 +-
.../simpleFoam/turbineSiting/system/controlDict | 2 --
15 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options
index c3f820e3be4..958a2d2fc81 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@@ -22,4 +22,5 @@ EXE_LIBS = \
-lfvOptions \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
- -ldynamicMesh
+ -ldynamicMesh \
+ -latmosphericModels
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options
index aecfa919e7f..d3514cf84d7 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@@ -17,4 +17,5 @@ EXE_LIBS = \
-lfiniteVolume \
-lsampling \
-lmeshTools \
- -lfvOptions
+ -lfvOptions \
+ -latmosphericModels
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
index 043be5d13c2..767fc60e5b6 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
@@ -18,4 +18,5 @@ EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lsampling \
- -lmeshTools
+ -lmeshTools \
+ -latmosphericModels
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
index 9046994122c..e805213895f 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options
@@ -16,4 +16,5 @@ EXE_LIBS = \
-lfiniteVolume \
-lsampling \
-lmeshTools \
- -lfvOptions
+ -lfvOptions \
+ -latmosphericModels
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
index 934083f2bba..cc85f5e8ccb 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@@ -18,4 +18,5 @@ EXE_LIBS = \
-lradiationModels \
-lspecie \
-lturbulenceModels \
- -lcompressibleTurbulenceModels
+ -lcompressibleTurbulenceModels \
+ -latmosphericModels
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
index 0d9433bac7d..c5694b8e518 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
-lradiationModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
- -lmeshTools
+ -lmeshTools \
+ -latmosphericModels
diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options
index 14a5a2d924c..dc33faebf8d 100644
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@@ -19,4 +19,5 @@ EXE_LIBS = \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
-ldynamicMesh \
- -lmeshTools
+ -lmeshTools \
+ -latmosphericModels
diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options
index 1d9ded80bfa..13060603d19 100644
--- a/applications/solvers/incompressible/simpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/Make/options
@@ -15,4 +15,5 @@ EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lfvOptions \
- -lsampling
+ -lsampling \
+ -latmosphericModels
diff --git a/src/atmosphericModels/Make/options b/src/atmosphericModels/Make/options
index 3ffea18becb..93f257f6ee1 100644
--- a/src/atmosphericModels/Make/options
+++ b/src/atmosphericModels/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/triSurface/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/fvOptions/lnInclude
LIB_LIBS = \
@@ -14,5 +14,5 @@ LIB_LIBS = \
-lincompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \
- -ltriSurface \
+ -lsurfMesh \
-lfvOptions
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
index a7360f8d380..0f244ed59ed 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
@@ -123,7 +123,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class atmBoundaryLayer Declaration
+ Class atmBoundaryLayer Declaration
\*---------------------------------------------------------------------------*/
class atmBoundaryLayer
@@ -168,8 +168,7 @@ public:
//- Construct from the coordinates field and dictionary
atmBoundaryLayer(const vectorField& p, const dictionary&);
- //- Construct by mapping given
- // atmBoundaryLayer onto a new patch
+ //- Construct by mapping given atmBoundaryLayer onto a new patch
atmBoundaryLayer
(
const atmBoundaryLayer&,
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index 65e748f3dc3..8aeeed713de 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -133,7 +133,7 @@ void atmBoundaryLayerInletEpsilonFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
atmBoundaryLayer::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
writeEntry("value", os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
index 4078d854825..06f366089d1 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C
@@ -133,7 +133,7 @@ void atmBoundaryLayerInletKFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
atmBoundaryLayer::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
writeEntry("value", os);
}
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index ec9ee6e79cf..b1d423e5454 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -133,7 +133,7 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchVectorField::write(os);
atmBoundaryLayer::write(os);
- writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+ os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
writeEntry("value", os);
}
diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H
index b72992d9a4b..a9f2affd6ba 100644
--- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H
+++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H
@@ -74,7 +74,7 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
- Class kEpsilonLopesdaCosta Declaration
+ Class kEpsilonLopesdaCosta Declaration
\*---------------------------------------------------------------------------*/
template<class BasicTurbulenceModel>
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
index bedecb22e9a..2654bdd2569 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict
@@ -44,6 +44,4 @@ timePrecision 6;
runTimeModifiable yes;
-libs ("libatmosphericModels.so");
-
// ************************************************************************* //
--
GitLab