diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 34a4606e088ade62d6f128c2c021c9524e81c33c..847d91abc6f6a73dbc6da0c691441d00c58d124a 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -164,6 +164,8 @@ $(interpolation)/interpolationCell/makeInterpolationCell.C
$(interpolation)/interpolationCellPoint/cellPointWeight/cellPointWeight.C
$(interpolation)/interpolationCellPoint/makeInterpolationCellPoint.C
$(interpolation)/interpolationCellPointFace/makeInterpolationCellPointFace.C
+$(interpolation)/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
+$(interpolation)/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
volPointInterpolation = interpolation/volPointInterpolation
$(volPointInterpolation)/pointPatchInterpolation/pointPatchInterpolation.C
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
index 767c90380932cf443ef50223649fcf251a86582f..937e277b61a3ceef0169e218bcbb18285281d979 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
@@ -51,7 +51,9 @@ class polyMesh;
class cellPointWeight
{
- // Private data
+protected:
+
+ // Protected data
//- Cell index
const label cellIndex_;
@@ -63,7 +65,7 @@ class cellPointWeight
FixedList<label, 3> faceVertices_;
- // Private Member Functions
+ // Protected Member Functions
void findTetrahedron
(
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
index 9388a85fc889214c1cb5685b3d15de4c17eacf0e..bbe76871ba730bcf70c86c057c5394a3644dd773 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
@@ -42,7 +42,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class interpolationCellPoint Declaration
+ Class interpolationCellPoint Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
@@ -50,7 +50,9 @@ class interpolationCellPoint
:
public interpolation<Type>
{
- // Private data
+protected:
+
+ // Protected data
//- Interpolated volfield
const GeometricField<Type, pointPatchField, pointMesh> psip_;
@@ -79,7 +81,7 @@ public:
//- Interpolate field to the given point in the given cell
inline Type interpolate
(
- const vector& position,
+ const vector& position,
const label nCell,
const label facei = -1
) const;
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
new file mode 100644
index 0000000000000000000000000000000000000000..f33af9e7e335104d78d03f9e1ed31b1f6a511b38
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "cellPointWeightWallModified.H"
+#include "wallPolyPatch.H"
+#include "polyMesh.H"
+#include "polyBoundaryMesh.H"
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::cellPointWeightWallModified::cellPointWeightWallModified
+(
+ const polyMesh& mesh,
+ const vector& position,
+ const label cellIndex,
+ const label faceIndex
+)
+:
+ cellPointWeight(mesh, position, cellIndex, faceIndex)
+{
+ if (faceIndex < 0)
+ {
+ findTetrahedron(mesh, position, cellIndex);
+ }
+ else
+ {
+ const polyBoundaryMesh& bm = mesh.boundaryMesh();
+ label patchI = bm.whichPatch(faceIndex);
+ if (patchI != -1)
+ {
+ if (isA<wallPolyPatch>(bm[patchI]))
+ {
+ // Apply cell centre value wall faces
+ weights_[0] = 0.0;
+ weights_[1] = 0.0;
+ weights_[2] = 0.0;
+ weights_[3] = 1.0;
+ }
+ }
+ else
+ {
+ // Interpolate
+ findTriangle(mesh, position, faceIndex);
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
new file mode 100644
index 0000000000000000000000000000000000000000..e7903a7338b9e4cc1bfcb1ba2eeba55a632bd505
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::cellPointWeightWallModified
+
+Description
+ Foam::cellPointWeightWallModified
+
+SourceFiles
+ cellPointWeightWallModified.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cellPointWeightWallModified_H
+#define cellPointWeightWallModified_H
+
+#include "cellPointWeight.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+ Class cellPointWeightWallModified Declaration
+\*---------------------------------------------------------------------------*/
+
+class cellPointWeightWallModified
+:
+ public cellPointWeight
+{
+public:
+
+ // Constructors
+
+ //- Construct from components
+ cellPointWeightWallModified
+ (
+ const polyMesh& mesh,
+ const vector& position,
+ const label nCell,
+ const label facei = -1
+ );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
new file mode 100644
index 0000000000000000000000000000000000000000..762aeef1cbcb6ab247aa45c9b79dc0a162b5bd6c
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "interpolationCellPointWallModified.H"
+
+// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::interpolationCellPointWallModified<Type>::
+interpolationCellPointWallModified
+(
+ const GeometricField<Type, fvPatchField, volMesh>& psi
+)
+:
+ interpolationCellPoint<Type>(psi)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
new file mode 100644
index 0000000000000000000000000000000000000000..a54fc8fb7a0fbbf2f360b6afa63973c59070cc36
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::interpolationCellPoint
+
+Description
+ Same as interpolationCellPoint, but if interpolating a wall face, uses
+ cell centre value instead
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef interpolationCellPointWallModified_H
+#define interpolationCellPointWallModified_H
+
+#include "interpolationCellPoint.H"
+#include "cellPointWeightWallModified.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class interpolationCellPoint Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class interpolationCellPointWallModified
+:
+ public interpolationCellPoint<Type>
+{
+public:
+
+ //- Runtime type information
+ TypeName("cellPointWallModified");
+
+
+ // Constructors
+
+ //- Construct from components
+ interpolationCellPointWallModified
+ (
+ const GeometricField<Type, fvPatchField, volMesh>& psi
+ );
+
+
+ // Member Functions
+
+ //- Interpolate field for the given cellPointWeight
+ inline Type interpolate(const cellPointWeightWallModified& cpw) const;
+
+ //- Interpolate field to the given point in the given cell
+ inline Type interpolate
+ (
+ const vector& position,
+ const label nCell,
+ const label facei = -1
+ ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "interpolationCellPointWallModifiedI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "interpolationCellPointWallModified.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
new file mode 100644
index 0000000000000000000000000000000000000000..4318ce899419eb46638114dab77a876f111de0cd
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class Type>
+inline Type Foam::interpolationCellPointWallModified<Type>::interpolate
+(
+ const cellPointWeightWallModified& cpw
+) const
+{
+ const FixedList<scalar, 4>& weights = cpw.weights();
+ const FixedList<label, 3>& faceVertices = cpw.faceVertices();
+
+ Type t = this->psip_[faceVertices[0]]*weights[0];
+ t += this->psip_[faceVertices[1]]*weights[1];
+ t += this->psip_[faceVertices[2]]*weights[2];
+ t += this->psi_[cpw.cell()]*weights[3];
+
+ return t;
+}
+
+
+template<class Type>
+inline Type Foam::interpolationCellPointWallModified<Type>::interpolate
+(
+ const vector& position,
+ const label celli,
+ const label facei
+) const
+{
+ return
+ interpolate
+ (
+ cellPointWeightWallModified
+ (
+ this->pMesh_,
+ position,
+ celli,
+ facei
+ )
+ );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
new file mode 100644
index 0000000000000000000000000000000000000000..c2e691f545b49453d136313d3d43554f175e97bb
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "interpolationCellPointWallModified.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ makeInterpolation(interpolationCellPointWallModified);
+}
+
+// ************************************************************************* //