COMP: Multiple changes - first clean build after latest merge - UNTESTED

applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C

@@ -93,7 +93,7 @@ void correctProcessorPatches(volScalarField& vf)
     // Not possible to use correctBoundaryConditions on fields as they may
     // use local info as opposed to the constraint values employed here,
     // but still need to update processor patches
-    volScalarField::GeometricBoundaryField& bf = vf.boundaryField();
+    volScalarField::Boundary& bf = vf.boundaryFieldRef();
 
     forAll(bf, patchI)
     {
@@ -134,8 +134,8 @@ void blendField
     if (fieldHeader.typeHeaderOk<volScalarField>(true))
     {
         volScalarField fld(fieldHeader, mesh);
-        scalarField& internalField = fld.internalField();
-        internalField = (1 - mask)*internalField + mask*boundaryLayerField;
+        scalarField& pf = fld.primitiveFieldRef();
+        pf = (1 - mask)*pf + mask*boundaryLayerField;
         fld.max(SMALL);
 
         // Do not correct BC
@@ -172,10 +172,9 @@ void calcOmegaField
     if (omegaHeader.typeHeaderOk<volScalarField>(true))
     {
         volScalarField omega(omegaHeader, mesh);
-        scalarField& internalField = omega.internalField();
+        scalarField& pf = omega.primitiveFieldRef();
 
-        internalField =
-            (1 - mask)*internalField + mask*epsilonBL/(Cmu*kBL + SMALL);
+        pf = (1 - mask)*pf + mask*epsilonBL/(Cmu*kBL + SMALL);
         omega.max(SMALL);
 
         // Do not correct BC

applications/utilities/preProcessing/applyBoundaryLayer/createFields.H

@@ -52,7 +52,7 @@ volScalarField y
     dimensionedScalar("zero", dimLength, 0.0),
     zeroGradientFvPatchScalarField::typeName
 );
-y.internalField() = wallDist::New(mesh).y().internalField();
+y.primitiveFieldRef() = wallDist::New(mesh).y().primitiveField();
 y.correctBoundaryConditions();
 
 

applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options

@@ -1,8 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/postProcessing/functionObjects/jobControl/lnInclude
+    -I$(LIB_SRC)/functionObjects/field/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -ljobControl
+    -lfieldFunctionObjects

applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometry.C

@@ -56,12 +56,12 @@ Note:
     used for face addressing starts at index 0.
 
 See also
-    externalCoupledFunctionObject
+    functionObjects::externalCoupled
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "externalCoupledFunctionObject.H"
+#include "externalCoupled.H"
 #include "IOobjectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
     }
 
 
-    externalCoupledFunctionObject::writeGeometry
+    functionObjects::externalCoupled::writeGeometry
     (
         UPtrList<const fvMesh>(meshes),
         commsDir,

applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C

@@ -786,6 +786,8 @@ int main(int argc, char *argv[])
         );
 
         label compactI = 0;
+
+        volScalarField::Boundary& vfbf = viewFactorField.boundaryFieldRef();
         forAll(viewFactorsPatches, i)
         {
             label patchID = viewFactorsPatches[i];
@@ -805,7 +807,7 @@ int main(int argc, char *argv[])
                     forAll(fineFaces, fineId)
                     {
                         const label faceID = fineFaces[fineId];
-                        viewFactorField.boundaryField()[patchID][faceID] = Fij;
+                        vfbf[patchID][faceID] = Fij;
                     }
                     compactI++;
                 }