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

fvModels: Remove 'Source' from names

Browse Source 
The fact that these names create sources in their associated transport
equations is clear in context, so the name does not need to contain
'Source'.

Having 'Source' in the name is a historic convention that dates back to
when fvModels and fvConstraints were combined in a single fvOptions
interface. In this interface, disambiguation between sources and
constraints was necessary.

The full set of name changes is as follows:

                   accelerationSource -> acceleration
                  actuationDiskSource -> actuationDisk
     effectivenessHeatExchangerSource -> effectivenessHeatExchanger
               explicitPorositySource -> porosityForce
            radialActuationDiskSource -> radialActuationDisk
                      rotorDiskSource -> rotorDisk
             sixDoFAccelerationSource -> sixDoFAcceleration
         solidEquilibriumEnergySource -> solidThermalEquilibrium
          solidificationMeltingSource -> solidificationMelting
                 volumeFractionSource -> volumeBlockage
    interRegionExplicitPorositySource -> interRegionPorosityForce
       VoFSolidificationMeltingSource -> VoFSolidificationMelting

The old names are still available for backwards compatibility.
This commit is contained in:
Will Bainbridge
2023-10-12 16:23:38 +01:00
parent 16ecc4fe08
commit e0bdf2405e
63 changed files with 556 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/modules/compressibleVoF/Allwmake
View File

@ -9,6 +9,6 @@ wmake $targetType
wmake $targetType fvModels/VoFTurbulenceDamping wmake $targetType fvModels/VoFTurbulenceDamping
wmake $targetType fvModels/VoFClouds wmake $targetType fvModels/VoFClouds
wmake $targetType fvModels/VoFCavitation wmake $targetType fvModels/VoFCavitation
wmake $targetType fvModels/VoFSolidificationMeltingSource wmake $targetType fvModels/VoFSolidificationMelting
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

3
applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/Make/files Normal file
View File

@ -0,0 +1,3 @@
VoFSolidificationMelting.C
LIB = $(FOAM_LIBBIN)/libVoFSolidificationMelting

0
applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/options → applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/Make/options
View File

38
applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C → applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "VoFSolidificationMeltingSource.H" #include "VoFSolidificationMelting.H"
#include "compressibleTwoPhaseVoFMixture.H" #include "compressibleTwoPhaseVoFMixture.H"
#include "fvcDdt.H" #include "fvcDdt.H"
#include "zeroGradientFvPatchFields.H" #include "zeroGradientFvPatchFields.H"
@ -35,21 +35,29 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(VoFSolidificationMeltingSource, 0); defineTypeNameAndDebug(VoFSolidificationMelting, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
( (
fvModel, fvModel,
VoFSolidificationMeltingSource, VoFSolidificationMelting,
dictionary dictionary
); );
addBackwardCompatibleToRunTimeSelectionTable
(
fvModel,
VoFSolidificationMelting,
dictionary,
VoFSolidificationMeltingSource,
"VoFSolidificationMeltingSource"
);
} }
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::VoFSolidificationMeltingSource::readCoeffs() void Foam::fv::VoFSolidificationMelting::readCoeffs()
{ {
alphaSolidT_.reset(Function1<scalar>::New("alphaSolidT", coeffs()).ptr()); alphaSolidT_.reset(Function1<scalar>::New("alphaSolidT", coeffs()).ptr());
L_ = dimensionedScalar("L", dimEnergy/dimMass, coeffs()); L_ = dimensionedScalar("L", dimEnergy/dimMass, coeffs());
@ -59,7 +67,7 @@ void Foam::fv::VoFSolidificationMeltingSource::readCoeffs()
} }
Foam::word Foam::fv::VoFSolidificationMeltingSource::alphaSolidName() const Foam::word Foam::fv::VoFSolidificationMelting::alphaSolidName() const
{ {
const compressibleTwoPhaseVoFMixture& thermo const compressibleTwoPhaseVoFMixture& thermo
( (
@ -77,7 +85,7 @@ Foam::word Foam::fv::VoFSolidificationMeltingSource::alphaSolidName() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource Foam::fv::VoFSolidificationMelting::VoFSolidificationMelting
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -122,13 +130,13 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::VoFSolidificationMeltingSource::addSupFields() const Foam::wordList Foam::fv::VoFSolidificationMelting::addSupFields() const
{ {
return wordList({"U", thermo_.thermo1().he().name()}); return wordList({"U", thermo_.thermo1().he().name()});
} }
void Foam::fv::VoFSolidificationMeltingSource::addSup void Foam::fv::VoFSolidificationMelting::addSup
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -145,7 +153,7 @@ void Foam::fv::VoFSolidificationMeltingSource::addSup
} }
void Foam::fv::VoFSolidificationMeltingSource::addSup void Foam::fv::VoFSolidificationMelting::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -175,7 +183,7 @@ void Foam::fv::VoFSolidificationMeltingSource::addSup
} }
void Foam::fv::VoFSolidificationMeltingSource::correct() void Foam::fv::VoFSolidificationMelting::correct()
{ {
if (debug) if (debug)
{ {
@ -215,7 +223,7 @@ void Foam::fv::VoFSolidificationMeltingSource::correct()
} }
void Foam::fv::VoFSolidificationMeltingSource::topoChange void Foam::fv::VoFSolidificationMelting::topoChange
( (
const polyTopoChangeMap& map const polyTopoChangeMap& map
) )
@ -224,13 +232,13 @@ void Foam::fv::VoFSolidificationMeltingSource::topoChange
} }
void Foam::fv::VoFSolidificationMeltingSource::mapMesh(const polyMeshMap& map) void Foam::fv::VoFSolidificationMelting::mapMesh(const polyMeshMap& map)
{ {
set_.mapMesh(map); set_.mapMesh(map);
} }
void Foam::fv::VoFSolidificationMeltingSource::distribute void Foam::fv::VoFSolidificationMelting::distribute
( (
const polyDistributionMap& map const polyDistributionMap& map
) )
@ -239,14 +247,14 @@ void Foam::fv::VoFSolidificationMeltingSource::distribute
} }
bool Foam::fv::VoFSolidificationMeltingSource::movePoints() bool Foam::fv::VoFSolidificationMelting::movePoints()
{ {
set_.movePoints(); set_.movePoints();
return true; return true;
} }
bool Foam::fv::VoFSolidificationMeltingSource::read(const dictionary& dict) bool Foam::fv::VoFSolidificationMelting::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

28
applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H → applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::VoFSolidificationMeltingSource Foam::fv::VoFSolidificationMelting
Description Description
Solidification and melting model for VoF simulations. Solidification and melting model for VoF simulations.
@ -38,9 +38,9 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
VoFSolidificationMeltingSource1 VoFSolidificationMelting1
{ {
type VoFSolidificationMeltingSource; type VoFSolidificationMelting;
select cellZone; select cellZone;
cellZone solidZone; cellZone solidZone;
@ -70,13 +70,13 @@ See also
Foam::Function1 Foam::Function1
SourceFiles SourceFiles
VoFSolidificationMeltingSource.C VoFSolidificationMelting.C
VoFSolidificationMeltingSourceIO.C VoFSolidificationMeltingIO.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef VoFSolidificationMeltingSource_H #ifndef VoFSolidificationMelting_H
#define VoFSolidificationMeltingSource_H #define VoFSolidificationMelting_H
#include "fvModel.H" #include "fvModel.H"
#include "fvCellSet.H" #include "fvCellSet.H"
@ -95,10 +95,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class VoFSolidificationMeltingSource Declaration Class VoFSolidificationMelting Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class VoFSolidificationMeltingSource class VoFSolidificationMelting
: :
public fvModel public fvModel
{ {
@ -145,13 +145,13 @@ class VoFSolidificationMeltingSource
public: public:
//- Runtime type information //- Runtime type information
TypeName("VoFSolidificationMeltingSource"); TypeName("VoFSolidificationMelting");
// Constructors // Constructors
//- Construct from explicit source name and mesh //- Construct from explicit source name and mesh
VoFSolidificationMeltingSource VoFSolidificationMelting
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -160,9 +160,9 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
VoFSolidificationMeltingSource VoFSolidificationMelting
( (
const VoFSolidificationMeltingSource& const VoFSolidificationMelting&
) = delete; ) = delete;
@ -223,7 +223,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const VoFSolidificationMeltingSource&) = delete; void operator=(const VoFSolidificationMelting&) = delete;
}; };

3
applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files
View File

@ -1,3 +0,0 @@
VoFSolidificationMeltingSource.C
LIB = $(FOAM_LIBBIN)/libVoFSolidificationMeltingSource

4
etc/caseDicts/fvModels/porosity/porousZone
View File

@ -13,9 +13,9 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
type DarcyForchheimer; type DarcyForchheimer;
select cellZone; select cellZone;

8
src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
View File

@ -26,7 +26,7 @@ License
#include "kEpsilonLopesdaCosta.H" #include "kEpsilonLopesdaCosta.H"
#include "fvModels.H" #include "fvModels.H"
#include "fvConstraints.H" #include "fvConstraints.H"
#include "explicitPorositySource.H" #include "porosityForce.H"
#include "bound.H" #include "bound.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -106,10 +106,10 @@ setPorosityCoefficients()
forAll(fvModels, i) forAll(fvModels, i)
{ {
if (isA<fv::explicitPorositySource>(fvModels[i])) if (isA<fv::porosityForce>(fvModels[i]))
{ {
const fv::explicitPorositySource& eps = const fv::porosityForce& eps =
refCast<const fv::explicitPorositySource>(fvModels[i]); refCast<const fv::porosityForce>(fvModels[i]);
if (isA<porosityModels::powerLawLopesdaCosta>(eps.model())) if (isA<porosityModels::powerLawLopesdaCosta>(eps.model()))
{ {

40
src/fvModels/Make/files
View File

@ -1,28 +1,28 @@
general/codedFvModel/codedFvModel.C general/codedFvModel/codedFvModel.C
general/semiImplicitSource/semiImplicitSource.C general/semiImplicitSource/semiImplicitSource.C
derived/actuationDiskSource/actuationDiskSource.C derived/actuationDisk/actuationDisk.C
derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C
derived/explicitPorositySource/explicitPorositySource.C derived/porosityForce/porosityForce.C
derived/radialActuationDiskSource/radialActuationDiskSource.C derived/radialActuationDisk/radialActuationDisk.C
derived/rotorDiskSource/rotorDiskSource.C derived/rotorDisk/rotorDisk.C
derived/rotorDiskSource/bladeModel/bladeModel.C derived/rotorDisk/bladeModel/bladeModel.C
derived/rotorDiskSource/profileModel/profileModel.C derived/rotorDisk/profileModel/profileModel.C
derived/rotorDiskSource/profileModel/profileModelList.C derived/rotorDisk/profileModel/profileModelList.C
derived/rotorDiskSource/profileModel/lookup/lookupProfile.C derived/rotorDisk/profileModel/lookup/lookupProfile.C
derived/rotorDiskSource/profileModel/series/seriesProfile.C derived/rotorDisk/profileModel/series/seriesProfile.C
derived/rotorDiskSource/trimModel/trimModel/trimModel.C derived/rotorDisk/trimModel/trimModel/trimModel.C
derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C derived/rotorDisk/trimModel/trimModel/trimModelNew.C
derived/rotorDiskSource/trimModel/fixed/fixedTrim.C derived/rotorDisk/trimModel/fixed/fixedTrim.C
derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C
derived/solidificationMeltingSource/solidificationMeltingSource.C derived/solidificationMelting/solidificationMelting.C
derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C derived/sixDoFAcceleration/sixDoFAcceleration.C
derived/buoyancyForce/buoyancyForce.C derived/buoyancyForce/buoyancyForce.C
derived/buoyancyEnergy/buoyancyEnergy.C derived/buoyancyEnergy/buoyancyEnergy.C
derived/phaseLimitStabilisation/phaseLimitStabilisation.C derived/phaseLimitStabilisation/phaseLimitStabilisation.C
derived/accelerationSource/accelerationSource.C derived/acceleration/acceleration.C
derived/volumeFractionSource/volumeFractionSource.C derived/volumeBlockage/volumeBlockage.C
derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C derived/solidThermalEquilibrium/solidThermalEquilibrium.C
derived/volumeSource/volumeSource.C derived/volumeSource/volumeSource.C
derived/massSource/massSourceBase.C derived/massSource/massSourceBase.C
derived/massSource/massSource.C derived/massSource/massSource.C
@ -34,7 +34,7 @@ derived/massTransfer/massTransferBase.C
derived/massTransfer/coefficientMassTransfer.C derived/massTransfer/coefficientMassTransfer.C
interRegion/interRegionModel/interRegionModel.C interRegion/interRegionModel/interRegionModel.C
interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C interRegion/interRegionPorosityForce/interRegionPorosityForce.C
interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C
derived/heatTransfer/heatTransferAv/heatTransferAv.C derived/heatTransfer/heatTransferAv/heatTransferAv.C

41
src/fvModels/derived/accelerationSource/accelerationSource.C → src/fvModels/derived/acceleration/acceleration.C
View File

@ -26,7 +26,7 @@ License
#include "fvMesh.H" #include "fvMesh.H"
#include "fvMatrix.H" #include "fvMatrix.H"
#include "geometricOneField.H" #include "geometricOneField.H"
#include "accelerationSource.H" #include "acceleration.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -35,15 +35,23 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(accelerationSource, 0); defineTypeNameAndDebug(acceleration, 0);
addToRunTimeSelectionTable(fvModel, accelerationSource, dictionary); addToRunTimeSelectionTable(fvModel, acceleration, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
(
fvModel,
acceleration,
dictionary,
accelerationSource,
"accelerationSource"
);
} }
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::accelerationSource::readCoeffs() void Foam::fv::acceleration::readCoeffs()
{ {
UName_ = coeffs().lookupOrDefault<word>("U", "U"); UName_ = coeffs().lookupOrDefault<word>("U", "U");
@ -52,7 +60,7 @@ void Foam::fv::accelerationSource::readCoeffs()
template<class AlphaRhoFieldType> template<class AlphaRhoFieldType>
void Foam::fv::accelerationSource::add void Foam::fv::acceleration::add
( (
const AlphaRhoFieldType& alphaRho, const AlphaRhoFieldType& alphaRho,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -79,7 +87,7 @@ void Foam::fv::accelerationSource::add
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::accelerationSource::accelerationSource Foam::fv::acceleration::acceleration
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -98,13 +106,13 @@ Foam::fv::accelerationSource::accelerationSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::accelerationSource::addSupFields() const Foam::wordList Foam::fv::acceleration::addSupFields() const
{ {
return wordList(1, UName_); return wordList(1, UName_);
} }
void Foam::fv::accelerationSource::addSup void Foam::fv::acceleration::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -114,7 +122,7 @@ void Foam::fv::accelerationSource::addSup
} }
void Foam::fv::accelerationSource::addSup void Foam::fv::acceleration::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -125,7 +133,7 @@ void Foam::fv::accelerationSource::addSup
} }
void Foam::fv::accelerationSource::addSup void Foam::fv::acceleration::addSup
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -137,35 +145,32 @@ void Foam::fv::accelerationSource::addSup
} }
bool Foam::fv::accelerationSource::movePoints() bool Foam::fv::acceleration::movePoints()
{ {
set_.movePoints(); set_.movePoints();
return true; return true;
} }
void Foam::fv::accelerationSource::topoChange(const polyTopoChangeMap& map) void Foam::fv::acceleration::topoChange(const polyTopoChangeMap& map)
{ {
set_.topoChange(map); set_.topoChange(map);
} }
void Foam::fv::accelerationSource::mapMesh(const polyMeshMap& map) void Foam::fv::acceleration::mapMesh(const polyMeshMap& map)
{ {
set_.mapMesh(map); set_.mapMesh(map);
} }
void Foam::fv::accelerationSource::distribute void Foam::fv::acceleration::distribute(const polyDistributionMap& map)
(
const polyDistributionMap& map
)
{ {
set_.distribute(map); set_.distribute(map);
} }
bool Foam::fv::accelerationSource::read(const dictionary& dict) bool Foam::fv::acceleration::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

22
src/fvModels/derived/accelerationSource/accelerationSource.H → src/fvModels/derived/acceleration/acceleration.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::accelerationSource Foam::fv::acceleration
Description Description
This fvModel applies an explicit acceleration force to components of the This fvModel applies an explicit acceleration force to components of the
@ -31,9 +31,9 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
accelerationSource1 acceleration1
{ {
type accelerationSource; type acceleration;
select all; select all;
@ -51,12 +51,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
accelerationSource.C acceleration.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef accelerationSource_H #ifndef acceleration_H
#define accelerationSource_H #define acceleration_H
#include "fvModel.H" #include "fvModel.H"
#include "fvCellSet.H" #include "fvCellSet.H"
@ -70,10 +70,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class accelerationSource Declaration Class acceleration Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class accelerationSource class acceleration
: :
public fvModel public fvModel
{ {
@ -106,13 +106,13 @@ class accelerationSource
public: public:
//- Runtime type information //- Runtime type information
TypeName("accelerationSource"); TypeName("acceleration");
// Constructors // Constructors
//- Construct from components //- Construct from components
accelerationSource acceleration
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -122,7 +122,7 @@ public:
//- Destructor //- Destructor
virtual ~accelerationSource() virtual ~acceleration()
{} {}

38
src/fvModels/derived/actuationDiskSource/actuationDiskSource.C → src/fvModels/derived/actuationDisk/actuationDisk.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "actuationDiskSource.H" #include "actuationDisk.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "fvMatrix.H" #include "fvMatrix.H"
#include "geometricOneField.H" #include "geometricOneField.H"
@ -35,12 +35,15 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(actuationDiskSource, 0); defineTypeNameAndDebug(actuationDisk, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, actuationDisk, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
actuationDisk,
dictionary,
actuationDiskSource, actuationDiskSource,
dictionary "actuationDiskSource"
); );
} }
} }
@ -48,7 +51,7 @@ namespace fv
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::actuationDiskSource::readCoeffs() void Foam::fv::actuationDisk::readCoeffs()
{ {
phaseName_ = coeffs().lookupOrDefault<word>("phase", word::null); phaseName_ = coeffs().lookupOrDefault<word>("phase", word::null);
@ -96,7 +99,7 @@ void Foam::fv::actuationDiskSource::readCoeffs()
template<class AlphaFieldType, class RhoFieldType> template<class AlphaFieldType, class RhoFieldType>
void Foam::fv::actuationDiskSource::addActuationDiskAxialInertialResistance void Foam::fv::actuationDisk::addActuationDiskAxialInertialResistance
( (
vectorField& Usource, vectorField& Usource,
const labelList& cells, const labelList& cells,
@ -128,7 +131,7 @@ void Foam::fv::actuationDiskSource::addActuationDiskAxialInertialResistance
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::actuationDiskSource::actuationDiskSource Foam::fv::actuationDisk::actuationDisk
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -153,13 +156,13 @@ Foam::fv::actuationDiskSource::actuationDiskSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::actuationDiskSource::addSupFields() const Foam::wordList Foam::fv::actuationDisk::addSupFields() const
{ {
return wordList(1, UName_); return wordList(1, UName_);
} }
void Foam::fv::actuationDiskSource::addSup void Foam::fv::actuationDisk::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -177,7 +180,7 @@ void Foam::fv::actuationDiskSource::addSup
} }
void Foam::fv::actuationDiskSource::addSup void Foam::fv::actuationDisk::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -196,7 +199,7 @@ void Foam::fv::actuationDiskSource::addSup
} }
void Foam::fv::actuationDiskSource::addSup void Foam::fv::actuationDisk::addSup
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -216,35 +219,32 @@ void Foam::fv::actuationDiskSource::addSup
} }
bool Foam::fv::actuationDiskSource::movePoints() bool Foam::fv::actuationDisk::movePoints()
{ {
set_.movePoints(); set_.movePoints();
return true; return true;
} }
void Foam::fv::actuationDiskSource::topoChange(const polyTopoChangeMap& map) void Foam::fv::actuationDisk::topoChange(const polyTopoChangeMap& map)
{ {
set_.topoChange(map); set_.topoChange(map);
} }
void Foam::fv::actuationDiskSource::mapMesh(const polyMeshMap& map) void Foam::fv::actuationDisk::mapMesh(const polyMeshMap& map)
{ {
set_.mapMesh(map); set_.mapMesh(map);
} }
void Foam::fv::actuationDiskSource::distribute void Foam::fv::actuationDisk::distribute(const polyDistributionMap& map)
(
const polyDistributionMap& map
)
{ {
set_.distribute(map); set_.distribute(map);
} }
bool Foam::fv::actuationDiskSource::read(const dictionary& dict) bool Foam::fv::actuationDisk::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

29
src/fvModels/derived/actuationDiskSource/actuationDiskSource.H → src/fvModels/derived/actuationDisk/actuationDisk.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::actuationDiskSource Foam::fv::actuationDisk
Description Description
Actuation disk source Actuation disk source
@ -45,9 +45,9 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
actuationDiskSource1 actuationDisk1
{ {
type actuationDiskSource; type actuationDisk;
select cellSet; select cellSet;
cellSet actuationDisk1; cellSet actuationDisk1;
@ -60,15 +60,14 @@ Usage
} }
\endverbatim \endverbatim
SourceFiles SourceFiles
actuationDiskSource.C actuationDisk.C
actuationDiskSourceTemplates.C actuationDiskTemplates.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef actuationDiskSource_H #ifndef actuationDisk_H
#define actuationDiskSource_H #define actuationDisk_H
#include "fvModel.H" #include "fvModel.H"
#include "fvCellSet.H" #include "fvCellSet.H"
@ -81,10 +80,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class actuationDiskSource Declaration Class actuationDisk Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class actuationDiskSource class actuationDisk
: :
public fvModel public fvModel
{ {
@ -143,13 +142,13 @@ private:
public: public:
//- Runtime type information //- Runtime type information
TypeName("actuationDiskSource"); TypeName("actuationDisk");
// Constructors // Constructors
//- Construct from components //- Construct from components
actuationDiskSource actuationDisk
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -158,11 +157,11 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
actuationDiskSource(const actuationDiskSource&) = delete; actuationDisk(const actuationDisk&) = delete;
//- Destructor //- Destructor
virtual ~actuationDiskSource() virtual ~actuationDisk()
{} {}
@ -226,7 +225,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const actuationDiskSource&) = delete; void operator=(const actuationDisk&) = delete;
}; };

33
src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C → src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "effectivenessHeatExchangerSource.H" #include "effectivenessHeatExchanger.H"
#include "fvMatrix.H" #include "fvMatrix.H"
#include "basicThermo.H" #include "basicThermo.H"
#include "surfaceInterpolate.H" #include "surfaceInterpolate.H"
@ -35,12 +35,15 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(effectivenessHeatExchangerSource, 0); defineTypeNameAndDebug(effectivenessHeatExchanger, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, effectivenessHeatExchanger, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
effectivenessHeatExchanger,
dictionary,
effectivenessHeatExchangerSource, effectivenessHeatExchangerSource,
dictionary "effectivenessHeatExchangerSource"
); );
} }
} }
@ -48,7 +51,7 @@ namespace fv
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::effectivenessHeatExchangerSource::readCoeffs() void Foam::fv::effectivenessHeatExchanger::readCoeffs()
{ {
secondaryMassFlowRate_ = coeffs().lookup<scalar>("secondaryMassFlowRate"); secondaryMassFlowRate_ = coeffs().lookup<scalar>("secondaryMassFlowRate");
secondaryInletT_ = coeffs().lookup<scalar>("secondaryInletT"); secondaryInletT_ = coeffs().lookup<scalar>("secondaryInletT");
@ -64,7 +67,7 @@ void Foam::fv::effectivenessHeatExchangerSource::readCoeffs()
} }
void Foam::fv::effectivenessHeatExchangerSource::setZone() void Foam::fv::effectivenessHeatExchanger::setZone()
{ {
zoneID_ = mesh().faceZones().findZoneID(faceZoneName_); zoneID_ = mesh().faceZones().findZoneID(faceZoneName_);
if (zoneID_ < 0) if (zoneID_ < 0)
@ -142,7 +145,7 @@ void Foam::fv::effectivenessHeatExchangerSource::setZone()
} }
void Foam::fv::effectivenessHeatExchangerSource::calculateTotalArea void Foam::fv::effectivenessHeatExchanger::calculateTotalArea
( (
scalar& area scalar& area
) const ) const
@ -167,7 +170,7 @@ void Foam::fv::effectivenessHeatExchangerSource::calculateTotalArea
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource Foam::fv::effectivenessHeatExchanger::effectivenessHeatExchanger
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -198,7 +201,7 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::effectivenessHeatExchangerSource::addSupFields() const Foam::wordList Foam::fv::effectivenessHeatExchanger::addSupFields() const
{ {
const basicThermo& thermo = const basicThermo& thermo =
mesh().lookupObject<basicThermo>(physicalProperties::typeName); mesh().lookupObject<basicThermo>(physicalProperties::typeName);
@ -207,7 +210,7 @@ Foam::wordList Foam::fv::effectivenessHeatExchangerSource::addSupFields() const
} }
void Foam::fv::effectivenessHeatExchangerSource::addSup void Foam::fv::effectivenessHeatExchanger::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volScalarField& he, const volScalarField& he,
@ -311,14 +314,14 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup
} }
bool Foam::fv::effectivenessHeatExchangerSource::movePoints() bool Foam::fv::effectivenessHeatExchanger::movePoints()
{ {
set_.movePoints(); set_.movePoints();
return true; return true;
} }
void Foam::fv::effectivenessHeatExchangerSource::topoChange void Foam::fv::effectivenessHeatExchanger::topoChange
( (
const polyTopoChangeMap& map const polyTopoChangeMap& map
) )
@ -327,13 +330,13 @@ void Foam::fv::effectivenessHeatExchangerSource::topoChange
} }
void Foam::fv::effectivenessHeatExchangerSource::mapMesh(const polyMeshMap& map) void Foam::fv::effectivenessHeatExchanger::mapMesh(const polyMeshMap& map)
{ {
set_.mapMesh(map); set_.mapMesh(map);
} }
void Foam::fv::effectivenessHeatExchangerSource::distribute void Foam::fv::effectivenessHeatExchanger::distribute
( (
const polyDistributionMap& map const polyDistributionMap& map
) )
@ -342,7 +345,7 @@ void Foam::fv::effectivenessHeatExchangerSource::distribute
} }
bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict) bool Foam::fv::effectivenessHeatExchanger::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

32
src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H → src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H
View File

@ -22,11 +22,10 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::effectivenessHeatExchangerSource Foam::fv::effectivenessHeatExchanger
Description Description
Heat exchanger source model, in which the heat exchanger is defined as a Heat exchanger model, based on an effectiveness
selection of cells.
The total heat exchange source is given by: The total heat exchange source is given by:
\f[ \f[
@ -44,7 +43,6 @@ Description
c_p | specific heat capacity [J/kg/K] c_p | specific heat capacity [J/kg/K]
\endvartable \endvartable
The distribution inside the hear exchanger is given by: The distribution inside the hear exchanger is given by:
\f[ \f[
Q_c = \frac{V_c |U_c| (T_c - T_{ref})}{\sum(V_c |U_c| (T_c - T_{ref}))} Q_c = \frac{V_c |U_c| (T_c - T_{ref})}{\sum(V_c |U_c| (T_c - T_{ref}))}
@ -62,9 +60,9 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
effectivenessHeatExchangerSource1 effectivenessHeatExchanger1
{ {
type effectivenessHeatExchangerSource; type effectivenessHeatExchanger;
select cellZone; select cellZone;
cellZone porosity; cellZone porosity;
@ -88,12 +86,12 @@ Usage
rate into the heat exchanger rate into the heat exchanger
SourceFiles SourceFiles
effectivenessHeatExchangerSource.C effectivenessHeatExchanger.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef effectivenessHeatExchangerSource_H #ifndef effectivenessHeatExchanger_H
#define effectivenessHeatExchangerSource_H #define effectivenessHeatExchanger_H
#include "fvModel.H" #include "fvModel.H"
#include "fvCellSet.H" #include "fvCellSet.H"
@ -107,10 +105,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class effectivenessHeatExchangerSource Declaration Class effectivenessHeatExchanger Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class effectivenessHeatExchangerSource class effectivenessHeatExchanger
: :
public fvModel public fvModel
{ {
@ -177,13 +175,13 @@ private:
public: public:
//- Runtime type information //- Runtime type information
TypeName("effectivenessHeatExchangerSource"); TypeName("effectivenessHeatExchanger");
// Constructors // Constructors
//- Construct from components //- Construct from components
effectivenessHeatExchangerSource effectivenessHeatExchanger
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -192,14 +190,14 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
effectivenessHeatExchangerSource effectivenessHeatExchanger
( (
const effectivenessHeatExchangerSource& const effectivenessHeatExchanger&
) = delete; ) = delete;
//- Destructor //- Destructor
virtual ~effectivenessHeatExchangerSource() virtual ~effectivenessHeatExchanger()
{} {}
@ -242,7 +240,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const effectivenessHeatExchangerSource&) = delete; void operator=(const effectivenessHeatExchanger&) = delete;
}; };

33
src/fvModels/derived/explicitPorositySource/explicitPorositySource.C → src/fvModels/derived/porosityForce/porosityForce.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "explicitPorositySource.H" #include "porosityForce.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "fvMatrices.H" #include "fvMatrices.H"
#include "porosityModel.H" #include "porosityModel.H"
@ -35,12 +35,15 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(explicitPorositySource, 0); defineTypeNameAndDebug(porosityForce, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, porosityForce, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
porosityForce,
dictionary,
explicitPorositySource, explicitPorositySource,
dictionary "explicitPorositySource"
); );
} }
} }
@ -48,7 +51,7 @@ namespace fv
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::explicitPorositySource::readCoeffs() void Foam::fv::porosityForce::readCoeffs()
{ {
if (coeffs().found("UNames")) if (coeffs().found("UNames"))
{ {
@ -75,7 +78,7 @@ void Foam::fv::explicitPorositySource::readCoeffs()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::explicitPorositySource::explicitPorositySource Foam::fv::porosityForce::porosityForce
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -94,13 +97,13 @@ Foam::fv::explicitPorositySource::explicitPorositySource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::explicitPorositySource::addSupFields() const Foam::wordList Foam::fv::porosityForce::addSupFields() const
{ {
return UNames_; return UNames_;
} }
void Foam::fv::explicitPorositySource::addSup void Foam::fv::porosityForce::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -112,7 +115,7 @@ void Foam::fv::explicitPorositySource::addSup
} }
void Foam::fv::explicitPorositySource::addSup void Foam::fv::porosityForce::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -125,7 +128,7 @@ void Foam::fv::explicitPorositySource::addSup
} }
void Foam::fv::explicitPorositySource::addSup void Foam::fv::porosityForce::addSup
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -139,26 +142,26 @@ void Foam::fv::explicitPorositySource::addSup
} }
bool Foam::fv::explicitPorositySource::movePoints() bool Foam::fv::porosityForce::movePoints()
{ {
set_.movePoints(); set_.movePoints();
return true; return true;
} }
void Foam::fv::explicitPorositySource::topoChange(const polyTopoChangeMap& map) void Foam::fv::porosityForce::topoChange(const polyTopoChangeMap& map)
{ {
set_.topoChange(map); set_.topoChange(map);
} }
void Foam::fv::explicitPorositySource::mapMesh(const polyMeshMap& map) void Foam::fv::porosityForce::mapMesh(const polyMeshMap& map)
{ {
set_.mapMesh(map); set_.mapMesh(map);
} }
void Foam::fv::explicitPorositySource::distribute void Foam::fv::porosityForce::distribute
( (
const polyDistributionMap& map const polyDistributionMap& map
) )
@ -167,7 +170,7 @@ void Foam::fv::explicitPorositySource::distribute
} }
bool Foam::fv::explicitPorositySource::read(const dictionary& dict) bool Foam::fv::porosityForce::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

26
src/fvModels/derived/explicitPorositySource/explicitPorositySource.H → src/fvModels/derived/porosityForce/porosityForce.H
View File

@ -22,15 +22,15 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::explicitPorositySource Foam::fv::porosityForce
Description Description
Explicit porosity source This model applies the force exerted on the fluid by a porous media
Usage Usage
Example usage, here employing the Darcy-Forchheimer model: Example usage, here employing the Darcy-Forchheimer model:
\verbatim \verbatim
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
type DarcyForchheimer; type DarcyForchheimer;
@ -58,12 +58,12 @@ Usage
The porous region must be selected as a cellZone. The porous region must be selected as a cellZone.
SourceFiles SourceFiles
explicitPorositySource.C porosityForce.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef explicitPorositySource_H #ifndef porosityForce_H
#define explicitPorositySource_H #define porosityForce_H
#include "fvModel.H" #include "fvModel.H"
#include "fvCellSet.H" #include "fvCellSet.H"
@ -80,10 +80,10 @@ namespace fv
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class explicitPorositySource Declaration Class porosityForce Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class explicitPorositySource class porosityForce
: :
public fvModel public fvModel
{ {
@ -108,13 +108,13 @@ class explicitPorositySource
public: public:
//- Runtime type information //- Runtime type information
TypeName("explicitPorositySource"); TypeName("porosityForce");
// Constructors // Constructors
//- Construct from components //- Construct from components
explicitPorositySource porosityForce
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -123,11 +123,11 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
explicitPorositySource(const explicitPorositySource&) = delete; porosityForce(const porosityForce&) = delete;
//- Destructor //- Destructor
virtual ~explicitPorositySource() virtual ~porosityForce()
{} {}
@ -200,7 +200,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const explicitPorositySource&) = delete; void operator=(const porosityForce&) = delete;
}; };

27
src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C → src/fvModels/derived/radialActuationDisk/radialActuationDisk.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "radialActuationDiskSource.H" #include "radialActuationDisk.H"
#include "volFields.H" #include "volFields.H"
#include "fvMatrix.H" #include "fvMatrix.H"
#include "geometricOneField.H" #include "geometricOneField.H"
@ -35,19 +35,22 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(radialActuationDiskSource, 0); defineTypeNameAndDebug(radialActuationDisk, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, radialActuationDisk, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
radialActuationDisk,
dictionary,
radialActuationDiskSource, radialActuationDiskSource,
dictionary "radialActuationDiskSource"
); );
} }
} }
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::radialActuationDiskSource::readCoeffs() void Foam::fv::radialActuationDisk::readCoeffs()
{ {
coeffs().lookup("coeffs") >> radialCoeffs_; coeffs().lookup("coeffs") >> radialCoeffs_;
} }
@ -55,7 +58,7 @@ void Foam::fv::radialActuationDiskSource::readCoeffs()
template<class RhoFieldType> template<class RhoFieldType>
void Foam::fv::radialActuationDiskSource:: void Foam::fv::radialActuationDisk::
addRadialActuationDiskAxialInertialResistance addRadialActuationDiskAxialInertialResistance
( (
vectorField& Usource, vectorField& Usource,
@ -119,7 +122,7 @@ addRadialActuationDiskAxialInertialResistance
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::radialActuationDiskSource::radialActuationDiskSource Foam::fv::radialActuationDisk::radialActuationDisk
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -127,7 +130,7 @@ Foam::fv::radialActuationDiskSource::radialActuationDiskSource
const dictionary& dict const dictionary& dict
) )
: :
actuationDiskSource(name, modelType, mesh, dict), actuationDisk(name, modelType, mesh, dict),
radialCoeffs_() radialCoeffs_()
{ {
readCoeffs(); readCoeffs();
@ -136,7 +139,7 @@ Foam::fv::radialActuationDiskSource::radialActuationDiskSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::fv::radialActuationDiskSource::addSup void Foam::fv::radialActuationDisk::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -153,7 +156,7 @@ void Foam::fv::radialActuationDiskSource::addSup
} }
void Foam::fv::radialActuationDiskSource::addSup void Foam::fv::radialActuationDisk::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -171,9 +174,9 @@ void Foam::fv::radialActuationDiskSource::addSup
} }
bool Foam::fv::radialActuationDiskSource::read(const dictionary& dict) bool Foam::fv::radialActuationDisk::read(const dictionary& dict)
{ {
if (actuationDiskSource::read(dict)) if (actuationDisk::read(dict))
{ {
readCoeffs(); readCoeffs();
return true; return true;

32
src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H → src/fvModels/derived/radialActuationDisk/radialActuationDisk.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::radialActuationDiskSource Foam::fv::radialActuationDisk
Description Description
Actuation disk source including radial thrust Actuation disk source including radial thrust
@ -56,9 +56,9 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
radialActuationDiskSource1 radialActuationDisk1
{ {
type radialActuationDiskSource; type radialActuationDisk;
select cellSet; select cellSet;
cellSet radialActuationDisk1; cellSet radialActuationDisk1;
@ -76,15 +76,15 @@ Usage
SourceFiles SourceFiles
radialActuationDiskSource.C radialActuationDisk.C
radialActuationDiskSourceTemplates.C radialActuationDiskTemplates.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef radialActuationDiskSource_H #ifndef radialActuationDisk_H
#define radialActuationDiskSource_H #define radialActuationDisk_H
#include "actuationDiskSource.H" #include "actuationDisk.H"
#include "FixedList.H" #include "FixedList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -95,12 +95,12 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class radialActuationDiskSource Declaration Class radialActuationDisk Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class radialActuationDiskSource class radialActuationDisk
: :
public actuationDiskSource public actuationDisk
{ {
// Private Data // Private Data
@ -128,13 +128,13 @@ class radialActuationDiskSource
public: public:
//- Runtime type information //- Runtime type information
TypeName("radialActuationDiskSource"); TypeName("radialActuationDisk");
// Constructors // Constructors
//- Construct from components //- Construct from components
radialActuationDiskSource radialActuationDisk
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -143,11 +143,11 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
radialActuationDiskSource(const radialActuationDiskSource&) = delete; radialActuationDisk(const radialActuationDisk&) = delete;
//- Destructor //- Destructor
virtual ~radialActuationDiskSource() virtual ~radialActuationDisk()
{} {}
@ -178,7 +178,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const radialActuationDiskSource&) = delete; void operator=(const radialActuationDisk&) = delete;
}; };

2
src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.C → src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.H → src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C → src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H → src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/profileModel.C → src/fvModels/derived/rotorDisk/profileModel/profileModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/profileModel.H → src/fvModels/derived/rotorDisk/profileModel/profileModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.C → src/fvModels/derived/rotorDisk/profileModel/profileModelList.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.H → src/fvModels/derived/rotorDisk/profileModel/profileModelList.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.C → src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.H → src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

92
src/fvModels/derived/rotorDiskSource/rotorDiskSource.C → src/fvModels/derived/rotorDisk/rotorDisk.C
View File

@ -23,8 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "rotorDiskSource.H" #include "rotorDisk.H"
#include "trimModel.H"
#include "fvMatrices.H" #include "fvMatrices.H"
#include "geometricOneField.H" #include "geometricOneField.H"
#include "syncTools.H" #include "syncTools.H"
@ -37,38 +36,43 @@ using namespace Foam::constant;
namespace Foam namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(rotorDiskSource, 0); defineTypeNameAndDebug(rotorDisk, 0);
addToRunTimeSelectionTable(fvModel, rotorDiskSource, dictionary); addToRunTimeSelectionTable(fvModel, rotorDisk, dictionary);
} addBackwardCompatibleToRunTimeSelectionTable
(
template<> const char* fvModel,
NamedEnum<fv::rotorDiskSource::geometryModeType, 2>::names[] = rotorDisk,
{ dictionary,
"auto", rotorDiskSource,
"specified" "rotorDiskSource"
}; );
const NamedEnum<fv::rotorDiskSource::geometryModeType, 2>
fv::rotorDiskSource::geometryModeTypeNames_;
template<> const char*
NamedEnum<fv::rotorDiskSource::inletFlowType, 3>::names[] =
{
"fixed",
"surfaceNormal",
"local"
};
const NamedEnum<fv::rotorDiskSource::inletFlowType, 3>
fv::rotorDiskSource::inletFlowTypeNames_;
} }
}
namespace Foam
{
template<>
const char* NamedEnum<fv::rotorDisk::geometryModeType, 2>::names[] =
{"auto", "specified"};
template<>
const char* NamedEnum<fv::rotorDisk::inletFlowType, 3>::names[] =
{"fixed", "surfaceNormal", "local"};
}
const Foam::NamedEnum<Foam::fv::rotorDisk::geometryModeType, 2>
Foam::fv::rotorDisk::geometryModeTypeNames_;
const Foam::NamedEnum<Foam::fv::rotorDisk::inletFlowType, 3>
Foam::fv::rotorDisk::inletFlowTypeNames_;
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void Foam::fv::rotorDiskSource::readCoeffs() void Foam::fv::rotorDisk::readCoeffs()
{ {
UName_ = coeffs().lookupOrDefault<word>("U", "U"); UName_ = coeffs().lookupOrDefault<word>("U", "U");
@ -108,7 +112,7 @@ void Foam::fv::rotorDiskSource::readCoeffs()
} }
void Foam::fv::rotorDiskSource::checkData() void Foam::fv::rotorDisk::checkData()
{ {
// Set inflow type // Set inflow type
switch (set_.selectionType()) switch (set_.selectionType())
@ -165,7 +169,7 @@ void Foam::fv::rotorDiskSource::checkData()
} }
void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct) void Foam::fv::rotorDisk::setFaceArea(vector& axis, const bool correct)
{ {
area_ = 0.0; area_ = 0.0;
@ -302,7 +306,7 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
} }
void Foam::fv::rotorDiskSource::createCoordinateSystem() void Foam::fv::rotorDisk::createCoordinateSystem()
{ {
// Construct the local rotor co-prdinate system // Construct the local rotor co-prdinate system
vector origin(Zero); vector origin(Zero);
@ -433,7 +437,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
} }
void Foam::fv::rotorDiskSource::constructGeometry() void Foam::fv::rotorDisk::constructGeometry()
{ {
const vectorField& C = mesh().C(); const vectorField& C = mesh().C();
@ -469,7 +473,7 @@ void Foam::fv::rotorDiskSource::constructGeometry()
} }
Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity Foam::tmp<Foam::vectorField> Foam::fv::rotorDisk::inflowVelocity
( (
const volVectorField& U const volVectorField& U
) const ) const
@ -505,7 +509,7 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
// * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
Foam::fv::rotorDiskSource::rotorDiskSource Foam::fv::rotorDisk::rotorDisk
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -540,19 +544,19 @@ Foam::fv::rotorDiskSource::rotorDiskSource
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::fv::rotorDiskSource::~rotorDiskSource() Foam::fv::rotorDisk::~rotorDisk()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::rotorDiskSource::addSupFields() const Foam::wordList Foam::fv::rotorDisk::addSupFields() const
{ {
return wordList(1, UName_); return wordList(1, UName_);
} }
void Foam::fv::rotorDiskSource::addSup void Foam::fv::rotorDisk::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -592,7 +596,7 @@ void Foam::fv::rotorDiskSource::addSup
} }
void Foam::fv::rotorDiskSource::addSup void Foam::fv::rotorDisk::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -630,32 +634,32 @@ void Foam::fv::rotorDiskSource::addSup
} }
bool Foam::fv::rotorDiskSource::movePoints() bool Foam::fv::rotorDisk::movePoints()
{ {
set_.movePoints(); set_.movePoints();
return true; return true;
} }
void Foam::fv::rotorDiskSource::topoChange(const polyTopoChangeMap& map) void Foam::fv::rotorDisk::topoChange(const polyTopoChangeMap& map)
{ {
set_.topoChange(map); set_.topoChange(map);
} }
void Foam::fv::rotorDiskSource::mapMesh(const polyMeshMap& map) void Foam::fv::rotorDisk::mapMesh(const polyMeshMap& map)
{ {
set_.mapMesh(map); set_.mapMesh(map);
} }
void Foam::fv::rotorDiskSource::distribute(const polyDistributionMap& map) void Foam::fv::rotorDisk::distribute(const polyDistributionMap& map)
{ {
set_.distribute(map); set_.distribute(map);
} }
bool Foam::fv::rotorDiskSource::read(const dictionary& dict) bool Foam::fv::rotorDisk::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

30
src/fvModels/derived/rotorDiskSource/rotorDiskSource.H → src/fvModels/derived/rotorDisk/rotorDisk.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::rotorDiskSource Foam::fv::rotorDisk
Description Description
Cell based momentum source which approximates the mean effects of Cell based momentum source which approximates the mean effects of
@ -31,7 +31,7 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
rotorDiskSource1 rotorDisk1
{ {
type rotorDisk; type rotorDisk;
@ -92,13 +92,13 @@ See also
Foam::seriesProfile Foam::seriesProfile
SourceFiles SourceFiles
rotorDiskSource.C rotorDisk.C
rotorDiskSourceTemplates.C rotorDiskTemplates.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef rotorDiskSource_H #ifndef rotorDisk_H
#define rotorDiskSource_H #define rotorDisk_H
#include "fvModel.H" #include "fvModel.H"
#include "fvCellSet.H" #include "fvCellSet.H"
@ -107,24 +107,20 @@ SourceFiles
#include "NamedEnum.H" #include "NamedEnum.H"
#include "bladeModel.H" #include "bladeModel.H"
#include "profileModelList.H" #include "profileModelList.H"
#include "volFieldsFwd.H" #include "trimModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// Forward declaration of classes
class trimModel;
namespace fv namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class rotorDiskSource Declaration Class rotorDisk Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class rotorDiskSource class rotorDisk
: :
public fvModel public fvModel
{ {
@ -257,7 +253,7 @@ public:
//- Construct from components //- Construct from components
rotorDiskSource rotorDisk
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -267,7 +263,7 @@ public:
//- Destructor //- Destructor
virtual ~rotorDiskSource(); virtual ~rotorDisk();
// Member Functions // Member Functions
@ -360,12 +356,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "rotorDiskSourceI.H" #include "rotorDiskI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository #ifdef NoRepository
#include "rotorDiskSourceTemplates.C" #include "rotorDiskTemplates.C"
#endif #endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

14
src/fvModels/derived/rotorDiskSource/rotorDiskSourceI.H → src/fvModels/derived/rotorDisk/rotorDiskI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -23,36 +23,36 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "rotorDiskSource.H" #include "rotorDisk.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
inline Foam::scalar Foam::fv::rotorDiskSource::rhoRef() const inline Foam::scalar Foam::fv::rotorDisk::rhoRef() const
{ {
return rhoRef_; return rhoRef_;
} }
inline Foam::scalar Foam::fv::rotorDiskSource::omega() const inline Foam::scalar Foam::fv::rotorDisk::omega() const
{ {
return omega_; return omega_;
} }
inline const Foam::fvCellSet& Foam::fv::rotorDiskSource::set() const inline const Foam::fvCellSet& Foam::fv::rotorDisk::set() const
{ {
return set_; return set_;
} }
inline const Foam::List<Foam::point>& Foam::fv::rotorDiskSource::x() const inline const Foam::List<Foam::point>& Foam::fv::rotorDisk::x() const
{ {
return x_; return x_;
} }
inline const Foam::coordinateSystems::cylindrical& inline const Foam::coordinateSystems::cylindrical&
Foam::fv::rotorDiskSource::coordSys() const Foam::fv::rotorDisk::coordSys() const
{ {
return coordSys_; return coordSys_;
} }

6
src/fvModels/derived/rotorDiskSource/rotorDiskSourceTemplates.C → src/fvModels/derived/rotorDisk/rotorDiskTemplates.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "rotorDiskSource.H" #include "rotorDisk.H"
#include "volFields.H" #include "volFields.H"
#include "unitConversion.H" #include "unitConversion.H"
@ -32,7 +32,7 @@ using namespace Foam::constant;
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
template<class RhoFieldType> template<class RhoFieldType>
void Foam::fv::rotorDiskSource::calculate void Foam::fv::rotorDisk::calculate
( (
const RhoFieldType& rho, const RhoFieldType& rho,
const vectorField& U, const vectorField& U,
@ -157,7 +157,7 @@ void Foam::fv::rotorDiskSource::calculate
template<class Type> template<class Type>
void Foam::fv::rotorDiskSource::writeField void Foam::fv::rotorDisk::writeField
( (
const word& name, const word& name,
const List<Type>& values const List<Type>& values

3
src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C → src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C
View File

@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fixedTrim.H" #include "fixedTrim.H"
#include "rotorDisk.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "unitConversion.H" #include "unitConversion.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
@ -44,7 +45,7 @@ namespace Foam
Foam::fixedTrim::fixedTrim Foam::fixedTrim::fixedTrim
( (
const fv::rotorDiskSource& rotor, const fv::rotorDisk& rotor,
const dictionary& dict const dictionary& dict
) )
: :

4
src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H → src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -65,7 +65,7 @@ public:
TypeName("fixedTrim"); TypeName("fixedTrim");
//- Constructor //- Constructor
fixedTrim(const fv::rotorDiskSource& rotor, const dictionary& dict); fixedTrim(const fv::rotorDisk& rotor, const dictionary& dict);
//- Destructor //- Destructor
virtual ~fixedTrim(); virtual ~fixedTrim();

3
src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C → src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C
View File

@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "targetCoeffTrim.H" #include "targetCoeffTrim.H"
#include "rotorDisk.H"
#include "geometricOneField.H" #include "geometricOneField.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -192,7 +193,7 @@ void Foam::targetCoeffTrim::correctTrim
Foam::targetCoeffTrim::targetCoeffTrim Foam::targetCoeffTrim::targetCoeffTrim
( (
const fv::rotorDiskSource& rotor, const fv::rotorDisk& rotor,
const dictionary& dict const dictionary& dict
) )
: :

4
src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H → src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -150,7 +150,7 @@ public:
TypeName("targetCoeffTrim"); TypeName("targetCoeffTrim");
//- Constructor //- Constructor
targetCoeffTrim(const fv::rotorDiskSource& rotor, const dictionary& dict); targetCoeffTrim(const fv::rotorDisk& rotor, const dictionary& dict);
//- Destructor //- Destructor
virtual ~targetCoeffTrim(); virtual ~targetCoeffTrim();

4
src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.C → src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,7 @@ namespace Foam
Foam::trimModel::trimModel Foam::trimModel::trimModel
( (
const fv::rotorDiskSource& rotor, const fv::rotorDisk& rotor,
const dictionary& dict, const dictionary& dict,
const word& name const word& name
) )

15
src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.H → src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,8 +35,9 @@ SourceFiles
#ifndef trimModel_H #ifndef trimModel_H
#define trimModel_H #define trimModel_H
#include "rotorDiskSource.H"
#include "dictionary.H" #include "dictionary.H"
#include "vectorField.H"
#include "volFieldsFwd.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,6 +45,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace fv { class rotorDisk; }
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class trimModel Declaration Class trimModel Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -56,7 +59,7 @@ protected:
// Protected data // Protected data
//- Reference to the rotor source model //- Reference to the rotor source model
const fv::rotorDiskSource& rotor_; const fv::rotorDisk& rotor_;
//- Name of model //- Name of model
const word name_; const word name_;
@ -79,7 +82,7 @@ public:
trimModel, trimModel,
dictionary, dictionary,
( (
const fv::rotorDiskSource& rotor, const fv::rotorDisk& rotor,
const dictionary& dict const dictionary& dict
), ),
(rotor, dict) (rotor, dict)
@ -91,7 +94,7 @@ public:
//- Construct from components //- Construct from components
trimModel trimModel
( (
const fv::rotorDiskSource& rotor, const fv::rotorDisk& rotor,
const dictionary& dict, const dictionary& dict,
const word& name const word& name
); );
@ -102,7 +105,7 @@ public:
//- Return a reference to the selected trim model //- Return a reference to the selected trim model
static autoPtr<trimModel> New static autoPtr<trimModel> New
( (
const fv::rotorDiskSource& rotor, const fv::rotorDisk& rotor,
const dictionary& dict const dictionary& dict
); );

4
src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C → src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModelNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,7 +29,7 @@ License
Foam::autoPtr<Foam::trimModel> Foam::trimModel::New Foam::autoPtr<Foam::trimModel> Foam::trimModel::New
( (
const fv::rotorDiskSource& rotor, const fv::rotorDisk& rotor,
const dictionary& dict const dictionary& dict
) )
{ {

40
src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C → src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "sixDoFAccelerationSource.H" #include "sixDoFAcceleration.H"
#include "fvMatrices.H" #include "fvMatrices.H"
#include "geometricOneField.H" #include "geometricOneField.H"
#include "uniformDimensionedFields.H" #include "uniformDimensionedFields.H"
@ -37,12 +37,15 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(sixDoFAccelerationSource, 0); defineTypeNameAndDebug(sixDoFAcceleration, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, sixDoFAcceleration, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
sixDoFAcceleration,
dictionary,
sixDoFAccelerationSource, sixDoFAccelerationSource,
dictionary "sixDoFAccelerationSource"
); );
} }
} }
@ -50,7 +53,7 @@ namespace fv
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
typedef Foam::fv::sixDoFAccelerationSource::accelerationVectors avType; typedef Foam::fv::sixDoFAcceleration::accelerationVectors avType;
template<> template<>
const char* const avType::vsType::typeName = "vectorVector"; const char* const avType::vsType::typeName = "vectorVector";
@ -91,7 +94,7 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::sixDoFAccelerationSource::readCoeffs() void Foam::fv::sixDoFAcceleration::readCoeffs()
{ {
UName_ = coeffs().lookupOrDefault<word>("U", "U"); UName_ = coeffs().lookupOrDefault<word>("U", "U");
@ -107,7 +110,7 @@ void Foam::fv::sixDoFAccelerationSource::readCoeffs()
template<class AlphaFieldType, class RhoFieldType> template<class AlphaFieldType, class RhoFieldType>
void Foam::fv::sixDoFAccelerationSource::addForce void Foam::fv::sixDoFAcceleration::addForce
( (
const AlphaFieldType& alpha, const AlphaFieldType& alpha,
const RhoFieldType& rho, const RhoFieldType& rho,
@ -170,7 +173,7 @@ void Foam::fv::sixDoFAccelerationSource::addForce
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::sixDoFAccelerationSource::sixDoFAccelerationSource Foam::fv::sixDoFAcceleration::sixDoFAcceleration
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -194,13 +197,13 @@ Foam::fv::sixDoFAccelerationSource::sixDoFAccelerationSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::sixDoFAccelerationSource::addSupFields() const Foam::wordList Foam::fv::sixDoFAcceleration::addSupFields() const
{ {
return wordList(1, UName_); return wordList(1, UName_);
} }
void Foam::fv::sixDoFAccelerationSource::addSup void Foam::fv::sixDoFAcceleration::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -210,7 +213,7 @@ void Foam::fv::sixDoFAccelerationSource::addSup
} }
void Foam::fv::sixDoFAccelerationSource::addSup void Foam::fv::sixDoFAcceleration::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -221,7 +224,7 @@ void Foam::fv::sixDoFAccelerationSource::addSup
} }
void Foam::fv::sixDoFAccelerationSource::addSup void Foam::fv::sixDoFAcceleration::addSup
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -233,28 +236,25 @@ void Foam::fv::sixDoFAccelerationSource::addSup
} }
bool Foam::fv::sixDoFAccelerationSource::movePoints() bool Foam::fv::sixDoFAcceleration::movePoints()
{ {
return true; return true;
} }
void Foam::fv::sixDoFAccelerationSource::topoChange(const polyTopoChangeMap&) void Foam::fv::sixDoFAcceleration::topoChange(const polyTopoChangeMap&)
{} {}
void Foam::fv::sixDoFAccelerationSource::mapMesh(const polyMeshMap& map) void Foam::fv::sixDoFAcceleration::mapMesh(const polyMeshMap& map)
{} {}
void Foam::fv::sixDoFAccelerationSource::distribute void Foam::fv::sixDoFAcceleration::distribute(const polyDistributionMap&)
(
const polyDistributionMap&
)
{} {}
bool Foam::fv::sixDoFAccelerationSource::read(const dictionary& dict) bool Foam::fv::sixDoFAcceleration::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

26
src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H → src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::sixDoFAccelerationSource Foam::fv::sixDoFAcceleration
Description Description
Solid-body 6-DoF acceleration source Solid-body 6-DoF acceleration source
@ -32,19 +32,19 @@ Usage
\verbatim \verbatim
SBM SBM
{ {
type sixDoFAccelerationSource; type sixDoFAcceleration;
accelerations <function1>; accelerations <function1>;
} }
\endverbatim \endverbatim
SourceFiles SourceFiles
sixDoFAccelerationSource.C sixDoFAcceleration.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef sixDoFAccelerationSource_H #ifndef sixDoFAcceleration_H
#define sixDoFAccelerationSource_H #define sixDoFAcceleration_H
#include "fvModel.H" #include "fvModel.H"
#include "Function1.H" #include "Function1.H"
@ -58,10 +58,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class sixDoFAccelerationSource Declaration Class sixDoFAcceleration Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class sixDoFAccelerationSource class sixDoFAcceleration
: :
public fvModel public fvModel
{ {
@ -110,13 +110,13 @@ private:
public: public:
//- Runtime type information //- Runtime type information
TypeName("sixDoFAccelerationSource"); TypeName("sixDoFAcceleration");
// Constructors // Constructors
//- Construct from components //- Construct from components
sixDoFAccelerationSource sixDoFAcceleration
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -125,14 +125,14 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
sixDoFAccelerationSource sixDoFAcceleration
( (
const sixDoFAccelerationSource& const sixDoFAcceleration&
) = delete; ) = delete;
//- Destructor //- Destructor
virtual ~sixDoFAccelerationSource() virtual ~sixDoFAcceleration()
{} {}
@ -189,7 +189,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const sixDoFAccelerationSource&) = delete; void operator=(const sixDoFAcceleration&) = delete;
}; };

37
src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C → src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "solidEquilibriumEnergySource.H" #include "solidThermalEquilibrium.H"
#include "fvmDdt.H" #include "fvmDdt.H"
#include "fvmLaplacian.H" #include "fvmLaplacian.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -34,12 +34,15 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(solidEquilibriumEnergySource, 0); defineTypeNameAndDebug(solidThermalEquilibrium, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, solidThermalEquilibrium, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
solidThermalEquilibrium,
dictionary,
solidEquilibriumEnergySource, solidEquilibriumEnergySource,
dictionary "solidEquilibriumEnergySource"
); );
} }
} }
@ -47,7 +50,7 @@ namespace fv
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::solidEquilibriumEnergySource::readCoeffs() void Foam::fv::solidThermalEquilibrium::readCoeffs()
{ {
phaseName_ = coeffs().lookupOrDefault<word>("phase", word::null); phaseName_ = coeffs().lookupOrDefault<word>("phase", word::null);
@ -56,7 +59,7 @@ void Foam::fv::solidEquilibriumEnergySource::readCoeffs()
const Foam::volScalarField& const Foam::volScalarField&
Foam::fv::solidEquilibriumEnergySource::solidAlpha() const Foam::fv::solidThermalEquilibrium::solidAlpha() const
{ {
const word alphaName = IOobject::groupName("alpha", solidPhaseName_); const word alphaName = IOobject::groupName("alpha", solidPhaseName_);
@ -84,7 +87,7 @@ Foam::fv::solidEquilibriumEnergySource::solidAlpha() const
const Foam::solidThermo& const Foam::solidThermo&
Foam::fv::solidEquilibriumEnergySource::solidThermo() const Foam::fv::solidThermalEquilibrium::solidThermo() const
{ {
const word thermoName = const word thermoName =
IOobject::groupName(physicalProperties::typeName, solidPhaseName_); IOobject::groupName(physicalProperties::typeName, solidPhaseName_);
@ -103,7 +106,7 @@ Foam::fv::solidEquilibriumEnergySource::solidThermo() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::solidEquilibriumEnergySource::solidEquilibriumEnergySource Foam::fv::solidThermalEquilibrium::solidThermalEquilibrium
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -123,13 +126,13 @@ Foam::fv::solidEquilibriumEnergySource::solidEquilibriumEnergySource
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::fv::solidEquilibriumEnergySource::~solidEquilibriumEnergySource() Foam::fv::solidThermalEquilibrium::~solidThermalEquilibrium()
{} {}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::wordList Foam::fv::solidEquilibriumEnergySource::addSupFields() const Foam::wordList Foam::fv::solidThermalEquilibrium::addSupFields() const
{ {
const basicThermo& thermo = const basicThermo& thermo =
mesh().lookupObject<basicThermo> mesh().lookupObject<basicThermo>
@ -141,7 +144,7 @@ Foam::wordList Foam::fv::solidEquilibriumEnergySource::addSupFields() const
} }
void Foam::fv::solidEquilibriumEnergySource::addSup void Foam::fv::solidThermalEquilibrium::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volScalarField& he, const volScalarField& he,
@ -168,7 +171,7 @@ void Foam::fv::solidEquilibriumEnergySource::addSup
} }
void Foam::fv::solidEquilibriumEnergySource::addSup void Foam::fv::solidThermalEquilibrium::addSup
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -196,31 +199,31 @@ void Foam::fv::solidEquilibriumEnergySource::addSup
} }
bool Foam::fv::solidEquilibriumEnergySource::movePoints() bool Foam::fv::solidThermalEquilibrium::movePoints()
{ {
return true; return true;
} }
void Foam::fv::solidEquilibriumEnergySource::topoChange void Foam::fv::solidThermalEquilibrium::topoChange
( (
const polyTopoChangeMap& const polyTopoChangeMap&
) )
{} {}
void Foam::fv::solidEquilibriumEnergySource::mapMesh(const polyMeshMap& map) void Foam::fv::solidThermalEquilibrium::mapMesh(const polyMeshMap& map)
{} {}
void Foam::fv::solidEquilibriumEnergySource::distribute void Foam::fv::solidThermalEquilibrium::distribute
( (
const polyDistributionMap& const polyDistributionMap&
) )
{} {}
bool Foam::fv::solidEquilibriumEnergySource::read(const dictionary& dict) bool Foam::fv::solidThermalEquilibrium::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

24
src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H → src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::solidEquilibriumEnergySource Foam::fv::solidThermalEquilibrium
Description Description
This fvModel adds the thermal inertia of a solid phase into the energy This fvModel adds the thermal inertia of a solid phase into the energy
@ -45,7 +45,7 @@ Usage
\verbatim \verbatim
<fvModelName> <fvModelName>
{ {
type solidEquilibriumEnergySource; type solidThermalEquilibrium;
solidPhase solid; solidPhase solid;
} }
@ -53,8 +53,8 @@ Usage
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef solidEquilibriumEnergySource_H #ifndef solidThermalEquilibrium_H
#define solidEquilibriumEnergySource_H #define solidThermalEquilibrium_H
#include "fvModel.H" #include "fvModel.H"
#include "volFields.H" #include "volFields.H"
@ -68,10 +68,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class solidEquilibriumEnergySource Declaration Class solidThermalEquilibrium Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class solidEquilibriumEnergySource class solidThermalEquilibrium
: :
public fvModel public fvModel
{ {
@ -99,13 +99,13 @@ class solidEquilibriumEnergySource
public: public:
//- Runtime type information //- Runtime type information
TypeName("solidEquilibriumEnergySource"); TypeName("solidThermalEquilibrium");
// Constructors // Constructors
//- Construct from components //- Construct from components
solidEquilibriumEnergySource solidThermalEquilibrium
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -114,14 +114,14 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
solidEquilibriumEnergySource solidThermalEquilibrium
( (
const solidEquilibriumEnergySource& const solidThermalEquilibrium&
) = delete; ) = delete;
//- Destructor //- Destructor
virtual ~solidEquilibriumEnergySource(); virtual ~solidThermalEquilibrium();
// Member Functions // Member Functions
@ -177,7 +177,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const solidEquilibriumEnergySource&) = delete; void operator=(const solidThermalEquilibrium&) = delete;
}; };

80
src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C → src/fvModels/derived/solidificationMelting/solidificationMelting.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "solidificationMeltingSource.H" #include "solidificationMelting.H"
#include "fvcDdt.H" #include "fvcDdt.H"
#include "fvMatrices.H" #include "fvMatrices.H"
#include "basicThermo.H" #include "basicThermo.H"
@ -37,37 +37,37 @@ License
namespace Foam namespace Foam
{ {
template<> namespace fv
const char* NamedEnum {
< defineTypeNameAndDebug(solidificationMelting, 0);
fv::solidificationMeltingSource::thermoMode,
2
>::names[] =
{
"thermo",
"lookup"
};
namespace fv addToRunTimeSelectionTable(fvModel, solidificationMelting, dictionary);
{ addBackwardCompatibleToRunTimeSelectionTable
defineTypeNameAndDebug(solidificationMeltingSource, 0); (
fvModel,
addToRunTimeSelectionTable solidificationMelting,
( dictionary,
fvModel, solidificationMeltingSource,
solidificationMeltingSource, "solidificationMeltingSource"
dictionary );
); }
}
} }
const Foam::NamedEnum<Foam::fv::solidificationMeltingSource::thermoMode, 2>
Foam::fv::solidificationMeltingSource::thermoModeTypeNames_; namespace Foam
{
template<>
const char* NamedEnum<fv::solidificationMelting::thermoMode, 2>::names[] =
{"thermo", "lookup"};
}
const Foam::NamedEnum<Foam::fv::solidificationMelting::thermoMode, 2>
Foam::fv::solidificationMelting::thermoModeTypeNames_;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::solidificationMeltingSource::readCoeffs() void Foam::fv::solidificationMelting::readCoeffs()
{ {
Tsol_ = coeffs().lookup<scalar>("Tsol"); Tsol_ = coeffs().lookup<scalar>("Tsol");
Tliq_ = coeffs().lookupOrDefault<scalar>("Tliq", Tsol_); Tliq_ = coeffs().lookupOrDefault<scalar>("Tliq", Tsol_);
@ -92,7 +92,7 @@ void Foam::fv::solidificationMeltingSource::readCoeffs()
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::fv::solidificationMeltingSource::Cp() const Foam::fv::solidificationMelting::Cp() const
{ {
switch (mode_) switch (mode_)
{ {
@ -141,7 +141,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
} }
Foam::vector Foam::fv::solidificationMeltingSource::g() const Foam::vector Foam::fv::solidificationMelting::g() const
{ {
if (mesh().foundObject<uniformDimensionedVectorField>("g")) if (mesh().foundObject<uniformDimensionedVectorField>("g"))
{ {
@ -156,7 +156,7 @@ Foam::vector Foam::fv::solidificationMeltingSource::g() const
} }
void Foam::fv::solidificationMeltingSource::update void Foam::fv::solidificationMelting::update
( (
const volScalarField& Cp const volScalarField& Cp
) const ) const
@ -216,7 +216,7 @@ void Foam::fv::solidificationMeltingSource::update
template<class RhoFieldType> template<class RhoFieldType>
void Foam::fv::solidificationMeltingSource::apply void Foam::fv::solidificationMelting::apply
( (
const RhoFieldType& rho, const RhoFieldType& rho,
fvMatrix<scalar>& eqn fvMatrix<scalar>& eqn
@ -247,7 +247,7 @@ void Foam::fv::solidificationMeltingSource::apply
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::solidificationMeltingSource::solidificationMeltingSource Foam::fv::solidificationMelting::solidificationMelting
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -294,7 +294,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::fv::solidificationMeltingSource::addSupFields() const Foam::wordList Foam::fv::solidificationMelting::addSupFields() const
{ {
switch (mode_) switch (mode_)
{ {
@ -315,7 +315,7 @@ Foam::wordList Foam::fv::solidificationMeltingSource::addSupFields() const
} }
void Foam::fv::solidificationMeltingSource::addSup void Foam::fv::solidificationMelting::addSup
( (
const volScalarField& he, const volScalarField& he,
fvMatrix<scalar>& eqn fvMatrix<scalar>& eqn
@ -325,7 +325,7 @@ void Foam::fv::solidificationMeltingSource::addSup
} }
void Foam::fv::solidificationMeltingSource::addSup void Foam::fv::solidificationMelting::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volScalarField& he, const volScalarField& he,
@ -336,7 +336,7 @@ void Foam::fv::solidificationMeltingSource::addSup
} }
void Foam::fv::solidificationMeltingSource::addSup void Foam::fv::solidificationMelting::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -375,7 +375,7 @@ void Foam::fv::solidificationMeltingSource::addSup
} }
void Foam::fv::solidificationMeltingSource::addSup void Foam::fv::solidificationMelting::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -386,14 +386,14 @@ void Foam::fv::solidificationMeltingSource::addSup
} }
bool Foam::fv::solidificationMeltingSource::movePoints() bool Foam::fv::solidificationMelting::movePoints()
{ {
set_.movePoints(); set_.movePoints();
return true; return true;
} }
void Foam::fv::solidificationMeltingSource::topoChange void Foam::fv::solidificationMelting::topoChange
( (
const polyTopoChangeMap& map const polyTopoChangeMap& map
) )
@ -402,13 +402,13 @@ void Foam::fv::solidificationMeltingSource::topoChange
} }
void Foam::fv::solidificationMeltingSource::mapMesh(const polyMeshMap& map) void Foam::fv::solidificationMelting::mapMesh(const polyMeshMap& map)
{ {
set_.mapMesh(map); set_.mapMesh(map);
} }
void Foam::fv::solidificationMeltingSource::distribute void Foam::fv::solidificationMelting::distribute
( (
const polyDistributionMap& map const polyDistributionMap& map
) )
@ -417,7 +417,7 @@ void Foam::fv::solidificationMeltingSource::distribute
} }
bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict) bool Foam::fv::solidificationMelting::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

26
src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H → src/fvModels/derived/solidificationMelting/solidificationMelting.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::solidificationMeltingSource Foam::fv::solidificationMelting
Description Description
This source is designed to model the effect of solidification and melting This source is designed to model the effect of solidification and melting
@ -76,9 +76,9 @@ Description
Usage Usage
Example usage: Example usage:
\verbatim \verbatim
solidificationMeltingSource1 solidificationMelting1
{ {
type solidificationMeltingSource; type solidificationMelting;
select cellZone; select cellZone;
cellZone iceZone; cellZone iceZone;
@ -113,12 +113,12 @@ Usage
\endtable \endtable
SourceFiles SourceFiles
solidificationMeltingSource.C solidificationMelting.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef solidificationMeltingSource_H #ifndef solidificationMelting_H
#define solidificationMeltingSource_H #define solidificationMelting_H
#include "fvModel.H" #include "fvModel.H"
#include "fvCellSet.H" #include "fvCellSet.H"
@ -134,10 +134,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class solidificationMeltingSource Declaration Class solidificationMelting Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class solidificationMeltingSource class solidificationMelting
: :
public fvModel public fvModel
{ {
@ -236,13 +236,13 @@ private:
public: public:
//- Runtime type information //- Runtime type information
TypeName("solidificationMeltingSource"); TypeName("solidificationMelting");
// Constructors // Constructors
//- Construct from explicit source name and mesh //- Construct from explicit source name and mesh
solidificationMeltingSource solidificationMelting
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -251,9 +251,9 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
solidificationMeltingSource solidificationMelting
( (
const solidificationMeltingSource& const solidificationMelting&
) = delete; ) = delete;
@ -323,7 +323,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const solidificationMeltingSource&) = delete; void operator=(const solidificationMelting&) = delete;
}; };

63
src/fvModels/derived/volumeFractionSource/volumeFractionSource.C → src/fvModels/derived/volumeBlockage/volumeBlockage.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "volumeFractionSource.H" #include "volumeBlockage.H"
#include "fvmDiv.H" #include "fvmDiv.H"
#include "fvmLaplacian.H" #include "fvmLaplacian.H"
#include "fvcDiv.H" #include "fvcDiv.H"
@ -37,12 +37,15 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(volumeFractionSource, 0); defineTypeNameAndDebug(volumeBlockage, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, volumeBlockage, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
volumeBlockage,
dictionary,
volumeFractionSource, volumeFractionSource,
dictionary "volumeFractionSource"
); );
} }
} }
@ -50,7 +53,7 @@ namespace fv
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fv::volumeFractionSource::readCoeffs() void Foam::fv::volumeBlockage::readCoeffs()
{ {
phiName_ = coeffs().lookupOrDefault<word>("phi", "phi"); phiName_ = coeffs().lookupOrDefault<word>("phi", "phi");
rhoName_ = coeffs().lookupOrDefault<word>("rho", "rho"); rhoName_ = coeffs().lookupOrDefault<word>("rho", "rho");
@ -60,7 +63,7 @@ void Foam::fv::volumeFractionSource::readCoeffs()
} }
const Foam::volScalarField& Foam::fv::volumeFractionSource::volumeAlpha() const const Foam::volScalarField& Foam::fv::volumeBlockage::volumeAlpha() const
{ {
const word alphaName = IOobject::groupName("alpha", volumePhaseName_); const word alphaName = IOobject::groupName("alpha", volumePhaseName_);
@ -87,7 +90,7 @@ const Foam::volScalarField& Foam::fv::volumeFractionSource::volumeAlpha() const
} }
Foam::tmp<Foam::volScalarField> Foam::fv::volumeFractionSource::D Foam::tmp<Foam::volScalarField> Foam::fv::volumeBlockage::D
( (
const word& fieldName const word& fieldName
) const ) const
@ -128,7 +131,7 @@ Foam::tmp<Foam::volScalarField> Foam::fv::volumeFractionSource::D
template <class Type, class AlphaFieldType> template <class Type, class AlphaFieldType>
void Foam::fv::volumeFractionSource::addGeneralSupType void Foam::fv::volumeBlockage::addGeneralSupType
( (
const AlphaFieldType& alpha, const AlphaFieldType& alpha,
fvMatrix<Type>& eqn fvMatrix<Type>& eqn
@ -157,7 +160,7 @@ void Foam::fv::volumeFractionSource::addGeneralSupType
template<class Type, class AlphaFieldType> template<class Type, class AlphaFieldType>
void Foam::fv::volumeFractionSource::addAlphaSupType void Foam::fv::volumeBlockage::addAlphaSupType
( (
const AlphaFieldType& alpha, const AlphaFieldType& alpha,
const VolField<Type>& field, const VolField<Type>& field,
@ -169,7 +172,7 @@ void Foam::fv::volumeFractionSource::addAlphaSupType
template<class AlphaFieldType> template<class AlphaFieldType>
void Foam::fv::volumeFractionSource::addAlphaSupType void Foam::fv::volumeBlockage::addAlphaSupType
( (
const AlphaFieldType& alpha, const AlphaFieldType& alpha,
const volScalarField& field, const volScalarField& field,
@ -195,7 +198,7 @@ void Foam::fv::volumeFractionSource::addAlphaSupType
template<class AlphaFieldType> template<class AlphaFieldType>
void Foam::fv::volumeFractionSource::addAlphaSupType void Foam::fv::volumeBlockage::addAlphaSupType
( (
const AlphaFieldType& alpha, const AlphaFieldType& alpha,
const volVectorField& field, const volVectorField& field,
@ -223,7 +226,7 @@ void Foam::fv::volumeFractionSource::addAlphaSupType
template<class Type> template<class Type>
void Foam::fv::volumeFractionSource::addSupType void Foam::fv::volumeBlockage::addSupType
( (
const VolField<Type>& field, const VolField<Type>& field,
fvMatrix<Type>& eqn fvMatrix<Type>& eqn
@ -234,7 +237,7 @@ void Foam::fv::volumeFractionSource::addSupType
template<class Type> template<class Type>
void Foam::fv::volumeFractionSource::addSupType void Foam::fv::volumeBlockage::addSupType
( (
const volScalarField& rho, const volScalarField& rho,
const VolField<Type>& field, const VolField<Type>& field,
@ -246,7 +249,7 @@ void Foam::fv::volumeFractionSource::addSupType
template<class Type> template<class Type>
void Foam::fv::volumeFractionSource::addSupType void Foam::fv::volumeBlockage::addSupType
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -260,7 +263,7 @@ void Foam::fv::volumeFractionSource::addSupType
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::volumeFractionSource::volumeFractionSource Foam::fv::volumeBlockage::volumeBlockage
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -281,64 +284,56 @@ Foam::fv::volumeFractionSource::volumeFractionSource
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::fv::volumeFractionSource::~volumeFractionSource() Foam::fv::volumeBlockage::~volumeBlockage()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::fv::volumeFractionSource::addsSupToField(const word& fieldName) const bool Foam::fv::volumeBlockage::addsSupToField(const word& fieldName) const
{ {
return true; return true;
} }
Foam::wordList Foam::fv::volumeFractionSource::addSupFields() const Foam::wordList Foam::fv::volumeBlockage::addSupFields() const
{ {
return wordList(); return wordList();
} }
FOR_ALL_FIELD_TYPES FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_FIELD_SUP, fv::volumeBlockage)
(
IMPLEMENT_FV_MODEL_ADD_FIELD_SUP,
fv::volumeFractionSource
)
FOR_ALL_FIELD_TYPES FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_RHO_FIELD_SUP, fv::volumeBlockage)
(
IMPLEMENT_FV_MODEL_ADD_RHO_FIELD_SUP,
fv::volumeFractionSource
)
FOR_ALL_FIELD_TYPES FOR_ALL_FIELD_TYPES
( (
IMPLEMENT_FV_MODEL_ADD_ALPHA_RHO_FIELD_SUP, IMPLEMENT_FV_MODEL_ADD_ALPHA_RHO_FIELD_SUP,
fv::volumeFractionSource fv::volumeBlockage
) )
bool Foam::fv::volumeFractionSource::movePoints() bool Foam::fv::volumeBlockage::movePoints()
{ {
return true; return true;
} }
void Foam::fv::volumeFractionSource::topoChange(const polyTopoChangeMap&) void Foam::fv::volumeBlockage::topoChange(const polyTopoChangeMap&)
{} {}
void Foam::fv::volumeFractionSource::mapMesh(const polyMeshMap& map) void Foam::fv::volumeBlockage::mapMesh(const polyMeshMap& map)
{} {}
void Foam::fv::volumeFractionSource::distribute(const polyDistributionMap&) void Foam::fv::volumeBlockage::distribute(const polyDistributionMap&)
{} {}
bool Foam::fv::volumeFractionSource::read(const dictionary& dict) bool Foam::fv::volumeBlockage::read(const dictionary& dict)
{ {
if (fvModel::read(dict)) if (fvModel::read(dict))
{ {

28
src/fvModels/derived/volumeFractionSource/volumeFractionSource.H → src/fvModels/derived/volumeBlockage/volumeBlockage.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::volumeFractionSource Foam::fv::volumeBlockage
Description Description
This fvModel adds transport terms into the equations to account for the This fvModel adds transport terms into the equations to account for the
@ -34,7 +34,7 @@ Description
This can be used to represent the effect of porous media that are caused This can be used to represent the effect of porous media that are caused
purely by the reduction in volume of the fluid phase; i.e., additional purely by the reduction in volume of the fluid phase; i.e., additional
blockage, and changes to transport and diffusion rates. It does not volumeBlockage, and changes to transport and diffusion rates. It does not
represent losses or transfers with the porous media. That requires separate represent losses or transfers with the porous media. That requires separate
sub-modelling. sub-modelling.
@ -50,9 +50,9 @@ Usage
Example specification: Example specification:
\verbatim \verbatim
volumeFractionSource1 volumeBlockage1
{ {
type volumeFractionSource; type volumeBlockage;
phi phi; phi phi;
rho rho; rho rho;
@ -63,12 +63,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
volumeFractionSource.C volumeBlockage.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef volumeFractionSource_H #ifndef volumeBlockage_H
#define volumeFractionSource_H #define volumeBlockage_H
#include "fvModel.H" #include "fvModel.H"
#include "surfaceFields.H" #include "surfaceFields.H"
@ -82,10 +82,10 @@ namespace fv
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class volumeFractionSource Declaration Class volumeBlockage Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class volumeFractionSource class volumeBlockage
: :
public fvModel public fvModel
{ {
@ -184,13 +184,13 @@ class volumeFractionSource
public: public:
//- Runtime type information //- Runtime type information
TypeName("volumeFractionSource"); TypeName("volumeBlockage");
// Constructors // Constructors
//- Construct from components //- Construct from components
volumeFractionSource volumeBlockage
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -199,11 +199,11 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
volumeFractionSource(const volumeFractionSource&) = delete; volumeBlockage(const volumeBlockage&) = delete;
//- Destructor //- Destructor
virtual ~volumeFractionSource(); virtual ~volumeBlockage();
// Member Functions // Member Functions
@ -255,7 +255,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const volumeFractionSource&) = delete; void operator=(const volumeBlockage&) = delete;
}; };

43
src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C → src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "interRegionExplicitPorositySource.H" #include "interRegionPorosityForce.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "fvMatrices.H" #include "fvMatrices.H"
#include "porosityModel.H" #include "porosityModel.H"
@ -35,12 +35,15 @@ namespace Foam
{ {
namespace fv namespace fv
{ {
defineTypeNameAndDebug(interRegionExplicitPorositySource, 0); defineTypeNameAndDebug(interRegionPorosityForce, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable(fvModel, interRegionPorosityForce, dictionary);
addBackwardCompatibleToRunTimeSelectionTable
( (
fvModel, fvModel,
interRegionPorosityForce,
dictionary,
interRegionExplicitPorositySource, interRegionExplicitPorositySource,
dictionary "interRegionExplicitPorositySource"
); );
} }
} }
@ -48,7 +51,7 @@ namespace fv
// * * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * // // * * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * //
void Foam::fv::interRegionExplicitPorositySource::readCoeffs() void Foam::fv::interRegionPorosityForce::readCoeffs()
{ {
UName_ = coeffs().lookupOrDefault<word>("U", "U"); UName_ = coeffs().lookupOrDefault<word>("U", "U");
} }
@ -56,7 +59,7 @@ void Foam::fv::interRegionExplicitPorositySource::readCoeffs()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource Foam::fv::interRegionPorosityForce::interRegionPorosityForce
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -143,14 +146,13 @@ Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::wordList Foam::wordList Foam::fv::interRegionPorosityForce::addSupFields() const
Foam::fv::interRegionExplicitPorositySource::addSupFields() const
{ {
return wordList(1, UName_); return wordList(1, UName_);
} }
void Foam::fv::interRegionExplicitPorositySource::addSup void Foam::fv::interRegionPorosityForce::addSup
( (
const volVectorField& U, const volVectorField& U,
fvMatrix<vector>& eqn fvMatrix<vector>& eqn
@ -162,7 +164,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
} }
void Foam::fv::interRegionExplicitPorositySource::addSup void Foam::fv::interRegionPorosityForce::addSup
( (
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
@ -175,7 +177,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
} }
void Foam::fv::interRegionExplicitPorositySource::addSup void Foam::fv::interRegionPorosityForce::addSup
( (
const volScalarField& alpha, const volScalarField& alpha,
const volScalarField& rho, const volScalarField& rho,
@ -189,41 +191,32 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
} }
bool Foam::fv::interRegionExplicitPorositySource::movePoints() bool Foam::fv::interRegionPorosityForce::movePoints()
{ {
NotImplemented; NotImplemented;
return true; return true;
} }
void Foam::fv::interRegionExplicitPorositySource::topoChange void Foam::fv::interRegionPorosityForce::topoChange(const polyTopoChangeMap&)
(
const polyTopoChangeMap&
)
{ {
NotImplemented; NotImplemented;
} }
void Foam::fv::interRegionExplicitPorositySource::mapMesh void Foam::fv::interRegionPorosityForce::mapMesh(const polyMeshMap&)
(
const polyMeshMap&
)
{ {
NotImplemented; NotImplemented;
} }
void Foam::fv::interRegionExplicitPorositySource::distribute void Foam::fv::interRegionPorosityForce::distribute(const polyDistributionMap&)
(
const polyDistributionMap&
)
{ {
NotImplemented; NotImplemented;
} }
bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict) bool Foam::fv::interRegionPorosityForce::read(const dictionary& dict)
{ {
if (interRegionModel::read(dict)) if (interRegionModel::read(dict))
{ {

29
src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H → src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.H
View File

@ -22,15 +22,16 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::fv::interRegionExplicitPorositySource Foam::fv::interRegionPorosityForce
Description Description
Inter-region explicit porosity source. This model applies the force exerted on the fluid by a porous media, the
extent of which is defined by an overlapping region
Usage Usage
Example usage, here employing the Darcy-Forchheimer model: Example usage, here employing the Darcy-Forchheimer model:
\verbatim \verbatim
interRegionExplicitPorositySourceCoeffs interRegionPorosityForceCoeffs
{ {
type DarcyForchheimer; type DarcyForchheimer;
@ -55,12 +56,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
interRegionExplicitPorositySource.C interRegionPorosityForce.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef interRegionExplicitPorositySource_H #ifndef interRegionPorosityForce_H
#define interRegionExplicitPorositySource_H #define interRegionPorosityForce_H
#include "interRegionModel.H" #include "interRegionModel.H"
@ -76,10 +77,10 @@ namespace fv
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interRegionExplicitPorositySource Declaration Class interRegionPorosityForce Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class interRegionExplicitPorositySource class interRegionPorosityForce
: :
public interRegionModel public interRegionModel
{ {
@ -104,13 +105,13 @@ class interRegionExplicitPorositySource
public: public:
//- Runtime type information //- Runtime type information
TypeName("interRegionExplicitPorositySource"); TypeName("interRegionPorosityForce");
// Constructors // Constructors
//- Construct from components //- Construct from components
interRegionExplicitPorositySource interRegionPorosityForce
( (
const word& name, const word& name,
const word& modelType, const word& modelType,
@ -119,14 +120,14 @@ public:
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
interRegionExplicitPorositySource interRegionPorosityForce
( (
const interRegionExplicitPorositySource& const interRegionPorosityForce&
) = delete; ) = delete;
//- Destructor //- Destructor
virtual ~interRegionExplicitPorositySource() virtual ~interRegionPorosityForce()
{} {}
@ -190,7 +191,7 @@ public:
// Member Operators // Member Operators
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const interRegionExplicitPorositySource&) = delete; void operator=(const interRegionPorosityForce&) = delete;
}; };

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

@ -32,9 +32,9 @@ Description
\verbatim \verbatim
porosity porosity
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
select cellZone; select cellZone;
cellZone porousBlockage; cellZone porousBlockage;

4
tutorials/fluid/angledDuct/constant/fvModels
View File

@ -16,9 +16,9 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
cellZone porosity; cellZone porosity;

4
tutorials/fluid/angledDuctExplicitFixedCoeff/constant/fvModels
View File

@ -16,9 +16,9 @@ FoamFile
porosity porosity
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
cellZone porosity; cellZone porosity;

4
tutorials/fluid/angledDuctLTS/constant/fvModels
View File

@ -16,9 +16,9 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
cellZone porosity; cellZone porosity;

12
tutorials/fluid/blockedChannel/constant/fvModels
View File

@ -14,21 +14,21 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
volumeFraction volumeBlockage
{ {
type volumeFractionSource; type volumeBlockage;
volumePhase volume; volumePhase volume;
} }
solidFraction solidBlockage
{ {
type volumeFractionSource; type volumeBlockage;
volumePhase solid; volumePhase solid;
} }
solidEquilibriumEnergy solidThermalEquilibrium
{ {
type solidEquilibriumEnergySource; type solidThermalEquilibrium;
solidPhase solid; solidPhase solid;
} }

4
tutorials/fluid/mixerVessel2DMRF/constant/fvModels
View File

@ -16,9 +16,9 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
cellZone stator; cellZone stator;

4
tutorials/incompressibleFluid/blockedChannel/constant/fvModels
View File

@ -14,9 +14,9 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
volumeFraction volumeBlockage
{ {
type volumeFractionSource; type volumeBlockage;
volumePhase volume; volumePhase volume;
} }

4
tutorials/incompressibleFluid/porousBlockage/constant/fvModels
View File

@ -16,9 +16,9 @@ FoamFile
porosity porosity
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
cellZone porousBlockage; cellZone porousBlockage;

4
tutorials/incompressibleFluid/turbineSiting/constant/fvModels
View File

@ -16,7 +16,7 @@ FoamFile
disk1 disk1
{ {
type actuationDiskSource; type actuationDisk;
cellSet actuationDisk1; cellSet actuationDisk1;
@ -29,7 +29,7 @@ disk1
disk2 disk2
{ {
type actuationDiskSource; type actuationDisk;
cellSet actuationDisk2; cellSet actuationDisk2;

4
tutorials/incompressibleVoF/angledDuct/constant/fvModels
View File

@ -16,9 +16,9 @@ FoamFile
porosity1 porosity1
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
cellZone porosity; cellZone porosity;

8
tutorials/multiRegion/CHT/heatExchanger/constant/air/fvModels
View File

@ -14,7 +14,7 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
airToporous airToPorous
{ {
type interRegionHeatTransfer; type interRegionHeatTransfer;
@ -26,11 +26,11 @@ airToporous
semiImplicit no; semiImplicit no;
} }
porosityBlockage porosity
{ {
type interRegionExplicitPorositySource; type interRegionPorosityForce;
interRegionExplicitPorositySourceCoeffs interRegionPorosityForceCoeffs
{ {
nbrRegion porous; nbrRegion porous;

2
tutorials/multiRegion/CHT/heatExchanger/constant/porous/fvModels
View File

@ -14,7 +14,7 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
porousToair porousToAir
{ {
type interRegionHeatTransfer; type interRegionHeatTransfer;

4
tutorials/multicomponentFluid/filter/constant/fvModels
View File

@ -27,9 +27,9 @@ clouds
filter1 filter1
{ {
type explicitPorositySource; type porosityForce;
explicitPorositySourceCoeffs porosityForceCoeffs
{ {
cellZone filter; cellZone filter;