diff --git a/src/Allwmake b/src/Allwmake index 58ad2e09a3..094a89ee73 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -95,7 +95,6 @@ fvAgglomerationMethods/Allwmake $targetType $* wmake $targetType waveModels wmake $targetType engine -wmake $targetType regionCoupled conversion/Allwmake $targetType $* functionObjects/Allwmake $targetType $* diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index ede7556c61..18d5b7c57b 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -35,9 +35,6 @@ derivedFvPatches = $(fvPatches)/derived $(derivedFvPatches)/wall/wallFvPatch.C $(derivedFvPatches)/mapped/mappedFvPatch.C $(derivedFvPatches)/mapped/mappedWallFvPatch.C -$(derivedFvPatches)/regionCoupled/regionCoupledBaseFvPatch.C -$(derivedFvPatches)/regionCoupled/regionCoupledFvPatch.C -$(derivedFvPatches)/regionCoupled/regionCoupledWallFvPatch.C wallDist = fvMesh/wallDist diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.C deleted file mode 100644 index c781544288..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.C +++ /dev/null @@ -1,42 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation -------------------------------------------------------------------------------- -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 . - -Description - - -\*---------------------------------------------------------------------------*/ - -#include "regionCoupledBaseFvPatch.H" - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(regionCoupledBaseFvPatch, 0); -} - - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.H deleted file mode 100644 index 0d3037ec80..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledBaseFvPatch.H +++ /dev/null @@ -1,211 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011 OpenFOAM Foundation -------------------------------------------------------------------------------- -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::regionCoupledBaseFvPatch - -Description - Base class of regionCoupledFvPatch with common functionality for - regionCoupledFvPatch and regionCoupledWallFvPatch - -SourceFiles - regionCoupledBaseFvPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef regionCoupledBaseFvPatch_H -#define regionCoupledBaseFvPatch_H - -#include "regionCoupledBase.H" -#include "fvMesh.H" -#include "Time.H" -#include "polyPatch.H" -#include "regionCoupledLduInterface.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class regionCoupledBaseFvPatch Declaration -\*---------------------------------------------------------------------------*/ - -class regionCoupledBaseFvPatch -: - public regionCoupledLduInterface -{ -protected: - - // Protected data - - //- Reference to regionCoupledBase - const regionCoupledBase& regionCoupledBase_; - - //- Reference to fvPatch - const fvPatch& patch_; - - - // Protected members - - //- Returns fvMesh - const fvMesh& nbrFvMesh() const - { - return - ( - patch_.boundaryMesh().mesh().time().lookupObject - ( - regionCoupledBase_.nbrRegionName() - ) - ); - } - - -public: - - //- Runtime type information - TypeName("regionCoupledBase"); - - - // Constructors - - //- Construct from polyPatch - regionCoupledBaseFvPatch - ( - const polyPatch& pp, - const fvPatch& patch - ) - : - regionCoupledLduInterface(), - regionCoupledBase_ - ( - refCast(pp) - ), - patch_(patch) - {} - - - //- Destructor - virtual ~regionCoupledBaseFvPatch() = default; - - - // Member Functions - - // Access - - //- Return neighbour - virtual label neighbPatchID() const - { - return regionCoupledBase_.neighbPatchID(); - } - - //- Is it the owner? - virtual bool owner() const - { - return regionCoupledBase_.owner(); - } - - //- Return regionCoupledBase neighbour Patch - virtual const regionCoupledBaseFvPatch& neighbPatch() const - { - return refCast - ( - nbrFvMesh().boundary() - [ - regionCoupledBase_.neighbPatchID() - ] - ); - } - - //- Return a reference to the AMI interpolator - virtual const AMIPatchToPatchInterpolation& AMI() const - { - return regionCoupledBase_.AMI(); - } - - //- Returns neighbour polyMesh - virtual const polyMesh& nbrMesh() const - { - return - ( - patch_.boundaryMesh().mesh().time().lookupObject - ( - regionCoupledBase_.nbrRegionName() - ) - ); - } - - //- Return fvPatch - const fvPatch& patch() const - { - return patch_; - } - - //- Returns if it is the same Region - bool sameRegion() const - { - return regionCoupledBase_.sameRegion(); - } - - //- Return regionCoupledPolyPatch - const regionCoupledBase& regionCoupledPatch() const - { - return regionCoupledBase_; - } - - //- Return neighbour fvPatch - const fvPatch& neighbFvPatch() const - { - return refCast - ( - nbrFvMesh().boundary() - [ - regionCoupledBase_.neighbPatchID() - ] - ); - } - - //- Return the interface type - const word& regionCoupleType() const - { - return regionCoupledBase_.regionCoupleType(); - } - - - //- Return faceCell addressing - virtual const labelUList& faceCells() const = 0; - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C deleted file mode 100644 index 5753d75939..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C +++ /dev/null @@ -1,66 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2016 OpenFOAM Foundation -------------------------------------------------------------------------------- -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 "regionCoupledFvPatch.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(regionCoupledFvPatch, 0); - addToRunTimeSelectionTable(fvPatch, regionCoupledFvPatch, polyPatch); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::tmp Foam::regionCoupledFvPatch::interfaceInternalField -( - const labelUList& internalData -) const -{ - return patchInternalField(internalData); -} - - -Foam::tmp Foam::regionCoupledFvPatch::internalFieldTransfer -( - const Pstream::commsTypes commsType, - const labelUList& iF -) const -{ - if (neighbFvPatch().sameRegion()) - { - return neighbFvPatch().patchInternalField(iF); - } - - return tmp::New(iF.size(), Zero); -} - - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H deleted file mode 100644 index 366b94da77..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H +++ /dev/null @@ -1,165 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation -------------------------------------------------------------------------------- -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::regionCoupledFvPatch - -Description - Common functionality for regionCoupleFvPatch and regionCoupledWallFvPatch - -SourceFiles - regionCoupledFvPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef regionCoupledFvPatch_H -#define regionCoupledFvPatch_H - -#include "fvPatch.H" -#include "fvMesh.H" -#include "Time.H" -#include "regionCoupledPolyPatch.H" -#include "regionCoupledBaseFvPatch.H" - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class regionCoupledFvPatch Declaration -\*---------------------------------------------------------------------------*/ - -class regionCoupledFvPatch -: - public lduInterface, - public fvPatch, - public regionCoupledBaseFvPatch -{ - // Private data - - const regionCoupledPolyPatch& regionCoupledPolyPatch_; - - // Private members - - //- Return regionCoupledFvPatch nbr - const regionCoupledFvPatch& neighbFvPatch() const - { - return refCast - ( - nbrFvMesh().boundary() - [ - neighbPatchID() - ] - ); - } - - -public: - - //- Runtime type information - TypeName(regionCoupledPolyPatch::typeName_()); - - - // Constructors - - //- Construct from polyPatch - regionCoupledFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm) - : - fvPatch(patch, bm), - regionCoupledBaseFvPatch - ( - patch, - *this - ), - regionCoupledPolyPatch_ - ( - refCast(patch) - ) - {} - - - //- Destructor - ~regionCoupledFvPatch() - {} - - - // Member Functions - - - // Access - - //- Return faceCell addressing - virtual const labelUList& faceCells() const - { - return fvPatch::faceCells(); - } - - //- Return true because this patch is coupled - virtual bool coupled() const - { - return regionCoupledPolyPatch_.coupled(); - } - - - // Interface transfer functions - - //- Return the values of the given internal data adjacent to - // the interface as a field - virtual tmp interfaceInternalField - ( - const labelUList& internalData - ) const; - - //- Inherit initInternalFieldTransfer from lduInterface - using lduInterface::initInternalFieldTransfer; - - //- Initialise neighbour field transfer - virtual void initInternalFieldTransfer - ( - const Pstream::commsTypes commsType, - labelUList& iF - ) const - {} - - //- Return neighbour field - virtual tmp internalFieldTransfer - ( - const Pstream::commsTypes commsType, - const labelUList& iF - ) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C deleted file mode 100644 index be7093e4be..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.C +++ /dev/null @@ -1,68 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2016 OpenFOAM Foundation -------------------------------------------------------------------------------- -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 "regionCoupledWallFvPatch.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(regionCoupledWallFvPatch, 0); - addToRunTimeSelectionTable(fvPatch, regionCoupledWallFvPatch, polyPatch); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::tmp Foam::regionCoupledWallFvPatch:: -interfaceInternalField -( - const labelUList& internalData -) const -{ - return patchInternalField(internalData); -} - - -Foam::tmp Foam::regionCoupledWallFvPatch:: -internalFieldTransfer -( - const Pstream::commsTypes commsType, - const labelUList& iF -) const -{ - if (neighbFvPatch().sameRegion()) - { - return neighbFvPatch().patchInternalField(iF); - } - - return tmp::New(iF.size(), Zero); -} - - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H deleted file mode 100644 index f71b95cc58..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H +++ /dev/null @@ -1,169 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation -------------------------------------------------------------------------------- -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::regionCoupledWallFvPatch - -Description - Foam::regionCoupledWallFvPatch - -SourceFiles - regionCoupledWallFvPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef regionCoupledWallFvPatch_H -#define regionCoupledWallFvPatch_H - -#include "wallFvPatch.H" -#include "fvMesh.H" -#include "Time.H" -#include "regionCoupledWallPolyPatch.H" -#include "regionCoupledBaseFvPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class regionCoupledWallFvPatch Declaration -\*---------------------------------------------------------------------------*/ - -class regionCoupledWallFvPatch -: - public lduInterface, - public wallFvPatch, - public regionCoupledBaseFvPatch -{ - - // Private data - - //- Const reference to regionCoupledWallPolyPatch - const regionCoupledWallPolyPatch& regionCoupledPolyPatch_; - - - // Private members - - //- Return regionCoupledBaseFvPatch nbr - const regionCoupledWallFvPatch& neighbFvPatch() const - { - return refCast - ( - nbrFvMesh().boundary()[neighbPatchID()] - ); - } - - -public: - - //- Runtime type information - TypeName(regionCoupledWallPolyPatch::typeName_()); - - - // Constructors - - //- Construct from components - regionCoupledWallFvPatch - ( - const polyPatch& patch, - const fvBoundaryMesh& bm - ) - : - wallFvPatch(patch, bm), - regionCoupledBaseFvPatch - ( - patch, - *this - ), - regionCoupledPolyPatch_ - ( - refCast(patch) - ) - {} - - - //- Destructor - ~regionCoupledWallFvPatch() - {} - - - // Member Functions - - - // Access - - //- Return faceCell addressing - virtual const labelUList& faceCells() const - { - return fvPatch::faceCells(); - } - - //- Return true because this patch is coupled - virtual bool coupled() const - { - return regionCoupledPolyPatch_.coupled(); - } - - - - // Interface transfer functions - - //- Return the values of the given internal data adjacent to - // the interface as a field - virtual tmp interfaceInternalField - ( - const labelUList& internalData - ) const; - - //- Inherit initInternalFieldTransfer from lduInterface - using lduInterface::initInternalFieldTransfer; - - //- Initialise neighbour field transfer - virtual void initInternalFieldTransfer - ( - const Pstream::commsTypes commsType, - labelUList& iF - ) const - {} - - //- Return neighbour field - virtual tmp internalFieldTransfer - ( - const Pstream::commsTypes commsType, - const labelUList& iF - ) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index 6a780352d8..93f1f04c99 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -308,19 +308,6 @@ output/foamVtkWriteCellSetFaces.C regionModel/regionProperties/regionProperties.C -regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C -regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C -regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C -regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C -regionCoupled/patches/regionCoupledPointPatch/regionCoupledPointPatch.C -regionCoupled/patches/regionCoupledPointPatch/regionCoupledWallPointPatch.C - -regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C -regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledGAMGInterface.C -regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledWallGAMGInterface.C -regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C -regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C - tetOverlapVolume/tetOverlapVolume.C LIB = $(FOAM_LIBBIN)/libmeshTools diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C deleted file mode 100644 index 26af2bd659..0000000000 --- a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.C +++ /dev/null @@ -1,89 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2013 OpenFOAM Foundation -------------------------------------------------------------------------------- -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 "regionCoupledGAMGInterfaceField.H" -#include "addToRunTimeSelectionTable.H" -#include "lduMatrix.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(regionCoupledGAMGInterfaceField, 0); - addToRunTimeSelectionTable - ( - GAMGInterfaceField, - regionCoupledGAMGInterfaceField, - lduInterface - ); - addToRunTimeSelectionTable - ( - GAMGInterfaceField, - regionCoupledGAMGInterfaceField, - lduInterfaceField - ); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::regionCoupledGAMGInterfaceField::regionCoupledGAMGInterfaceField -( - const GAMGInterface& GAMGCp, - const lduInterfaceField& fineInterface -) -: - GAMGInterfaceField(GAMGCp, fineInterface), - regionCoupledGAMGInterface_ - ( - refCast(GAMGCp) - ) -{} - - -Foam::regionCoupledGAMGInterfaceField::regionCoupledGAMGInterfaceField -( - const GAMGInterface& GAMGCp, - const bool doTransform, - const int rank -) -: - GAMGInterfaceField(GAMGCp, doTransform, rank), - regionCoupledGAMGInterface_ - ( - refCast(GAMGCp) - ) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::regionCoupledGAMGInterfaceField::~regionCoupledGAMGInterfaceField() -{} - - -// ************************************************************************* // diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H deleted file mode 100644 index 13031281d8..0000000000 --- a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledGAMGInterfaceField.H +++ /dev/null @@ -1,136 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2013 OpenFOAM Foundation -------------------------------------------------------------------------------- -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::regionCoupledGAMGInterfaceField - -Description - GAMG agglomerated region coupled interface field. - -SourceFiles - regionCoupledGAMGInterfaceField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef regionCoupledGAMGInterfaceField_H -#define regionCoupledGAMGInterfaceField_H - -#include "GAMGInterfaceField.H" -#include "regionCoupledGAMGInterface.H" - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class regionCoupledGAMGInterfaceField Declaration -\*---------------------------------------------------------------------------*/ - -class regionCoupledGAMGInterfaceField -: - public GAMGInterfaceField -{ - // Private data - - //- Local reference cast into the cyclic interface - const regionCoupledGAMGInterface& regionCoupledGAMGInterface_; - - - // Private Member Functions - - //- No copy construct - regionCoupledGAMGInterfaceField - ( - const regionCoupledGAMGInterfaceField& - ) = delete; - - //- No copy assignment - void operator=(const regionCoupledGAMGInterfaceField&) = delete; - - -public: - - //- Runtime type information - TypeName("regionCoupled"); - - - // Constructors - - //- Construct from GAMG interface and fine level interface field - regionCoupledGAMGInterfaceField - ( - const GAMGInterface& GAMGCp, - const lduInterfaceField& fineInterfaceField - ); - - //- Construct from GAMG interface and fine level interface field - regionCoupledGAMGInterfaceField - ( - const GAMGInterface& GAMGCp, - const bool doTransform, - const int rank - ); - - //- Destructor - virtual ~regionCoupledGAMGInterfaceField(); - - - // Member Functions - - // Access - - //- Return size - label size() const - { - return regionCoupledGAMGInterface_.size(); - } - - - //- Interface matrix update - virtual void updateInterfaceMatrix - ( - solveScalarField&, - const bool add, - const solveScalarField&, - const scalarField&, - const direction, - const Pstream::commsTypes commsType - ) const - {} - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C deleted file mode 100644 index 190c2ae983..0000000000 --- a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.C +++ /dev/null @@ -1,90 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2013 OpenFOAM Foundation -------------------------------------------------------------------------------- -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 "regionCoupledWallGAMGInterfaceField.H" -#include "addToRunTimeSelectionTable.H" -#include "lduMatrix.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(regionCoupledWallGAMGInterfaceField, 0); - addToRunTimeSelectionTable - ( - GAMGInterfaceField, - regionCoupledWallGAMGInterfaceField, - lduInterface - ); - addToRunTimeSelectionTable - ( - GAMGInterfaceField, - regionCoupledWallGAMGInterfaceField, - lduInterfaceField - ); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::regionCoupledWallGAMGInterfaceField::regionCoupledWallGAMGInterfaceField -( - const GAMGInterface& GAMGCp, - const lduInterfaceField& fineInterface -) -: - GAMGInterfaceField(GAMGCp, fineInterface), - regionCoupledGAMGInterface_ - ( - refCast(GAMGCp) - ) -{} - - -Foam::regionCoupledWallGAMGInterfaceField::regionCoupledWallGAMGInterfaceField -( - const GAMGInterface& GAMGCp, - const bool doTransform, - const int rank -) -: - GAMGInterfaceField(GAMGCp, doTransform, rank), - regionCoupledGAMGInterface_ - ( - refCast(GAMGCp) - ) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::regionCoupledWallGAMGInterfaceField::~regionCoupledWallGAMGInterfaceField -() -{} - - -// ************************************************************************* // diff --git a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H b/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H deleted file mode 100644 index 310bd53ea5..0000000000 --- a/src/meshTools/regionCoupled/GAMG/interfaceFields/regionCoupledGAMGInterfaceField/regionCoupledWallGAMGInterfaceField.H +++ /dev/null @@ -1,137 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2013 OpenFOAM Foundation -------------------------------------------------------------------------------- -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::regionCoupledWallGAMGInterfaceField - -Description - GAMG agglomerated region coupled interface field. - -SourceFiles - regionCoupledWallGAMGInterfaceField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef regionCoupledWallGAMGInterfaceField_H -#define regionCoupledWallGAMGInterfaceField_H - -#include "GAMGInterfaceField.H" -#include "regionCoupledWallGAMGInterface.H" - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class regionCoupledWallGAMGInterfaceField Declaration -\*---------------------------------------------------------------------------*/ - -class regionCoupledWallGAMGInterfaceField -: - public GAMGInterfaceField -{ - // Private data - - //- Local reference cast into the region coupled interface - const regionCoupledWallGAMGInterface& regionCoupledGAMGInterface_; - - - // Private Member Functions - - //- No copy construct - regionCoupledWallGAMGInterfaceField - ( - const regionCoupledWallGAMGInterfaceField& - ) = delete; - - //- No copy assignment - void operator=(const regionCoupledWallGAMGInterfaceField&) = delete; - - -public: - - //- Runtime type information - TypeName("regionCoupledWall"); - - - // Constructors - - //- Construct from GAMG interface and fine level interface field - regionCoupledWallGAMGInterfaceField - ( - const GAMGInterface& GAMGCp, - const lduInterfaceField& fineInterfaceField - ); - - //- Construct from GAMG interface and fine level interface field - regionCoupledWallGAMGInterfaceField - ( - const GAMGInterface& GAMGCp, - const bool doTransform, - const int rank - ); - - - //- Destructor - virtual ~regionCoupledWallGAMGInterfaceField(); - - - // Member Functions - - // Access - - //- Return size - label size() const - { - return regionCoupledGAMGInterface_.size(); - } - - - //- Interface matrix update - virtual void updateInterfaceMatrix - ( - solveScalarField&, - const bool add, - const solveScalarField&, - const scalarField&, - const direction, - const Pstream::commsTypes commsType - ) const - {} - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C deleted file mode 100644 index e9feb65ef3..0000000000 --- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C +++ /dev/null @@ -1,232 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2015 OpenFOAM Foundation -------------------------------------------------------------------------------- -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 "AMIInterpolation.H" -#include "regionCoupledBaseGAMGInterface.H" -#include "addToRunTimeSelectionTable.H" -#include "Map.H" -#include "polyMesh.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::regionCoupledBaseGAMGInterface::regionCoupledBaseGAMGInterface -( - const label index, - const lduInterfacePtrsList& coarseInterfaces, - const lduInterface& fineInterface, - const labelField& localRestrictAddressing, - const labelField& neighbourRestrictAddressing, - const label fineLevelIndex, - const label coarseComm -) -: - GAMGInterface - ( - index, - coarseInterfaces - ), - fineRegionCoupledLduInterface_ - ( - refCast(fineInterface) - ) -{ - // Construct face agglomeration from cell agglomeration - { - // From coarse face to cell - DynamicList