From ee4e19ef850577772bb218ac281ac5e12eeaa3dd Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 30 Jan 2014 13:01:04 +0000
Subject: [PATCH] Renamed folder -> directory for consistency with POSIX and
the rest of OpenFOAM
---
.gitignore | 6 +++---
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C | 2 +-
.../mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C | 4 ++--
.../miscellaneous/foamHelp/helpTypes/helpType/helpType.C | 4 ++--
.../dataConversion/foamToEnsight/foamToEnsight.C | 2 +-
.../PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt | 2 +-
.../PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt | 2 +-
.../PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt | 2 +-
.../PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt | 2 +-
.../execFlowFunctionObjects/execFlowFunctionObjects.C | 2 +-
.../createExternalCoupledPatchGeometry.C | 2 +-
.../utilities/preProcessing/createZeroFolder/Make/files | 4 ++--
doc/Doxygen/Doxyfile | 8 ++++----
.../functionObjectFile/functionObjectFile.H | 2 +-
.../nutUTabulatedWallFunctionFvPatchScalarField.H | 2 +-
.../externalCoupledMixedFvPatchField.H | 8 ++++----
.../functionObjects/IO/writeDictionary/writeDictionary.C | 8 ++++----
.../functionObjects/IO/writeDictionary/writeDictionary.H | 2 +-
.../functionObjects/doc/functionObjects.dox | 2 +-
.../functionObjects/field/readFields/readFields.H | 2 +-
.../utilities/wallShearStress/wallShearStress.H | 2 +-
.../functionObjects/utilities/yPlusLES/yPlusLES.H | 2 +-
.../functionObjects/utilities/yPlusRAS/yPlusRAS.H | 2 +-
.../sixDoFRigidBodyMotionSolver.C | 6 ++++--
.../externalCoupledTemperatureMixedFvPatchScalarField.H | 4 ++--
.../nutUTabulatedWallFunctionFvPatchScalarField.H | 2 +-
tutorials/Alltest | 2 +-
tutorials/combustion/chemFoam/README | 2 +-
.../buoyantCavity/validation/createGraphs | 2 +-
.../incompressible/pimpleDyMFoam/propeller/Allrun.pre | 2 +-
.../pisoFoam/les/motorBike/motorBike/Allrun | 2 +-
.../les/motorBike/motorBike/constant/triSurface/README | 4 ++--
tutorials/incompressible/simpleFoam/airFoil2D/Allclean | 2 +-
tutorials/incompressible/simpleFoam/motorBike/Allrun | 2 +-
.../simpleFoam/motorBike/constant/triSurface/README | 4 ++--
.../LTSReactingParcelFoam/verticalChannel/Allclean | 2 +-
.../MPPICFoam/cyclone/constant/triSurface/README | 4 ++--
tutorials/lagrangian/reactingParcelFoam/filter/Allclean | 2 +-
.../reactingParcelFoam/verticalChannel/Allclean | 2 +-
.../simpleReactingParcelFoam/verticalChannel/Allclean | 2 +-
tutorials/mesh/foamyHexMesh/blob/Allrun | 2 +-
tutorials/mesh/foamyHexMesh/blob/Allrun-parallel | 2 +-
.../mesh/foamyHexMesh/blob/constant/triSurface/README | 4 ++--
tutorials/mesh/foamyHexMesh/flange/Allrun | 2 +-
tutorials/mesh/foamyHexMesh/flange/Allrun-parallel | 2 +-
tutorials/mesh/foamyHexMesh/flange/Alltest | 2 +-
.../mesh/foamyHexMesh/flange/constant/triSurface/README | 4 ++--
tutorials/mesh/snappyHexMesh/flange/Allrun | 2 +-
.../mesh/snappyHexMesh/flange/constant/triSurface/README | 4 ++--
tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun | 2 +-
.../LTSInterFoam/wigleyHull/constant/triSurface/README | 4 ++--
.../multiphase/interPhaseChangeDyMFoam/propeller/0.org/U | 2 +-
.../interPhaseChangeDyMFoam/propeller/0.org/p_rgh | 8 +++++++-
.../interPhaseChangeDyMFoam/propeller/Allrun.pre | 2 +-
.../interPhaseChangeDyMFoam/propeller/system/controlDict | 4 ++--
.../interPhaseChangeDyMFoam/propeller/system/fvSolution | 7 ++++---
.../interPhaseChangeFoam/cavitatingBullet/Allrun | 2 +-
.../cavitatingBullet/constant/triSurface/README | 4 ++--
tutorials/multiphase/settlingFoam/ras/tank3D/Allclean | 2 +-
59 files changed, 95 insertions(+), 86 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7c8bce03fee..43edf63dbb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,10 @@ core
# dependency files - anywhere
*.dep
-# lnInclude (symlink) folders - anywhere
+# lnInclude (symlink) directories - anywhere
lnInclude
-# build folders - anywhere
+# build directories - anywhere
linux*Clang*/
linux*Gcc*/
linux*Icc*/
@@ -44,7 +44,7 @@ solaris*Gcc*/
SunOS*Gcc*/
platforms/
-# reinstate wmake/rules that might look like build folders
+# reinstate wmake/rules that might look like build directories
!wmake/rules/*/
# doxygen generated documentation
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index b9d60d2f4c6..6473bb4d88b 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -748,7 +748,7 @@ int main(int argc, char *argv[])
subsetter.faceMap()
)();
- // Read all fields in time and constant folders
+ // Read all fields in time and constant directories
IOobjectList objects(mesh, runTime.timeName());
IOobjectList timeObjects(IOobjectList(mesh, mesh.facesInstance()));
forAllConstIter(IOobjectList, timeObjects, iter)
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 0f937132468..a01507aef86 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -44,7 +44,7 @@ void writeWeights
(
const scalarField& wghtSum,
const primitivePatch& patch,
- const fileName& folder,
+ const fileName& directory,
const fileName& prefix,
const word& timeName
)
@@ -53,7 +53,7 @@ void writeWeights
writer.write
(
- folder,
+ directory,
prefix + "_proc" + Foam::name(Pstream::myProcNo()) + "_" + timeName,
patch.localPoints(),
patch.localFaces(),
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
index 29ad9ddbde3..061a00d18fb 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
@@ -134,12 +134,12 @@ void Foam::helpType::displayDoc
// can use FOAM_DOC_BROWSER='application file://%f' if required
docBrowser.replaceAll("%f", docFile);
- fileName classFolder(parser.subDict(className).lookup("path"));
+ fileName classDirectory(parser.subDict(className).lookup("path"));
word classFile(parser.subDict(className).lookup("name"));
Info<< "Showing documentation for type " << className << nl << endl;
- Info<< "Source file: " << classFolder.c_str() << classFile << nl
+ Info<< "Source file: " << classDirectory.c_str() << classFile << nl
<< endl;
system(docBrowser);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index bc589915426..fd5b574fd4e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
volTensorField::typeName
};
- // Path to EnSight folder at case level only
+ // Path to EnSight directory at case level only
// - For parallel cases, data only written from master
fileName ensightDir = args.rootPath()/args.globalCaseName()/"EnSight";
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
index 0a615c5085b..94d1763a207 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
-DWM_$ENV{WM_PRECISION_OPTION}
)
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
SET(
LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
index ff2639ed4bf..8166a78a8d6 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
-DWM_$ENV{WM_PRECISION_OPTION}
)
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
SET(
LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index a587d33f346..92494c4f6b9 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
-DWM_$ENV{WM_PRECISION_OPTION}
)
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
SET(
LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
index 21ee1a3f791..9ed8871208d 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(
-DWM_$ENV{WM_PRECISION_OPTION}
)
-# Set output library destination to plugin folder
+# Set output library destination to plugin directory
SET(
LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
CACHE INTERNAL
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 411643622c7..5c8b105282c 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -27,7 +27,7 @@ Application
Description
Execute the set of functionObjects specified in the selected dictionary
(which defaults to system/controlDict) for the selected set of times.
- Alternative dictionaries should be placed in the system/ folder.
+ Alternative dictionaries should be placed in the system/ directory.
The flow (p-U) and optionally turbulence fields are available for the
function objects to operate on allowing forces and other related properties
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
index dc0348da1a4..7a5fbd533b5 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C
@@ -35,7 +35,7 @@ Description
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
- to the communications folder.
+ to the communications directory.
Note:
The addressing is patch-local, i.e. point indices for each patch point
diff --git a/applications/utilities/preProcessing/createZeroFolder/Make/files b/applications/utilities/preProcessing/createZeroFolder/Make/files
index df1304a8842..379802af212 100644
--- a/applications/utilities/preProcessing/createZeroFolder/Make/files
+++ b/applications/utilities/preProcessing/createZeroFolder/Make/files
@@ -2,6 +2,6 @@ boundaryInfo.C
boundaryTemplates.C
caseInfo.C
solverTemplate.C
-createZeroFolder.C
+createZeroDirectory.C
-EXE = $(FOAM_APPBIN)/createZeroFolder
+EXE = $(FOAM_APPBIN)/createZeroDirectory
diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile
index 5e1108d06b3..eafbe480f04 100644
--- a/doc/Doxygen/Doxyfile
+++ b/doc/Doxygen/Doxyfile
@@ -562,14 +562,14 @@ SHOW_DIRECTORIES = YES
# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Directory Tree View (if specified). The default is YES.
SHOW_FILES = YES
# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
# Namespaces page.
# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# and from the Directory Tree View (if specified). The default is YES.
SHOW_NAMESPACES = YES
@@ -1080,7 +1080,7 @@ GENERATE_QHP = NO
# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# The path specified is relative to the HTML output directory.
QCH_FILE =
@@ -1092,7 +1092,7 @@ QHP_NAMESPACE = org.doxygen.Project
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# http://doc.trolltech.com/qthelpproject.html#virtual-directories
QHP_VIRTUAL_FOLDER = doc
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
index 5488da6e586..05b3512afa1 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectFile/functionObjectFile.H
@@ -114,7 +114,7 @@ protected:
public:
- //- Folder prefix
+ //- Directory prefix
static const word outputPrefix;
//- Additional characters for writing
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
index 8881eeb0940..c6441b60696 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
@@ -31,7 +31,7 @@ Description
This boundary condition provides a turbulent kinematic viscosity condition
when using wall functions. As input, the user specifies a look-up table
of U+ as a function of near-wall Reynolds number. The table should be
- located in the $FOAM_CASE/constant folder.
+ located in the $FOAM_CASE/constant directory.
\heading Patch usage
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
index 0680f6443bd..e96dd895f46 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H
@@ -48,7 +48,7 @@ Description
...
<valueN> <gradientN> <valueFracionN>
- Data is sent/received as a single file for all patches from the folder
+ Data is sent/received as a single file for all patches from the directory
$FOAM_CASE/<commsDir>
@@ -75,7 +75,7 @@ Description
\table
Property | Description | Required | Default value
- commsDir | communications folder | yes |
+ commsDir | communications directory | yes |
fileName | transfer file name | yes |
waitInterval | interval [s] between file checks | no | 1
timeOut | time after which error invoked [s] |no |100*waitInterval
@@ -135,7 +135,7 @@ private:
typedef externalCoupledMixedFvPatchField<Type> patchType;
typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
- //- Path to communications folder
+ //- Path to communications directory
fileName commsDir_;
//- Name of data file
@@ -178,7 +178,7 @@ private:
//- Set the master flag when collate option is selected
void setMaster(const labelList& patchIDs);
- //- Return the file path to the base communications folder
+ //- Return the file path to the base communications directory
fileName baseDir() const;
//- Write the geometry to the comms dir
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
index 74fa1f0b008..0e6ec44ce8c 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
@@ -38,7 +38,7 @@ defineTypeNameAndDebug(writeDictionary, 0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-bool Foam::writeDictionary::tryFolder
+bool Foam::writeDictionary::tryDirectory
(
const label dictI,
const word& location,
@@ -167,16 +167,16 @@ void Foam::writeDictionary::execute()
}
else
{
- bool processed = tryFolder(i, obr_.time().timeName(), firstDict);
+ bool processed = tryDirectory(i, obr_.time().timeName(), firstDict);
if (!processed)
{
- processed = tryFolder(i, obr_.time().constant(), firstDict);
+ processed = tryDirectory(i, obr_.time().constant(), firstDict);
}
if (!processed)
{
- processed = tryFolder(i, obr_.time().system(), firstDict);
+ processed = tryDirectory(i, obr_.time().system(), firstDict);
}
if (!processed)
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
index a4ac474e408..106305faa64 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
@@ -80,7 +80,7 @@ protected:
// Private Member Functions
//- Helper function to write the dictionary if found at location
- bool tryFolder
+ bool tryDirectory
(
const label dictI,
const word& location,
diff --git a/src/postProcessing/functionObjects/doc/functionObjects.dox b/src/postProcessing/functionObjects/doc/functionObjects.dox
index 94eb32bc479..da48ee0bae2 100644
--- a/src/postProcessing/functionObjects/doc/functionObjects.dox
+++ b/src/postProcessing/functionObjects/doc/functionObjects.dox
@@ -84,7 +84,7 @@ Where:
\endtable
The sub-dictionary name \c myFunctionObject is chosen by the user, and is
-typically used as the name of the output folder for any derived data. The
+typically used as the name of the output directory for any derived data. The
\c type entry defines the type of function object properties that follow.
Since the function objects are packaged into separate libraries, the user must
tell the code where to find the function object implementation, identified
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index 0c39404a932..14f7e80723d 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -28,7 +28,7 @@ Group
grpFieldFunctionObjects
Description
- This function object reads fields from the time folders and adds them to
+ This function object reads fields from the time directories and adds them to
the mesh database for further post-processing.
Example of function object specification:
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
index c2927eaad53..4e206460e54 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
@@ -29,7 +29,7 @@ Group
Description
This function object evaluates and outputs the shear stress at wall
- patches. The result is written as a volVectorField to time folders as
+ patches. The result is written as a volVectorField to time directories as
field 'wallShearStress'
\f[
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
index 94a2bb349a3..c58f521eaac 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
@@ -29,7 +29,7 @@ Group
Description
Evaluates and outputs turbulence y+ for LES models. Values written to
- time folders as field 'yPlusLES'
+ time directories as field 'yPlusLES'
SourceFiles
yPlusLES.C
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
index 747f100ab4f..b55c692f394 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
@@ -29,7 +29,7 @@ Group
Description
Evaluates and outputs turbulence y+ for RAS models. Values written to
- time folders as field 'yPlusRAS'
+ time directories as field 'yPlusRAS'
SourceFiles
yPlusRAS.C
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index da97394dc49..bc3afcd13f0 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -112,7 +112,9 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{
- pointPatchDist pDist(pointMesh::New(mesh), patchSet_, points0());
+ const pointMesh& pMesh = pointMesh::New(mesh);
+
+ pointPatchDist pDist(pMesh, patchSet_, points0());
// Scaling: 1 up to di then linear down to 0 at do away from patches
scale_.internalField() =
@@ -141,7 +143,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
scalar(1)
);
- scale_.correctBoundaryConditions();
+ pointConstraints::New(pMesh).constrain(scale_);
scale_.write();
}
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
index 29c64541ac5..70df99f8aef 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H
@@ -48,7 +48,7 @@ Description
...
<valueN> <gradientN> <valueFracionN>
- Data is sent/received as a single file for all patches from the folder
+ Data is sent/received as a single file for all patches from the directory
$FOAM_CASE/<commsDir>
@@ -75,7 +75,7 @@ Description
\table
Property | Description | Required | Default value
- commsDir | communications folder | yes |
+ commsDir | communications directory | yes |
fileName | transfer file name | yes |
waitInterval | interval [s] between file checks | no | 1
timeOut | time after which error invoked [s] |no |100*waitInterval
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
index dbc1a75ab73..4c409b9980f 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H
@@ -31,7 +31,7 @@ Description
This boundary condition provides a turbulent kinematic viscosity condition
when using wall functions. As input, the user specifies a look-up table
of U+ as a function of near-wall Reynolds number. The table should be
- located in the $FOAM_CASE/constant folder.
+ located in the $FOAM_CASE/constant directory.
\heading Patch usage
diff --git a/tutorials/Alltest b/tutorials/Alltest
index 9a80b425e3f..5d07674de16 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -39,7 +39,7 @@ usage()
usage: ${0##*/} [OPTION]
options:
- -root <dir> specify root folder to run tests from
+ -root <dir> specify root directory to run tests from
-default sets up a default scheme on all schemes
-help print the usage
diff --git a/tutorials/combustion/chemFoam/README b/tutorials/combustion/chemFoam/README
index 4af18c90e13..597d2b72d96 100644
--- a/tutorials/combustion/chemFoam/README
+++ b/tutorials/combustion/chemFoam/README
@@ -5,7 +5,7 @@ h2 : H2 combustion, 10 species, 27 reactions
nc7h16 : n-Heptane combustion, 544 species, 2446 reactions
ic8h18 : iso-Octane combustion, 874 species, 3796 reactions
-Results interpreted in 'validation' sub-folder, where OpenFOAM results
+Results interpreted in 'validation' sub-directory, where OpenFOAM results
are compared against those predicted by CHEMKIN II.
Overall the best performing ODE solver is seulex followed closely by rodas23.
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
index d1761013315..bb2a662f8f4 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
@@ -87,7 +87,7 @@ SETSDIR="../postProcessing/sets"
if [ ! -d $SETSDIR ]
then
- echo "createGraphs: results sets not available in folder $SETSDIR"
+ echo "createGraphs: results sets not available in directory $SETSDIR"
exit 0
fi
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index 71224edd243..ceabeb37bdc 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy propeller surface from resources folder
+# copy propeller surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
index 5a71c3e1b89..a38fa1edfac 100755
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy motorbike surface from resources folder
+# copy motorbike surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
# Make dummy 0 directory
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
index e0102f95da6..cd0a5ef7643 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-# Clean time folders only
+# Clean time directories only
rm -rf *[1-9]*
rm -f log.* 2>/dev/null
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 5275ea56bf3..75906bd525c 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy motorbike surface from resources folder
+# copy motorbike surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
runApplication surfaceFeatureExtract
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README b/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean
index 6ac02e9eab6..71ba44f70cd 100755
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove old time and post-processing folders
+# remove old time and post-processing directories
rm -rf 0 *[1-9]* processor* postProcessing
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README b/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
index 3f107970554..7b653d8391b 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
@@ -9,7 +9,7 @@ cleanCase
# remove 0 directory
rm -rf 0
-# remove post-processing folder
+# remove post-processing directory
rm -rf postProcessing
# copy 0.org to 0
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
index b0a57810b30..b3aa3f98f7f 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove old time and post-processing folders
+# remove old time and post-processing directories
rm -rf 0 *[1-9]* processor* postProcessing
cleanCase
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
index d0839b002eb..921fd627a7e 100755
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove old time and post-processing folders
+# remove old time and post-processing directories
rm -rf 0 *[1-9]* processor* postProcessing
# copy 0.org to 0
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun b/tutorials/mesh/foamyHexMesh/blob/Allrun
index 3ef4e5b75e1..3e796d3215c 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy flange surface from resources folder
+# copy flange surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
runApplication foamyHexMesh
diff --git a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
index 1674277920d..34ead2b0329 100755
--- a/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/blob/Allrun-parallel
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Get the number of processors to run on from system/decomposeParDict
nProc=$(getNumberOfProcessors)
-# copy flange surface from resources folder
+# copy flange surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
runApplication blockMesh -region backgroundMeshDecomposition
diff --git a/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README b/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README
+++ b/tutorials/mesh/foamyHexMesh/blob/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun b/tutorials/mesh/foamyHexMesh/flange/Allrun
index 959eae6fd35..1038c97d0f2 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy flange surface from resources folder
+# copy flange surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
runApplication foamyHexMesh
diff --git a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
index 8f33af0d7e1..8191bdc819e 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
+++ b/tutorials/mesh/foamyHexMesh/flange/Allrun-parallel
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Get the number of processors to run on from system/decomposeParDict
nProc=$(getNumberOfProcessors)
-# copy flange surface from resources folder
+# copy flange surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
# Create tight-fitting background mesh
diff --git a/tutorials/mesh/foamyHexMesh/flange/Alltest b/tutorials/mesh/foamyHexMesh/flange/Alltest
index c63a5906a23..184f9435760 100755
--- a/tutorials/mesh/foamyHexMesh/flange/Alltest
+++ b/tutorials/mesh/foamyHexMesh/flange/Alltest
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy flange surface from resources folder
+# copy flange surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
cp system/controlDict system/controlDict.org
diff --git a/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README b/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README
+++ b/tutorials/mesh/foamyHexMesh/flange/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun
index 365020d19d5..49602feb6e7 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allrun
+++ b/tutorials/mesh/snappyHexMesh/flange/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy flange surface from resources folder
+# copy flange surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
runApplication blockMesh
diff --git a/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README b/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README
+++ b/tutorials/mesh/snappyHexMesh/flange/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
index 2924a2cd45d..f57a6542d2a 100755
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy wigley surface from resources folder
+# copy wigley surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/wigley-scaled-oriented.stl.gz constant/triSurface/
runApplication blockMesh
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
index 865aff56b8c..b8d2f2caa33 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/U
@@ -38,7 +38,7 @@ boundaryField
outlet
{
- type inletOutlet;
+ type pressureInletOutletVelocity;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
index c40de26d4b5..e89c0586e65 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.org/p_rgh
@@ -31,7 +31,13 @@ boundaryField
outlet
{
- type fixedValue;
+ type totalPressure;
+ p0 $internalField;
+ U U;
+ phi phi;
+ rho rho;
+ psi none;
+ gamma 1;
value $internalField;
}
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
index a5ed0514a9c..754315442fc 100755
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy propeller surface from resources folder
+# copy propeller surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
index 269adf2b4fb..a121b19ddf1 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict
@@ -23,7 +23,7 @@ libs
application interPhaseChangeDyMFoam;
-startFrom latestTime;
+startFrom startTime;
startTime 0;
@@ -54,6 +54,6 @@ runTimeModifiable true;
adjustTimeStep yes;
maxCo 2;
-maxAlphaCo 2;
+maxAlphaCo 1;
// ************************************************************************* //
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index bc5e84cf853..6fbe8482e0c 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -30,6 +30,7 @@ solvers
tolerance 1e-8;
relTol 0;
maxIter 10;
+ minIter 1;
};
"pcorr.*"
@@ -65,12 +66,12 @@ solvers
smoother symGaussSeidel;
tolerance 1e-6;
relTol 0.1;
+ minIter 1;
}
"(U|k|epsilon)Final"
{
$U;
- tolerance 1e-6;
relTol 0;
}
}
@@ -78,8 +79,8 @@ solvers
PIMPLE
{
correctPhi yes;
- nOuterCorrectors 1;
- nCorrectors 3;
+ nOuterCorrectors 3;
+ nCorrectors 1;
nNonOrthogonalCorrectors 0;
}
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
index 1b52d0a3a6f..abd6a03a353 100755
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# copy bullet surface from resources folder
+# copy bullet surface from resources directory
cp $FOAM_TUTORIALS/resources/geometry/bullet.stl.gz constant/triSurface/
# Generate the base block mesh
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README
index dbf3b73d5fc..de3f29cc012 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/triSurface/README
@@ -1,4 +1,4 @@
-Folder to house tri-surfaces
+Directory to house tri-surfaces
The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-folder
+directory
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
index e0102f95da6..cd0a5ef7643 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
@@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-# Clean time folders only
+# Clean time directories only
rm -rf *[1-9]*
rm -f log.* 2>/dev/null
--
GitLab