From b07bf72e295fc8073a2413a48bd345a7ee7c9497 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 3 Jan 2014 10:56:14 +0000
Subject: [PATCH] ENH: function objects - move turbulenceFields into utilities
---
src/postProcessing/functionObjects/field/Make/files | 3 ---
src/postProcessing/functionObjects/field/Make/options | 9 +--------
src/postProcessing/functionObjects/utilities/Make/files | 3 +++
.../turbulenceFields/IOturbulenceFields.H | 2 +-
.../turbulenceFields/postProcessingDict | 0
.../turbulenceFields/turbulenceFields.C | 0
.../turbulenceFields/turbulenceFields.H | 2 +-
.../turbulenceFields/turbulenceFieldsFunctionObject.C | 2 +-
.../turbulenceFields/turbulenceFieldsFunctionObject.H | 2 +-
.../turbulenceFields/turbulenceFieldsTemplates.C | 2 +-
10 files changed, 9 insertions(+), 16 deletions(-)
rename src/postProcessing/functionObjects/{field => utilities}/turbulenceFields/IOturbulenceFields.H (95%)
rename src/postProcessing/functionObjects/{field => utilities}/turbulenceFields/postProcessingDict (100%)
rename src/postProcessing/functionObjects/{field => utilities}/turbulenceFields/turbulenceFields.C (100%)
rename src/postProcessing/functionObjects/{field => utilities}/turbulenceFields/turbulenceFields.H (98%)
rename src/postProcessing/functionObjects/{field => utilities}/turbulenceFields/turbulenceFieldsFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{field => utilities}/turbulenceFields/turbulenceFieldsFunctionObject.H (96%)
rename src/postProcessing/functionObjects/{field => utilities}/turbulenceFields/turbulenceFieldsTemplates.C (97%)
diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files
index dd138902e3c..75464c40139 100644
--- a/src/postProcessing/functionObjects/field/Make/files
+++ b/src/postProcessing/functionObjects/field/Make/files
@@ -34,9 +34,6 @@ streamLine/streamLineParticle.C
streamLine/streamLineParticleCloud.C
streamLine/streamLineFunctionObject.C
-turbulenceFields/turbulenceFields.C
-turbulenceFields/turbulenceFieldsFunctionObject.C
-
wallBoundedStreamLine/wallBoundedStreamLine.C
wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.C
wallBoundedStreamLine/wallBoundedStreamLineParticle.C
diff --git a/src/postProcessing/functionObjects/field/Make/options b/src/postProcessing/functionObjects/field/Make/options
index 0cb1bb8f092..0732822dba6 100644
--- a/src/postProcessing/functionObjects/field/Make/options
+++ b/src/postProcessing/functionObjects/field/Make/options
@@ -3,11 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude
LIB_LIBS = \
@@ -16,8 +12,5 @@ LIB_LIBS = \
-lsurfMesh \
-llagrangian \
-lfileFormats \
- -lsurfMesh \
-lsampling \
- -lincompressibleTransportModels \
- -lcompressibleTurbulenceModel \
- -lincompressibleTurbulenceModel
+ -lsurfMesh
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 6a905f28a1e..43b161e6346 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -30,6 +30,9 @@ scalarTransport/scalarTransportFunctionObject.C
timeActivatedFileUpdate/timeActivatedFileUpdate.C
timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.C
+turbulenceFields/turbulenceFields.C
+turbulenceFields/turbulenceFieldsFunctionObject.C
+
wallShearStress/wallShearStress.C
wallShearStress/wallShearStressFunctionObject.C
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/IOturbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/IOturbulenceFields.H
similarity index 95%
rename from src/postProcessing/functionObjects/field/turbulenceFields/IOturbulenceFields.H
rename to src/postProcessing/functionObjects/utilities/turbulenceFields/IOturbulenceFields.H
index 3ac6a32e54f..c6005f8e37b 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/IOturbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/IOturbulenceFields.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
similarity index 100%
rename from src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict
rename to src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
similarity index 100%
rename from src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
rename to src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
similarity index 98%
rename from src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.H
rename to src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index 09ecd93e687..2ff4476dad2 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsFunctionObject.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.C
index f5f542d12f3..4f779363f88 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsFunctionObject.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.H
similarity index 96%
rename from src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.H
index 6631fb14344..e9e393d170d 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
similarity index 97%
rename from src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
rename to src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
index bee58240135..a3bcd7135fd 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
--
GitLab