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

Merge remote-tracking branch 'origin/develop' into feature-AMIMethod

Browse Source 
Conflicts:
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
	src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
This commit is contained in:
mattijs
2016-05-18 13:08:52 +01:00
parent a2be9acca4 ecdc2b2a60
commit bda3d11072
4310 changed files with 76537 additions and 39714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/meshTools/AABBTree/AABBTree.C
View File

@ -82,8 +82,8 @@ void Foam::AABBTree<Type>::writeOBJ
const bool writeLinesOnly,
const treeBoundBox& bb,
const label nodeI,
const List<Pair<treeBoundBox> >& bbs,
const List<Pair<label> >& nodes,
const List<Pair<treeBoundBox>>& bbs,
const List<Pair<label>>& nodes,
label& vertI,
Ostream& os
) const
@ -133,7 +133,7 @@ void Foam::AABBTree<Type>::createBoxes
const treeBoundBox& bb,
const label nodeI,
DynamicList<Pair<treeBoundBox> >& bbs,
DynamicList<Pair<treeBoundBox>>& bbs,
DynamicList<labelPair>& nodes,
DynamicList<labelList>& addressing
) const
@ -356,7 +356,7 @@ Foam::AABBTree<Type>::AABBTree
}
DynamicList<Pair<treeBoundBox> > bbs(maxLevel);
DynamicList<Pair<treeBoundBox>> bbs(maxLevel);
DynamicList<labelPair> nodes(maxLevel);
DynamicList<labelList> addr(maxLevel);

6
src/meshTools/AABBTree/AABBTree.H
View File

@ -109,8 +109,8 @@ protected:
const bool writeLinesOnly,
const treeBoundBox& bb,
const label nodeI,
const List<Pair<treeBoundBox> >& bbs,
const List<Pair<label> >& nodes,
const List<Pair<treeBoundBox>>& bbs,
const List<Pair<label>>& nodes,
label& vertI,
Ostream& os
) const;
@ -126,7 +126,7 @@ protected:
const treeBoundBox& bb,
const label nodeI,
DynamicList<Pair<treeBoundBox> >& bbs,
DynamicList<Pair<treeBoundBox>>& bbs,
DynamicList<labelPair>& nodes,
DynamicList<labelList>& addressing
) const;

46
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -970,7 +970,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
// calculate AMI interpolation
autoPtr<AMIMethod<SourcePatch, TargetPatch> > AMIPtr
autoPtr<AMIMethod<SourcePatch, TargetPatch>> AMIPtr
(
AMIMethod<SourcePatch, TargetPatch>::New
(
@ -1065,14 +1065,14 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
AMIPtr->normaliseWeights(true, *this);
// cache maps and reset addresses
List<Map<label> > cMap;
List<Map<label>> cMap;
srcMapPtr_.reset(new mapDistribute(globalSrcFaces, tgtAddress_, cMap));
tgtMapPtr_.reset(new mapDistribute(globalTgtFaces, srcAddress_, cMap));
}
else
{
// calculate AMI interpolation
autoPtr<AMIMethod<SourcePatch, TargetPatch> > AMIPtr
autoPtr<AMIMethod<SourcePatch, TargetPatch>> AMIPtr
(
AMIMethod<SourcePatch, TargetPatch>::New
(
@ -1119,7 +1119,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::append
)
{
// Create a new interpolation
autoPtr<AMIInterpolation<SourcePatch, TargetPatch> > newPtr
autoPtr<AMIInterpolation<SourcePatch, TargetPatch>> newPtr
(
new AMIInterpolation<SourcePatch, TargetPatch>
(
@ -1494,7 +1494,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
template<class SourcePatch, class TargetPatch>
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
(
const Field<Type>& fld,
@ -1502,12 +1502,12 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
const UList<Type>& defaultValues
) const
{
tmp<Field<Type> > tresult
tmp<Field<Type>> tresult
(
new Field<Type>
(
srcAddress_.size(),
pTraits<Type>::zero
Zero
)
);
@ -1515,7 +1515,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
(
fld,
multiplyWeightedOp<Type, CombineOp>(cop),
tresult(),
tresult.ref(),
defaultValues
);
@ -1525,10 +1525,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
template<class SourcePatch, class TargetPatch>
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const CombineOp& cop,
const UList<Type>& defaultValues
) const
@ -1539,7 +1539,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
template<class SourcePatch, class TargetPatch>
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
(
const Field<Type>& fld,
@ -1547,12 +1547,12 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
const UList<Type>& defaultValues
) const
{
tmp<Field<Type> > tresult
tmp<Field<Type>> tresult
(
new Field<Type>
(
tgtAddress_.size(),
pTraits<Type>::zero
Zero
)
);
@ -1560,7 +1560,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
(
fld,
multiplyWeightedOp<Type, CombineOp>(cop),
tresult(),
tresult.ref(),
defaultValues
);
@ -1570,10 +1570,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
template<class SourcePatch, class TargetPatch>
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const CombineOp& cop,
const UList<Type>& defaultValues
) const
@ -1584,7 +1584,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
template<class SourcePatch, class TargetPatch>
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
(
const Field<Type>& fld,
@ -1597,10 +1597,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
template<class SourcePatch, class TargetPatch>
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const UList<Type>& defaultValues
) const
{
@ -1610,7 +1610,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToSource
template<class SourcePatch, class TargetPatch>
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
(
const Field<Type>& fld,
@ -1623,10 +1623,10 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
template<class SourcePatch, class TargetPatch>
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::AMIInterpolation<SourcePatch, TargetPatch>::interpolateToTarget
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const UList<Type>& defaultValues
) const
{

30
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -484,7 +484,7 @@ public:
//- Interpolate from target to source with supplied op
template<class Type, class CombineOp>
tmp<Field<Type> > interpolateToSource
tmp<Field<Type>> interpolateToSource
(
const Field<Type>& fld,
const CombineOp& cop,
@ -493,16 +493,16 @@ public:
//- Interpolate from target tmp field to source with supplied op
template<class Type, class CombineOp>
tmp<Field<Type> > interpolateToSource
tmp<Field<Type>> interpolateToSource
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const CombineOp& cop,
const UList<Type>& defaultValues = UList<Type>::null()
) const;
//- Interpolate from source to target with supplied op
template<class Type, class CombineOp>
tmp<Field<Type> > interpolateToTarget
tmp<Field<Type>> interpolateToTarget
(
const Field<Type>& fld,
const CombineOp& cop,
@ -511,16 +511,16 @@ public:
//- Interpolate from source tmp field to target with supplied op
template<class Type, class CombineOp>
tmp<Field<Type> > interpolateToTarget
tmp<Field<Type>> interpolateToTarget
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const CombineOp& cop,
const UList<Type>& defaultValues = UList<Type>::null()
) const;
//- Interpolate from target to source
template<class Type>
tmp<Field<Type> > interpolateToSource
tmp<Field<Type>> interpolateToSource
(
const Field<Type>& fld,
const UList<Type>& defaultValues = UList<Type>::null()
@ -528,15 +528,15 @@ public:
//- Interpolate from target tmp field
template<class Type>
tmp<Field<Type> > interpolateToSource
tmp<Field<Type>> interpolateToSource
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const UList<Type>& defaultValues = UList<Type>::null()
) const;
//- Interpolate from source to target
template<class Type>
tmp<Field<Type> > interpolateToTarget
tmp<Field<Type>> interpolateToTarget
(
const Field<Type>& fld,
const UList<Type>& defaultValues = UList<Type>::null()
@ -544,9 +544,9 @@ public:
//- Interpolate from source tmp field
template<class Type>
tmp<Field<Type> > interpolateToTarget
tmp<Field<Type>> interpolateToTarget
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const UList<Type>& defaultValues = UList<Type>::null()
) const;
@ -599,8 +599,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "AMIInterpolation.C"
# include "AMIInterpolationParallelOps.C"
#include "AMIInterpolation.C"
#include "AMIInterpolationParallelOps.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -61,7 +61,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
procI = -1;
if (debug)
{
Info<< "AMIInterpolation::calcDistribution: "
InfoInFunction
<< "AMI split across multiple processors" << endl;
}
}
@ -70,7 +70,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
procI = findIndex(facesPresentOnProc, 1);
if (debug)
{
Info<< "AMIInterpolation::calcDistribution: "
InfoInFunction
<< "AMI local to processor" << procI << endl;
}
}
@ -248,7 +248,7 @@ distributeAndMergePatches
// My own data first
{
const labelList& faceIDs = allTgtFaceIDs[Pstream::myProcNo()];
SubList<label>(tgtFaceIDs, faceIDs.size()).assign(faceIDs);
SubList<label>(tgtFaceIDs, faceIDs.size()) = faceIDs;
const faceList& fcs = allFaces[Pstream::myProcNo()];
forAll(fcs, i)
@ -276,7 +276,7 @@ distributeAndMergePatches
if (procI != Pstream::myProcNo())
{
const labelList& faceIDs = allTgtFaceIDs[procI];
SubList<label>(tgtFaceIDs, faceIDs.size(), nFaces).assign(faceIDs);
SubList<label>(tgtFaceIDs, faceIDs.size(), nFaces) = faceIDs;
const faceList& fcs = allFaces[procI];
forAll(fcs, i)
@ -374,7 +374,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcProcMap
{
// Per processor indices into all segments to send
List<DynamicList<label> > dynSendMap(Pstream::nProcs());
List<DynamicList<label>> dynSendMap(Pstream::nProcs());
// Work array - whether processor bb overlaps the face bounds
boolList procBbOverlaps(Pstream::nProcs());

38
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpcnCFD Ltd.
-------------------------------------------------------------------------------
License
@ -102,7 +102,7 @@ protected:
labelList srcNonOverlap_;
//- Octree used to find face seeds
autoPtr<indexedOctree<treeType> > treePtr_;
autoPtr<indexedOctree<treeType>> treePtr_;
//- Face triangulation mode
const faceAreaIntersect::triangulationMode triMode_;
@ -257,24 +257,24 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeAMIMethod(AMIType) \
\
typedef AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType> \
AMIMethod##AMIType; \
\
defineNamedTemplateTypeNameAndDebug(AMIMethod##AMIType, 0); \
#define makeAMIMethod(AMIType) \
\
typedef AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType> \
AMIMethod##AMIType; \
\
defineNamedTemplateTypeNameAndDebug(AMIMethod##AMIType, 0); \
defineTemplateRunTimeSelectionTable(AMIMethod##AMIType, components);
#define makeAMIMethodType(AMIType, Method) \
\
typedef Method<AMIType::sourcePatchType,AMIType::targetPatchType> \
Method##AMIType; \
\
defineNamedTemplateTypeNameAndDebug(Method##AMIType, 0); \
\
AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType>:: \
addcomponentsConstructorToTable<Method##AMIType> \
#define makeAMIMethodType(AMIType, Method) \
\
typedef Method<AMIType::sourcePatchType,AMIType::targetPatchType> \
Method##AMIType; \
\
defineNamedTemplateTypeNameAndDebug(Method##AMIType, 0); \
\
AMIMethod<AMIType::sourcePatchType,AMIType::targetPatchType>:: \
addcomponentsConstructorToTable<Method##AMIType> \
add##Method##AMIType##ConstructorToTable_;
@ -285,8 +285,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "AMIMethod.C"
# include "AMIMethodNew.C"
#include "AMIMethod.C"
#include "AMIMethodNew.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

6
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethodNew.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class SourcePatch, class TargetPatch>
Foam::autoPtr<Foam::AMIMethod<SourcePatch, TargetPatch> >
Foam::autoPtr<Foam::AMIMethod<SourcePatch, TargetPatch>>
Foam::AMIMethod<SourcePatch, TargetPatch>::New
(
const word& methodName,
@ -56,7 +56,7 @@ Foam::AMIMethod<SourcePatch, TargetPatch>::New
<< componentsConstructorTablePtr_->sortedToc() << exit(FatalError);
}
return autoPtr<AMIMethod<SourcePatch, TargetPatch> >
return autoPtr<AMIMethod<SourcePatch, TargetPatch>>
(
cstrIter()
(

6
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -250,8 +250,8 @@ void Foam::directAMI<SourcePatch, TargetPatch>::calculate
// temporary storage for addressing and weights
List<DynamicList<label> > srcAddr(this->srcPatch_.size());
List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
List<DynamicList<label>> srcAddr(this->srcPatch_.size());
List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
// construct weights and addressing

4
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -153,7 +153,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "directAMI.C"
#include "directAMI.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

34
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,10 +30,10 @@ License
template<class SourcePatch, class TargetPatch>
void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calcAddressing
(
List<DynamicList<label> >& srcAddr,
List<DynamicList<scalar> >& srcWght,
List<DynamicList<label> >& tgtAddr,
List<DynamicList<scalar> >& tgtWght,
List<DynamicList<label>>& srcAddr,
List<DynamicList<scalar>>& srcWght,
List<DynamicList<label>>& tgtAddr,
List<DynamicList<scalar>>& tgtWght,
label srcFaceI,
label tgtFaceI
)
@ -117,10 +117,10 @@ bool Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::processSourceFace
DynamicList<label>& visitedFaces,
// temporary storage for addressing and weights
List<DynamicList<label> >& srcAddr,
List<DynamicList<scalar> >& srcWght,
List<DynamicList<label> >& tgtAddr,
List<DynamicList<scalar> >& tgtWght
List<DynamicList<label>>& srcAddr,
List<DynamicList<scalar>>& srcWght,
List<DynamicList<label>>& tgtAddr,
List<DynamicList<scalar>>& tgtWght
)
{
if (tgtStartFaceI == -1)
@ -358,10 +358,10 @@ template<class SourcePatch, class TargetPatch>
void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::
restartUncoveredSourceFace
(
List<DynamicList<label> >& srcAddr,
List<DynamicList<scalar> >& srcWght,
List<DynamicList<label> >& tgtAddr,
List<DynamicList<scalar> >& tgtWght
List<DynamicList<label>>& srcAddr,
List<DynamicList<scalar>>& srcWght,
List<DynamicList<label>>& tgtAddr,
List<DynamicList<scalar>>& tgtWght
)
{
// Collect all src faces with a low weight
@ -518,10 +518,10 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
}
// temporary storage for addressing and weights
List<DynamicList<label> > srcAddr(this->srcPatch_.size());
List<DynamicList<scalar> > srcWght(srcAddr.size());
List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
List<DynamicList<scalar> > tgtWght(tgtAddr.size());
List<DynamicList<label>> srcAddr(this->srcPatch_.size());
List<DynamicList<scalar>> srcWght(srcAddr.size());
List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
List<DynamicList<scalar>> tgtWght(tgtAddr.size());
calcAddressing
(

28
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -74,10 +74,10 @@ protected:
//- Calculate addressing and weights using temporary storage
virtual void calcAddressing
(
List<DynamicList<label> >& srcAddress,
List<DynamicList<scalar> >& srcWeights,
List<DynamicList<label> >& tgtAddress,
List<DynamicList<scalar> >& tgtWeights,
List<DynamicList<label>>& srcAddress,
List<DynamicList<scalar>>& srcWeights,
List<DynamicList<label>>& tgtAddress,
List<DynamicList<scalar>>& tgtWeights,
label srcFaceI,
label tgtFaceI
);
@ -89,19 +89,19 @@ protected:
const label tgtStartFaceI,
DynamicList<label>& nbrFaces,
DynamicList<label>& visitedFaces,
List<DynamicList<label> >& srcAddr,
List<DynamicList<scalar> >& srcWght,
List<DynamicList<label> >& tgtAddr,
List<DynamicList<scalar> >& tgtWght
List<DynamicList<label>>& srcAddr,
List<DynamicList<scalar>>& srcWght,
List<DynamicList<label>>& tgtAddr,
List<DynamicList<scalar>>& tgtWght
);
//- Attempt to re-evaluate source faces that have not been included
virtual void restartUncoveredSourceFace
(
List<DynamicList<label> >& srcAddr,
List<DynamicList<scalar> >& srcWght,
List<DynamicList<label> >& tgtAddr,
List<DynamicList<scalar> >& tgtWght
List<DynamicList<label>>& srcAddr,
List<DynamicList<scalar>>& srcWght,
List<DynamicList<label>>& tgtAddr,
List<DynamicList<scalar>>& tgtWght
);
//- Set the source and target seed faces
@ -185,7 +185,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "faceAreaWeightAMI.C"
#include "faceAreaWeightAMI.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ template<class SourcePatch, class TargetPatch>
Foam::label Foam::mapNearestAMI<SourcePatch, TargetPatch>::findMappedSrcFace
(
const label tgtFaceI,
const List<DynamicList<label> >& tgtToSrc
const List<DynamicList<label>>& tgtToSrc
) const
{
DynamicList<label> testFaces(10);
@ -230,8 +230,8 @@ void Foam::mapNearestAMI<SourcePatch, TargetPatch>::calculate
// temporary storage for addressing and weights
List<DynamicList<label> > srcAddr(this->srcPatch_.size());
List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
List<DynamicList<label>> srcAddr(this->srcPatch_.size());
List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
// construct weights and addressing

6
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -86,7 +86,7 @@ private:
label findMappedSrcFace
(
const label tgtFaceI,
const List<DynamicList<label> >& tgtToSrc
const List<DynamicList<label>>& tgtToSrc
) const;
@ -157,7 +157,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "mapNearestAMI.C"
#include "mapNearestAMI.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -125,10 +125,10 @@ void Foam::partialFaceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
}
// temporary storage for addressing and weights
List<DynamicList<label> > srcAddr(this->srcPatch_.size());
List<DynamicList<scalar> > srcWght(srcAddr.size());
List<DynamicList<label> > tgtAddr(this->tgtPatch_.size());
List<DynamicList<scalar> > tgtWght(tgtAddr.size());
List<DynamicList<label>> srcAddr(this->srcPatch_.size());
List<DynamicList<scalar>> srcWght(srcAddr.size());
List<DynamicList<label>> tgtAddr(this->tgtPatch_.size());
List<DynamicList<scalar>> tgtWght(tgtAddr.size());
faceAreaWeightAMI<SourcePatch, TargetPatch>::calcAddressing
(

4
src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -132,7 +132,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "partialFaceAreaWeightAMI.C"
#include "partialFaceAreaWeightAMI.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -184,7 +184,7 @@ Foam::cyclicACMIGAMGInterface::internalFieldTransfer
const labelUList& nbrFaceCells = nbr.faceCells();
tmp<labelField> tpnf(new labelField(nbrFaceCells.size()));
labelField& pnf = tpnf();
labelField& pnf = tpnf.ref();
forAll(pnf, facei)
{

4
src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -183,7 +183,7 @@ Foam::tmp<Foam::labelField> Foam::cyclicAMIGAMGInterface::internalFieldTransfer
const labelUList& nbrFaceCells = nbr.faceCells();
tmp<labelField> tpnf(new labelField(nbrFaceCells.size()));
labelField& pnf = tpnf();
labelField& pnf = tpnf.ref();
forAll(pnf, facei)
{

6
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -129,13 +129,13 @@ void Foam::cyclicACMIPointPatchField<Type>::swapAddSeparated
// Get neighbouring pointPatchField
const GeometricField<Type, pointPatchField, pointMesh>& fld =
refCast<const GeometricField<Type, pointPatchField, pointMesh> >
refCast<const GeometricField<Type, pointPatchField, pointMesh>>
(
this->dimensionedInternalField()
);
const cyclicACMIPointPatchField<Type>& nbr =
refCast<const cyclicACMIPointPatchField<Type> >
refCast<const cyclicACMIPointPatchField<Type>>
(
fld.boundaryField()[nbrPatch.index()]
);

16
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,10 +59,10 @@ class cyclicACMIPointPatchField
const cyclicACMIPointPatch& cyclicACMIPatch_;
//- Owner side patch interpolation pointer
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> > ppiPtr_;
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>> ppiPtr_;
//- Neighbour side patch interpolation pointer
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> >
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>>
nbrPpiPtr_;
@ -136,9 +136,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<Type> > clone() const
virtual autoPtr<pointPatchField<Type>> clone() const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new cyclicACMIPointPatchField<Type>
(
@ -155,12 +155,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<Type> > clone
virtual autoPtr<pointPatchField<Type>> clone
(
const DimensionedField<Type, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new cyclicACMIPointPatchField<Type>
(
@ -231,7 +231,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "cyclicACMIPointPatchField.C"
#include "cyclicACMIPointPatchField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -280,7 +280,7 @@ public:
//- Interpolate field
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const Field<Type>& fldCouple,
const Field<Type>& fldNonOverlap
@ -288,10 +288,10 @@ public:
//- Interpolate tmp field
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const tmp<Field<Type> >& tFldCouple,
const tmp<Field<Type> >& tFldNonOverlap
const tmp<Field<Type>>& tFldCouple,
const tmp<Field<Type>>& tFldNonOverlap
) const;
//- Low-level interpolate List

14
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
Foam::tmp<Foam::Field<Type>> Foam::cyclicACMIPolyPatch::interpolate
(
const Field<Type>& fldCouple,
const Field<Type>& fldNonOverlap
@ -39,7 +39,7 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
{
const scalarField& w = AMI().srcWeightsSum();
tmp<Field<Type> > interpField(AMI().interpolateToSource(fldCouple));
tmp<Field<Type>> interpField(AMI().interpolateToSource(fldCouple));
return interpField + (1.0 - w)*fldNonOverlap;
}
@ -47,7 +47,7 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
{
const scalarField& w = neighbPatch().AMI().tgtWeightsSum();
tmp<Field<Type> > interpField
tmp<Field<Type>> interpField
(
neighbPatch().AMI().interpolateToTarget(fldCouple)
);
@ -58,10 +58,10 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::cyclicACMIPolyPatch::interpolate
Foam::tmp<Foam::Field<Type>> Foam::cyclicACMIPolyPatch::interpolate
(
const tmp<Field<Type> >& tFldCouple,
const tmp<Field<Type> >& tFldNonOverlap
const tmp<Field<Type>>& tFldCouple,
const tmp<Field<Type>>& tFldNonOverlap
) const
{
return interpolate(tFldCouple(), tFldNonOverlap());

6
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -129,13 +129,13 @@ void Foam::cyclicAMIPointPatchField<Type>::swapAddSeparated
// Get neighbouring pointPatchField
const GeometricField<Type, pointPatchField, pointMesh>& fld =
refCast<const GeometricField<Type, pointPatchField, pointMesh> >
refCast<const GeometricField<Type, pointPatchField, pointMesh>>
(
this->dimensionedInternalField()
);
const cyclicAMIPointPatchField<Type>& nbr =
refCast<const cyclicAMIPointPatchField<Type> >
refCast<const cyclicAMIPointPatchField<Type>>
(
fld.boundaryField()[nbrPatch.index()]
);

16
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,10 +59,10 @@ class cyclicAMIPointPatchField
const cyclicAMIPointPatch& cyclicAMIPatch_;
//- Owner side patch interpolation pointer
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> > ppiPtr_;
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>> ppiPtr_;
//- Neighbour side patch interpolation pointer
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch> >
mutable autoPtr<PrimitivePatchInterpolation<primitivePatch>>
nbrPpiPtr_;
@ -136,9 +136,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<Type> > clone() const
virtual autoPtr<pointPatchField<Type>> clone() const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new cyclicAMIPointPatchField<Type>
(
@ -155,12 +155,12 @@ public:
);
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<Type> > clone
virtual autoPtr<pointPatchField<Type>> clone
(
const DimensionedField<Type, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new cyclicAMIPointPatchField<Type>
(
@ -231,7 +231,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "cyclicAMIPointPatchField.C"
#include "cyclicAMIPointPatchField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

20
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -136,7 +136,7 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
{
case ROTATIONAL:
{
tensor revT = tensor::zero;
tensor revT = Zero;
if (rotationAngleDefined_)
{
@ -221,8 +221,8 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
}
else
{
point n0 = vector::zero;
point n1 = vector::zero;
point n0 = Zero;
point n1 = Zero;
if (half0Ctrs.size())
{
n0 = findFaceNormalMaxRadius(half0Ctrs);
@ -489,11 +489,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
coupledPolyPatch(name, size, start, index, bm, patchType, transform),
nbrPatchName_(word::null),
nbrPatchID_(-1),
rotationAxis_(vector::zero),
rotationCentre_(point::zero),
rotationAxis_(Zero),
rotationCentre_(Zero),
rotationAngleDefined_(false),
rotationAngle_(0.0),
separationVector_(vector::zero),
separationVector_(Zero),
AMIPtr_(NULL),
AMIMethod_(AMIPatchToPatchInterpolation::imFaceAreaWeight),
AMIReverse_(false),
@ -520,11 +520,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
nbrPatchName_(dict.lookupOrDefault<word>("neighbourPatch", "")),
coupleGroup_(dict),
nbrPatchID_(-1),
rotationAxis_(vector::zero),
rotationCentre_(point::zero),
rotationAxis_(Zero),
rotationCentre_(Zero),
rotationAngleDefined_(false),
rotationAngle_(0.0),
separationVector_(vector::zero),
separationVector_(Zero),
AMIPtr_(NULL),
AMIMethod_
(

8
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -351,7 +351,7 @@ public:
//- Interpolate field
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const Field<Type>& fld,
const UList<Type>& defaultValues = UList<Type>()
@ -359,9 +359,9 @@ public:
//- Interpolate tmp field
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const UList<Type>& defaultValues = UList<Type>()
) const;

8
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
(
const Field<Type>& fld,
const UList<Type>& defaultValues
@ -44,9 +44,9 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
(
const tmp<Field<Type> >& tFld,
const tmp<Field<Type>>& tFld,
const UList<Type>& defaultValues
) const
{

23
src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
View File

@ -284,7 +284,8 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
ownStr.reset(new OBJstream(dir/name() + postfix));
neiStr.reset(new OBJstream(dir/neighbPatch().name() + postfix));
Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:" << name()
InfoInFunction
<< "patch:" << name()
<< " writing accumulated AMI to " << ownStr().name()
<< " and " << neiStr().name() << endl;
}
@ -368,7 +369,8 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
if (debug)
{
Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:" << name()
InfoInFunction
<< "patch:" << name()
<< " srcSum:" << srcSum
<< " tgtSum:" << tgtSum
<< " direction:" << direction
@ -391,8 +393,8 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
if (debug)
{
Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:"
<< name()
InfoInFunction
<< "patch:" << name()
<< " moving this side from:"
<< gAverage(thisPatch.points())
<< " to:" << gAverage(thisPoints) << endl;
@ -402,8 +404,8 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
if (debug)
{
Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:"
<< name()
InfoInFunction
<< "patch:" << name()
<< " appending weights with untransformed slave side"
<< endl;
}
@ -421,8 +423,8 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
if (debug)
{
Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:"
<< name()
InfoInFunction
<< "patch:" << name()
<< " moving neighbour side from:"
<< gAverage(nbrPatch.points())
<< " to:" << gAverage(nbrPoints) << endl;
@ -453,11 +455,12 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
nTransforms_ += direction ? +1 : -1;
++ iter;
++iter;
if (debug)
{
Info<< "cyclicPeriodicAMIPolyPatch::resetAMI : patch:" << name()
InfoInFunction
<< "patch:" << name()
<< " iteration:" << iter
<< " srcSum:" << srcSum
<< " tgtSum:" << tgtSum

4
src/meshTools/algorithms/MeshWave/FaceCellWave.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -384,7 +384,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "FaceCellWave.C"
#include "FaceCellWave.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/algorithms/MeshWave/MeshWave.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -167,7 +167,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "MeshWave.C"
#include "MeshWave.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -358,7 +358,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "PatchEdgeFaceWave.C"
#include "PatchEdgeFaceWave.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/algorithms/PointEdgeWave/PointData.H
View File

@ -181,13 +181,13 @@ public:
//- Data associated with PointData types is contiguous
template<>
inline bool contiguous<PointData<scalar> >()
inline bool contiguous<PointData<scalar>>()
{
return true;
}
template<>
inline bool contiguous<PointData<vector> >()
inline bool contiguous<PointData<vector>>()
{
return true;
}

4
src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -357,7 +357,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "PointEdgeWave.C"
#include "PointEdgeWave.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/cellDist/cellDistFuncs.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -162,7 +162,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "cellDistFuncsTemplates.C"
#include "cellDistFuncsTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/cellDist/patchWave/patchDataWave.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -172,7 +172,7 @@ Foam::patchDataWave<TransferType>::patchDataWave
(
const polyMesh& mesh,
const labelHashSet& patchIDs,
const UPtrList<Field<Type> >& initialPatchValuePtrs,
const UPtrList<Field<Type>>& initialPatchValuePtrs,
const bool correctWalls
)
:

8
src/meshTools/cellDist/patchWave/patchDataWave.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,7 +77,7 @@ private:
labelHashSet patchIDs_;
//- Reference to initial extra data at patch faces
const UPtrList<Field<Type> >& initialPatchValuePtrs_;
const UPtrList<Field<Type>>& initialPatchValuePtrs_;
//- Do accurate distance calculation for near-wall cells.
bool correctWalls_;
@ -128,7 +128,7 @@ public:
(
const polyMesh& mesh,
const labelHashSet& patchIDs,
const UPtrList<Field<Type> >& initialPatchValuePtrs,
const UPtrList<Field<Type>>& initialPatchValuePtrs,
bool correctWalls = true
);
@ -198,7 +198,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "patchDataWave.C"
#include "patchDataWave.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

18
src/meshTools/cellDist/wallPoint/wallPointData.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -164,37 +164,37 @@ public:
// ones.
template<>
inline bool contiguous<wallPointData<bool> >()
inline bool contiguous<wallPointData<bool>>()
{
return contiguous<wallPoint>();
}
template<>
inline bool contiguous<wallPointData<label> >()
inline bool contiguous<wallPointData<label>>()
{
return contiguous<wallPoint>();
}
template<>
inline bool contiguous<wallPointData<scalar> >()
inline bool contiguous<wallPointData<scalar>>()
{
return contiguous<wallPoint>();
}
template<>
inline bool contiguous<wallPointData<vector> >()
inline bool contiguous<wallPointData<vector>>()
{
return contiguous<wallPoint>();
}
template<>
inline bool contiguous<wallPointData<sphericalTensor> >()
inline bool contiguous<wallPointData<sphericalTensor>>()
{
return contiguous<wallPoint>();
}
template<>
inline bool contiguous<wallPointData<symmTensor> >()
inline bool contiguous<wallPointData<symmTensor>>()
{
return contiguous<wallPoint>();
}
template<>
inline bool contiguous<wallPointData<tensor> >()
inline bool contiguous<wallPointData<tensor>>()
{
return contiguous<wallPoint>();
}
@ -208,7 +208,7 @@ inline bool contiguous<wallPointData<tensor> >()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "wallPointData.C"
#include "wallPointData.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

6
src/meshTools/cellFeatures/cellFeatures.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,7 +78,7 @@ class cellFeatures
mutable faceList* facesPtr_;
//- New to old face mapping
mutable List<DynamicList<label> > faceMap_;
mutable List<DynamicList<label>> faceMap_;
// Private Member Functions
@ -147,7 +147,7 @@ public:
}
//- New to old faceMap. Guaranteed to be shrunk.
const List<DynamicList<label> >& faceMap() const
const List<DynamicList<label>>& faceMap() const
{
if (!facesPtr_)
{

10
src/meshTools/cellQuality/cellQuality.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -47,7 +47,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
)
);
scalarField& result = tresult();
scalarField& result = tresult.ref();
scalarField sumArea(mesh_.nCells(), 0.0);
@ -108,7 +108,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
mesh_.nCells(), 0.0
)
);
scalarField& result = tresult();
scalarField& result = tresult.ref();
scalarField sumArea(mesh_.nCells(), 0.0);
@ -187,7 +187,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
mesh_.nFaces(), 0.0
)
);
scalarField& result = tresult();
scalarField& result = tresult.ref();
const vectorField& centres = mesh_.cellCentres();
@ -247,7 +247,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
mesh_.nFaces(), 0.0
)
);
scalarField& result = tresult();
scalarField& result = tresult.ref();
const vectorField& cellCtrs = mesh_.cellCentres();

4
src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -128,7 +128,7 @@ transformVector
) const
{
tmp<symmTensorField> tfld(new symmTensorField(st.size()));
symmTensorField& fld = tfld();
symmTensorField& fld = tfld.ref();
forAll(fld, i)
{

29
src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,14 +37,17 @@ Description
- the rotation angles are in degrees, unless otherwise explictly specified:
\verbatim
coordinateRotation
{
type EulerRotation
degrees false;
rotation (0 0 3.141592654);
}
coordinateRotation
{
type EulerRotation;
degrees false;
rotation (0 0 3.141592654);
}
\endverbatim
SourceFiles
EulerCoordinateRotation.C
\*---------------------------------------------------------------------------*/
#ifndef EulerCoordinateRotation_H
@ -163,22 +166,22 @@ public:
return Rtr_;
};
//- Return local Cartesian x-axis
//- Return local Cartesian x-axis in global coordinates
virtual const vector e1() const
{
return R_.x();
return Rtr_.x();
}
//- Return local Cartesian y-axis
//- Return local Cartesian y-axis in global coordinates
virtual const vector e2() const
{
return R_.y();
return Rtr_.y();
}
//- Return local Cartesian z-axis
//- Return local Cartesian z-axis in global coordinates
virtual const vector e3() const
{
return R_.z();
return Rtr_.z();
}
//- Return transformation tensor field

4
src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -129,7 +129,7 @@ transformVector
) const
{
tmp<symmTensorField> tfld(new symmTensorField(st.size()));
symmTensorField& fld = tfld();
symmTensorField& fld = tfld.ref();
forAll(fld, i)
{

29
src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,14 +34,17 @@ Description
- the rotation angles are in degrees, unless otherwise explictly specified:
\verbatim
coordinateRotation
{
type STARCDRotation;
degrees false;
rotation (0 0 3.141592654);
}
coordinateRotation
{
type STARCDRotation;
degrees false;
rotation (0 0 3.141592654);
}
\endverbatim
SourceFiles
STARCDCoordinateRotation.C
\*---------------------------------------------------------------------------*/
#ifndef STARCDCoordinateRotation_H
@ -160,22 +163,22 @@ public:
return Rtr_;
};
//- Return local Cartesian x-axis
//- Return local Cartesian x-axis in global coordinates
virtual const vector e1() const
{
return R_.x();
return Rtr_.x();
}
//- Return local Cartesian y-axis
//- Return local Cartesian y-axis in global coordinates
virtual const vector e2() const
{
return R_.y();
return Rtr_.y();
}
//- Return local Cartesian z-axis
//- Return local Cartesian z-axis in global coordinates
virtual const vector e3() const
{
return R_.z();
return Rtr_.z();
}
//- Return transformation tensor field

6
src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -90,7 +90,7 @@ void Foam::axesRotation::calcTransform
<< "Unhandled axes specifictation" << endl
<< abort(FatalError);
Rtr = tensor::zero;
Rtr = Zero;
break;
}
}
@ -240,7 +240,7 @@ Foam::tmp<Foam::symmTensorField> Foam::axesRotation::transformVector
) const
{
tmp<symmTensorField> tfld(new symmTensorField(st.size()));
symmTensorField& fld = tfld();
symmTensorField& fld = tfld.ref();
forAll(fld, i)
{

32
src/meshTools/coordinateSystems/coordinateRotation/axesRotation.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,17 +28,21 @@ Description
A coordinate rotation specified using global axis
The rotation is defined by a combination of vectors (e1/e2), (e2/e3)
or (e3/e1). Any nonorthogonality will be absorbed into the second vector.
or (e3/e1). Any nonorthogonality will be absorbed into the second
vector.
\verbatim
axesRotation
{
type axesRotation;
e1 (1 0 0);
e2 (0 1 0);
}
axesRotation
{
type axesRotation;
e1 (1 0 0);
e2 (0 1 0);
}
\endverbatim
SourceFiles
axesRotation.C
\*---------------------------------------------------------------------------*/
#ifndef axesRotation_H
@ -153,22 +157,22 @@ public:
return Rtr_;
}
//- Return local Cartesian x-axis
//- Return local Cartesian x-axis in global coordinates
virtual const vector e1() const
{
return R_.x();
return Rtr_.x();
}
//- Return local Cartesian y-axis
//- Return local Cartesian y-axis in global coordinates
virtual const vector e2() const
{
return R_.y();
return Rtr_.y();
}
//- Return local Cartesian z-axis
//- Return local Cartesian z-axis in global coordinates
virtual const vector e3() const
{
return R_.z();
return Rtr_.z();
}
//- Return transformation tensor field

25
src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,21 +28,24 @@ Description
Abstract base class for coordinate rotation
\verbatim
coordinateRotation
{
type axesRotation
e1 (1 0 0);
e2 (0 1 0);
}
coordinateRotation
{
type axesRotation
e1 (1 0 0);
e2 (0 1 0);
}
\endverbatim
Types of coordinateRotation:
1) axesRotation
2) STARCDRotation
3) cylindrical
4) EulerCoordinateRotation
\li 1. axesRotation
\li 2. STARCDRotation
\li 3. cylindrical
\li 4. EulerCoordinateRotation
SourceFiles
coordinateRotation.C
coordinateRotationNew.C
\*---------------------------------------------------------------------------*/

22
src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -99,8 +99,8 @@ Foam::cylindrical::cylindrical
)
:
Rptr_(),
origin_(point::zero),
e3_(vector::zero)
origin_(Zero),
e3_(Zero)
{
// If origin is specified in the coordinateSystem
if (dict.parent().found("origin"))
@ -165,8 +165,8 @@ Foam::cylindrical::cylindrical(const dictionary& dict)
Foam::cylindrical::cylindrical(const tensorField& R)
:
Rptr_(),
origin_(vector::zero),
e3_(vector::zero)
origin_(Zero),
e3_(Zero)
{
Rptr_() = R;
}
@ -231,7 +231,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::transform
Foam::vector Foam::cylindrical::transform(const vector& v) const
{
NotImplemented;
return vector::zero;
return Zero;
}
@ -257,7 +257,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::invTransform
Foam::vector Foam::cylindrical::invTransform(const vector& v) const
{
NotImplemented;
return vector::zero;
return Zero;
}
@ -293,7 +293,7 @@ Foam::tensor Foam::cylindrical::transformTensor
{
NotImplemented;
return tensor::zero;
return Zero;
}
@ -313,7 +313,7 @@ Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
const tensorField& R = Rptr_();
const tensorField Rtr(R.T());
tmp<tensorField> tt(new tensorField(cellMap.size()));
tensorField& t = tt();
tensorField& t = tt.ref();
forAll(cellMap, i)
{
const label cellI = cellMap[i];
@ -337,7 +337,7 @@ Foam::tmp<Foam::symmTensorField> Foam::cylindrical::transformVector
}
tmp<symmTensorField> tfld(new symmTensorField(Rptr_->size()));
symmTensorField& fld = tfld();
symmTensorField& fld = tfld.ref();
const tensorField& R = Rptr_();
forAll(fld, i)
@ -354,7 +354,7 @@ Foam::symmTensor Foam::cylindrical::transformVector
) const
{
NotImplemented;
return symmTensor::zero;
return Zero;
}

30
src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,20 +28,22 @@ Description
A local coordinate rotation.
The cell based rotational field can be created in two ways:
1) Each rotational tensor is defined with two vectors (dir and e3)
where dir = cellC - origin and e3 is the rotation axis.
\li 1. Each rotational tensor is defined with two vectors (\c dir and \c e3)
where <tt>dir = cellC - origin</tt> and \c e3 is the rotation axis.
Per each cell an axesRotation type of rotation is created
(cylindrical coordinates)
(cylindrical coordinates). For example:
\verbatim
cylindrical
{
type localAxes;
e3 (0 0 1);
}
cylindrical
{
type localAxes;
e3 (0 0 1);
}
\endverbatim
2) The rotational tensor field is provided at construction
\li 2. The rotational tensor field is provided at construction.
SourceFiles
cylindrical.C
\*---------------------------------------------------------------------------*/
@ -157,21 +159,21 @@ public:
return tensor::zero;
}
//- Return local Cartesian x-axis
//- Return local Cartesian x-axis in global coordinates
virtual const vector e1() const
{
NotImplemented;
return vector::zero;
}
//- Return local Cartesian y-axis
//- Return local Cartesian y-axis in global coordinates
virtual const vector e2() const
{
NotImplemented;
return vector::zero;
}
//- Return local Cartesian z-axis
//- Return local Cartesian z-axis in global coordinates
virtual const vector e3() const
{
return e3_;

19
src/meshTools/coordinateSystems/coordinateSystem.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -43,7 +43,7 @@ Foam::coordinateSystem::coordinateSystem()
:
name_(),
note_(),
origin_(point::zero),
origin_(Zero),
R_(new axesRotation(sphericalTensor::I))
{}
@ -98,7 +98,7 @@ Foam::coordinateSystem::coordinateSystem
:
name_(name),
note_(),
origin_(point::zero),
origin_(Zero),
R_()
{
init(dict);
@ -109,7 +109,7 @@ Foam::coordinateSystem::coordinateSystem(const dictionary& dict)
:
name_(),
note_(),
origin_(point::zero),
origin_(Zero),
R_()
{
init(dict);
@ -124,7 +124,7 @@ Foam::coordinateSystem::coordinateSystem
:
name_(),
note_(),
origin_(point::zero),
origin_(Zero),
R_()
{
const entry* entryPtr = dict.lookupEntryPtr(typeName_(), false, false);
@ -139,9 +139,8 @@ Foam::coordinateSystem::coordinateSystem
if (debug)
{
Info<< "coordinateSystem::coordinateSystem"
"(const objectRegistry&, const dictionary&):"
<< nl << "using global coordinate system: "
InfoInFunction
<< "Using global coordinate system: "
<< key << "=" << index << endl;
}
@ -169,7 +168,7 @@ Foam::coordinateSystem::coordinateSystem(Istream& is)
:
name_(is),
note_(),
origin_(point::zero),
origin_(Zero),
R_()
{
dictionary dict(is);
@ -282,7 +281,7 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystem::globalToLocal
void Foam::coordinateSystem::clear()
{
note_.clear();
origin_ = point::zero;
origin_ = Zero;
R_->clear();
}

31
src/meshTools/coordinateSystems/coordinateSystem.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,30 +30,29 @@ Description
All systems are defined by an origin point and a co-ordinate rotation.
\verbatim
coordinateSystem
coordinateSystem
{
type cartesian;
origin (0 0 0);
coordinateRotation
{
type cartesian;
origin (0 0 0);
coordinateRotation
{
type cylindrical;
e3 (0 0 1);
}
type cylindrical;
e3 (0 0 1);
}
}
\endverbatim
Types of coordinateRotation:
1) axesRotation
2) STARCDRotation
3) cylindrical
4) EulerCoordinateRotation
\li 1. axesRotation
\li 2. STARCDRotation
\li 3. cylindrical
\li 4. EulerCoordinateRotation
Type of co-ordinates:
1) cartesian
\li 1. cartesian
See Also
coordinateSystem and coordinateSystem::New
SourceFiles
coordinateSystem.C

4
src/meshTools/coordinateSystems/coordinateSystems.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,7 +57,7 @@ Foam::coordinateSystems::coordinateSystems
Foam::coordinateSystems::coordinateSystems
(
const IOobject& io,
const Xfer<PtrList<coordinateSystem> >& lst
const Xfer<PtrList<coordinateSystem>>& lst
)
:
IOPtrList<coordinateSystem>(io, lst)

4
src/meshTools/coordinateSystems/coordinateSystems.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -104,7 +104,7 @@ public:
coordinateSystems
(
const IOobject&,
const Xfer<PtrList<coordinateSystem> >&
const Xfer<PtrList<coordinateSystem>>&
);

4
src/meshTools/coordinateSystems/cylindricalCS.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -208,7 +208,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
);
tmp<vectorField> tresult(new vectorField(lc.size()));
vectorField& result = tresult();
vectorField& result = tresult.ref();
result.replace
(

8
src/meshTools/indexedOctree/treeDataEdge.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,7 +30,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(treeDataEdge, 0);
defineTypeNameAndDebug(treeDataEdge, 0);
}
@ -128,8 +128,6 @@ Foam::pointField Foam::treeDataEdge::shapePoints() const
}
//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
// Only makes sense for closed surfaces.
Foam::volumeType Foam::treeDataEdge::getVolumeType
(
const indexedOctree<treeDataEdge>& oc,
@ -140,7 +138,6 @@ Foam::volumeType Foam::treeDataEdge::getVolumeType
}
// Check if any point on shape is inside cubeBb.
bool Foam::treeDataEdge::overlaps
(
const label index,
@ -158,7 +155,6 @@ bool Foam::treeDataEdge::overlaps
}
// Check if any point on shape is inside sphere.
bool Foam::treeDataEdge::overlaps
(
const label index,

12
src/meshTools/indexedOctree/treeDataFace.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,9 +31,9 @@ License
namespace Foam
{
defineTypeNameAndDebug(treeDataFace, 0);
defineTypeNameAndDebug(treeDataFace, 0);
scalar treeDataFace::tolSqr = sqr(1e-6);
scalar treeDataFace::tolSqr = sqr(1e-6);
}
@ -178,8 +178,6 @@ Foam::pointField Foam::treeDataFace::shapePoints() const
}
//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
// Only makes sense for closed surfaces.
Foam::volumeType Foam::treeDataFace::getVolumeType
(
const indexedOctree<treeDataFace>& oc,
@ -267,7 +265,7 @@ Foam::volumeType Foam::treeDataFace::getVolumeType
// triangle normals)
const labelList& pFaces = mesh_.pointFaces()[f[fp]];
vector pointNormal(vector::zero);
vector pointNormal(Zero);
forAll(pFaces, i)
{
@ -336,7 +334,7 @@ Foam::volumeType Foam::treeDataFace::getVolumeType
// triangle normals)
const labelList& eFaces = mesh_.edgeFaces()[myEdges[myEdgeI]];
vector edgeNormal(vector::zero);
vector edgeNormal(Zero);
forAll(eFaces, i)
{

6
src/meshTools/indexedOctree/treeDataPoint.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,8 +88,6 @@ Foam::pointField Foam::treeDataPoint::shapePoints() const
}
//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
// Only makes sense for closed surfaces.
Foam::volumeType Foam::treeDataPoint::getVolumeType
(
const indexedOctree<treeDataPoint>& oc,
@ -100,7 +98,6 @@ Foam::volumeType Foam::treeDataPoint::getVolumeType
}
// Check if any point on shape is inside cubeBb.
bool Foam::treeDataPoint::overlaps
(
const label index,
@ -112,7 +109,6 @@ bool Foam::treeDataPoint::overlaps
}
// Check if any point on shape is inside sphere.
bool Foam::treeDataPoint::overlaps
(
const label index,

18
src/meshTools/indexedOctree/treeDataPrimitivePatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -88,7 +88,7 @@ Foam::treeDataPrimitivePatch<PatchType>::treeDataPrimitivePatch
template<class PatchType>
Foam::treeDataPrimitivePatch<PatchType>::findNearestOp::findNearestOp
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree
const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree
)
:
tree_(tree)
@ -98,7 +98,7 @@ Foam::treeDataPrimitivePatch<PatchType>::findNearestOp::findNearestOp
template<class PatchType>
Foam::treeDataPrimitivePatch<PatchType>::findIntersectOp::findIntersectOp
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree
const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree
)
:
tree_(tree)
@ -108,7 +108,7 @@ Foam::treeDataPrimitivePatch<PatchType>::findIntersectOp::findIntersectOp
template<class PatchType>
Foam::treeDataPrimitivePatch<PatchType>::findAllIntersectOp::findAllIntersectOp
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
DynamicList<label>& shapeMask
)
:
@ -121,7 +121,7 @@ template<class PatchType>
Foam::treeDataPrimitivePatch<PatchType>::
findSelfIntersectOp::findSelfIntersectOp
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
const label edgeID
)
:
@ -146,12 +146,10 @@ Foam::pointField Foam::treeDataPrimitivePatch<PatchType>::shapePoints() const
}
//- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
// Only makes sense for closed surfaces.
template<class PatchType>
Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >& oc,
const indexedOctree<treeDataPrimitivePatch<PatchType>>& oc,
const point& sample
) const
{
@ -290,7 +288,7 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
// triangle normals)
const labelList& eFaces = patch_.edgeFaces()[edgeI];
vector edgeNormal(vector::zero);
vector edgeNormal(Zero);
forAll(eFaces, i)
{
@ -610,7 +608,7 @@ bool Foam::treeDataPrimitivePatch<PatchType>::findSelfIntersectOp::operator()
template<class PatchType>
bool Foam::treeDataPrimitivePatch<PatchType>::findIntersection
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
const label index,
const point& start,
const point& end,

8
src/meshTools/indexedOctree/treeDataPrimitivePatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -232,7 +232,7 @@ public:
// Only makes sense for closed surfaces.
volumeType getVolumeType
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >&,
const indexedOctree<treeDataPrimitivePatch<PatchType>>&,
const point&
) const;
@ -254,7 +254,7 @@ public:
//- Helper: find intersection of line with shapes
static bool findIntersection
(
const indexedOctree<treeDataPrimitivePatch<PatchType> >& tree,
const indexedOctree<treeDataPrimitivePatch<PatchType>>& tree,
const label index,
const point& start,
const point& end,
@ -270,7 +270,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "treeDataPrimitivePatch.C"
#include "treeDataPrimitivePatch.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/indexedOctree/treeDataTriSurface.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,7 +31,7 @@ License
template<>
Foam::volumeType Foam::treeDataPrimitivePatch<Foam::triSurface>::getVolumeType
(
const indexedOctree<treeDataPrimitivePatch<triSurface> >& oc,
const indexedOctree<treeDataPrimitivePatch<triSurface>>& oc,
const point& sample
) const
{

4
src/meshTools/indexedOctree/treeDataTriSurface.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,7 +51,7 @@ namespace Foam
template<>
volumeType treeDataPrimitivePatch<triSurface>::getVolumeType
(
const indexedOctree<treeDataPrimitivePatch<triSurface> >& oc,
const indexedOctree<treeDataPrimitivePatch<triSurface>>& oc,
const point& sample
) const;
}

23
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -99,7 +99,7 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::facePoints
// Initialise to face-centre
tmp<pointField> tfacePoints(new pointField(patch_.size()));
pointField& facePoints = tfacePoints();
pointField& facePoints = tfacePoints.ref();
forAll(pp, faceI)
{
@ -478,8 +478,9 @@ void Foam::mappedPatchBase::findSamples
if (debug)
{
Info<< "mappedPatchBase::findSamples on mesh " << sampleRegion()
<< " : " << endl;
InfoInFunction
<< "mesh " << sampleRegion() << " : " << endl;
forAll(nearest, sampleI)
{
label procI = nearest[sampleI].second().second();
@ -868,7 +869,7 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::readListOrField
)
{
tmp<pointField> tfld(new pointField());
pointField& fld = tfld();
pointField& fld = tfld.ref();
if (size)
{
@ -940,7 +941,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(""),
coupleGroup_(),
offsetMode_(UNIFORM),
offset_(vector::zero),
offset_(Zero),
offsets_(pp.size(), offset_),
distance_(0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@ -967,7 +968,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(samplePatch),
coupleGroup_(),
offsetMode_(NONUNIFORM),
offset_(vector::zero),
offset_(Zero),
offsets_(offsets),
distance_(0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@ -1021,7 +1022,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(samplePatch),
coupleGroup_(),
offsetMode_(NORMAL),
offset_(vector::zero),
offset_(Zero),
offsets_(0),
distance_(distance),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@ -1045,7 +1046,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
coupleGroup_(dict),
offsetMode_(UNIFORM),
offset_(vector::zero),
offset_(Zero),
offsets_(0),
distance_(0.0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@ -1127,7 +1128,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
coupleGroup_(dict), //dict.lookupOrDefault<word>("coupleGroup", "")),
offsetMode_(UNIFORM),
offset_(vector::zero),
offset_(Zero),
offsets_(0),
distance_(0.0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@ -1268,7 +1269,7 @@ Foam::tmp<Foam::pointField> Foam::mappedPatchBase::samplePoints
) const
{
tmp<pointField> tfld(new pointField(fc));
pointField& fld = tfld();
pointField& fld = tfld.ref();
switch (offsetMode_)
{

15
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,6 +29,7 @@ Description
centres and processors they're on.
If constructed from dictionary:
\verbatim
// Region to sample (default is region0)
sampleRegion region0;
@ -63,8 +64,9 @@ Description
// According to offsetMode (see above) supply one of
// offset, offsets or distance
offset (1 0 0);
\endverbatim
Note: if offsetMode is 'normal' it uses outwards pointing normals. So
Note: if offsetMode is \c normal it uses outwards pointing normals. So
supply a negative distance if sampling inside the domain.
@ -135,7 +137,7 @@ public:
// - point+local index
// - sqr(distance)
// - processor
typedef Tuple2<pointIndexHit, Tuple2<scalar, label> > nearInfo;
typedef Tuple2<pointIndexHit, Tuple2<scalar, label>> nearInfo;
class nearestEqOp
{
@ -218,9 +220,10 @@ protected:
// Derived information
//- Communication schedule:
// - Cells/faces to sample per processor
// - Patch faces to receive per processor
// - schedule
//
// - Cells/faces to sample per processor
// - Patch faces to receive per processor
// - schedule
mutable autoPtr<mapDistribute> mapPtr_;

6
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,7 +73,7 @@ void Foam::mappedPatchBase::distribute
lst,
cop,
flipOp(),
pTraits<Type>::zero
Type(Zero)
);
}
}
@ -132,7 +132,7 @@ void Foam::mappedPatchBase::reverseDistribute
lst,
cop,
flipOp(),
pTraits<Type>::zero
Type(Zero)
);
break;
}

6
src/meshTools/meshSearch/meshSearch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,8 +69,8 @@ class meshSearch
mutable autoPtr<treeBoundBox> overallBbPtr_;
//- Demand driven octrees
mutable autoPtr<indexedOctree<treeDataFace> > boundaryTreePtr_;
mutable autoPtr<indexedOctree<treeDataCell> > cellTreePtr_;
mutable autoPtr<indexedOctree<treeDataFace>> boundaryTreePtr_;
mutable autoPtr<indexedOctree<treeDataCell>> cellTreePtr_;
// Private Member Functions

4
src/meshTools/meshTools/meshTools.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -171,7 +171,7 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
}
else
{
pn[pointI] = vector::zero;
pn[pointI] = Zero;
WarningInFunction
<< "No visible octant for point:" << pp.meshPoints()[pointI]

4
src/meshTools/meshTools/meshTools.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -345,7 +345,7 @@ namespace meshTools
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "meshToolsTemplates.C"
#include "meshToolsTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/meshTools/momentOfInertia/momentOfInertia.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -199,8 +199,8 @@ void Foam::momentOfInertia::massPropertiesShell
// Reset properties for accumulation
mass = 0.0;
cM = vector::zero;
J = tensor::zero;
cM = Zero;
J = Zero;
// Find centre of mass
@ -353,7 +353,7 @@ Foam::tmp<Foam::tensorField> Foam::momentOfInertia::meshInertia
{
tmp<tensorField> tTf = tmp<tensorField>(new tensorField(mesh.nCells()));
tensorField& tf = tTf();
tensorField& tf = tTf.ref();
forAll(tf, cI)
{
@ -384,8 +384,8 @@ Foam::tensor Foam::momentOfInertia::meshInertia
}
scalar m = 0.0;
vector cM = vector::zero;
tensor J = tensor::zero;
vector cM = Zero;
tensor J = Zero;
massPropertiesSolid(mesh.points(), faces, 1.0, m, cM, J);

70
src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -123,7 +123,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
<< "Should be 1 or 2 - serious error "
<< "in mesh structure. " << endl;
# ifdef DEBUG_ZIPUP
#ifdef DEBUG_ZIPUP
forAll(curFaces, faceI)
{
Info<< "face: " << oldFaces[curFaces[faceI]]
@ -140,7 +140,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
<< "\" coordinates "
<< Points[cellPoints[cpI]] << endl;
}
# endif
#endif
// Gather the problem cell
problemCells.insert(cellI);
@ -152,7 +152,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
singleEdges.setSize(nSingleEdges);
# ifdef DEBUG_ZIPUP
#ifdef DEBUG_ZIPUP
Info<< "Cell " << cellI << endl;
forAll(curFaces, faceI)
@ -171,7 +171,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
<< "\" coordinates "
<< points()[cellPoints[cpI]] << endl;
}
# endif
#endif
// Loop through all single edges and mark the points they use
// points marked twice are internal to edge; those marked more than
@ -260,10 +260,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
pointChain.insert(newEdgeStart);
pointChain.append(newEdgeEnd);
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "found edge to start with: "
<< singleEdges[edgeI] << endl;
# endif
#endif
// Check if head or tail are blocked
forAll(cellPoints, pointI)
@ -272,9 +272,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
{
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "start head blocked" << endl;
# endif
#endif
blockHead = true;
}
@ -283,9 +283,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
{
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "start tail blocked" << endl;
# endif
#endif
blockTail = true;
}
@ -310,10 +310,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
label addEnd =
singleEdges[addEdgeI].end();
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "Trying candidate "
<< singleEdges[addEdgeI] << endl;
# endif
#endif
// Try to add the edge onto the head
if (!blockHead)
@ -356,10 +356,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
label curEdgeStart = pointChain.first();
label curEdgeEnd = pointChain.last();
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "curEdgeStart: " << curEdgeStart
<< " curEdgeEnd: " << curEdgeEnd << endl;
# endif
#endif
forAll(cellPoints, pointI)
{
@ -367,9 +367,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
{
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "head blocked" << endl;
# endif
#endif
blockHead = true;
}
@ -378,9 +378,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
{
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "tail blocked" << endl;
# endif
#endif
blockTail = true;
}
@ -390,9 +390,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
// Check if the loop is closed
if (curEdgeStart == curEdgeEnd)
{
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "closed loop" << endl;
# endif
#endif
pointChain.removeHead();
@ -402,10 +402,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
stopSearching = true;
}
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "current pointChain: " << pointChain
<< endl;
# endif
#endif
if (stopSearching) break;
}
@ -413,9 +413,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
} while (stopSearching);
}
# ifdef DEBUG_CHAIN
#ifdef DEBUG_CHAIN
Info<< "completed patch chain: " << pointChain << endl;
# endif
#endif
if (pointChain.size() > 2)
{
@ -426,9 +426,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
edgesToInsert.setSize(nEdgesToInsert);
# ifdef DEBUG_ZIPUP
#ifdef DEBUG_ZIPUP
Info<< "edgesToInsert: " << edgesToInsert << endl;
# endif
#endif
// Insert the edges into a list of faces
forAll(edgesToInsert, edgeToInsertI)
@ -477,10 +477,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
used[nextPoint] = true;
}
# ifdef DEBUG_ORDER
#ifdef DEBUG_ORDER
Info<< "unorderedEdge: " << unorderedEdge << nl
<< "orderedEdge: " << orderedEdge << endl;
# endif
#endif
// check for duplicate points in the ordered edge
forAll(orderedEdge, checkI)
@ -582,12 +582,12 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
allPointsPresent && curPointFound;
}
# ifdef DEBUG_ZIPUP
#ifdef DEBUG_ZIPUP
if (allPointsPresent)
{
Info<< "All points present" << endl;
}
# endif
#endif
if (!allPointsPresent)
{
@ -601,9 +601,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
// resized.
edgeList newFaceEdges = newFace.edges();
# ifdef DEBUG_ZIPUP
#ifdef DEBUG_ZIPUP
Info<< "Not all points present." << endl;
# endif
#endif
label nNewFacePoints = 0;
@ -670,11 +670,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
}
}
# ifdef DEBUG_ZIPUP
#ifdef DEBUG_ZIPUP
Info<< "oldFace: "
<< oldFaces[currentFaceIndex] << nl
<< "newFace: " << newFace << endl;
# endif
#endif
// Check for duplicate points in the new face
forAll(newFace, checkI)

14
src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,9 +62,9 @@ void Foam::primitiveMeshGeometry::updateFaceCentresAndAreas
}
else
{
vector sumN = vector::zero;
vector sumN = Zero;
scalar sumA = 0.0;
vector sumAc = vector::zero;
vector sumAc = Zero;
point fCentre = p[f[0]];
for (label pi = 1; pi < nPoints; pi++)
@ -101,7 +101,7 @@ void Foam::primitiveMeshGeometry::updateCellCentresAndVols
)
{
// Clear the fields for accumulation
UIndirectList<vector>(cellCentres_, changedCells) = vector::zero;
UIndirectList<vector>(cellCentres_, changedCells) = Zero;
UIndirectList<scalar>(cellVolumes_, changedCells) = 0.0;
const labelList& own = mesh_.faceOwner();
@ -110,7 +110,7 @@ void Foam::primitiveMeshGeometry::updateCellCentresAndVols
// first estimate the approximate cell centre as the average of face centres
vectorField cEst(mesh_.nCells());
UIndirectList<vector>(cEst, changedCells) = vector::zero;
UIndirectList<vector>(cEst, changedCells) = Zero;
scalarField nCellFaces(mesh_.nCells());
UIndirectList<scalar>(nCellFaces, changedCells) = 0.0;
@ -230,7 +230,6 @@ Foam::primitiveMeshGeometry::primitiveMeshGeometry
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
//- Take over properties from mesh
void Foam::primitiveMeshGeometry::correct()
{
faceAreas_ = mesh_.faceAreas();
@ -240,7 +239,6 @@ void Foam::primitiveMeshGeometry::correct()
}
//- Recalculate on selected faces
void Foam::primitiveMeshGeometry::correct
(
const pointField& p,
@ -1189,7 +1187,7 @@ bool Foam::primitiveMeshGeometry::checkCellDeterminant
{
const cell& cFaces = cells[affectedCells[i]];
tensor areaSum(tensor::zero);
tensor areaSum(Zero);
scalar magAreaSum = 0;
forAll(cFaces, cFaceI)

8
src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -161,13 +161,13 @@ public:
//- Interpolate field
template<class Type>
tmp<Field<Type> > interpolate(const Field<Type>& fld) const;
tmp<Field<Type>> interpolate(const Field<Type>& fld) const;
//- Interpolate tmp field
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const tmp<Field<Type> >& tFld
const tmp<Field<Type>>& tFld
) const;
//- Low-level interpolate List

8
src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBaseTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
Foam::tmp<Foam::Field<Type>> Foam::regionCoupledBase::interpolate
(
const Field<Type>& fld
) const
@ -43,9 +43,9 @@ Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::regionCoupledBase::interpolate
Foam::tmp<Foam::Field<Type>> Foam::regionCoupledBase::interpolate
(
const tmp<Field<Type> >& tFld
const tmp<Field<Type>>& tFld
) const
{
if (owner())

19
src/meshTools/regionSplit/regionSplit.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -344,13 +344,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
// Get the wanted region labels into recvNonLocal
labelListList recvNonLocal(Pstream::nProcs());
labelListList sizes;
Pstream::exchange<labelList, label>
(
sendNonLocal,
recvNonLocal,
sizes
);
Pstream::exchange<labelList, label>(sendNonLocal, recvNonLocal);
// Now we have the wanted compact region labels that procI wants in
// recvNonLocal[procI]. Construct corresponding list of compact
@ -371,14 +365,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
// Send back (into recvNonLocal)
recvNonLocal.clear();
recvNonLocal.setSize(sendWantedLocal.size());
sizes.clear();
Pstream::exchange<labelList, label>
(
sendWantedLocal,
recvNonLocal,
sizes
);
Pstream::exchange<labelList, label>(sendWantedLocal, recvNonLocal);
sendWantedLocal.clear();
// Now recvNonLocal contains for every element in setNonLocal the

8
src/meshTools/searchableSurface/searchableBox.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -223,7 +223,7 @@ const Foam::wordList& Foam::searchableBox::regions() const
Foam::tmp<Foam::pointField> Foam::searchableBox::coordinates() const
{
tmp<pointField> tCtrs = tmp<pointField>(new pointField(6));
pointField& ctrs = tCtrs();
pointField& ctrs = tCtrs.ref();
const pointField pts(treeBoundBox::points());
const faceList& fcs = treeBoundBox::faces;
@ -497,7 +497,7 @@ void Foam::searchableBox::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());
@ -579,7 +579,7 @@ void Foam::searchableBox::getNormal
) const
{
normal.setSize(info.size());
normal = vector::zero;
normal = Zero;
forAll(info, i)
{

4
src/meshTools/searchableSurface/searchableBox.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -231,7 +231,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

14
src/meshTools/searchableSurface/searchableCone.C
View File

@ -30,10 +30,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchableCone, 0);
addToRunTimeSelectionTable(searchableSurface, searchableCone, dict);
defineTypeNameAndDebug(searchableCone, 0);
addToRunTimeSelectionTable(searchableSurface, searchableCone, dict);
}
@ -74,7 +72,7 @@ void Foam::searchableCone::boundingSpheres
Foam::tmp<Foam::pointField> Foam::searchableCone::points() const
{
tmp<pointField> tPts(new pointField(2));
pointField& pts = tPts();
pointField& pts = tPts.ref();
pts[0] = point1_;
pts[1] = point2_;
@ -102,7 +100,7 @@ void Foam::searchableCone::findNearestAndNormal
scalar magV = mag(v);
if (magV < ROOTVSMALL)
{
v = vector::zero;
v = Zero;
}
else
{
@ -939,7 +937,7 @@ void Foam::searchableCone::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());
@ -1047,7 +1045,7 @@ void Foam::searchableCone::getNormal
) const
{
normal.setSize(info.size());
normal = vector::zero;
normal = Zero;
forAll(info, i)
{

2
src/meshTools/searchableSurface/searchableCone.H
View File

@ -237,7 +237,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- Find any intersection on line from start to end

16
src/meshTools/searchableSurface/searchableCylinder.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,10 +30,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchableCylinder, 0);
addToRunTimeSelectionTable(searchableSurface, searchableCylinder, dict);
defineTypeNameAndDebug(searchableCylinder, 0);
addToRunTimeSelectionTable(searchableSurface, searchableCylinder, dict);
}
@ -67,7 +65,7 @@ void Foam::searchableCylinder::boundingSpheres
Foam::tmp<Foam::pointField> Foam::searchableCylinder::points() const
{
tmp<pointField> tPts(new pointField(2));
pointField& pts = tPts();
pointField& pts = tPts.ref();
pts[0] = point1_;
pts[1] = point2_;
@ -95,7 +93,7 @@ Foam::pointIndexHit Foam::searchableCylinder::findNearest
if (magV < ROOTVSMALL)
{
v = vector::zero;
v = Zero;
}
else
{
@ -595,7 +593,7 @@ void Foam::searchableCylinder::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());
@ -653,7 +651,7 @@ void Foam::searchableCylinder::getNormal
) const
{
normal.setSize(info.size());
normal = vector::zero;
normal = Zero;
forAll(info, i)
{

6
src/meshTools/searchableSurface/searchableCylinder.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class searchableCylinder Declaration
Class searchableCylinder Declaration
\*---------------------------------------------------------------------------*/
class searchableCylinder
@ -203,7 +203,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

10
src/meshTools/searchableSurface/searchableDisk.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,7 +58,7 @@ Foam::pointIndexHit Foam::searchableDisk::findNearest
if (magV < ROOTVSMALL)
{
v = vector::zero;
v = Zero;
}
else
{
@ -85,7 +85,7 @@ void Foam::searchableDisk::findLine
pointIndexHit& info
) const
{
info = pointIndexHit(false, vector::zero, -1);
info = pointIndexHit(false, Zero, -1);
vector v(start - origin_);
@ -103,7 +103,7 @@ void Foam::searchableDisk::findLine
if (magV < ROOTVSMALL)
{
v = vector::zero;
v = Zero;
}
else
{
@ -266,7 +266,7 @@ void Foam::searchableDisk::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());

4
src/meshTools/searchableSurface/searchableDisk.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -198,7 +198,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

6
src/meshTools/searchableSurface/searchablePlane.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,7 +46,7 @@ Foam::pointIndexHit Foam::searchablePlane::findLine
const point& end
) const
{
pointIndexHit info(true, vector::zero, 0);
pointIndexHit info(true, Zero, 0);
linePointRef l(start, end);
@ -206,7 +206,7 @@ void Foam::searchablePlane::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
List<pointIndexHit> nearestInfo;

4
src/meshTools/searchableSurface/searchablePlane.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -182,7 +182,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

20
src/meshTools/searchableSurface/searchablePlate.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,10 +31,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchablePlate, 0);
addToRunTimeSelectionTable(searchableSurface, searchablePlate, dict);
defineTypeNameAndDebug(searchablePlate, 0);
addToRunTimeSelectionTable(searchableSurface, searchablePlate, dict);
}
@ -134,7 +132,7 @@ Foam::pointIndexHit Foam::searchablePlate::findLine
pointIndexHit info
(
true,
vector::zero,
Zero,
0
);
@ -220,7 +218,7 @@ Foam::searchablePlate::searchablePlate
{
if (debug)
{
Info<< "searchablePlate::searchablePlate :"
InfoInFunction
<< " origin:" << origin_
<< " origin+span:" << origin_+span_
<< " normal:" << vector::componentNames[normalDir_]
@ -244,7 +242,7 @@ Foam::searchablePlate::searchablePlate
{
if (debug)
{
Info<< "searchablePlate::searchablePlate :"
InfoInFunction
<< " origin:" << origin_
<< " origin+span:" << origin_+span_
<< " normal:" << vector::componentNames[normalDir_]
@ -300,7 +298,7 @@ void Foam::searchablePlate::boundingSpheres
Foam::tmp<Foam::pointField> Foam::searchablePlate::points() const
{
tmp<pointField> tPts(new pointField(4));
pointField& pts = tPts();
pointField& pts = tPts.ref();
pts[0] = origin_;
pts[2] = origin_ + span_;
@ -386,7 +384,7 @@ void Foam::searchablePlate::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
List<pointIndexHit> nearestInfo;
@ -426,7 +424,7 @@ void Foam::searchablePlate::getNormal
) const
{
normal.setSize(info.size());
normal = vector::zero;
normal = Zero;
forAll(normal, i)
{
normal[i][normalDir_] = 1.0;

4
src/meshTools/searchableSurface/searchablePlate.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -193,7 +193,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

4
src/meshTools/searchableSurface/searchableRotatedBox.C
View File

@ -57,7 +57,7 @@ Foam::searchableRotatedBox::searchableRotatedBox
io.writeOpt(),
false //io.registerObject(),
),
treeBoundBox(point::zero, dict.lookup("span"))
treeBoundBox(Zero, dict.lookup("span"))
),
transform_
(
@ -295,7 +295,7 @@ void Foam::searchableRotatedBox::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());

2
src/meshTools/searchableSurface/searchableRotatedBox.H
View File

@ -215,7 +215,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

6
src/meshTools/searchableSurface/searchableSphere.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -268,7 +268,7 @@ void Foam::searchableSphere::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());
@ -326,7 +326,7 @@ void Foam::searchableSphere::getNormal
) const
{
normal.setSize(info.size());
normal = vector::zero;
normal = Zero;
forAll(info, i)
{

4
src/meshTools/searchableSurface/searchableSphere.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -188,7 +188,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

4
src/meshTools/searchableSurface/searchableSurface.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -317,7 +317,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const = 0;
//- From a set of points and indices get the region

22
src/meshTools/searchableSurface/searchableSurfaceCollection.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -118,7 +118,7 @@ void Foam::searchableSurfaceCollection::findNearest
void Foam::searchableSurfaceCollection::sortHits
(
const List<pointIndexHit>& info,
List<List<pointIndexHit> >& surfInfo,
List<List<pointIndexHit>>& surfInfo,
labelListList& infoMap
) const
{
@ -325,7 +325,7 @@ Foam::tmp<Foam::pointField>
Foam::searchableSurfaceCollection::coordinates() const
{
tmp<pointField> tCtrs = tmp<pointField>(new pointField(size()));
pointField& ctrs = tCtrs();
pointField& ctrs = tCtrs.ref();
// Append individual coordinates
label coordI = 0;
@ -400,7 +400,7 @@ Foam::searchableSurfaceCollection::points() const
}
tmp<pointField> tPts(new pointField(nPoints));
pointField& pts = tPts();
pointField& pts = tPts.ref();
// Append individual coordinates
nPoints = 0;
@ -560,7 +560,7 @@ void Foam::searchableSurfaceCollection::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
// To be done. Assume for now only one intersection.
@ -608,9 +608,9 @@ void Foam::searchableSurfaceCollection::getRegion
// Multiple surfaces. Sort by surface.
// Per surface the hit
List<List<pointIndexHit> > surfInfo;
List<List<pointIndexHit>> surfInfo;
// Per surface the original position
List<List<label> > infoMap;
List<List<label>> infoMap;
sortHits(info, surfInfo, infoMap);
region.setSize(info.size());
@ -665,9 +665,9 @@ void Foam::searchableSurfaceCollection::getNormal
// Multiple surfaces. Sort by surface.
// Per surface the hit
List<List<pointIndexHit> > surfInfo;
List<List<pointIndexHit>> surfInfo;
// Per surface the original position
List<List<label> > infoMap;
List<List<label>> infoMap;
sortHits(info, surfInfo, infoMap);
normal.setSize(info.size());
@ -774,9 +774,9 @@ void Foam::searchableSurfaceCollection::getField
// Multiple surfaces. Sort by surface.
// Per surface the hit
List<List<pointIndexHit> > surfInfo;
List<List<pointIndexHit>> surfInfo;
// Per surface the original position
List<List<label> > infoMap;
List<List<label>> infoMap;
sortHits(info, surfInfo, infoMap);
// Do surface tests

6
src/meshTools/searchableSurface/searchableSurfaceCollection.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -104,7 +104,7 @@ private:
void sortHits
(
const List<pointIndexHit>& info,
List<List<pointIndexHit> >& surfInfo,
List<List<pointIndexHit>>& surfInfo,
labelListList& infoMap
) const;
@ -225,7 +225,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

6
src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -47,7 +47,7 @@ Foam::Pair<Foam::vector> Foam::searchableSurfaceWithGaps::offsetVecs
const point& end
) const
{
Pair<vector> offsets(vector::zero, vector::zero);
Pair<vector> offsets(Zero, Zero);
vector n(end-start);
@ -341,7 +341,7 @@ void Foam::searchableSurfaceWithGaps::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
// To be done. Assume for now only one intersection.

4
src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -236,7 +236,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

18
src/meshTools/searchableSurface/searchableSurfaces.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -35,13 +35,12 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchableSurfaces, 0);
defineTypeNameAndDebug(searchableSurfaces, 0);
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
//- Is edge connected to triangle
bool Foam::searchableSurfaces::connected
(
const triSurface& s,
@ -323,14 +322,12 @@ void Foam::searchableSurfaces::findAnyIntersection
}
//- Find all intersections in order from start to end. Returns for
// every hit the surface and the hit info.
void Foam::searchableSurfaces::findAllIntersections
(
const pointField& start,
const pointField& end,
labelListList& hitSurfaces,
List<List<pointIndexHit> >& hitInfo
List<List<pointIndexHit>>& hitInfo
) const
{
searchableSurfacesQueries::findAllIntersections
@ -370,7 +367,6 @@ void Foam::searchableSurfaces::findNearestIntersection
}
// Find nearest. Return -1 or nearest point
void Foam::searchableSurfaces::findNearest
(
const pointField& samples,
@ -391,7 +387,6 @@ void Foam::searchableSurfaces::findNearest
}
// Find nearest. Return -1 or nearest point
void Foam::searchableSurfaces::findNearest
(
const labelListList& regionIndices,
@ -415,7 +410,7 @@ void Foam::searchableSurfaces::findNearest
);
}
//- Calculate bounding box
Foam::boundBox Foam::searchableSurfaces::bounds() const
{
return searchableSurfacesQueries::bounds
@ -426,7 +421,6 @@ Foam::boundBox Foam::searchableSurfaces::bounds() const
}
//- Calculate point which is on a set of surfaces.
Foam::pointIndexHit Foam::searchableSurfaces::facesIntersection
(
const scalar initDistSqr,
@ -609,7 +603,7 @@ bool Foam::searchableSurfaces::checkSizes
bool Foam::searchableSurfaces::checkIntersection
(
const scalar tolerance,
const autoPtr<writer<scalar> >& setWriter,
const autoPtr<writer<scalar>>& setWriter,
const bool report
) const
{
@ -837,7 +831,7 @@ Foam::label Foam::searchableSurfaces::checkGeometry
(
const scalar maxRatio,
const scalar tol,
const autoPtr<writer<scalar> >& setWriter,
const autoPtr<writer<scalar>>& setWriter,
const scalar minQuality,
const bool report
) const

8
src/meshTools/searchableSurface/searchableSurfaces.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -174,7 +174,7 @@ public:
const pointField& start,
const pointField& end,
labelListList& surfaces,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//Find intersections of edge nearest to both endpoints.
@ -237,7 +237,7 @@ public:
bool checkIntersection
(
const scalar tol,
const autoPtr<writer<scalar> >&,
const autoPtr<writer<scalar>>&,
const bool report
) const;
@ -256,7 +256,7 @@ public:
(
const scalar maxRatio,
const scalar tolerance,
const autoPtr<writer<scalar> >& setWriter,
const autoPtr<writer<scalar>>& setWriter,
const scalar minQuality,
const bool report
) const;

13
src/meshTools/searchableSurface/searchableSurfacesQueries.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchableSurfacesQueries, 0);
defineTypeNameAndDebug(searchableSurfacesQueries, 0);
}
@ -263,7 +263,7 @@ bool Foam::searchableSurfacesQueries::morphTet
// const pointField& start,
// const pointField& end,
// const vectorField& smallVec,
// List<List<pointIndexHit> >& surfaceHitInfo
// List<List<pointIndexHit>>& surfaceHitInfo
//)
//{
// surfaceHitInfo.setSize(start.size());
@ -460,7 +460,7 @@ void Foam::searchableSurfacesQueries::findAllIntersections
const pointField& start,
const pointField& end,
labelListList& hitSurfaces,
List<List<pointIndexHit> >& hitInfo
List<List<pointIndexHit>>& hitInfo
)
{
// Note: maybe move the single-surface all intersections test into
@ -505,7 +505,7 @@ void Foam::searchableSurfacesQueries::findAllIntersections
// Test the other surfaces and merge (according to distance from start).
for (label testI = 1; testI < surfacesToTest.size(); testI++)
{
List<List<pointIndexHit> > surfHits;
List<List<pointIndexHit>> surfHits;
allSurfaces[surfacesToTest[testI]].findLineAll
(
start,
@ -851,7 +851,6 @@ Foam::boundBox Foam::searchableSurfacesQueries::bounds
}
//- Calculate point which is on a set of surfaces.
Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection
(
const PtrList<searchableSurface>& allSurfaces,
@ -865,7 +864,7 @@ Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection
// starting point onto the surfaces and the mid point
List<point> nearest(surfacesToTest.size()+1);
point sumNearest = vector::zero;
point sumNearest = Zero;
forAll(surfacesToTest, i)
{

6
src/meshTools/searchableSurface/searchableSurfacesQueries.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -110,7 +110,7 @@ class searchableSurfacesQueries
// const pointField& start,
// const pointField& end,
// const vectorField& smallVec,
// List<List<pointIndexHit> >&
// List<List<pointIndexHit>>&
//);
static void mergeHits
@ -155,7 +155,7 @@ public:
const pointField& start,
const pointField& end,
labelListList& surfaces,
List<List<pointIndexHit> >& surfaceHits
List<List<pointIndexHit>>& surfaceHits
);
//Find intersections of edge nearest to both endpoints.

19
src/meshTools/searchableSurface/triSurfaceMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -100,7 +100,6 @@ word triSurfaceMesh::meshSubDir = "triSurface";
//}
//- Check file existence
const Foam::fileName& Foam::triSurfaceMesh::checkFile
(
const fileName& fName,
@ -395,7 +394,7 @@ void Foam::triSurfaceMesh::clearOut()
Foam::tmp<Foam::pointField> Foam::triSurfaceMesh::coordinates() const
{
tmp<pointField> tPts(new pointField(8));
pointField& pt = tPts();
pointField& pt = tPts.ref();
// Use copy to calculate face centres so they don't get stored
pt = PrimitivePatch<triSurface::FaceType, SubList, const pointField&>
@ -489,7 +488,7 @@ Foam::triSurfaceMesh::edgeTree() const
+ nInternalEdges()
);
treeBoundBox bb(vector::zero, vector::zero);
treeBoundBox bb(Zero, Zero);
if (bEdges.size())
{
@ -627,7 +626,7 @@ void Foam::triSurfaceMesh::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
triSurfaceSearch::findLineAll(start, end, info);
@ -704,7 +703,7 @@ void Foam::triSurfaceMesh::getNormal
else
{
// Set to what?
normal[i] = vector::zero;
normal[i] = Zero;
}
}
}
@ -715,17 +714,17 @@ void Foam::triSurfaceMesh::getNormal
if (info[i].hit())
{
label faceI = info[i].index();
//- Cached:
// Cached:
//normal[i] = faceNormals()[faceI];
//- Uncached
// Uncached
normal[i] = s[faceI].normal(pts);
normal[i] /= mag(normal[i]) + VSMALL;
}
else
{
// Set to what?
normal[i] = vector::zero;
normal[i] = Zero;
}
}
}
@ -841,7 +840,6 @@ void Foam::triSurfaceMesh::getVolumeType
}
//- Write using given format, version and compression
bool Foam::triSurfaceMesh::writeObject
(
IOstream::streamFormat fmt,
@ -881,7 +879,6 @@ bool Foam::triSurfaceMesh::writeObject
return false;
}
//return objectRegistry::writeObject(fmt, ver, cmp);
return true;
}

6
src/meshTools/searchableSurface/triSurfaceMesh.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -77,7 +77,7 @@ private:
scalar minQuality_;
//- Search tree for boundary edges.
mutable autoPtr<indexedOctree<treeDataEdge> > edgeTree_;
mutable autoPtr<indexedOctree<treeDataEdge>> edgeTree_;
//- Names of regions
mutable wordList regions_;
@ -242,7 +242,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region

2
src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License

4
src/meshTools/sets/faceSources/regionToFace/regionToFace.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ void Foam::regionToFace::combine(topoSet& set, const bool add) const
mappedPatchBase::nearInfo ni
(
pointIndexHit(false, vector::zero, -1),
pointIndexHit(false, Zero, -1),
Tuple2<scalar, label>
(
sqr(GREAT),

Some files were not shown because too many files have changed in this diff Show More