mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev
This commit is contained in:
Henry
@ -1,50 +0,0 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "patchFaceOrientation.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
|
||||
|
||||
Foam::Ostream& Foam::operator<<
|
||||
(
|
||||
Foam::Ostream& os,
|
||||
const Foam::patchFaceOrientation& wDist
|
||||
)
|
||||
{
|
||||
return os << wDist.flipStatus_;
|
||||
}
|
||||
|
||||
|
||||
Foam::Istream& Foam::operator>>
|
||||
(
|
||||
Foam::Istream& is,
|
||||
Foam::patchFaceOrientation& wDist
|
||||
)
|
||||
{
|
||||
return is >> wDist.flipStatus_;
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -1,176 +0,0 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Class
|
||||
Foam::patchFaceOrientation
|
||||
|
||||
Description
|
||||
Transport of orientation for use in PatchEdgeFaceWave.
|
||||
|
||||
SourceFiles
|
||||
patchFaceOrientationI.H
|
||||
patchFaceOrientation.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef patchFaceOrientation_H
|
||||
#define patchFaceOrientation_H
|
||||
|
||||
#include "tensor.H"
|
||||
#include "indirectPrimitivePatch.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
// Forward declaration of classes
|
||||
class polyMesh;
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class patchFaceOrientation Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class patchFaceOrientation
|
||||
{
|
||||
// Private data
|
||||
|
||||
//- flip status
|
||||
label flipStatus_;
|
||||
|
||||
public:
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct null
|
||||
inline patchFaceOrientation();
|
||||
|
||||
//- Construct from components
|
||||
inline patchFaceOrientation(const label);
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
//- Orientation
|
||||
inline label flipStatus() const;
|
||||
|
||||
//- Reverse orientation
|
||||
inline void flip();
|
||||
|
||||
|
||||
// Needed by meshWave
|
||||
|
||||
//- Check whether origin has been changed at all or
|
||||
// still contains original (invalid) value.
|
||||
template<class TrackingData>
|
||||
inline bool valid(TrackingData& td) const;
|
||||
|
||||
//- Apply rotation matrix
|
||||
template<class TrackingData>
|
||||
inline void transform
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const tensor& rotTensor,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
);
|
||||
|
||||
//- Influence of face on edge
|
||||
template<class TrackingData>
|
||||
inline bool updateEdge
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const label edgeI,
|
||||
const label faceI,
|
||||
const patchFaceOrientation& faceInfo,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
);
|
||||
|
||||
//- New information for edge (from e.g. coupled edge)
|
||||
template<class TrackingData>
|
||||
inline bool updateEdge
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const patchFaceOrientation& edgeInfo,
|
||||
const bool sameOrientation,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
);
|
||||
|
||||
//- Influence of edge on face.
|
||||
template<class TrackingData>
|
||||
inline bool updateFace
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const label faceI,
|
||||
const label edgeI,
|
||||
const patchFaceOrientation& edgeInfo,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
);
|
||||
|
||||
//- Same (like operator==)
|
||||
template<class TrackingData>
|
||||
inline bool equal(const patchFaceOrientation&, TrackingData&) const;
|
||||
|
||||
|
||||
// Member Operators
|
||||
|
||||
// Needed for List IO
|
||||
inline bool operator==(const patchFaceOrientation&) const;
|
||||
inline bool operator!=(const patchFaceOrientation&) const;
|
||||
|
||||
|
||||
// IOstream Operators
|
||||
|
||||
friend Ostream& operator<<(Ostream&, const patchFaceOrientation&);
|
||||
friend Istream& operator>>(Istream&, patchFaceOrientation&);
|
||||
};
|
||||
|
||||
|
||||
//- Data associated with patchFaceOrientation type are contiguous
|
||||
template<>
|
||||
inline bool contiguous<patchFaceOrientation>()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#include "patchFaceOrientationI.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -1,227 +0,0 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "polyMesh.H"
|
||||
#include "transform.H"
|
||||
#include "orientedSurface.H"
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
inline Foam::patchFaceOrientation::patchFaceOrientation()
|
||||
:
|
||||
flipStatus_(orientedSurface::UNVISITED)
|
||||
{}
|
||||
|
||||
|
||||
inline Foam::patchFaceOrientation::patchFaceOrientation
|
||||
(
|
||||
const label flipStatus
|
||||
)
|
||||
:
|
||||
flipStatus_(flipStatus)
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
inline Foam::label Foam::patchFaceOrientation::flipStatus() const
|
||||
{
|
||||
return flipStatus_;
|
||||
}
|
||||
|
||||
|
||||
inline void Foam::patchFaceOrientation::flip()
|
||||
{
|
||||
if (flipStatus_ == orientedSurface::NOFLIP)
|
||||
{
|
||||
flipStatus_ = orientedSurface::FLIP;
|
||||
}
|
||||
else if (flipStatus_ == orientedSurface::FLIP)
|
||||
{
|
||||
flipStatus_ = orientedSurface::NOFLIP;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
template<class TrackingData>
|
||||
inline bool Foam::patchFaceOrientation::valid(TrackingData& td) const
|
||||
{
|
||||
return flipStatus_ != orientedSurface::UNVISITED;
|
||||
}
|
||||
|
||||
|
||||
template<class TrackingData>
|
||||
inline void Foam::patchFaceOrientation::transform
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const tensor& rotTensor,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
)
|
||||
{}
|
||||
|
||||
|
||||
template<class TrackingData>
|
||||
inline bool Foam::patchFaceOrientation::updateEdge
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const label edgeI,
|
||||
const label faceI,
|
||||
const patchFaceOrientation& faceInfo,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
)
|
||||
{
|
||||
if (valid(td))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
const face& f = patch.localFaces()[faceI];
|
||||
const edge& e = patch.edges()[edgeI];
|
||||
|
||||
//Pout<< "Updating edge:" << edgeI << " verts:" << e << nl
|
||||
// << " start:" << patch.localPoints()[e[0]] << nl
|
||||
// << " end:" << patch.localPoints()[e[1]] << endl;
|
||||
|
||||
patchFaceOrientation consistentInfo(faceInfo);
|
||||
|
||||
// Check how edge relates to face
|
||||
if (f.edgeDirection(e) < 0)
|
||||
{
|
||||
// Create flipped version of faceInfo
|
||||
consistentInfo.flip();
|
||||
}
|
||||
|
||||
operator=(consistentInfo);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
template<class TrackingData>
|
||||
inline bool Foam::patchFaceOrientation::updateEdge
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const patchFaceOrientation& edgeInfo,
|
||||
const bool sameOrientation,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
)
|
||||
{
|
||||
if (valid(td))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Create (flipped/unflipped) version of edgeInfo
|
||||
patchFaceOrientation consistentInfo(edgeInfo);
|
||||
|
||||
if (!sameOrientation)
|
||||
{
|
||||
consistentInfo.flip();
|
||||
}
|
||||
|
||||
operator=(consistentInfo);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
template<class TrackingData>
|
||||
inline bool Foam::patchFaceOrientation::updateFace
|
||||
(
|
||||
const polyMesh& mesh,
|
||||
const indirectPrimitivePatch& patch,
|
||||
const label faceI,
|
||||
const label edgeI,
|
||||
const patchFaceOrientation& edgeInfo,
|
||||
const scalar tol,
|
||||
TrackingData& td
|
||||
)
|
||||
{
|
||||
if (valid(td))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Transfer flip to face
|
||||
const face& f = patch.localFaces()[faceI];
|
||||
const edge& e = patch.edges()[edgeI];
|
||||
|
||||
|
||||
//Pout<< "Updating face:" << faceI << nl
|
||||
// << " verts:" << f << nl
|
||||
// << " with edge:" << edgeI << nl
|
||||
// << " start:" << patch.localPoints()[e[0]] << nl
|
||||
// << " end:" << patch.localPoints()[e[1]] << endl;
|
||||
|
||||
|
||||
// Create (flipped/unflipped) version of edgeInfo
|
||||
patchFaceOrientation consistentInfo(edgeInfo);
|
||||
|
||||
if (f.edgeDirection(e) > 0)
|
||||
{
|
||||
consistentInfo.flip();
|
||||
}
|
||||
|
||||
operator=(consistentInfo);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
template<class TrackingData>
|
||||
inline bool Foam::patchFaceOrientation::equal
|
||||
(
|
||||
const patchFaceOrientation& rhs,
|
||||
TrackingData& td
|
||||
) const
|
||||
{
|
||||
return operator==(rhs);
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
||||
|
||||
inline bool Foam::patchFaceOrientation::operator==
|
||||
(
|
||||
const Foam::patchFaceOrientation& rhs
|
||||
) const
|
||||
{
|
||||
return flipStatus() == rhs.flipStatus();
|
||||
}
|
||||
|
||||
|
||||
inline bool Foam::patchFaceOrientation::operator!=
|
||||
(
|
||||
const Foam::patchFaceOrientation& rhs
|
||||
) const
|
||||
{
|
||||
return !(*this == rhs);
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
Reference in New Issue
Block a user