diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files index dd138902e3c7eafc3ff1d7553710063ffcfb7178..75464c40139f6cd10a231b39aa23a81f4fbbf873 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 0cb1bb8f0921cd7a87be8a84e55cd06b375a2ebe..0732822dba6309b4f07c986b07406c8eece747b1 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 6a905f28a1e0245d752a0275f83a15469dfdbaa4..43b161e6346fb40438df9806bb59107bdf0f673d 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 3ac6a32e54f52621b33282b6c921f97c844f05ba..c6005f8e37bc114edfcf4bb0224872a4dd3d065b 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 09ecd93e687d92d514b221535f99d3936eb2bda7..2ff4476dad2eaa23fa065d8aec2203b93adbb452 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 f5f542d12f321c39415ad7ee1b8715a94db4b669..4f779363f880ec8c86d211df21b77e7f19dcef3b 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 6631fb143448fdf8fea64edbef3c48bd8d6a6ade..e9e393d170dc17a59365d7b3e0fdffe81add1a28 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 bee582401355193028351c3e87cf5999732f6346..a3bcd7135fde4273c3f2228f370079daa86d603c 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