zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Multiple commits - lumped due to git index file corruption

Browse Source 
- Re-located mapped point patches
- Updated mapped patch write
- deprecated directMapped in favour of mapped
- updated resulting dependancies - apps/libs/tuts
This commit is contained in:
andy
2011-09-09 12:05:12 +01:00
parent 531b721d4b
commit 8ae9569085
106 changed files with 558 additions and 5444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sampling/probes/patchProbes.C
View File

@ -27,7 +27,7 @@ License
#include "volFields.H"
#include "IOmanip.H"
// For 'nearInfo' helper class only
#include "directMappedPatchBase.H"
#include "mappedPatchBase.H"
//#include "meshSearch.H"
#include "treeBoundBox.H"
#include "treeDataFace.H"
@ -59,7 +59,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
}
// All the info for nearest. Construct to miss
List<directMappedPatchBase::nearInfo> nearest(this->size());
List<mappedPatchBase::nearInfo> nearest(this->size());
const polyPatch& pp = bm[patchI];
@ -133,7 +133,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
{
const point& fc = mesh.faceCentres()[faceI];
directMappedPatchBase::nearInfo sampleInfo;
mappedPatchBase::nearInfo sampleInfo;
sampleInfo.first() = pointIndexHit
(
@ -152,7 +152,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
// Find nearest.
Pstream::listCombineGather(nearest, directMappedPatchBase::nearestEqOp());
Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
Pstream::listCombineScatter(nearest);
if (debug)

6
src/sampling/sampledSet/patchCloud/patchCloudSet.C
View File

@ -31,7 +31,7 @@ License
#include "Time.H"
#include "meshTools.H"
// For 'nearInfo' helper class only
#include "directMappedPatchBase.H"
#include "mappedPatchBase.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -118,7 +118,7 @@ void Foam::patchCloudSet::calcSamples
// All the info for nearest. Construct to miss
List<directMappedPatchBase::nearInfo> nearest(sampleCoords_.size());
List<mappedPatchBase::nearInfo> nearest(sampleCoords_.size());
forAll(sampleCoords_, sampleI)
{
@ -159,7 +159,7 @@ void Foam::patchCloudSet::calcSamples
// Find nearest.
Pstream::listCombineGather(nearest, directMappedPatchBase::nearestEqOp());
Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
Pstream::listCombineScatter(nearest);

4
src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.C
View File

@ -66,11 +66,11 @@ Foam::sampledPatchInternalField::sampledPatchInternalField
mappers_.set
(
i,
new directMappedPatchBase
new mappedPatchBase
(
mesh.boundaryMesh()[patchI],
mesh.name(), // sampleRegion
directMappedPatchBase::NEARESTCELL, // sampleMode
mappedPatchBase::NEARESTCELL, // sampleMode
word::null, // samplePatch
-distance // sample inside my domain
)

4
src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
View File

@ -41,7 +41,7 @@ SourceFiles
#define sampledPatchInternalField_H
#include "sampledPatch.H"
#include "directMappedPatchBase.H"
#include "mappedPatchBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -59,7 +59,7 @@ class sampledPatchInternalField
// Private data
//- Mapping engines
PtrList<directMappedPatchBase> mappers_;
PtrList<mappedPatchBase> mappers_;
// Private Member Functions

2
src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
View File

@ -82,7 +82,7 @@ Foam::sampledPatchInternalField::interpolateField
forAll(patchIDs(), i)
{
// See directMappedFixedValueFvPatchField
// See mappedFixedValueFvPatchField
const mapDistribute& distMap = mappers_[i].map();
// Send back sample points to processor that holds the cell.