Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C

src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C

@@ -89,7 +89,7 @@ void Foam::nearWallFields::read(const dictionary& dict)
         distance_ = readScalar(dict.lookup("distance"));
 
 
-        // Clear out any previously loaded fields 
+        // Clear out any previously loaded fields
         vsf_.clear();
         vvf_.clear();
         vSpheretf_.clear();
@@ -99,7 +99,7 @@ void Foam::nearWallFields::read(const dictionary& dict)
         reverseFieldMap_.clear();
 
 
-        // Generate fields with selfContainedDirectMapped bc.
+        // Generate fields with selfContainedMapped bc.
 
         // Convert field to map
         fieldMap_.resize(2*fieldSet_.size());

src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C

@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "nearWallFields.H"
-#include "selfContainedDirectMappedFixedValueFvPatchFields.H"
+#include "selfContainedMappedFixedValueFvPatchFields.H"
 #include "interpolationCellPoint.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,7 +66,7 @@ void Foam::nearWallFields::createFields
                 sflds.set(sz, new vfType(io, fld));
                 vfType& sampleFld = sflds[sz];
 
-                // Reset the bcs to be directMapped
+                // Reset the bcs to be mapped
                 forAllConstIter(labelHashSet, patchSet_, iter)
                 {
                     label patchI = iter.key();
@@ -74,14 +74,13 @@ void Foam::nearWallFields::createFields
                     sampleFld.boundaryField().set
                     (
                         patchI,
-                        new selfContainedDirectMappedFixedValueFvPatchField
-                            <Type>
+                        new selfContainedMappedFixedValueFvPatchField<Type>
                         (
                             sampleFld.mesh().boundary()[patchI],
                             sampleFld.dimensionedInternalField(),
 
                             sampleFld.mesh().name(),
-                            directMappedPatchBase::NEARESTCELL,
+                            mappedPatchBase::NEARESTCELL,
                             word::null,     // samplePatch
                             -distance_,
 
@@ -116,7 +115,7 @@ void Foam::nearWallFields::sampleFields
 
         // Take over internal and boundary values
         sflds[i] == fld;
-        // Evaluate to update the directMapped
+        // Evaluate to update the mapped
         sflds[i].correctBoundaryConditions();
     }
 }

src/postProcessing/functionObjects/field/readFields/readFields.C

@@ -88,7 +88,7 @@ void Foam::readFields::execute()
 {
     //Info<< type() << " " << name_ << ":" << nl;
 
-    // Clear out any previously loaded fields 
+    // Clear out any previously loaded fields
     vsf_.clear();
     vvf_.clear();
     vSpheretf_.clear();

src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C

@@ -90,7 +90,7 @@ void Foam::surfaceInterpolateFields::execute()
 {
     if (active_)
     {
-        // Clear out any previously loaded fields 
+        // Clear out any previously loaded fields
         ssf_.clear();
         svf_.clear();
         sSpheretf_.clear();