diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
index 518432cbd9ef33a2e7edcffd1e7ea19f429406a6..0d74d0b44ca05ad8d253ab552452c486c057d5bf 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
@@ -1,9 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/postProcessing/functionObjects/jobControl/lnInclude
EXE_LIBS = \
- -lturbulenceModels \
- -lcompressibleTurbulenceModels \
-lfiniteVolume \
- -lmeshTools
+ -ljobControl
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
index 3b9ed64abb35d0f1ba4dd798e315c9736addef0e..51818b378741ee10d3cf18fa4dac9dc0d0f8a9bf 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,15 +26,19 @@ Application
Description
Application to generate the patch geometry (points and faces) for use
- with the externalCoupled boundary condition.
+ with the externalCoupled functionObject.
- Usage:
+Usage
+ - createExternalCoupledPatchGeometry \<patchGroup\> [OPTION]
- createExternalCoupledPatchGeometry \<fieldName\>
+ \param -commsDir \<commsDir\> \n
+ Specify an alternative communications directory (default is comms
+ in the case directory)
- On execution, the field \<fieldName\> is read, and its boundary conditions
- interrogated for the presence of an \c externalCoupled type. If found,
- the patch geometry (points and faces) for the coupled patches are output
+ \param -region \<name\> \n
+ Specify an alternative mesh region.
+
+ On execution, the combined patch geometry (points and faces) are output
to the communications directory.
Note:
@@ -42,12 +46,12 @@ Note:
used for face addressing starts at index 0.
SeeAlso
- externalCoupledMixedFvPatchField
+ externalCoupledFunctionObject
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "createExternalCoupledPatchGeometryTemplates.H"
+#include "externalCoupledFunctionObject.H"
#include "IOobjectList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,28 +59,25 @@ SeeAlso
int main(int argc, char *argv[])
{
#include "addRegionOption.H"
- argList::validArgs.append("fieldName");
+ argList::validArgs.append("patchGroup");
+ argList::addOption
+ (
+ "commsDir",
+ "dir",
+ "specify alternate communications directory. default is 'comms'"
+ );
#include "setRootCase.H"
#include "createTime.H"
#include "createNamedMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
- const word fieldName = args[1];
-
- IOobjectList objects(IOobjectList(mesh, mesh.time().timeName()));
+ const wordRe patchGroup(args[1]);
- label processed = -1;
- processField<scalar>(mesh, objects, fieldName, processed);
- processField<vector>(mesh, objects, fieldName, processed);
- processField<sphericalTensor>(mesh, objects, fieldName, processed);
- processField<symmTensor>(mesh, objects, fieldName, processed);
- processField<tensor>(mesh, objects, fieldName, processed);
+ fileName commsDir(runTime.path()/"comms");
+ args.optionReadIfPresent("commsDir", commsDir);
- if (processed == -1)
- {
- Info<< "Field " << fieldName << " not found" << endl;
- }
+ externalCoupledFunctionObject::writeGeometry(mesh, commsDir, patchGroup);
Info<< "\nEnd\n" << endl;
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
deleted file mode 100644
index c5d842237e157e1208c779215e883fd05129df00..0000000000000000000000000000000000000000
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
+++ /dev/null
@@ -1,90 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2013 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 "createExternalCoupledPatchGeometryTemplates.H"
-#include "externalCoupledMixedFvPatchField.H"
-#include "IOobjectList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-void processField
-(
- const fvMesh& mesh,
- const IOobjectList& objects,
- const word& fieldName,
- label& processed
-)
-{
- if (processed != -1)
- {
- return;
- }
-
- typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
-
- const word timeName(mesh.time().timeName());
-
- IOobjectList fieldObjbjects(objects.lookupClass(fieldType::typeName));
-
- if (fieldObjbjects.lookup(fieldName) != NULL)
- {
- fieldType vtf(*fieldObjbjects.lookup(fieldName), mesh);
- const typename fieldType::GeometricBoundaryField& bf =
- vtf.boundaryField();
-
- forAll(bf, patchI)
- {
- if (isA<externalCoupledMixedFvPatchField<Type> >(bf[patchI]))
- {
- Info<< "Generating external coupled geometry for field "
- << fieldName << endl;
-
- const externalCoupledMixedFvPatchField<Type>& pf =
- refCast<const externalCoupledMixedFvPatchField<Type> >
- (
- bf[patchI]
- );
-
- pf.writeGeometry();
- processed = 1;
-
- break;
- }
- }
-
- if (processed != 1)
- {
- processed = 0;
-
- Info<< "Field " << fieldName << " found, but does not have any "
- << externalCoupledMixedFvPatchField<Type>::typeName
- << " boundary conditions" << endl;
- }
- }
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.H b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.H
deleted file mode 100644
index 0c1391f80a13b78181c78a65ea01ee8ab3194c8a..0000000000000000000000000000000000000000
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.H
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2013-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/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef createExternalCoupledPatchGeometryTemplates_H
-#define createExternalCoupledPatchGeometryTemplates_H
-
-#include "word.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- template<class Type>
- void processField(bool& processed, const word& fieldName);
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
- #include "createExternalCoupledPatchGeometryTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/db/Time/timeSelector.H b/src/OpenFOAM/db/Time/timeSelector.H
index 836264f1da76e6cb5e70785136ce754d60fb6fa6..197f558f61906e42356965481ea8c16b15ffd083 100644
--- a/src/OpenFOAM/db/Time/timeSelector.H
+++ b/src/OpenFOAM/db/Time/timeSelector.H
@@ -162,7 +162,7 @@ public:
//- Return the set of times selected based on the argList options
// including support for \b -newTimes in which times are selected
- // if the file <fName> does not exist in the time directory.
+ // if the file \<fName\> does not exist in the time directory.
// Also set the runTime to the first instance or the
// \c constant/ directory if no instances are specified or available
static instantList select
diff --git a/src/TurbulenceModels/compressible/turbulenceModelDoc.H b/src/TurbulenceModels/compressible/turbulenceModelDoc.H
index 5722cee54e88064bceebbb4f56a89404dd989583..941e205368208e83151d1e10358fec60d7a354ca 100644
--- a/src/TurbulenceModels/compressible/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/compressible/turbulenceModelDoc.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -25,6 +25,7 @@ License
\defgroup grpCmpTurbulence Compressible turbulence
@{
+ \ingroup grpTurbulence
This group contains compressible turbulence models.
@}
diff --git a/src/TurbulenceModels/incompressible/turbulenceModelDoc.H b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
index 2e5547351f1a35a65c933524b4b2c24385aa5160..a0357f18d1c7b0b357d4f0edb3e021c0c102e992 100644
--- a/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
+++ b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -25,6 +25,7 @@ License
\defgroup grpIcoTurbulence Incompressible turbulence
@{
+ \ingroup grpTurbulence
This group contains incompressible turbulence models.
@}
diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files
index f5360c2c1a7d77a0023d573355ffb68748e1de92..3f2b8f9f50c4c31aa4ae522d16474e2997ebc229 100644
--- a/src/postProcessing/functionObjects/field/Make/files
+++ b/src/postProcessing/functionObjects/field/Make/files
@@ -30,6 +30,7 @@ readFields/readFields.C
readFields/readFieldsFunctionObject.C
streamLine/streamLine.C
+streamLine/streamLineBase.C
streamLine/streamLineParticle.C
streamLine/streamLineParticleCloud.C
streamLine/streamLineFunctionObject.C
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineBase.C b/src/postProcessing/functionObjects/field/streamLine/streamLineBase.C
index 94b7d124fea51bf4c7e5774f9fba1aca0a04107b..e319081bf9a84855a2260997de51feaf8a72602e 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineBase.C
@@ -883,7 +883,8 @@ void Foam::streamLineBase::write()
)
);
- Info(log_)<< " Writing data to " << vtkFile.path() << endl;
+ if (log_) Info
+ << " Writing data to " << vtkFile.path() << endl;
scalarFormatterPtr_().write
(
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
index 97706a49bb9c4af76c25a02562fecc859ea3ae87..83bafbab532e306df8fbd8bca43270771407210d 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
@@ -61,7 +61,7 @@ Description
\table
Property | Description | Required | Default value
type | type name: wallShearStress | yes |
- resultName | Name of wall shear stress field | no | \<function name\>
+ resultName | Name of wall shear stress field | no | \<function name\>
patches | list of patches to process | no | all wall patches
log | Log to standard output | no | yes
\endtable
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
index 80ce1abb8d82d13b638124cececcc32451a3b7d3..7c1461ae4e52b187a775a37eabfb23a2a0a7b133 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
@@ -47,7 +47,7 @@ Description
Property | Description | Required | Default value
type | Type name: yPlus | yes |
phiName | Name of flux field | no | phi
- resultName | Name of y+ field | no | <function name>
+ resultName | Name of y+ field | no | \<function name\>
log | Log to standard output | no | yes
\endtable
diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index 85fb7bc74b59649889319367c827f5ea5bb5bd01..1257807e2b41f6982c764a60363a014fbf0ff96a 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -169,6 +169,7 @@ void Foam::faceOnlySet::calcSamples
// Set points and cell/face labels to empty lists
//Info<< "calcSamples : Both start_ and end_ outside domain"
// << endl;
+ const_cast<polyMesh&>(mesh()).moving(oldMoving);
return;
}
diff --git a/src/sampling/sampledSet/uniform/uniformSet.C b/src/sampling/sampledSet/uniform/uniformSet.C
index 9689218ae58c591fde4c69fcad9decabc52c767c..4c2650c443426761a48df748e19aee3f7e6be7df 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.C
+++ b/src/sampling/sampledSet/uniform/uniformSet.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -276,6 +276,8 @@ void Foam::uniformSet::calcSamples
// (or is along edge)
// Set points and cell/face labels to empty lists
+ const_cast<polyMesh&>(mesh()).moving(oldMoving);
+
return;
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H b/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
index 54902fa26105b483c25c9709a7d53bd042136a17..910371fb4abc30131a4ac7c0df848e80c2d97be5 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- radiationCoupledBase
+ Foam::radiationCoupledBase
Description
Common functions to emissivity. It gets supplied from lookup into a