diff --git a/applications/solvers/modules/isothermalFilm/Make/files b/applications/solvers/modules/isothermalFilm/Make/files index 9d95b37e7e..0fca0c8400 100644 --- a/applications/solvers/modules/isothermalFilm/Make/files +++ b/applications/solvers/modules/isothermalFilm/Make/files @@ -12,6 +12,10 @@ patches/mappedFilmWall/mappedFilmWallFvPatch/mappedFilmWallFvPatch.C patches/mappedFilmWall/mappedFilmWallPointPatch/mappedFilmWallPointPatch.C patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.C +patches/mappedFilmSurface/mappedFilmSurfacePolyPatch/mappedFilmSurfacePolyPatch.C +patches/mappedFilmSurface/mappedFilmSurfacePointPatch/mappedFilmSurfacePointPatch.C +patches/mappedFilmSurface/mappedFilmSurfaceFvPatch/mappedFilmSurfaceFvPatch.C + derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.C diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfaceFvPatch/mappedFilmSurfaceFvPatch.C b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfaceFvPatch/mappedFilmSurfaceFvPatch.C new file mode 100644 index 0000000000..10e526d7ae --- /dev/null +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfaceFvPatch/mappedFilmSurfaceFvPatch.C @@ -0,0 +1,37 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 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 . + +\*---------------------------------------------------------------------------*/ + +#include "mappedFilmSurfaceFvPatch.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(mappedFilmSurfaceFvPatch, 0); + addToRunTimeSelectionTable(fvPatch, mappedFilmSurfaceFvPatch, polyPatch); +} + +// ************************************************************************* // diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfaceFvPatch/mappedFilmSurfaceFvPatch.H b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfaceFvPatch/mappedFilmSurfaceFvPatch.H new file mode 100644 index 0000000000..207c594267 --- /dev/null +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfaceFvPatch/mappedFilmSurfaceFvPatch.H @@ -0,0 +1,80 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 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 . + +Class + Foam::mappedFilmSurfaceFvPatch + +SourceFiles + mappedFilmSurfaceFvPatch.C + +\*---------------------------------------------------------------------------*/ + +#ifndef mappedFilmSurfaceFvPatch_H +#define mappedFilmSurfaceFvPatch_H + +#include "filmSurfaceFvPatch.H" +#include "mappedFilmSurfacePolyPatch.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class mappedFilmSurfaceFvPatch Declaration +\*---------------------------------------------------------------------------*/ + +class mappedFilmSurfaceFvPatch +: + public filmSurfaceFvPatch +{ + +public: + + //- Runtime type information + TypeName(mappedFilmSurfacePolyPatch::typeName_()); + + + // Constructors + + //- Construct from components + mappedFilmSurfaceFvPatch + ( + const polyPatch& patch, + const fvBoundaryMesh& bm + ) + : + filmSurfaceFvPatch(patch, bm) + {} +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePointPatch/mappedFilmSurfacePointPatch.C b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePointPatch/mappedFilmSurfacePointPatch.C new file mode 100644 index 0000000000..9a4db4adf1 --- /dev/null +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePointPatch/mappedFilmSurfacePointPatch.C @@ -0,0 +1,51 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 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 . + +\*---------------------------------------------------------------------------*/ + +#include "mappedFilmSurfacePointPatch.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +defineTypeNameAndDebug(mappedFilmSurfacePointPatch, 0); + +// Add the patch constructor functions to the hash tables +addToRunTimeSelectionTable +( + facePointPatch, + mappedFilmSurfacePointPatch, + polyPatch +); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePointPatch/mappedFilmSurfacePointPatch.H b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePointPatch/mappedFilmSurfacePointPatch.H new file mode 100644 index 0000000000..1d18e38029 --- /dev/null +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePointPatch/mappedFilmSurfacePointPatch.H @@ -0,0 +1,80 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 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 . + +Class + Foam::mappedFilmSurfacePointPatch + +SourceFiles + mappedFilmSurfacePointPatch.C + +\*---------------------------------------------------------------------------*/ + +#ifndef mappedFilmSurfacePointPatch_H +#define mappedFilmSurfacePointPatch_H + +#include "filmSurfacePointPatch.H" +#include "mappedFilmSurfacePolyPatch.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class mappedFilmSurfacePointPatch Declaration +\*---------------------------------------------------------------------------*/ + +class mappedFilmSurfacePointPatch +: + public filmSurfacePointPatch +{ + +public: + + //- Runtime type information + TypeName(mappedFilmSurfacePolyPatch::typeName_()); + + + // Constructors + + //- Construct from polyPatch + mappedFilmSurfacePointPatch + ( + const polyPatch& patch, + const pointBoundaryMesh& bm + ) + : + filmSurfacePointPatch(patch, bm) + {} +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePolyPatch/mappedFilmSurfacePolyPatch.C b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePolyPatch/mappedFilmSurfacePolyPatch.C new file mode 100644 index 0000000000..f3094bcc5f --- /dev/null +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePolyPatch/mappedFilmSurfacePolyPatch.C @@ -0,0 +1,178 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 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 . + +\*---------------------------------------------------------------------------*/ + +#include "mappedFilmSurfacePolyPatch.H" +#include "mappedPolyPatch.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(mappedFilmSurfacePolyPatch, 0); + + addToRunTimeSelectionTable(polyPatch, mappedFilmSurfacePolyPatch, word); + addToRunTimeSelectionTable + ( + polyPatch, + mappedFilmSurfacePolyPatch, + dictionary + ); +} + + +// * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * * * * // + +Foam::mappedFilmSurfacePolyPatch::mappedFilmSurfacePolyPatch +( + const word& name, + const label size, + const label start, + const label index, + const polyBoundaryMesh& bm, + const word& patchType +) +: + filmSurfacePolyPatch(name, size, start, index, bm, patchType), + mappedExtrudedPatchBase(static_cast(*this)) +{ + // mapped is not constraint type so add mapped group explicitly + if (findIndex(inGroups(), mappedPolyPatch::typeName) == -1) + { + inGroups().append(mappedPolyPatch::typeName); + } +} + + +Foam::mappedFilmSurfacePolyPatch::mappedFilmSurfacePolyPatch +( + const word& name, + const label size, + const label start, + const label index, + const word& neighbourRegion, + const word& neighbourPatch, + const word& bottomPatch, + const polyBoundaryMesh& bm +) +: + filmSurfacePolyPatch(name, size, start, index, bm, typeName), + mappedExtrudedPatchBase + ( + *this, + neighbourRegion, + neighbourPatch, + bottomPatch, + cyclicTransform(true) + ) +{} + + +Foam::mappedFilmSurfacePolyPatch::mappedFilmSurfacePolyPatch +( + const word& name, + const dictionary& dict, + const label index, + const polyBoundaryMesh& bm, + const word& patchType +) +: + filmSurfacePolyPatch(name, dict, index, bm, patchType), + mappedExtrudedPatchBase(*this, dict, true) +{ + // mapped is not constraint type so add mapped group explicitly + if (findIndex(inGroups(), mappedPolyPatch::typeName) == -1) + { + inGroups().append(mappedPolyPatch::typeName); + } +} + + +Foam::mappedFilmSurfacePolyPatch::mappedFilmSurfacePolyPatch +( + const mappedFilmSurfacePolyPatch& pp, + const polyBoundaryMesh& bm +) +: + filmSurfacePolyPatch(pp, bm), + mappedExtrudedPatchBase(*this, pp) +{} + + +Foam::mappedFilmSurfacePolyPatch::mappedFilmSurfacePolyPatch +( + const mappedFilmSurfacePolyPatch& pp, + const polyBoundaryMesh& bm, + const label index, + const label newSize, + const label newStart +) +: + filmSurfacePolyPatch(pp, bm, index, newSize, newStart), + mappedExtrudedPatchBase(*this, pp) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::mappedFilmSurfacePolyPatch::~mappedFilmSurfacePolyPatch() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::mappedFilmSurfacePolyPatch::calcGeometry(PstreamBuffers& pBufs) +{ + filmSurfacePolyPatch::calcGeometry(pBufs); + mappedExtrudedPatchBase::clearOut(); +} + + +void Foam::mappedFilmSurfacePolyPatch::movePoints +( + PstreamBuffers& pBufs, + const pointField& p +) +{ + filmSurfacePolyPatch::movePoints(pBufs, p); + mappedExtrudedPatchBase::clearOut(); +} + + +void Foam::mappedFilmSurfacePolyPatch::topoChange(PstreamBuffers& pBufs) +{ + filmSurfacePolyPatch::topoChange(pBufs); + mappedExtrudedPatchBase::clearOut(); +} + + +void Foam::mappedFilmSurfacePolyPatch::write(Ostream& os) const +{ + filmSurfacePolyPatch::write(os); + mappedExtrudedPatchBase::write(os); +} + + +// ************************************************************************* // diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePolyPatch/mappedFilmSurfacePolyPatch.H b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePolyPatch/mappedFilmSurfacePolyPatch.H new file mode 100644 index 0000000000..e6a7706b21 --- /dev/null +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmSurface/mappedFilmSurfacePolyPatch/mappedFilmSurfacePolyPatch.H @@ -0,0 +1,185 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 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 . + +Class + Foam::mappedFilmSurfacePolyPatch + +Description + Film surface patch which holds a mapping engine to map values + from another patch + +SourceFiles + mappedFilmSurfacePolyPatch.C + +\*---------------------------------------------------------------------------*/ + +#ifndef mappedFilmSurfacePolyPatch_H +#define mappedFilmSurfacePolyPatch_H + +#include "filmSurfacePolyPatch.H" +#include "mappedExtrudedPatchBase.H" + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +class polyMesh; + +/*---------------------------------------------------------------------------*\ + Class mappedFilmSurfacePolyPatch Declaration +\*---------------------------------------------------------------------------*/ + +class mappedFilmSurfacePolyPatch +: + public filmSurfacePolyPatch, + public mappedExtrudedPatchBase +{ +protected: + + // Protected Member Functions + + //- Calculate the patch geometry + virtual void calcGeometry(PstreamBuffers&); + + //- Correct patches after moving points + virtual void movePoints(PstreamBuffers&, const pointField&); + + //- Update of the patch topology + virtual void topoChange(PstreamBuffers&); + + +public: + + //- Runtime type information + TypeName("mappedFilmSurface"); + + + // Constructors + + //- Construct from components + mappedFilmSurfacePolyPatch + ( + const word& name, + const label size, + const label start, + const label index, + const polyBoundaryMesh& bm, + const word& patchType + ); + + //- Construct from components + mappedFilmSurfacePolyPatch + ( + const word& name, + const label size, + const label start, + const label index, + const word& neighbourRegion, + const word& neighbourPatch, + const word& bottomPatch, + const polyBoundaryMesh& bm + ); + + //- Construct from dictionary + mappedFilmSurfacePolyPatch + ( + const word& name, + const dictionary& dict, + const label index, + const polyBoundaryMesh& bm, + const word& patchType + ); + + //- Construct as copy, resetting the boundary mesh + mappedFilmSurfacePolyPatch + ( + const mappedFilmSurfacePolyPatch&, + const polyBoundaryMesh& + ); + + //- Construct given the original patch and resetting the + // face list and boundary mesh information + mappedFilmSurfacePolyPatch + ( + const mappedFilmSurfacePolyPatch& pp, + const polyBoundaryMesh& bm, + const label index, + const label newSize, + const label newStart + ); + + //- Construct and return a clone, resetting the boundary mesh + virtual autoPtr clone(const polyBoundaryMesh& bm) const + { + return autoPtr + ( + new mappedFilmSurfacePolyPatch(*this, bm) + ); + } + + //- Construct and return a clone, resetting the face list + // and boundary mesh + virtual autoPtr clone + ( + const polyBoundaryMesh& bm, + const label index, + const label newSize, + const label newStart + ) const + { + return autoPtr + ( + new mappedFilmSurfacePolyPatch + ( + *this, + bm, + index, + newSize, + newStart + ) + ); + } + + + //- Destructor + virtual ~mappedFilmSurfacePolyPatch(); + + + // Member Functions + + //- Write the polyPatch data as a dictionary + virtual void write(Ostream&) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.C b/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.C index a19dae21d3..dac5f120dd 100644 --- a/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.C +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.C @@ -56,8 +56,7 @@ Foam::mappedFilmWallPolyPatch::mappedFilmWallPolyPatch ) : filmWallPolyPatch(name, size, start, index, bm, patchType), - mappedPatchBase(static_cast(*this)), - reMapAfterMove_(true) + mappedPatchBase(static_cast(*this)) { // mapped is not constraint type so add mapped group explicitly if (findIndex(inGroups(), mappedPolyPatch::typeName) == -1) @@ -85,8 +84,7 @@ Foam::mappedFilmWallPolyPatch::mappedFilmWallPolyPatch neighbourRegion, neighbourPatch, cyclicTransform(true) - ), - reMapAfterMove_(true) + ) {} @@ -100,8 +98,7 @@ Foam::mappedFilmWallPolyPatch::mappedFilmWallPolyPatch ) : filmWallPolyPatch(name, dict, index, bm, patchType), - mappedPatchBase(*this, dict, true), - reMapAfterMove_(dict.lookupOrDefault("reMapAfterMove", true)) + mappedPatchBase(*this, dict, true) { // mapped is not constraint type so add mapped group explicitly if (findIndex(inGroups(), mappedPolyPatch::typeName) == -1) @@ -118,8 +115,7 @@ Foam::mappedFilmWallPolyPatch::mappedFilmWallPolyPatch ) : filmWallPolyPatch(pp, bm), - mappedPatchBase(*this, pp), - reMapAfterMove_(true) + mappedPatchBase(*this, pp) {} @@ -133,8 +129,7 @@ Foam::mappedFilmWallPolyPatch::mappedFilmWallPolyPatch ) : filmWallPolyPatch(pp, bm, index, newSize, newStart), - mappedPatchBase(*this, pp), - reMapAfterMove_(true) + mappedPatchBase(*this, pp) {} @@ -146,12 +141,6 @@ Foam::mappedFilmWallPolyPatch::~mappedFilmWallPolyPatch() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::mappedFilmWallPolyPatch::initCalcGeometry(PstreamBuffers& pBufs) -{ - filmWallPolyPatch::initCalcGeometry(pBufs); -} - - void Foam::mappedFilmWallPolyPatch::calcGeometry(PstreamBuffers& pBufs) { filmWallPolyPatch::calcGeometry(pBufs); @@ -159,16 +148,6 @@ void Foam::mappedFilmWallPolyPatch::calcGeometry(PstreamBuffers& pBufs) } -void Foam::mappedFilmWallPolyPatch::initMovePoints -( - PstreamBuffers& pBufs, - const pointField& p -) -{ - filmWallPolyPatch::initMovePoints(pBufs, p); -} - - void Foam::mappedFilmWallPolyPatch::movePoints ( PstreamBuffers& pBufs, @@ -176,16 +155,7 @@ void Foam::mappedFilmWallPolyPatch::movePoints ) { filmWallPolyPatch::movePoints(pBufs, p); - if (reMapAfterMove_) - { - mappedPatchBase::clearOut(); - } -} - - -void Foam::mappedFilmWallPolyPatch::initTopoChange(PstreamBuffers& pBufs) -{ - filmWallPolyPatch::initTopoChange(pBufs); + mappedPatchBase::clearOut(); } @@ -200,7 +170,6 @@ void Foam::mappedFilmWallPolyPatch::write(Ostream& os) const { filmWallPolyPatch::write(os); mappedPatchBase::write(os); - writeEntryIfDifferent(os, "reMapAfterMove", true, reMapAfterMove_); } diff --git a/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.H b/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.H index 80abe5b1b4..f6b71d55f9 100644 --- a/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.H +++ b/applications/solvers/modules/isothermalFilm/patches/mappedFilmWall/mappedFilmWallPolyPatch/mappedFilmWallPolyPatch.H @@ -55,32 +55,16 @@ class mappedFilmWallPolyPatch public filmWallPolyPatch, public mappedPatchBase { - // Private Data - - //- Do we need to re-calculate the mapping if mesh motion takes place? - // Defaults to true. - const bool reMapAfterMove_; - - protected: // Protected Member Functions - //- Initialise the calculation of the patch geometry - virtual void initCalcGeometry(PstreamBuffers&); - //- Calculate the patch geometry virtual void calcGeometry(PstreamBuffers&); - //- Initialise the patches for moving points - virtual void initMovePoints(PstreamBuffers&, const pointField&); - //- Correct patches after moving points virtual void movePoints(PstreamBuffers&, const pointField&); - //- Initialise the update of the patch topology - virtual void initTopoChange(PstreamBuffers&); - //- Update of the patch topology virtual void topoChange(PstreamBuffers&);