From 211ac3b04df40e4eda71ba8cfc13d5f9a1c77e4b Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 21 Jun 2018 12:34:21 +0100 Subject: [PATCH] sampledSet: Fix headers and interfaceHeight for new namespace --- src/functionObjects/field/interfaceHeight/interfaceHeight.C | 4 ++-- src/sampling/sampledSet/arcUniform/arcUniform.H | 2 +- src/sampling/sampledSet/boundaryPoints/boundaryPoints.H | 2 +- src/sampling/sampledSet/boundaryRandom/boundaryRandom.H | 2 +- src/sampling/sampledSet/boxUniform/boxUniform.H | 2 +- src/sampling/sampledSet/circleRandom/circleRandom.H | 2 +- src/sampling/sampledSet/lineCell/lineCell.H | 2 +- src/sampling/sampledSet/lineCellFace/lineCellFace.H | 2 +- src/sampling/sampledSet/lineFace/lineFace.H | 2 +- src/sampling/sampledSet/lineUniform/lineUniform.H | 2 +- src/sampling/sampledSet/points/points.H | 2 +- src/sampling/sampledSet/sphereRandom/sphereRandom.H | 2 +- .../triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/functionObjects/field/interfaceHeight/interfaceHeight.C b/src/functionObjects/field/interfaceHeight/interfaceHeight.C index 1ec9c3dc0..7cb3ccdfe 100644 --- a/src/functionObjects/field/interfaceHeight/interfaceHeight.C +++ b/src/functionObjects/field/interfaceHeight/interfaceHeight.C @@ -28,7 +28,7 @@ License #include "interpolation.H" #include "IOmanip.H" #include "meshSearch.H" -#include "lineCellFaceSet.H" +#include "lineCellFace.H" #include "Time.H" #include "uniformDimensionedFields.H" #include "volFields.H" @@ -72,7 +72,7 @@ void Foam::functionObjects::interfaceHeight::writePositions() forAll(locations_, li) { // Create a set along a ray projected in the direction of gravity - const lineCellFaceSet set + const sampledSets::lineCellFace set ( "", mesh_, diff --git a/src/sampling/sampledSet/arcUniform/arcUniform.H b/src/sampling/sampledSet/arcUniform/arcUniform.H index e37f763eb..81fee73c3 100644 --- a/src/sampling/sampledSet/arcUniform/arcUniform.H +++ b/src/sampling/sampledSet/arcUniform/arcUniform.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::arcUniform + Foam::sampledSets::arcUniform Description Uniform samples along an arc diff --git a/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H index 56d80e957..57cb614d4 100644 --- a/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H +++ b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::boundaryPoints + Foam::sampledSets::boundaryPoints Description Specified point samples within patches diff --git a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H index 62c311c5a..48f8f8525 100644 --- a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H +++ b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::boundaryRandom + Foam::sampledSets::boundaryRandom Description Random samples within patches diff --git a/src/sampling/sampledSet/boxUniform/boxUniform.H b/src/sampling/sampledSet/boxUniform/boxUniform.H index 0583ebfbe..b9784dae7 100644 --- a/src/sampling/sampledSet/boxUniform/boxUniform.H +++ b/src/sampling/sampledSet/boxUniform/boxUniform.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::boxUniform + Foam::sampledSets::boxUniform Description Uniform 3D-grid of samples diff --git a/src/sampling/sampledSet/circleRandom/circleRandom.H b/src/sampling/sampledSet/circleRandom/circleRandom.H index 0517f5964..86540c28f 100644 --- a/src/sampling/sampledSet/circleRandom/circleRandom.H +++ b/src/sampling/sampledSet/circleRandom/circleRandom.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::circleRandom + Foam::sampledSets::circleRandom Description Random samples within a circle diff --git a/src/sampling/sampledSet/lineCell/lineCell.H b/src/sampling/sampledSet/lineCell/lineCell.H index 88c6b903f..51793542d 100644 --- a/src/sampling/sampledSet/lineCell/lineCell.H +++ b/src/sampling/sampledSet/lineCell/lineCell.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::lineCell + Foam::sampledSets::lineCell Description Cell-samples along a line at the mid-points in-between face-intersections diff --git a/src/sampling/sampledSet/lineCellFace/lineCellFace.H b/src/sampling/sampledSet/lineCellFace/lineCellFace.H index 17a8e2383..6cea0e47e 100644 --- a/src/sampling/sampledSet/lineCellFace/lineCellFace.H +++ b/src/sampling/sampledSet/lineCellFace/lineCellFace.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::lineCellFace + Foam::sampledSets::lineCellFace Description Face-intersections along a line, plus cell-samples at the mid-points diff --git a/src/sampling/sampledSet/lineFace/lineFace.H b/src/sampling/sampledSet/lineFace/lineFace.H index 9dc34d612..349812e24 100644 --- a/src/sampling/sampledSet/lineFace/lineFace.H +++ b/src/sampling/sampledSet/lineFace/lineFace.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::lineFace + Foam::sampledSets::lineFace Description Face-intersections along a line diff --git a/src/sampling/sampledSet/lineUniform/lineUniform.H b/src/sampling/sampledSet/lineUniform/lineUniform.H index 475467aa6..948b28083 100644 --- a/src/sampling/sampledSet/lineUniform/lineUniform.H +++ b/src/sampling/sampledSet/lineUniform/lineUniform.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::lineUniform + Foam::sampledSets::lineUniform Description Uniform samples along a line diff --git a/src/sampling/sampledSet/points/points.H b/src/sampling/sampledSet/points/points.H index 8216c95f8..498a8abe9 100644 --- a/src/sampling/sampledSet/points/points.H +++ b/src/sampling/sampledSet/points/points.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::points + Foam::sampledSets::points Description Specified point samples. Optionally ordered into a continuous path. diff --git a/src/sampling/sampledSet/sphereRandom/sphereRandom.H b/src/sampling/sampledSet/sphereRandom/sphereRandom.H index 885238c32..f6b2f1edb 100644 --- a/src/sampling/sampledSet/sphereRandom/sphereRandom.H +++ b/src/sampling/sampledSet/sphereRandom/sphereRandom.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::sphereRandom + Foam::sampledSets::sphereRandom Description Random samples within a sphere diff --git a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H index 2ca3afb93..556653a55 100644 --- a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H +++ b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::triSurfaceMeshSampledSet + Foam::sampledSets::triSurfaceMeshSampledSet Description Samples from all the points of a triSurfaceMesh. Surface files are read