From 1a992064c0041898b8b3c8e74184ddf5c308ea0b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 19 Nov 2015 13:48:37 +0000
Subject: [PATCH] TurbulenceModels: Separate template functions into .C files
---
.../turbulentFluidThermoModel.C | 60 +++++++++++++++++++
.../turbulentFluidThermoModel.H | 21 +++----
.../turbulentTransportModel.C | 59 ++++++++++++++++++
.../turbulentTransportModel.H | 21 +++----
4 files changed, 135 insertions(+), 26 deletions(-)
create mode 100644 src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C
create mode 100644 src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C
new file mode 100644
index 00000000000..0e7a8eb146c
--- /dev/null
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentFluidThermoModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ namespace compressible
+ {
+ template<class BasicCompressibleTurbulenceModel>
+ autoPtr<BasicCompressibleTurbulenceModel> New
+ (
+ const volScalarField& rho,
+ const volVectorField& U,
+ const surfaceScalarField& phi,
+ const typename BasicCompressibleTurbulenceModel::transportModel&
+ transport,
+ const word& propertiesName
+ )
+ {
+ return BasicCompressibleTurbulenceModel::New
+ (
+ geometricOneField(),
+ rho,
+ U,
+ phi,
+ phi,
+ transport,
+ propertiesName
+ );
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index b7a9eabd607..9420f898648 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -35,6 +35,7 @@ Description
based on the standard laminar transport package.
SourceFiles
+ turbulentFluidThermoModel.C
turbulentFluidThermoModels.C
\*---------------------------------------------------------------------------*/
@@ -70,23 +71,17 @@ namespace Foam
const typename BasicCompressibleTurbulenceModel::transportModel&
transport,
const word& propertiesName = turbulenceModel::propertiesName
- )
- {
- return BasicCompressibleTurbulenceModel::New
- (
- geometricOneField(),
- rho,
- U,
- phi,
- phi,
- transport,
- propertiesName
- );
- }
+ );
}
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "turbulentFluidThermoModel.C"
+#endif
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C
new file mode 100644
index 00000000000..aa3bfa784a9
--- /dev/null
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentTransportModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ namespace incompressible
+ {
+ template<class BasicCompressibleTurbulenceModel>
+ autoPtr<BasicCompressibleTurbulenceModel> New
+ (
+ const volVectorField& U,
+ const surfaceScalarField& phi,
+ const typename BasicCompressibleTurbulenceModel::transportModel&
+ transport,
+ const word& propertiesName
+ )
+ {
+ return BasicCompressibleTurbulenceModel::New
+ (
+ geometricOneField(),
+ geometricOneField(),
+ U,
+ phi,
+ phi,
+ transport,
+ propertiesName
+ );
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
index 4ed30e08463..99f70435bdb 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
@@ -35,6 +35,7 @@ Description
based on the standard laminar transport package.
SourceFiles
+ turbulentTransportModel.C
turbulentTransportModels.C
\*---------------------------------------------------------------------------*/
@@ -66,23 +67,17 @@ namespace Foam
const typename BasicCompressibleTurbulenceModel::transportModel&
transport,
const word& propertiesName = turbulenceModel::propertiesName
- )
- {
- return BasicCompressibleTurbulenceModel::New
- (
- geometricOneField(),
- geometricOneField(),
- U,
- phi,
- phi,
- transport,
- propertiesName
- );
- }
+ );
}
}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "turbulentTransportModel.C"
+#endif
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
--
GitLab