zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/cvMesh

Browse Source 
Conflicts:
	applications/test/Matrix/Test-Matrix.C
	applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
	applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
	src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
	src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
This commit is contained in:
laurence
2013-04-05 16:09:24 +01:00
parent 7964ebe67e b07e4f55b4
commit 72c3da08b2
1087 changed files with 16553 additions and 13759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dynamicMesh/attachDetach/attachInterface.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -83,6 +83,10 @@ void Foam::attachDetach::attachInterface
forAll(removedPoints, pointI)
{
//Pout<< "Removing point:" << removedPoints[pointI]
// << " currently at:" << ref.points()[removedPoints[pointI]]
// << endl;
ref.setAction(polyRemovePoint(removedPoints[pointI]));
}
@ -90,8 +94,16 @@ void Foam::attachDetach::attachInterface
// Remove all faces from the slave patch
forAll(slavePatch, i)
{
//Pout<< "Removing face " << i + slavePatchStart
// << " with verts:" << ref.faces()[i + slavePatchStart]
// << " at:"
// << UIndirectList<point>
// (
// ref.points(),
// ref.faces()[i + slavePatchStart]
// )
// << endl;
ref.setAction(polyRemoveFace(i + slavePatchStart));
// Pout<< "Removing face " << i + slavePatchStart << endl;
}
// Modify the faces from the master patch

4
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -21,7 +21,7 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*----------------------------------------------------------------------------*/
\*---------------------------------------------------------------------------*/
#include "fvMeshDistribute.H"
#include "PstreamCombineReduceOps.H"

6
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -103,14 +103,14 @@ class fvMeshDistribute
label findNonEmptyPatch() const;
//- Save boundary fields
template <class T, class Mesh>
template<class T, class Mesh>
void saveBoundaryFields
(
PtrList<FieldField<fvsPatchField, T> >& bflds
) const;
//- Map boundary fields
template <class T, class Mesh>
template<class T, class Mesh>
void mapBoundaryFields
(
const mapPolyMesh& map,

38
src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,7 +56,7 @@ void Foam::fvMeshDistribute::printFieldInfo(const fvMesh& mesh)
// Save whole boundary field
template <class T, class Mesh>
template<class T, class Mesh>
void Foam::fvMeshDistribute::saveBoundaryFields
(
PtrList<FieldField<fvsPatchField, T> >& bflds
@ -66,7 +66,7 @@ void Foam::fvMeshDistribute::saveBoundaryFields
HashTable<const fldType*> flds
(
mesh_.objectRegistry::lookupClass<fldType>()
static_cast<const fvMesh&>(mesh_).objectRegistry::lookupClass<fldType>()
);
bflds.setSize(flds.size());
@ -85,7 +85,7 @@ void Foam::fvMeshDistribute::saveBoundaryFields
// Map boundary field
template <class T, class Mesh>
template<class T, class Mesh>
void Foam::fvMeshDistribute::mapBoundaryFields
(
const mapPolyMesh& map,
@ -97,7 +97,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
typedef GeometricField<T, fvsPatchField, Mesh> fldType;
HashTable<const fldType*> flds
HashTable<fldType*> flds
(
mesh_.objectRegistry::lookupClass<fldType>()
);
@ -110,15 +110,11 @@ void Foam::fvMeshDistribute::mapBoundaryFields
label fieldI = 0;
forAllConstIter(typename HashTable<const fldType*>, flds, iter)
forAllIter(typename HashTable<fldType*>, flds, iter)
{
const fldType& fld = *iter();
fldType& fld = *iter();
typename fldType::GeometricBoundaryField& bfld =
const_cast<typename fldType::GeometricBoundaryField&>
(
fld.boundaryField()
);
fld.boundaryField();
const FieldField<fvsPatchField, T>& oldBfld = oldBflds[fieldI++];
@ -156,20 +152,17 @@ void Foam::fvMeshDistribute::initPatchFields
const typename GeoField::value_type& initVal
)
{
HashTable<const GeoField*> flds
HashTable<GeoField*> flds
(
mesh_.objectRegistry::lookupClass<GeoField>()
);
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
forAllIter(typename HashTable<GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
const_cast<typename GeoField::GeometricBoundaryField&>
(
fld.boundaryField()
);
fld.boundaryField();
forAll(bfld, patchI)
{
@ -186,16 +179,15 @@ void Foam::fvMeshDistribute::initPatchFields
template<class GeoField>
void Foam::fvMeshDistribute::correctBoundaryConditions()
{
HashTable<const GeoField*> flds
HashTable<GeoField*> flds
(
mesh_.objectRegistry::lookupClass<GeoField>()
);
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
forAllIter(typename HashTable<GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
const_cast<GeoField&>(fld).correctBoundaryConditions();
fld.correctBoundaryConditions();
}
}

59
src/dynamicMesh/fvMeshTools/fvMeshToolsTemplates.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,20 +38,17 @@ void Foam::fvMeshTools::addPatchFields
const typename GeoField::value_type& defaultPatchValue
)
{
HashTable<const GeoField*> flds
HashTable<GeoField*> flds
(
mesh.objectRegistry::lookupClass<GeoField>()
);
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
forAllIter(typename HashTable<GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
const_cast<typename GeoField::GeometricBoundaryField&>
(
fld.boundaryField()
);
fld.boundaryField();
label sz = bfld.size();
bfld.setSize(sz+1);
@ -95,20 +92,17 @@ void Foam::fvMeshTools::setPatchFields
const dictionary& patchFieldDict
)
{
HashTable<const GeoField*> flds
HashTable<GeoField*> flds
(
mesh.objectRegistry::lookupClass<GeoField>()
);
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
forAllIter(typename HashTable<GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
const_cast<typename GeoField::GeometricBoundaryField&>
(
fld.boundaryField()
);
fld.boundaryField();
if (patchFieldDict.found(fld.name()))
{
@ -137,20 +131,17 @@ void Foam::fvMeshTools::setPatchFields
const typename GeoField::value_type& value
)
{
HashTable<const GeoField*> flds
HashTable<GeoField*> flds
(
mesh.objectRegistry::lookupClass<GeoField>()
);
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
forAllIter(typename HashTable<GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
const_cast<typename GeoField::GeometricBoundaryField&>
(
fld.boundaryField()
);
fld.boundaryField();
bfld[patchI] == value;
}
@ -161,19 +152,15 @@ void Foam::fvMeshTools::setPatchFields
template<class GeoField>
void Foam::fvMeshTools::trimPatchFields(fvMesh& mesh, const label nPatches)
{
HashTable<const GeoField*> flds
HashTable<GeoField*> flds
(
mesh.objectRegistry::lookupClass<GeoField>()
);
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
forAllIter(typename HashTable<GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
const_cast<typename GeoField::GeometricBoundaryField&>
(
fld.boundaryField()
).setSize(nPatches);
GeoField& fld = *iter();
fld.boundaryField().setSize(nPatches);
}
}
@ -186,20 +173,18 @@ void Foam::fvMeshTools::reorderPatchFields
const labelList& oldToNew
)
{
HashTable<const GeoField*> flds
HashTable<GeoField*> flds
(
mesh.objectRegistry::lookupClass<GeoField>()
);
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
forAllIter(typename HashTable<GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
const_cast<typename GeoField::GeometricBoundaryField&>
(
fld.boundaryField()
);
fld.boundaryField();
bfld.reorder(oldToNew);
}
}

6
src/dynamicMesh/layerAdditionRemoval/addCellLayer.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -203,8 +203,8 @@ void Foam::layerAdditionRemoval::addCellLayer
// Flip the face as necessary
if
(
mc[faceI] == nei[mf[faceI]]
|| !mesh.isInternalFace(mf[faceI])
!mesh.isInternalFace(mf[faceI])
|| mc[faceI] == nei[mf[faceI]]
)
{
flipFaceFlux = true;

6
src/dynamicMesh/layerAdditionRemoval/removeCellLayer.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -275,7 +275,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
// of the cell to be removed
label masterSideCell = own[mf[faceI]];
if (masterSideCell == mc[faceI])
if (mesh.isInternalFace(mf[faceI]) && masterSideCell == mc[faceI])
{
// Owner cell of the face is being removed.
// Grab the neighbour instead
@ -284,7 +284,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
label slaveSideCell = own[ftc[faceI]];
if (slaveSideCell == mc[faceI])
if (mesh.isInternalFace(ftc[faceI]) && slaveSideCell == mc[faceI])
{
// Owner cell of the face is being removed.
// Grab the neighbour instead

4
src/dynamicMesh/meshCut/cellLooper/topoCellLooper.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,7 +49,7 @@ const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(degToRad(10.0));
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// In-memory truncate a list
template <class T>
template<class T>
void Foam::topoCellLooper::subsetList
(
const label startI,

4
src/dynamicMesh/meshCut/cellLooper/topoCellLooper.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,7 +72,7 @@ class topoCellLooper
// Private Member Functions
//- In-memory truncate a list
template <class T>
template<class T>
static void subsetList
(
const label startI,

3
src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -21,7 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "directionInfo.H"

4
src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -285,7 +285,7 @@ inline bool Foam::directionInfo::updateFace
}
template <class TrackingData>
template<class TrackingData>
inline bool Foam::directionInfo::equal
(
const directionInfo& rhs,

4
src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -194,7 +194,7 @@ inline bool Foam::wallNormalInfo::updateFace
}
template <class TrackingData>
template<class TrackingData>
inline bool Foam::wallNormalInfo::equal
(
const wallNormalInfo& rhs,

31
src/dynamicMesh/motionSmoother/motionSmoother.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(motionSmoother, 0);
defineTypeNameAndDebug(motionSmoother, 0);
}
@ -65,7 +65,11 @@ void Foam::motionSmoother::testSyncPositions
{
FatalErrorIn
(
"motionSmoother::testSyncPositions(const pointField&)"
"motionSmoother::testSyncPositions"
"("
"const pointField&, "
"const scalar"
")"
) << "On point " << i << " point:" << fld[i]
<< " synchronised point:" << syncedFld[i]
<< abort(FatalError);
@ -245,7 +249,7 @@ void Foam::motionSmoother::checkFld(const pointScalarField& fld)
{}
else
{
FatalErrorIn("motionSmoother::checkFld")
FatalErrorIn("motionSmoother::checkFld(const pointScalarField&)")
<< "Problem : point:" << pointI << " value:" << val
<< abort(FatalError);
}
@ -870,7 +874,7 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::movePoints
if (mesh_.globalData().parallel())
{
WarningIn("motionSmoother::movePoints(pointField& newPoints)")
WarningIn("motionSmoother::movePoints(pointField&)")
<< "2D mesh-motion probably not correct in parallel" << endl;
}
@ -981,7 +985,18 @@ bool Foam::motionSmoother::scaleMesh
{
if (!smoothMesh && adaptPatchIDs_.empty())
{
FatalErrorIn("motionSmoother::scaleMesh(const bool")
FatalErrorIn
(
"motionSmoother::scaleMesh"
"("
"labelList&, "
"const List<labelPair>&, "
"const dictionary&, "
"const dictionary&, "
"const bool, "
"const label"
")"
)
<< "You specified both no movement on the internal mesh points"
<< " (smoothMesh = false)" << nl
<< "and no movement on the patch (adaptPatchIDs is empty)" << nl
@ -1062,7 +1077,7 @@ bool Foam::motionSmoother::scaleMesh
newPoints = oldPoints_ + totalDisplacement.internalField();
}
Info<< "Moving mesh using diplacement scaling :"
Info<< "Moving mesh using displacement scaling :"
<< " min:" << gMin(scale_.internalField())
<< " max:" << gMax(scale_.internalField())
<< endl;
@ -1225,7 +1240,7 @@ void Foam::motionSmoother::updateMesh()
{
FatalErrorIn
(
"motionSmoother::motionSmoother"
"motionSmoother::updateMesh"
) << "Patch " << patches[patchI].name()
<< " has wrong boundary condition "
<< displacement_.boundaryField()[patchI].type()

8
src/dynamicMesh/motionSmoother/motionSmoother.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -179,7 +179,7 @@ class motionSmoother
// Private Member Functions
//- Average of connected points.
template <class Type>
template<class Type>
tmp<GeometricField<Type, pointPatchField, pointMesh> > avg
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
@ -187,7 +187,7 @@ class motionSmoother
) const;
//- Average postion of connected points.
template <class Type>
template<class Type>
tmp<GeometricField<Type, pointPatchField, pointMesh> > avgPositions
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
@ -510,7 +510,7 @@ public:
//- Fully explicit smoothing of fields (not positions)
// of internal points with varying diffusivity.
template <class Type>
template<class Type>
void smooth
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,

6
src/dynamicMesh/motionSmoother/motionSmootherTemplates.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -153,7 +153,7 @@ void Foam::motionSmoother::applyCornerConstraints
// Average of connected points.
template <class Type>
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
Foam::motionSmoother::avg
(
@ -252,7 +252,7 @@ Foam::motionSmoother::avg
// smooth field (point-jacobi)
template <class Type>
template<class Type>
void Foam::motionSmoother::smooth
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,

2
src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.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) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

9
src/dynamicMesh/motionSolver/componentVelocity/componentVelocityMotionSolver.H
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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,6 +108,13 @@ public:
// Member Functions
//- Non-const access to the pointMotionU in order to allow changes
// to the boundary motion
pointScalarField& pointMotionU()
{
return pointMotionU_;
}
//- Update local data for geometry changes
virtual void movePoints(const pointField&);

4
src/dynamicMesh/polyMeshAdder/faceCoupleInfo.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -21,7 +21,7 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*----------------------------------------------------------------------------*/
\*---------------------------------------------------------------------------*/
#include "faceCoupleInfo.H"
#include "polyMesh.H"

4
src/dynamicMesh/polyMeshAdder/polyMeshAdder.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -21,7 +21,7 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*----------------------------------------------------------------------------*/
\*---------------------------------------------------------------------------*/
#include "polyMeshAdder.H"
#include "mapAddedPolyMesh.H"

2
src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
View File

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

2
src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
View File

@ -266,7 +266,7 @@ inline bool Foam::pointEdgeCollapse::updateEdge
}
template <class TrackingData>
template<class TrackingData>
inline bool Foam::pointEdgeCollapse::equal
(
const pointEdgeCollapse& rhs,

8
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template <class T>
template<class T>
void Foam::polyTopoChange::reorder
(
const labelList& oldToNew,
@ -49,7 +49,7 @@ void Foam::polyTopoChange::reorder
}
template <class T>
template<class T>
void Foam::polyTopoChange::reorder
(
const labelList& oldToNew,
@ -71,7 +71,7 @@ void Foam::polyTopoChange::reorder
}
template <class T>
template<class T>
void Foam::polyTopoChange::renumberKey
(
const labelList& oldToNew,

4
src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -236,7 +236,7 @@ inline bool Foam::refinementData::updateFace
}
template <class TrackingData>
template<class TrackingData>
inline bool Foam::refinementData::equal
(
const refinementData& rhs,

4
src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -260,7 +260,7 @@ inline bool Foam::refinementDistanceData::updateFace
}
template <class TrackingData>
template<class TrackingData>
inline bool Foam::refinementDistanceData::equal
(
const refinementDistanceData& rhs,

6
src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,7 +44,7 @@ defineTypeNameAndDebug(removePoints, 0);
//- Combine-reduce operator to combine data on faces. Takes care
// of reverse orientation on coupled face.
template <class T, template<class> class CombineOp>
template<class T, template<class> class CombineOp>
class faceEqOp
{
@ -73,7 +73,7 @@ public:
//// Dummy transform for List. Used in synchronisation.
//template <class T>
//template<class T>
//class dummyTransformList
//{
//public: