diff --git a/applications/test/mapDistributePolyMesh/cavity/system/processorField b/applications/test/mapDistributePolyMesh/cavity/system/processorField
index a350fc30921a15081f4e5008440ed36b048a9611..f4c97a0bffd4bba3b621d741aa5dc643ef1869e6 100644
--- a/applications/test/mapDistributePolyMesh/cavity/system/processorField
+++ b/applications/test/mapDistributePolyMesh/cavity/system/processorField
@@ -18,25 +18,22 @@ functions
{
processorField
{
- // Type of functionObject
type processorField;
- // Where to load it from (if not already in solver)
libs ("libfieldFunctionObjects.so");
- // Function object enabled flag
enabled true;
- // When to output the average fields
writeControl writeTime;
}
cellID
{
- // Load the library containing the 'coded' functionObject
- functionObjectLibs ("libutilityFunctionObjects.so");
type coded;
- // Name of on-the-fly generated functionObject
- redirectType cellID;
+
+ libs ("libutilityFunctionObjects.so");
+
+ name cellID;
+
codeExecute
#{
volScalarField cellID
diff --git a/src/functionObjects/doc/functionObjects.dox b/src/functionObjects/doc/functionObjects.dox
index 694ac1ec2ab133178258816e97e2f489e19f2485..62b88707eb25361472fe71408ebfa42e905e61f5 100644
--- a/src/functionObjects/doc/functionObjects.dox
+++ b/src/functionObjects/doc/functionObjects.dox
@@ -91,7 +91,7 @@ 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
-using the \c functionObjectLibs entry.
+using the \c libs entry.
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/IO/fileHandler/system/controlDict b/tutorials/IO/fileHandler/system/controlDict
index 135f64524bd24380457f9da5686fb50d2a51d5fd..3cdc44bd5933bb52ca47f09794aa047f153b0280 100644
--- a/tutorials/IO/fileHandler/system/controlDict
+++ b/tutorials/IO/fileHandler/system/controlDict
@@ -37,7 +37,7 @@ writeFormat binary;
writePrecision 6;
-writeCompression false;
+writeCompression off;
timeFormat general;
diff --git a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy
index 3f687d1b4b6d0b5df6b156d9339eda9aa20fec74..27dcf2052242370f4a5eb58f4772777308cac6c0 100644
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: plus |
@@ -29,7 +29,7 @@ boundaryField
cylinder
{
type codedFixedValue;
- redirectType pointDisplacementy_cylinder;
+ name pointDisplacementy_cylinder;
code
#{
const scalar t = this->db().time().value();
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict
index 4b5fbc95346294e1db2e31f43bacc5969349173f..5cd603b8ee5830e16cea38281e3f7db9896d6fce 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/controlDict
@@ -37,7 +37,7 @@ writeFormat binary;
writePrecision 10;
-writeCompression uncompressed;
+writeCompression off;
timeFormat general;
@@ -51,7 +51,7 @@ functions
{
type probes;
- functionObjectLibs ("libsampling.so");
+ libs ("libsampling.so");
probeLocations
(
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
index cdedac6aa5732c28058ef89ef0c85685ab9a6d3e..a1134c2a748d5b51f242b80b7a96f571f4960c2a 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
@@ -20,8 +20,8 @@ functions
createVortex
{
type coded;
- functionObjectLibs ("libutilityFunctionObjects.so");
- redirectType createVortices;
+ libs ("libutilityFunctionObjects.so");
+ name createVortices;
enabled yes;
codeInclude
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/0/T b/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
index f756375b63e9139a905273f739020b749bb6d5af..12808cba494b1bebd9a54d35f7a1932da0f5f6fe 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/0/T
@@ -30,7 +30,7 @@ boundaryField
{
type inletOutlet;
value $internalField;
- inletValue $internalField;;
+ inletValue $internalField;
}
".*"
diff --git a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes
index c0bf1c9a597be31805763310f2ac8709a53f75ad..b32e7219a24a72fcc286f5d18825119fe863e4f7 100644
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/fvSchemes
@@ -29,10 +29,10 @@ divSchemes
{
default none;
div(phi,U) Gauss limitedLinearV 1;
- div(phi,k) Gauss limitedLinear 1;;
- div(phi,epsilon) Gauss limitedLinear 1;;
- div(phi,R) Gauss limitedLinear 1;;
- div(R) Gauss limitedLinear 1;;
+ div(phi,k) Gauss limitedLinear 1;
+ div(phi,epsilon) Gauss limitedLinear 1;
+ div(phi,R) Gauss limitedLinear 1;
+ div(R) Gauss limitedLinear 1;
div(phi,omega) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict
index 6e5ca5c1c57a348167f7335fb4a53bae065a87a8..e12ee7f7c50c6bc2a4caa14b2b3e9a1b43bbd206 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict
@@ -49,7 +49,7 @@ functions
forces
{
type forces;
- functionObjectLibs ( "libforces.so" );
+ libs ( "libforces.so" );
outputControl timeStep;
outputInterval 10;
patches (wing);
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
index 195bd9349d9d80481d436ffc15d43d41395cacad..a70ebbdb623d6e0429ce1c7416c2e117b8dcd39c 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
@@ -24,7 +24,7 @@ boundaryField
inlet
{
- type codedFixedValue;
+ type codedFixedValue;
name swirl;
code
diff --git a/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes b/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes
index c0bf1c9a597be31805763310f2ac8709a53f75ad..b32e7219a24a72fcc286f5d18825119fe863e4f7 100644
--- a/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/squareBend/system/fvSchemes
@@ -29,10 +29,10 @@ divSchemes
{
default none;
div(phi,U) Gauss limitedLinearV 1;
- div(phi,k) Gauss limitedLinear 1;;
- div(phi,epsilon) Gauss limitedLinear 1;;
- div(phi,R) Gauss limitedLinear 1;;
- div(R) Gauss limitedLinear 1;;
+ div(phi,k) Gauss limitedLinear 1;
+ div(phi,epsilon) Gauss limitedLinear 1;
+ div(phi,R) Gauss limitedLinear 1;
+ div(R) Gauss limitedLinear 1;
div(phi,omega) Gauss limitedLinear 1;
div(phid,p) Gauss limitedLinear 1;
div(phi,K) Gauss limitedLinear 1;
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
index 245a1149e04787422cca7146ba3be4ff2370438d..84da1f42790f0e46eeca838089b328ea0d887307 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict
@@ -37,7 +37,7 @@ writeFormat binary;
writePrecision 6;
-writeCompression uncompressed;
+writeCompression off;
timeFormat general;
diff --git a/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict
index 5c8d4177a6e3a7c730e8f2138cbd2851e186649b..b3bb6899c4e2b0568040e159bc14cef3ff0087e9 100644
--- a/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/twistingColumn/constant/dynamicMeshDict
@@ -68,9 +68,7 @@ code
const scalar maxRotAngle =
constant::mathematical::pi*Foam::sin(degToRad(90.0/10.0*tm.value()));
- tmp<pointField> tnewPoints(twistColumn(maxRotAngle, p0));
-
- return tnewPoints;
+ return twistColumn(maxRotAngle, p0);
#};
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
index 5d2af31bd2db4156032ec845b84ea05cdd696a48..7d628acf094b11841a46d55e1bca15a3755644ea 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict
@@ -37,7 +37,7 @@ writeFormat ascii;
writePrecision 10;
-writeCompression uncompressed;
+writeCompression off;
timeFormat general;
diff --git a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/controlDict
index 9264fee8a1f24ead996bc11f4343bd212a27c543..0635361d036e1a4ae21d1663ddab8d51a74b921f 100644
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/controlDict
@@ -59,7 +59,7 @@ functions
line
{
type sets;
- functionObjectLibs ("libsampling.so");
+ libs ("libsampling.so");
enabled true;
writeControl writeTime;
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
index 1ce0f5a1452e65d29919ca45121f560dd0f90129..785591d16e8b8cd59b83711c0b2d6314a22de359 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
@@ -37,7 +37,7 @@ writeFormat ascii;
writePrecision 6;
-writeCompression uncompressed;
+writeCompression off;
timeFormat general;
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
index 2452962436b72657b23af502d7f101b7aee1c75b..ddc83226089aa4f245e6aeafdb09ee0ed277288f 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
@@ -56,7 +56,7 @@ functions
timeStepping
{
type setTimeStep;
- functionObjectLibs ("libutilityFunctionObjects.so");
+ libs ("libutilityFunctionObjects.so");
enabled yes;
deltaT tableFile;
file "system/deltaTvalues";
@@ -65,7 +65,7 @@ functions
minMaxp
{
type fieldMinMax;
- functionObjectLibs ("libfieldFunctionObjects.so");
+ libs ("libfieldFunctionObjects.so");
fields
(
p
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict b/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict
index ef00d10576304fc29a0f1de33e4813b84aed980d..9f4c60bb10026813f25f58015d84c90defd9c3a7 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict
@@ -50,7 +50,7 @@ functions
sample1
{
type sets;
- functionObjectLibs ("libsampling.so");
+ libs ("libsampling.so");
writeControl onEnd;
setFormat raw;
sets