diff --git a/applications/modules/compressibleVoF/Allwmake b/applications/modules/compressibleVoF/Allwmake index b62e4363b4..be3fce24ba 100755 --- a/applications/modules/compressibleVoF/Allwmake +++ b/applications/modules/compressibleVoF/Allwmake @@ -9,6 +9,6 @@ wmake $targetType wmake $targetType fvModels/VoFTurbulenceDamping wmake $targetType fvModels/VoFClouds wmake $targetType fvModels/VoFCavitation -wmake $targetType fvModels/VoFSolidificationMeltingSource +wmake $targetType fvModels/VoFSolidificationMelting #------------------------------------------------------------------------------ diff --git a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/Make/files b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/Make/files new file mode 100644 index 0000000000..2f18a89169 --- /dev/null +++ b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/Make/files @@ -0,0 +1,3 @@ +VoFSolidificationMelting.C + +LIB = $(FOAM_LIBBIN)/libVoFSolidificationMelting diff --git a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/options b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/Make/options similarity index 100% rename from applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/options rename to applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/Make/options diff --git a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C similarity index 84% rename from applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C rename to applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C index 95732accb5..f5e3de9ef0 100644 --- a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C +++ b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "VoFSolidificationMeltingSource.H" +#include "VoFSolidificationMelting.H" #include "compressibleTwoPhaseVoFMixture.H" #include "fvcDdt.H" #include "zeroGradientFvPatchFields.H" @@ -35,21 +35,29 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(VoFSolidificationMeltingSource, 0); + defineTypeNameAndDebug(VoFSolidificationMelting, 0); addToRunTimeSelectionTable ( fvModel, - VoFSolidificationMeltingSource, + VoFSolidificationMelting, dictionary ); + addBackwardCompatibleToRunTimeSelectionTable + ( + fvModel, + VoFSolidificationMelting, + dictionary, + VoFSolidificationMeltingSource, + "VoFSolidificationMeltingSource" + ); } } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::VoFSolidificationMeltingSource::readCoeffs() +void Foam::fv::VoFSolidificationMelting::readCoeffs() { alphaSolidT_.reset(Function1::New("alphaSolidT", coeffs()).ptr()); 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 ( @@ -77,7 +85,7 @@ Foam::word Foam::fv::VoFSolidificationMeltingSource::alphaSolidName() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource +Foam::fv::VoFSolidificationMelting::VoFSolidificationMelting ( const word& name, const word& modelType, @@ -122,13 +130,13 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::VoFSolidificationMeltingSource::addSupFields() const +Foam::wordList Foam::fv::VoFSolidificationMelting::addSupFields() const { return wordList({"U", thermo_.thermo1().he().name()}); } -void Foam::fv::VoFSolidificationMeltingSource::addSup +void Foam::fv::VoFSolidificationMelting::addSup ( const volScalarField& alpha, 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 volVectorField& U, @@ -175,7 +183,7 @@ void Foam::fv::VoFSolidificationMeltingSource::addSup } -void Foam::fv::VoFSolidificationMeltingSource::correct() +void Foam::fv::VoFSolidificationMelting::correct() { if (debug) { @@ -215,7 +223,7 @@ void Foam::fv::VoFSolidificationMeltingSource::correct() } -void Foam::fv::VoFSolidificationMeltingSource::topoChange +void Foam::fv::VoFSolidificationMelting::topoChange ( 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); } -void Foam::fv::VoFSolidificationMeltingSource::distribute +void Foam::fv::VoFSolidificationMelting::distribute ( const polyDistributionMap& map ) @@ -239,14 +247,14 @@ void Foam::fv::VoFSolidificationMeltingSource::distribute } -bool Foam::fv::VoFSolidificationMeltingSource::movePoints() +bool Foam::fv::VoFSolidificationMelting::movePoints() { set_.movePoints(); return true; } -bool Foam::fv::VoFSolidificationMeltingSource::read(const dictionary& dict) +bool Foam::fv::VoFSolidificationMelting::read(const dictionary& dict) { if (fvModel::read(dict)) { diff --git a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.H similarity index 90% rename from applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H rename to applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.H index a880d456a1..9c46b528c6 100644 --- a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H +++ b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMelting/VoFSolidificationMelting.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::VoFSolidificationMeltingSource + Foam::fv::VoFSolidificationMelting Description Solidification and melting model for VoF simulations. @@ -38,9 +38,9 @@ Description Usage Example usage: \verbatim - VoFSolidificationMeltingSource1 + VoFSolidificationMelting1 { - type VoFSolidificationMeltingSource; + type VoFSolidificationMelting; select cellZone; cellZone solidZone; @@ -70,13 +70,13 @@ See also Foam::Function1 SourceFiles - VoFSolidificationMeltingSource.C - VoFSolidificationMeltingSourceIO.C + VoFSolidificationMelting.C + VoFSolidificationMeltingIO.C \*---------------------------------------------------------------------------*/ -#ifndef VoFSolidificationMeltingSource_H -#define VoFSolidificationMeltingSource_H +#ifndef VoFSolidificationMelting_H +#define VoFSolidificationMelting_H #include "fvModel.H" #include "fvCellSet.H" @@ -95,10 +95,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class VoFSolidificationMeltingSource Declaration + Class VoFSolidificationMelting Declaration \*---------------------------------------------------------------------------*/ -class VoFSolidificationMeltingSource +class VoFSolidificationMelting : public fvModel { @@ -145,13 +145,13 @@ class VoFSolidificationMeltingSource public: //- Runtime type information - TypeName("VoFSolidificationMeltingSource"); + TypeName("VoFSolidificationMelting"); // Constructors //- Construct from explicit source name and mesh - VoFSolidificationMeltingSource + VoFSolidificationMelting ( const word& name, const word& modelType, @@ -160,9 +160,9 @@ public: ); //- Disallow default bitwise copy construction - VoFSolidificationMeltingSource + VoFSolidificationMelting ( - const VoFSolidificationMeltingSource& + const VoFSolidificationMelting& ) = delete; @@ -223,7 +223,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const VoFSolidificationMeltingSource&) = delete; + void operator=(const VoFSolidificationMelting&) = delete; }; diff --git a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files b/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files deleted file mode 100644 index 01cf8ad2c7..0000000000 --- a/applications/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -VoFSolidificationMeltingSource.C - -LIB = $(FOAM_LIBBIN)/libVoFSolidificationMeltingSource diff --git a/etc/caseDicts/fvModels/porosity/porousZone b/etc/caseDicts/fvModels/porosity/porousZone index 086db9130f..fbfb22a73f 100644 --- a/etc/caseDicts/fvModels/porosity/porousZone +++ b/etc/caseDicts/fvModels/porosity/porousZone @@ -13,9 +13,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type explicitPorositySource; +type porosityForce; -explicitPorositySourceCoeffs +porosityForceCoeffs { type DarcyForchheimer; select cellZone; diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C index 46e02525a3..412b8260cb 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C @@ -26,7 +26,7 @@ License #include "kEpsilonLopesdaCosta.H" #include "fvModels.H" #include "fvConstraints.H" -#include "explicitPorositySource.H" +#include "porosityForce.H" #include "bound.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -106,10 +106,10 @@ setPorosityCoefficients() forAll(fvModels, i) { - if (isA(fvModels[i])) + if (isA(fvModels[i])) { - const fv::explicitPorositySource& eps = - refCast(fvModels[i]); + const fv::porosityForce& eps = + refCast(fvModels[i]); if (isA(eps.model())) { diff --git a/src/fvModels/Make/files b/src/fvModels/Make/files index fb672fb3df..1549002f4f 100644 --- a/src/fvModels/Make/files +++ b/src/fvModels/Make/files @@ -1,28 +1,28 @@ general/codedFvModel/codedFvModel.C general/semiImplicitSource/semiImplicitSource.C -derived/actuationDiskSource/actuationDiskSource.C -derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C -derived/explicitPorositySource/explicitPorositySource.C -derived/radialActuationDiskSource/radialActuationDiskSource.C -derived/rotorDiskSource/rotorDiskSource.C -derived/rotorDiskSource/bladeModel/bladeModel.C -derived/rotorDiskSource/profileModel/profileModel.C -derived/rotorDiskSource/profileModel/profileModelList.C -derived/rotorDiskSource/profileModel/lookup/lookupProfile.C -derived/rotorDiskSource/profileModel/series/seriesProfile.C -derived/rotorDiskSource/trimModel/trimModel/trimModel.C -derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C -derived/rotorDiskSource/trimModel/fixed/fixedTrim.C -derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C -derived/solidificationMeltingSource/solidificationMeltingSource.C -derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C +derived/actuationDisk/actuationDisk.C +derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C +derived/porosityForce/porosityForce.C +derived/radialActuationDisk/radialActuationDisk.C +derived/rotorDisk/rotorDisk.C +derived/rotorDisk/bladeModel/bladeModel.C +derived/rotorDisk/profileModel/profileModel.C +derived/rotorDisk/profileModel/profileModelList.C +derived/rotorDisk/profileModel/lookup/lookupProfile.C +derived/rotorDisk/profileModel/series/seriesProfile.C +derived/rotorDisk/trimModel/trimModel/trimModel.C +derived/rotorDisk/trimModel/trimModel/trimModelNew.C +derived/rotorDisk/trimModel/fixed/fixedTrim.C +derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C +derived/solidificationMelting/solidificationMelting.C +derived/sixDoFAcceleration/sixDoFAcceleration.C derived/buoyancyForce/buoyancyForce.C derived/buoyancyEnergy/buoyancyEnergy.C derived/phaseLimitStabilisation/phaseLimitStabilisation.C -derived/accelerationSource/accelerationSource.C -derived/volumeFractionSource/volumeFractionSource.C -derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C +derived/acceleration/acceleration.C +derived/volumeBlockage/volumeBlockage.C +derived/solidThermalEquilibrium/solidThermalEquilibrium.C derived/volumeSource/volumeSource.C derived/massSource/massSourceBase.C derived/massSource/massSource.C @@ -34,7 +34,7 @@ derived/massTransfer/massTransferBase.C derived/massTransfer/coefficientMassTransfer.C interRegion/interRegionModel/interRegionModel.C -interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C +interRegion/interRegionPorosityForce/interRegionPorosityForce.C interRegion/interRegionHeatTransfer/interRegionHeatTransfer.C derived/heatTransfer/heatTransferAv/heatTransferAv.C diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.C b/src/fvModels/derived/acceleration/acceleration.C similarity index 79% rename from src/fvModels/derived/accelerationSource/accelerationSource.C rename to src/fvModels/derived/acceleration/acceleration.C index 6b14f020ab..65fac4902a 100644 --- a/src/fvModels/derived/accelerationSource/accelerationSource.C +++ b/src/fvModels/derived/acceleration/acceleration.C @@ -26,7 +26,7 @@ License #include "fvMesh.H" #include "fvMatrix.H" #include "geometricOneField.H" -#include "accelerationSource.H" +#include "acceleration.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -35,15 +35,23 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(accelerationSource, 0); - addToRunTimeSelectionTable(fvModel, accelerationSource, dictionary); + defineTypeNameAndDebug(acceleration, 0); + addToRunTimeSelectionTable(fvModel, acceleration, dictionary); + addBackwardCompatibleToRunTimeSelectionTable + ( + fvModel, + acceleration, + dictionary, + accelerationSource, + "accelerationSource" + ); } } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::accelerationSource::readCoeffs() +void Foam::fv::acceleration::readCoeffs() { UName_ = coeffs().lookupOrDefault("U", "U"); @@ -52,7 +60,7 @@ void Foam::fv::accelerationSource::readCoeffs() template -void Foam::fv::accelerationSource::add +void Foam::fv::acceleration::add ( const AlphaRhoFieldType& alphaRho, fvMatrix& eqn @@ -79,7 +87,7 @@ void Foam::fv::accelerationSource::add // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::accelerationSource::accelerationSource +Foam::fv::acceleration::acceleration ( const word& name, const word& modelType, @@ -98,13 +106,13 @@ Foam::fv::accelerationSource::accelerationSource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::accelerationSource::addSupFields() const +Foam::wordList Foam::fv::acceleration::addSupFields() const { return wordList(1, UName_); } -void Foam::fv::accelerationSource::addSup +void Foam::fv::acceleration::addSup ( const volVectorField& U, fvMatrix& eqn @@ -114,7 +122,7 @@ void Foam::fv::accelerationSource::addSup } -void Foam::fv::accelerationSource::addSup +void Foam::fv::acceleration::addSup ( const volScalarField& rho, 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& rho, @@ -137,35 +145,32 @@ void Foam::fv::accelerationSource::addSup } -bool Foam::fv::accelerationSource::movePoints() +bool Foam::fv::acceleration::movePoints() { set_.movePoints(); return true; } -void Foam::fv::accelerationSource::topoChange(const polyTopoChangeMap& map) +void Foam::fv::acceleration::topoChange(const polyTopoChangeMap& map) { set_.topoChange(map); } -void Foam::fv::accelerationSource::mapMesh(const polyMeshMap& map) +void Foam::fv::acceleration::mapMesh(const polyMeshMap& map) { set_.mapMesh(map); } -void Foam::fv::accelerationSource::distribute -( - const polyDistributionMap& map -) +void Foam::fv::acceleration::distribute(const polyDistributionMap& map) { set_.distribute(map); } -bool Foam::fv::accelerationSource::read(const dictionary& dict) +bool Foam::fv::acceleration::read(const dictionary& dict) { if (fvModel::read(dict)) { diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.H b/src/fvModels/derived/acceleration/acceleration.H similarity index 92% rename from src/fvModels/derived/accelerationSource/accelerationSource.H rename to src/fvModels/derived/acceleration/acceleration.H index e1ad4c73d3..2ded2562b2 100644 --- a/src/fvModels/derived/accelerationSource/accelerationSource.H +++ b/src/fvModels/derived/acceleration/acceleration.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::accelerationSource + Foam::fv::acceleration Description This fvModel applies an explicit acceleration force to components of the @@ -31,9 +31,9 @@ Description Usage Example usage: \verbatim - accelerationSource1 + acceleration1 { - type accelerationSource; + type acceleration; select all; @@ -51,12 +51,12 @@ Usage \endverbatim SourceFiles - accelerationSource.C + acceleration.C \*---------------------------------------------------------------------------*/ -#ifndef accelerationSource_H -#define accelerationSource_H +#ifndef acceleration_H +#define acceleration_H #include "fvModel.H" #include "fvCellSet.H" @@ -70,10 +70,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class accelerationSource Declaration + Class acceleration Declaration \*---------------------------------------------------------------------------*/ -class accelerationSource +class acceleration : public fvModel { @@ -106,13 +106,13 @@ class accelerationSource public: //- Runtime type information - TypeName("accelerationSource"); + TypeName("acceleration"); // Constructors //- Construct from components - accelerationSource + acceleration ( const word& name, const word& modelType, @@ -122,7 +122,7 @@ public: //- Destructor - virtual ~accelerationSource() + virtual ~acceleration() {} diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C b/src/fvModels/derived/actuationDisk/actuationDisk.C similarity index 85% rename from src/fvModels/derived/actuationDiskSource/actuationDiskSource.C rename to src/fvModels/derived/actuationDisk/actuationDisk.C index 4884f1a979..3377b05f5f 100644 --- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.C +++ b/src/fvModels/derived/actuationDisk/actuationDisk.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "actuationDiskSource.H" +#include "actuationDisk.H" #include "fvMesh.H" #include "fvMatrix.H" #include "geometricOneField.H" @@ -35,12 +35,15 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(actuationDiskSource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(actuationDisk, 0); + addToRunTimeSelectionTable(fvModel, actuationDisk, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + actuationDisk, + dictionary, actuationDiskSource, - dictionary + "actuationDiskSource" ); } } @@ -48,7 +51,7 @@ namespace fv // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::actuationDiskSource::readCoeffs() +void Foam::fv::actuationDisk::readCoeffs() { phaseName_ = coeffs().lookupOrDefault("phase", word::null); @@ -96,7 +99,7 @@ void Foam::fv::actuationDiskSource::readCoeffs() template -void Foam::fv::actuationDiskSource::addActuationDiskAxialInertialResistance +void Foam::fv::actuationDisk::addActuationDiskAxialInertialResistance ( vectorField& Usource, const labelList& cells, @@ -128,7 +131,7 @@ void Foam::fv::actuationDiskSource::addActuationDiskAxialInertialResistance // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::actuationDiskSource::actuationDiskSource +Foam::fv::actuationDisk::actuationDisk ( const word& name, const word& modelType, @@ -153,13 +156,13 @@ Foam::fv::actuationDiskSource::actuationDiskSource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::actuationDiskSource::addSupFields() const +Foam::wordList Foam::fv::actuationDisk::addSupFields() const { return wordList(1, UName_); } -void Foam::fv::actuationDiskSource::addSup +void Foam::fv::actuationDisk::addSup ( const volVectorField& U, fvMatrix& eqn @@ -177,7 +180,7 @@ void Foam::fv::actuationDiskSource::addSup } -void Foam::fv::actuationDiskSource::addSup +void Foam::fv::actuationDisk::addSup ( const volScalarField& rho, 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& rho, @@ -216,35 +219,32 @@ void Foam::fv::actuationDiskSource::addSup } -bool Foam::fv::actuationDiskSource::movePoints() +bool Foam::fv::actuationDisk::movePoints() { set_.movePoints(); return true; } -void Foam::fv::actuationDiskSource::topoChange(const polyTopoChangeMap& map) +void Foam::fv::actuationDisk::topoChange(const polyTopoChangeMap& map) { set_.topoChange(map); } -void Foam::fv::actuationDiskSource::mapMesh(const polyMeshMap& map) +void Foam::fv::actuationDisk::mapMesh(const polyMeshMap& map) { set_.mapMesh(map); } -void Foam::fv::actuationDiskSource::distribute -( - const polyDistributionMap& map -) +void Foam::fv::actuationDisk::distribute(const polyDistributionMap& map) { set_.distribute(map); } -bool Foam::fv::actuationDiskSource::read(const dictionary& dict) +bool Foam::fv::actuationDisk::read(const dictionary& dict) { if (fvModel::read(dict)) { diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H b/src/fvModels/derived/actuationDisk/actuationDisk.H similarity index 91% rename from src/fvModels/derived/actuationDiskSource/actuationDiskSource.H rename to src/fvModels/derived/actuationDisk/actuationDisk.H index 1039be4736..7334bd92fd 100644 --- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H +++ b/src/fvModels/derived/actuationDisk/actuationDisk.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::actuationDiskSource + Foam::fv::actuationDisk Description Actuation disk source @@ -45,9 +45,9 @@ Description Usage Example usage: \verbatim - actuationDiskSource1 + actuationDisk1 { - type actuationDiskSource; + type actuationDisk; select cellSet; cellSet actuationDisk1; @@ -60,15 +60,14 @@ Usage } \endverbatim - SourceFiles - actuationDiskSource.C - actuationDiskSourceTemplates.C + actuationDisk.C + actuationDiskTemplates.C \*---------------------------------------------------------------------------*/ -#ifndef actuationDiskSource_H -#define actuationDiskSource_H +#ifndef actuationDisk_H +#define actuationDisk_H #include "fvModel.H" #include "fvCellSet.H" @@ -81,10 +80,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class actuationDiskSource Declaration + Class actuationDisk Declaration \*---------------------------------------------------------------------------*/ -class actuationDiskSource +class actuationDisk : public fvModel { @@ -143,13 +142,13 @@ private: public: //- Runtime type information - TypeName("actuationDiskSource"); + TypeName("actuationDisk"); // Constructors //- Construct from components - actuationDiskSource + actuationDisk ( const word& name, const word& modelType, @@ -158,11 +157,11 @@ public: ); //- Disallow default bitwise copy construction - actuationDiskSource(const actuationDiskSource&) = delete; + actuationDisk(const actuationDisk&) = delete; //- Destructor - virtual ~actuationDiskSource() + virtual ~actuationDisk() {} @@ -226,7 +225,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const actuationDiskSource&) = delete; + void operator=(const actuationDisk&) = delete; }; diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C similarity index 89% rename from src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C rename to src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C index 5d4a65cfb3..9db639eecd 100644 --- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C +++ b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "effectivenessHeatExchangerSource.H" +#include "effectivenessHeatExchanger.H" #include "fvMatrix.H" #include "basicThermo.H" #include "surfaceInterpolate.H" @@ -35,12 +35,15 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(effectivenessHeatExchangerSource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(effectivenessHeatExchanger, 0); + addToRunTimeSelectionTable(fvModel, effectivenessHeatExchanger, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + effectivenessHeatExchanger, + dictionary, effectivenessHeatExchangerSource, - dictionary + "effectivenessHeatExchangerSource" ); } } @@ -48,7 +51,7 @@ namespace fv // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::effectivenessHeatExchangerSource::readCoeffs() +void Foam::fv::effectivenessHeatExchanger::readCoeffs() { secondaryMassFlowRate_ = coeffs().lookup("secondaryMassFlowRate"); secondaryInletT_ = coeffs().lookup("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_); if (zoneID_ < 0) @@ -142,7 +145,7 @@ void Foam::fv::effectivenessHeatExchangerSource::setZone() } -void Foam::fv::effectivenessHeatExchangerSource::calculateTotalArea +void Foam::fv::effectivenessHeatExchanger::calculateTotalArea ( scalar& area ) const @@ -167,7 +170,7 @@ void Foam::fv::effectivenessHeatExchangerSource::calculateTotalArea // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource +Foam::fv::effectivenessHeatExchanger::effectivenessHeatExchanger ( const word& name, const word& modelType, @@ -198,7 +201,7 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::effectivenessHeatExchangerSource::addSupFields() const +Foam::wordList Foam::fv::effectivenessHeatExchanger::addSupFields() const { const basicThermo& thermo = mesh().lookupObject(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& he, @@ -311,14 +314,14 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup } -bool Foam::fv::effectivenessHeatExchangerSource::movePoints() +bool Foam::fv::effectivenessHeatExchanger::movePoints() { set_.movePoints(); return true; } -void Foam::fv::effectivenessHeatExchangerSource::topoChange +void Foam::fv::effectivenessHeatExchanger::topoChange ( 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); } -void Foam::fv::effectivenessHeatExchangerSource::distribute +void Foam::fv::effectivenessHeatExchanger::distribute ( 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)) { diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H similarity index 89% rename from src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H rename to src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H index 1323b2a615..8afe543217 100644 --- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H @@ -22,11 +22,10 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::effectivenessHeatExchangerSource + Foam::fv::effectivenessHeatExchanger Description - Heat exchanger source model, in which the heat exchanger is defined as a - selection of cells. + Heat exchanger model, based on an effectiveness The total heat exchange source is given by: \f[ @@ -44,7 +43,6 @@ Description c_p | specific heat capacity [J/kg/K] \endvartable - The distribution inside the hear exchanger is given by: \f[ 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 Example usage: \verbatim - effectivenessHeatExchangerSource1 + effectivenessHeatExchanger1 { - type effectivenessHeatExchangerSource; + type effectivenessHeatExchanger; select cellZone; cellZone porosity; @@ -88,12 +86,12 @@ Usage rate into the heat exchanger SourceFiles - effectivenessHeatExchangerSource.C + effectivenessHeatExchanger.C \*---------------------------------------------------------------------------*/ -#ifndef effectivenessHeatExchangerSource_H -#define effectivenessHeatExchangerSource_H +#ifndef effectivenessHeatExchanger_H +#define effectivenessHeatExchanger_H #include "fvModel.H" #include "fvCellSet.H" @@ -107,10 +105,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class effectivenessHeatExchangerSource Declaration + Class effectivenessHeatExchanger Declaration \*---------------------------------------------------------------------------*/ -class effectivenessHeatExchangerSource +class effectivenessHeatExchanger : public fvModel { @@ -177,13 +175,13 @@ private: public: //- Runtime type information - TypeName("effectivenessHeatExchangerSource"); + TypeName("effectivenessHeatExchanger"); // Constructors //- Construct from components - effectivenessHeatExchangerSource + effectivenessHeatExchanger ( const word& name, const word& modelType, @@ -192,14 +190,14 @@ public: ); //- Disallow default bitwise copy construction - effectivenessHeatExchangerSource + effectivenessHeatExchanger ( - const effectivenessHeatExchangerSource& + const effectivenessHeatExchanger& ) = delete; //- Destructor - virtual ~effectivenessHeatExchangerSource() + virtual ~effectivenessHeatExchanger() {} @@ -242,7 +240,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const effectivenessHeatExchangerSource&) = delete; + void operator=(const effectivenessHeatExchanger&) = delete; }; diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C b/src/fvModels/derived/porosityForce/porosityForce.C similarity index 81% rename from src/fvModels/derived/explicitPorositySource/explicitPorositySource.C rename to src/fvModels/derived/porosityForce/porosityForce.C index 97f680245f..f3f9ac16ed 100644 --- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.C +++ b/src/fvModels/derived/porosityForce/porosityForce.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "explicitPorositySource.H" +#include "porosityForce.H" #include "fvMesh.H" #include "fvMatrices.H" #include "porosityModel.H" @@ -35,12 +35,15 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(explicitPorositySource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(porosityForce, 0); + addToRunTimeSelectionTable(fvModel, porosityForce, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + porosityForce, + dictionary, explicitPorositySource, - dictionary + "explicitPorositySource" ); } } @@ -48,7 +51,7 @@ namespace fv // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::explicitPorositySource::readCoeffs() +void Foam::fv::porosityForce::readCoeffs() { if (coeffs().found("UNames")) { @@ -75,7 +78,7 @@ void Foam::fv::explicitPorositySource::readCoeffs() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::explicitPorositySource::explicitPorositySource +Foam::fv::porosityForce::porosityForce ( const word& name, const word& modelType, @@ -94,13 +97,13 @@ Foam::fv::explicitPorositySource::explicitPorositySource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::explicitPorositySource::addSupFields() const +Foam::wordList Foam::fv::porosityForce::addSupFields() const { return UNames_; } -void Foam::fv::explicitPorositySource::addSup +void Foam::fv::porosityForce::addSup ( const volVectorField& U, fvMatrix& eqn @@ -112,7 +115,7 @@ void Foam::fv::explicitPorositySource::addSup } -void Foam::fv::explicitPorositySource::addSup +void Foam::fv::porosityForce::addSup ( const volScalarField& rho, 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& rho, @@ -139,26 +142,26 @@ void Foam::fv::explicitPorositySource::addSup } -bool Foam::fv::explicitPorositySource::movePoints() +bool Foam::fv::porosityForce::movePoints() { set_.movePoints(); return true; } -void Foam::fv::explicitPorositySource::topoChange(const polyTopoChangeMap& map) +void Foam::fv::porosityForce::topoChange(const polyTopoChangeMap& map) { set_.topoChange(map); } -void Foam::fv::explicitPorositySource::mapMesh(const polyMeshMap& map) +void Foam::fv::porosityForce::mapMesh(const polyMeshMap& map) { set_.mapMesh(map); } -void Foam::fv::explicitPorositySource::distribute +void Foam::fv::porosityForce::distribute ( 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)) { diff --git a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H b/src/fvModels/derived/porosityForce/porosityForce.H similarity index 90% rename from src/fvModels/derived/explicitPorositySource/explicitPorositySource.H rename to src/fvModels/derived/porosityForce/porosityForce.H index 9db51eeae5..29a601b955 100644 --- a/src/fvModels/derived/explicitPorositySource/explicitPorositySource.H +++ b/src/fvModels/derived/porosityForce/porosityForce.H @@ -22,15 +22,15 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::explicitPorositySource + Foam::fv::porosityForce Description - Explicit porosity source + This model applies the force exerted on the fluid by a porous media Usage Example usage, here employing the Darcy-Forchheimer model: \verbatim - explicitPorositySourceCoeffs + porosityForceCoeffs { type DarcyForchheimer; @@ -58,12 +58,12 @@ Usage The porous region must be selected as a cellZone. SourceFiles - explicitPorositySource.C + porosityForce.C \*---------------------------------------------------------------------------*/ -#ifndef explicitPorositySource_H -#define explicitPorositySource_H +#ifndef porosityForce_H +#define porosityForce_H #include "fvModel.H" #include "fvCellSet.H" @@ -80,10 +80,10 @@ namespace fv /*---------------------------------------------------------------------------*\ - Class explicitPorositySource Declaration + Class porosityForce Declaration \*---------------------------------------------------------------------------*/ -class explicitPorositySource +class porosityForce : public fvModel { @@ -108,13 +108,13 @@ class explicitPorositySource public: //- Runtime type information - TypeName("explicitPorositySource"); + TypeName("porosityForce"); // Constructors //- Construct from components - explicitPorositySource + porosityForce ( const word& name, const word& modelType, @@ -123,11 +123,11 @@ public: ); //- Disallow default bitwise copy construction - explicitPorositySource(const explicitPorositySource&) = delete; + porosityForce(const porosityForce&) = delete; //- Destructor - virtual ~explicitPorositySource() + virtual ~porosityForce() {} @@ -200,7 +200,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const explicitPorositySource&) = delete; + void operator=(const porosityForce&) = delete; }; diff --git a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C b/src/fvModels/derived/radialActuationDisk/radialActuationDisk.C similarity index 86% rename from src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C rename to src/fvModels/derived/radialActuationDisk/radialActuationDisk.C index 7c4a64919f..16b8097c6d 100644 --- a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.C +++ b/src/fvModels/derived/radialActuationDisk/radialActuationDisk.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "radialActuationDiskSource.H" +#include "radialActuationDisk.H" #include "volFields.H" #include "fvMatrix.H" #include "geometricOneField.H" @@ -35,19 +35,22 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(radialActuationDiskSource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(radialActuationDisk, 0); + addToRunTimeSelectionTable(fvModel, radialActuationDisk, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + radialActuationDisk, + dictionary, radialActuationDiskSource, - dictionary + "radialActuationDiskSource" ); } } // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::radialActuationDiskSource::readCoeffs() +void Foam::fv::radialActuationDisk::readCoeffs() { coeffs().lookup("coeffs") >> radialCoeffs_; } @@ -55,7 +58,7 @@ void Foam::fv::radialActuationDiskSource::readCoeffs() template -void Foam::fv::radialActuationDiskSource:: +void Foam::fv::radialActuationDisk:: addRadialActuationDiskAxialInertialResistance ( vectorField& Usource, @@ -119,7 +122,7 @@ addRadialActuationDiskAxialInertialResistance // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::radialActuationDiskSource::radialActuationDiskSource +Foam::fv::radialActuationDisk::radialActuationDisk ( const word& name, const word& modelType, @@ -127,7 +130,7 @@ Foam::fv::radialActuationDiskSource::radialActuationDiskSource const dictionary& dict ) : - actuationDiskSource(name, modelType, mesh, dict), + actuationDisk(name, modelType, mesh, dict), radialCoeffs_() { readCoeffs(); @@ -136,7 +139,7 @@ Foam::fv::radialActuationDiskSource::radialActuationDiskSource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::fv::radialActuationDiskSource::addSup +void Foam::fv::radialActuationDisk::addSup ( const volVectorField& U, fvMatrix& eqn @@ -153,7 +156,7 @@ void Foam::fv::radialActuationDiskSource::addSup } -void Foam::fv::radialActuationDiskSource::addSup +void Foam::fv::radialActuationDisk::addSup ( const volScalarField& rho, 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(); return true; diff --git a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvModels/derived/radialActuationDisk/radialActuationDisk.H similarity index 86% rename from src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H rename to src/fvModels/derived/radialActuationDisk/radialActuationDisk.H index 6812f05220..18121be6f9 100644 --- a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H +++ b/src/fvModels/derived/radialActuationDisk/radialActuationDisk.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::radialActuationDiskSource + Foam::fv::radialActuationDisk Description Actuation disk source including radial thrust @@ -56,9 +56,9 @@ Description Usage Example usage: \verbatim - radialActuationDiskSource1 + radialActuationDisk1 { - type radialActuationDiskSource; + type radialActuationDisk; select cellSet; cellSet radialActuationDisk1; @@ -76,15 +76,15 @@ Usage SourceFiles - radialActuationDiskSource.C - radialActuationDiskSourceTemplates.C + radialActuationDisk.C + radialActuationDiskTemplates.C \*---------------------------------------------------------------------------*/ -#ifndef radialActuationDiskSource_H -#define radialActuationDiskSource_H +#ifndef radialActuationDisk_H +#define radialActuationDisk_H -#include "actuationDiskSource.H" +#include "actuationDisk.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 @@ -128,13 +128,13 @@ class radialActuationDiskSource public: //- Runtime type information - TypeName("radialActuationDiskSource"); + TypeName("radialActuationDisk"); // Constructors //- Construct from components - radialActuationDiskSource + radialActuationDisk ( const word& name, const word& modelType, @@ -143,11 +143,11 @@ public: ); //- Disallow default bitwise copy construction - radialActuationDiskSource(const radialActuationDiskSource&) = delete; + radialActuationDisk(const radialActuationDisk&) = delete; //- Destructor - virtual ~radialActuationDiskSource() + virtual ~radialActuationDisk() {} @@ -178,7 +178,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const radialActuationDiskSource&) = delete; + void operator=(const radialActuationDisk&) = delete; }; diff --git a/src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.C b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C similarity index 98% rename from src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.C rename to src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C index 1aaee0527c..9b0141db01 100644 --- a/src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.C +++ b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.H b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H similarity index 98% rename from src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.H rename to src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H index c0432d1f02..cc67c52015 100644 --- a/src/fvModels/derived/rotorDiskSource/bladeModel/bladeModel.H +++ b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C b/src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.C similarity index 98% rename from src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C rename to src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.C index 400297a139..503c8493dd 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C +++ b/src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H b/src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.H similarity index 98% rename from src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H rename to src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.H index a3d89a9a35..e097f91377 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H +++ b/src/fvModels/derived/rotorDisk/profileModel/lookup/lookupProfile.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/profileModel.C b/src/fvModels/derived/rotorDisk/profileModel/profileModel.C similarity index 97% rename from src/fvModels/derived/rotorDiskSource/profileModel/profileModel.C rename to src/fvModels/derived/rotorDisk/profileModel/profileModel.C index 3ec2a01968..4de140eaa2 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/profileModel.C +++ b/src/fvModels/derived/rotorDisk/profileModel/profileModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/profileModel.H b/src/fvModels/derived/rotorDisk/profileModel/profileModel.H similarity index 98% rename from src/fvModels/derived/rotorDiskSource/profileModel/profileModel.H rename to src/fvModels/derived/rotorDisk/profileModel/profileModel.H index de05be0e46..6091c9fd2c 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/profileModel.H +++ b/src/fvModels/derived/rotorDisk/profileModel/profileModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.C b/src/fvModels/derived/rotorDisk/profileModel/profileModelList.C similarity index 98% rename from src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.C rename to src/fvModels/derived/rotorDisk/profileModel/profileModelList.C index d5a4a09b9e..e71ec21480 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.C +++ b/src/fvModels/derived/rotorDisk/profileModel/profileModelList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.H b/src/fvModels/derived/rotorDisk/profileModel/profileModelList.H similarity index 97% rename from src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.H rename to src/fvModels/derived/rotorDisk/profileModel/profileModelList.H index 691a98597c..db91eef69a 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/profileModelList.H +++ b/src/fvModels/derived/rotorDisk/profileModel/profileModelList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.C b/src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.C similarity index 98% rename from src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.C rename to src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.C index 59359edd6a..2741e32116 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.C +++ b/src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.H b/src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.H similarity index 98% rename from src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.H rename to src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.H index 2c3661ae21..10e6d26ab7 100644 --- a/src/fvModels/derived/rotorDiskSource/profileModel/series/seriesProfile.H +++ b/src/fvModels/derived/rotorDisk/profileModel/series/seriesProfile.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C b/src/fvModels/derived/rotorDisk/rotorDisk.C similarity index 90% rename from src/fvModels/derived/rotorDiskSource/rotorDiskSource.C rename to src/fvModels/derived/rotorDisk/rotorDisk.C index 969ccf8bed..074904b488 100644 --- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C +++ b/src/fvModels/derived/rotorDisk/rotorDisk.C @@ -23,8 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "rotorDiskSource.H" -#include "trimModel.H" +#include "rotorDisk.H" #include "fvMatrices.H" #include "geometricOneField.H" #include "syncTools.H" @@ -37,38 +36,43 @@ using namespace Foam::constant; namespace Foam { - namespace fv - { - defineTypeNameAndDebug(rotorDiskSource, 0); - addToRunTimeSelectionTable(fvModel, rotorDiskSource, dictionary); - } - - template<> const char* - NamedEnum::names[] = - { - "auto", - "specified" - }; - - const NamedEnum - fv::rotorDiskSource::geometryModeTypeNames_; - - template<> const char* - NamedEnum::names[] = - { - "fixed", - "surfaceNormal", - "local" - }; - - const NamedEnum - fv::rotorDiskSource::inletFlowTypeNames_; +namespace fv +{ + defineTypeNameAndDebug(rotorDisk, 0); + addToRunTimeSelectionTable(fvModel, rotorDisk, dictionary); + addBackwardCompatibleToRunTimeSelectionTable + ( + fvModel, + rotorDisk, + dictionary, + rotorDiskSource, + "rotorDiskSource" + ); } +} + + +namespace Foam +{ + template<> + const char* NamedEnum::names[] = + {"auto", "specified"}; + + template<> + const char* NamedEnum::names[] = + {"fixed", "surfaceNormal", "local"}; +} + +const Foam::NamedEnum + Foam::fv::rotorDisk::geometryModeTypeNames_; + +const Foam::NamedEnum + Foam::fv::rotorDisk::inletFlowTypeNames_; // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void Foam::fv::rotorDiskSource::readCoeffs() +void Foam::fv::rotorDisk::readCoeffs() { UName_ = coeffs().lookupOrDefault("U", "U"); @@ -108,7 +112,7 @@ void Foam::fv::rotorDiskSource::readCoeffs() } -void Foam::fv::rotorDiskSource::checkData() +void Foam::fv::rotorDisk::checkData() { // Set inflow type 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; @@ -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 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(); @@ -469,7 +473,7 @@ void Foam::fv::rotorDiskSource::constructGeometry() } -Foam::tmp Foam::fv::rotorDiskSource::inflowVelocity +Foam::tmp Foam::fv::rotorDisk::inflowVelocity ( const volVectorField& U ) const @@ -505,7 +509,7 @@ Foam::tmp Foam::fv::rotorDiskSource::inflowVelocity // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // -Foam::fv::rotorDiskSource::rotorDiskSource +Foam::fv::rotorDisk::rotorDisk ( const word& name, const word& modelType, @@ -540,19 +544,19 @@ Foam::fv::rotorDiskSource::rotorDiskSource // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::fv::rotorDiskSource::~rotorDiskSource() +Foam::fv::rotorDisk::~rotorDisk() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::rotorDiskSource::addSupFields() const +Foam::wordList Foam::fv::rotorDisk::addSupFields() const { return wordList(1, UName_); } -void Foam::fv::rotorDiskSource::addSup +void Foam::fv::rotorDisk::addSup ( const volVectorField& U, fvMatrix& eqn @@ -592,7 +596,7 @@ void Foam::fv::rotorDiskSource::addSup } -void Foam::fv::rotorDiskSource::addSup +void Foam::fv::rotorDisk::addSup ( const volScalarField& rho, const volVectorField& U, @@ -630,32 +634,32 @@ void Foam::fv::rotorDiskSource::addSup } -bool Foam::fv::rotorDiskSource::movePoints() +bool Foam::fv::rotorDisk::movePoints() { set_.movePoints(); return true; } -void Foam::fv::rotorDiskSource::topoChange(const polyTopoChangeMap& map) +void Foam::fv::rotorDisk::topoChange(const polyTopoChangeMap& map) { set_.topoChange(map); } -void Foam::fv::rotorDiskSource::mapMesh(const polyMeshMap& map) +void Foam::fv::rotorDisk::mapMesh(const polyMeshMap& map) { set_.mapMesh(map); } -void Foam::fv::rotorDiskSource::distribute(const polyDistributionMap& map) +void Foam::fv::rotorDisk::distribute(const polyDistributionMap& map) { set_.distribute(map); } -bool Foam::fv::rotorDiskSource::read(const dictionary& dict) +bool Foam::fv::rotorDisk::read(const dictionary& dict) { if (fvModel::read(dict)) { diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H b/src/fvModels/derived/rotorDisk/rotorDisk.H similarity index 95% rename from src/fvModels/derived/rotorDiskSource/rotorDiskSource.H rename to src/fvModels/derived/rotorDisk/rotorDisk.H index cd9a36ebe5..1d25fe8843 100644 --- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.H +++ b/src/fvModels/derived/rotorDisk/rotorDisk.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::rotorDiskSource + Foam::fv::rotorDisk Description Cell based momentum source which approximates the mean effects of @@ -31,7 +31,7 @@ Description Usage Example usage: \verbatim - rotorDiskSource1 + rotorDisk1 { type rotorDisk; @@ -92,13 +92,13 @@ See also Foam::seriesProfile SourceFiles - rotorDiskSource.C - rotorDiskSourceTemplates.C + rotorDisk.C + rotorDiskTemplates.C \*---------------------------------------------------------------------------*/ -#ifndef rotorDiskSource_H -#define rotorDiskSource_H +#ifndef rotorDisk_H +#define rotorDisk_H #include "fvModel.H" #include "fvCellSet.H" @@ -107,24 +107,20 @@ SourceFiles #include "NamedEnum.H" #include "bladeModel.H" #include "profileModelList.H" -#include "volFieldsFwd.H" +#include "trimModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - -// Forward declaration of classes -class trimModel; - namespace fv { /*---------------------------------------------------------------------------*\ - Class rotorDiskSource Declaration + Class rotorDisk Declaration \*---------------------------------------------------------------------------*/ -class rotorDiskSource +class rotorDisk : public fvModel { @@ -257,7 +253,7 @@ public: //- Construct from components - rotorDiskSource + rotorDisk ( const word& name, const word& modelType, @@ -267,7 +263,7 @@ public: //- Destructor - virtual ~rotorDiskSource(); + virtual ~rotorDisk(); // Member Functions @@ -360,12 +356,12 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "rotorDiskSourceI.H" +#include "rotorDiskI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "rotorDiskSourceTemplates.C" + #include "rotorDiskTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSourceI.H b/src/fvModels/derived/rotorDisk/rotorDiskI.H similarity index 78% rename from src/fvModels/derived/rotorDiskSource/rotorDiskSourceI.H rename to src/fvModels/derived/rotorDisk/rotorDiskI.H index cb8cff5c5e..57c722cf15 100644 --- a/src/fvModels/derived/rotorDiskSource/rotorDiskSourceI.H +++ b/src/fvModels/derived/rotorDisk/rotorDiskI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- 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_; } -inline Foam::scalar Foam::fv::rotorDiskSource::omega() const +inline Foam::scalar Foam::fv::rotorDisk::omega() const { return omega_; } -inline const Foam::fvCellSet& Foam::fv::rotorDiskSource::set() const +inline const Foam::fvCellSet& Foam::fv::rotorDisk::set() const { return set_; } -inline const Foam::List& Foam::fv::rotorDiskSource::x() const +inline const Foam::List& Foam::fv::rotorDisk::x() const { return x_; } inline const Foam::coordinateSystems::cylindrical& -Foam::fv::rotorDiskSource::coordSys() const +Foam::fv::rotorDisk::coordSys() const { return coordSys_; } diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvModels/derived/rotorDisk/rotorDiskTemplates.C similarity index 98% rename from src/fvModels/derived/rotorDiskSource/rotorDiskSourceTemplates.C rename to src/fvModels/derived/rotorDisk/rotorDiskTemplates.C index 2cd55eee5d..213bbb8fd0 100644 --- a/src/fvModels/derived/rotorDiskSource/rotorDiskSourceTemplates.C +++ b/src/fvModels/derived/rotorDisk/rotorDiskTemplates.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "rotorDiskSource.H" +#include "rotorDisk.H" #include "volFields.H" #include "unitConversion.H" @@ -32,7 +32,7 @@ using namespace Foam::constant; // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template -void Foam::fv::rotorDiskSource::calculate +void Foam::fv::rotorDisk::calculate ( const RhoFieldType& rho, const vectorField& U, @@ -157,7 +157,7 @@ void Foam::fv::rotorDiskSource::calculate template -void Foam::fv::rotorDiskSource::writeField +void Foam::fv::rotorDisk::writeField ( const word& name, const List& values diff --git a/src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C b/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C similarity index 98% rename from src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C rename to src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C index d4f9951b2e..6aac50a249 100644 --- a/src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C +++ b/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.C @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "fixedTrim.H" +#include "rotorDisk.H" #include "addToRunTimeSelectionTable.H" #include "unitConversion.H" #include "mathematicalConstants.H" @@ -44,7 +45,7 @@ namespace Foam Foam::fixedTrim::fixedTrim ( - const fv::rotorDiskSource& rotor, + const fv::rotorDisk& rotor, const dictionary& dict ) : diff --git a/src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H b/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.H similarity index 95% rename from src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H rename to src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.H index a115dfb398..031193d49a 100644 --- a/src/fvModels/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H +++ b/src/fvModels/derived/rotorDisk/trimModel/fixed/fixedTrim.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,7 @@ public: TypeName("fixedTrim"); //- Constructor - fixedTrim(const fv::rotorDiskSource& rotor, const dictionary& dict); + fixedTrim(const fv::rotorDisk& rotor, const dictionary& dict); //- Destructor virtual ~fixedTrim(); diff --git a/src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C similarity index 99% rename from src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C rename to src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C index 9969d2f9ad..e2636d8446 100644 --- a/src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C +++ b/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.C @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "targetCoeffTrim.H" +#include "rotorDisk.H" #include "geometricOneField.H" #include "addToRunTimeSelectionTable.H" @@ -192,7 +193,7 @@ void Foam::targetCoeffTrim::correctTrim Foam::targetCoeffTrim::targetCoeffTrim ( - const fv::rotorDiskSource& rotor, + const fv::rotorDisk& rotor, const dictionary& dict ) : diff --git a/src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H b/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.H similarity index 97% rename from src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H rename to src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.H index 70c71dc66e..3f15c37851 100644 --- a/src/fvModels/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H +++ b/src/fvModels/derived/rotorDisk/trimModel/targetCoeff/targetCoeffTrim.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,7 +150,7 @@ public: TypeName("targetCoeffTrim"); //- Constructor - targetCoeffTrim(const fv::rotorDiskSource& rotor, const dictionary& dict); + targetCoeffTrim(const fv::rotorDisk& rotor, const dictionary& dict); //- Destructor virtual ~targetCoeffTrim(); diff --git a/src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.C b/src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.C similarity index 95% rename from src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.C rename to src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.C index 6fe8dfa27b..4c3f0acbcc 100644 --- a/src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.C +++ b/src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ namespace Foam Foam::trimModel::trimModel ( - const fv::rotorDiskSource& rotor, + const fv::rotorDisk& rotor, const dictionary& dict, const word& name ) diff --git a/src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.H b/src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.H similarity index 91% rename from src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.H rename to src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.H index d0284289f2..f8089ee84c 100644 --- a/src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModel.H +++ b/src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,8 +35,9 @@ SourceFiles #ifndef trimModel_H #define trimModel_H -#include "rotorDiskSource.H" #include "dictionary.H" +#include "vectorField.H" +#include "volFieldsFwd.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,6 +45,8 @@ SourceFiles namespace Foam { +namespace fv { class rotorDisk; } + /*---------------------------------------------------------------------------*\ Class trimModel Declaration \*---------------------------------------------------------------------------*/ @@ -56,7 +59,7 @@ protected: // Protected data //- Reference to the rotor source model - const fv::rotorDiskSource& rotor_; + const fv::rotorDisk& rotor_; //- Name of model const word name_; @@ -79,7 +82,7 @@ public: trimModel, dictionary, ( - const fv::rotorDiskSource& rotor, + const fv::rotorDisk& rotor, const dictionary& dict ), (rotor, dict) @@ -91,7 +94,7 @@ public: //- Construct from components trimModel ( - const fv::rotorDiskSource& rotor, + const fv::rotorDisk& rotor, const dictionary& dict, const word& name ); @@ -102,7 +105,7 @@ public: //- Return a reference to the selected trim model static autoPtr New ( - const fv::rotorDiskSource& rotor, + const fv::rotorDisk& rotor, const dictionary& dict ); diff --git a/src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModelNew.C similarity index 95% rename from src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C rename to src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModelNew.C index 162e951550..d650cda259 100644 --- a/src/fvModels/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C +++ b/src/fvModels/derived/rotorDisk/trimModel/trimModel/trimModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ License Foam::autoPtr Foam::trimModel::New ( - const fv::rotorDiskSource& rotor, + const fv::rotorDisk& rotor, const dictionary& dict ) { diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C b/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C similarity index 85% rename from src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C rename to src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C index d5c3da2afa..556dee4784 100644 --- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C +++ b/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "sixDoFAccelerationSource.H" +#include "sixDoFAcceleration.H" #include "fvMatrices.H" #include "geometricOneField.H" #include "uniformDimensionedFields.H" @@ -37,12 +37,15 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(sixDoFAccelerationSource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(sixDoFAcceleration, 0); + addToRunTimeSelectionTable(fvModel, sixDoFAcceleration, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + sixDoFAcceleration, + dictionary, sixDoFAccelerationSource, - dictionary + "sixDoFAccelerationSource" ); } } @@ -50,7 +53,7 @@ namespace fv // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -typedef Foam::fv::sixDoFAccelerationSource::accelerationVectors avType; +typedef Foam::fv::sixDoFAcceleration::accelerationVectors avType; template<> const char* const avType::vsType::typeName = "vectorVector"; @@ -91,7 +94,7 @@ namespace Foam // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::sixDoFAccelerationSource::readCoeffs() +void Foam::fv::sixDoFAcceleration::readCoeffs() { UName_ = coeffs().lookupOrDefault("U", "U"); @@ -107,7 +110,7 @@ void Foam::fv::sixDoFAccelerationSource::readCoeffs() template -void Foam::fv::sixDoFAccelerationSource::addForce +void Foam::fv::sixDoFAcceleration::addForce ( const AlphaFieldType& alpha, const RhoFieldType& rho, @@ -170,7 +173,7 @@ void Foam::fv::sixDoFAccelerationSource::addForce // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::sixDoFAccelerationSource::sixDoFAccelerationSource +Foam::fv::sixDoFAcceleration::sixDoFAcceleration ( const word& name, const word& modelType, @@ -194,13 +197,13 @@ Foam::fv::sixDoFAccelerationSource::sixDoFAccelerationSource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::sixDoFAccelerationSource::addSupFields() const +Foam::wordList Foam::fv::sixDoFAcceleration::addSupFields() const { return wordList(1, UName_); } -void Foam::fv::sixDoFAccelerationSource::addSup +void Foam::fv::sixDoFAcceleration::addSup ( const volVectorField& U, fvMatrix& eqn @@ -210,7 +213,7 @@ void Foam::fv::sixDoFAccelerationSource::addSup } -void Foam::fv::sixDoFAccelerationSource::addSup +void Foam::fv::sixDoFAcceleration::addSup ( const volScalarField& rho, 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& rho, @@ -233,28 +236,25 @@ void Foam::fv::sixDoFAccelerationSource::addSup } -bool Foam::fv::sixDoFAccelerationSource::movePoints() +bool Foam::fv::sixDoFAcceleration::movePoints() { 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 -( - const polyDistributionMap& -) +void Foam::fv::sixDoFAcceleration::distribute(const polyDistributionMap&) {} -bool Foam::fv::sixDoFAccelerationSource::read(const dictionary& dict) +bool Foam::fv::sixDoFAcceleration::read(const dictionary& dict) { if (fvModel::read(dict)) { diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H b/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.H similarity index 90% rename from src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H rename to src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.H index 1234b57a26..186c4a8fd3 100644 --- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.H +++ b/src/fvModels/derived/sixDoFAcceleration/sixDoFAcceleration.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::sixDoFAccelerationSource + Foam::fv::sixDoFAcceleration Description Solid-body 6-DoF acceleration source @@ -32,19 +32,19 @@ Usage \verbatim SBM { - type sixDoFAccelerationSource; + type sixDoFAcceleration; accelerations ; } \endverbatim SourceFiles - sixDoFAccelerationSource.C + sixDoFAcceleration.C \*---------------------------------------------------------------------------*/ -#ifndef sixDoFAccelerationSource_H -#define sixDoFAccelerationSource_H +#ifndef sixDoFAcceleration_H +#define sixDoFAcceleration_H #include "fvModel.H" #include "Function1.H" @@ -58,10 +58,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class sixDoFAccelerationSource Declaration + Class sixDoFAcceleration Declaration \*---------------------------------------------------------------------------*/ -class sixDoFAccelerationSource +class sixDoFAcceleration : public fvModel { @@ -110,13 +110,13 @@ private: public: //- Runtime type information - TypeName("sixDoFAccelerationSource"); + TypeName("sixDoFAcceleration"); // Constructors //- Construct from components - sixDoFAccelerationSource + sixDoFAcceleration ( const word& name, const word& modelType, @@ -125,14 +125,14 @@ public: ); //- Disallow default bitwise copy construction - sixDoFAccelerationSource + sixDoFAcceleration ( - const sixDoFAccelerationSource& + const sixDoFAcceleration& ) = delete; //- Destructor - virtual ~sixDoFAccelerationSource() + virtual ~sixDoFAcceleration() {} @@ -189,7 +189,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const sixDoFAccelerationSource&) = delete; + void operator=(const sixDoFAcceleration&) = delete; }; diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C b/src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.C similarity index 82% rename from src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C rename to src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.C index 5e9a9a4f3b..b168c76980 100644 --- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.C +++ b/src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "solidEquilibriumEnergySource.H" +#include "solidThermalEquilibrium.H" #include "fvmDdt.H" #include "fvmLaplacian.H" #include "addToRunTimeSelectionTable.H" @@ -34,12 +34,15 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(solidEquilibriumEnergySource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(solidThermalEquilibrium, 0); + addToRunTimeSelectionTable(fvModel, solidThermalEquilibrium, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + solidThermalEquilibrium, + dictionary, solidEquilibriumEnergySource, - dictionary + "solidEquilibriumEnergySource" ); } } @@ -47,7 +50,7 @@ namespace fv // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::solidEquilibriumEnergySource::readCoeffs() +void Foam::fv::solidThermalEquilibrium::readCoeffs() { phaseName_ = coeffs().lookupOrDefault("phase", word::null); @@ -56,7 +59,7 @@ void Foam::fv::solidEquilibriumEnergySource::readCoeffs() const Foam::volScalarField& -Foam::fv::solidEquilibriumEnergySource::solidAlpha() const +Foam::fv::solidThermalEquilibrium::solidAlpha() const { const word alphaName = IOobject::groupName("alpha", solidPhaseName_); @@ -84,7 +87,7 @@ Foam::fv::solidEquilibriumEnergySource::solidAlpha() const const Foam::solidThermo& -Foam::fv::solidEquilibriumEnergySource::solidThermo() const +Foam::fv::solidThermalEquilibrium::solidThermo() const { const word thermoName = IOobject::groupName(physicalProperties::typeName, solidPhaseName_); @@ -103,7 +106,7 @@ Foam::fv::solidEquilibriumEnergySource::solidThermo() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::solidEquilibriumEnergySource::solidEquilibriumEnergySource +Foam::fv::solidThermalEquilibrium::solidThermalEquilibrium ( const word& name, const word& modelType, @@ -123,13 +126,13 @@ Foam::fv::solidEquilibriumEnergySource::solidEquilibriumEnergySource // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::fv::solidEquilibriumEnergySource::~solidEquilibriumEnergySource() +Foam::fv::solidThermalEquilibrium::~solidThermalEquilibrium() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::wordList Foam::fv::solidEquilibriumEnergySource::addSupFields() const +Foam::wordList Foam::fv::solidThermalEquilibrium::addSupFields() const { const basicThermo& thermo = mesh().lookupObject @@ -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& 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& rho, @@ -196,31 +199,31 @@ void Foam::fv::solidEquilibriumEnergySource::addSup } -bool Foam::fv::solidEquilibriumEnergySource::movePoints() +bool Foam::fv::solidThermalEquilibrium::movePoints() { return true; } -void Foam::fv::solidEquilibriumEnergySource::topoChange +void Foam::fv::solidThermalEquilibrium::topoChange ( 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& ) {} -bool Foam::fv::solidEquilibriumEnergySource::read(const dictionary& dict) +bool Foam::fv::solidThermalEquilibrium::read(const dictionary& dict) { if (fvModel::read(dict)) { diff --git a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H b/src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.H similarity index 90% rename from src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H rename to src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.H index c8cd7c08bf..e34d42240f 100644 --- a/src/fvModels/derived/solidEquilibriumEnergySource/solidEquilibriumEnergySource.H +++ b/src/fvModels/derived/solidThermalEquilibrium/solidThermalEquilibrium.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::solidEquilibriumEnergySource + Foam::fv::solidThermalEquilibrium Description This fvModel adds the thermal inertia of a solid phase into the energy @@ -45,7 +45,7 @@ Usage \verbatim { - type solidEquilibriumEnergySource; + type solidThermalEquilibrium; solidPhase solid; } @@ -53,8 +53,8 @@ Usage \*---------------------------------------------------------------------------*/ -#ifndef solidEquilibriumEnergySource_H -#define solidEquilibriumEnergySource_H +#ifndef solidThermalEquilibrium_H +#define solidThermalEquilibrium_H #include "fvModel.H" #include "volFields.H" @@ -68,10 +68,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class solidEquilibriumEnergySource Declaration + Class solidThermalEquilibrium Declaration \*---------------------------------------------------------------------------*/ -class solidEquilibriumEnergySource +class solidThermalEquilibrium : public fvModel { @@ -99,13 +99,13 @@ class solidEquilibriumEnergySource public: //- Runtime type information - TypeName("solidEquilibriumEnergySource"); + TypeName("solidThermalEquilibrium"); // Constructors //- Construct from components - solidEquilibriumEnergySource + solidThermalEquilibrium ( const word& name, const word& modelType, @@ -114,14 +114,14 @@ public: ); //- Disallow default bitwise copy construction - solidEquilibriumEnergySource + solidThermalEquilibrium ( - const solidEquilibriumEnergySource& + const solidThermalEquilibrium& ) = delete; //- Destructor - virtual ~solidEquilibriumEnergySource(); + virtual ~solidThermalEquilibrium(); // Member Functions @@ -177,7 +177,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const solidEquilibriumEnergySource&) = delete; + void operator=(const solidThermalEquilibrium&) = delete; }; diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvModels/derived/solidificationMelting/solidificationMelting.C similarity index 85% rename from src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C rename to src/fvModels/derived/solidificationMelting/solidificationMelting.C index 7bf160696e..57e747b85a 100644 --- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.C +++ b/src/fvModels/derived/solidificationMelting/solidificationMelting.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "solidificationMeltingSource.H" +#include "solidificationMelting.H" #include "fvcDdt.H" #include "fvMatrices.H" #include "basicThermo.H" @@ -37,37 +37,37 @@ License namespace Foam { - template<> - const char* NamedEnum - < - fv::solidificationMeltingSource::thermoMode, - 2 - >::names[] = - { - "thermo", - "lookup" - }; +namespace fv +{ + defineTypeNameAndDebug(solidificationMelting, 0); - namespace fv - { - defineTypeNameAndDebug(solidificationMeltingSource, 0); - - addToRunTimeSelectionTable - ( - fvModel, - solidificationMeltingSource, - dictionary - ); - } + addToRunTimeSelectionTable(fvModel, solidificationMelting, dictionary); + addBackwardCompatibleToRunTimeSelectionTable + ( + fvModel, + solidificationMelting, + dictionary, + solidificationMeltingSource, + "solidificationMeltingSource" + ); +} } -const Foam::NamedEnum - Foam::fv::solidificationMeltingSource::thermoModeTypeNames_; + +namespace Foam +{ + template<> + const char* NamedEnum::names[] = + {"thermo", "lookup"}; +} + +const Foam::NamedEnum + Foam::fv::solidificationMelting::thermoModeTypeNames_; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::solidificationMeltingSource::readCoeffs() +void Foam::fv::solidificationMelting::readCoeffs() { Tsol_ = coeffs().lookup("Tsol"); Tliq_ = coeffs().lookupOrDefault("Tliq", Tsol_); @@ -92,7 +92,7 @@ void Foam::fv::solidificationMeltingSource::readCoeffs() Foam::tmp -Foam::fv::solidificationMeltingSource::Cp() const +Foam::fv::solidificationMelting::Cp() const { 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("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 @@ -216,7 +216,7 @@ void Foam::fv::solidificationMeltingSource::update template -void Foam::fv::solidificationMeltingSource::apply +void Foam::fv::solidificationMelting::apply ( const RhoFieldType& rho, fvMatrix& eqn @@ -247,7 +247,7 @@ void Foam::fv::solidificationMeltingSource::apply // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::solidificationMeltingSource::solidificationMeltingSource +Foam::fv::solidificationMelting::solidificationMelting ( const word& name, const word& modelType, @@ -294,7 +294,7 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList Foam::fv::solidificationMeltingSource::addSupFields() const +Foam::wordList Foam::fv::solidificationMelting::addSupFields() const { 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, fvMatrix& 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& he, @@ -336,7 +336,7 @@ void Foam::fv::solidificationMeltingSource::addSup } -void Foam::fv::solidificationMeltingSource::addSup +void Foam::fv::solidificationMelting::addSup ( const volVectorField& U, fvMatrix& eqn @@ -375,7 +375,7 @@ void Foam::fv::solidificationMeltingSource::addSup } -void Foam::fv::solidificationMeltingSource::addSup +void Foam::fv::solidificationMelting::addSup ( const volScalarField& rho, const volVectorField& U, @@ -386,14 +386,14 @@ void Foam::fv::solidificationMeltingSource::addSup } -bool Foam::fv::solidificationMeltingSource::movePoints() +bool Foam::fv::solidificationMelting::movePoints() { set_.movePoints(); return true; } -void Foam::fv::solidificationMeltingSource::topoChange +void Foam::fv::solidificationMelting::topoChange ( 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); } -void Foam::fv::solidificationMeltingSource::distribute +void Foam::fv::solidificationMelting::distribute ( 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)) { diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvModels/derived/solidificationMelting/solidificationMelting.H similarity index 94% rename from src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H rename to src/fvModels/derived/solidificationMelting/solidificationMelting.H index 94767def6e..7c197505de 100644 --- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H +++ b/src/fvModels/derived/solidificationMelting/solidificationMelting.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::solidificationMeltingSource + Foam::fv::solidificationMelting Description This source is designed to model the effect of solidification and melting @@ -76,9 +76,9 @@ Description Usage Example usage: \verbatim - solidificationMeltingSource1 + solidificationMelting1 { - type solidificationMeltingSource; + type solidificationMelting; select cellZone; cellZone iceZone; @@ -113,12 +113,12 @@ Usage \endtable SourceFiles - solidificationMeltingSource.C + solidificationMelting.C \*---------------------------------------------------------------------------*/ -#ifndef solidificationMeltingSource_H -#define solidificationMeltingSource_H +#ifndef solidificationMelting_H +#define solidificationMelting_H #include "fvModel.H" #include "fvCellSet.H" @@ -134,10 +134,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class solidificationMeltingSource Declaration + Class solidificationMelting Declaration \*---------------------------------------------------------------------------*/ -class solidificationMeltingSource +class solidificationMelting : public fvModel { @@ -236,13 +236,13 @@ private: public: //- Runtime type information - TypeName("solidificationMeltingSource"); + TypeName("solidificationMelting"); // Constructors //- Construct from explicit source name and mesh - solidificationMeltingSource + solidificationMelting ( const word& name, const word& modelType, @@ -251,9 +251,9 @@ public: ); //- Disallow default bitwise copy construction - solidificationMeltingSource + solidificationMelting ( - const solidificationMeltingSource& + const solidificationMelting& ) = delete; @@ -323,7 +323,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const solidificationMeltingSource&) = delete; + void operator=(const solidificationMelting&) = delete; }; diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C b/src/fvModels/derived/volumeBlockage/volumeBlockage.C similarity index 82% rename from src/fvModels/derived/volumeFractionSource/volumeFractionSource.C rename to src/fvModels/derived/volumeBlockage/volumeBlockage.C index 5b2693f800..5d7f04d317 100644 --- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.C +++ b/src/fvModels/derived/volumeBlockage/volumeBlockage.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "volumeFractionSource.H" +#include "volumeBlockage.H" #include "fvmDiv.H" #include "fvmLaplacian.H" #include "fvcDiv.H" @@ -37,12 +37,15 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(volumeFractionSource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(volumeBlockage, 0); + addToRunTimeSelectionTable(fvModel, volumeBlockage, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + volumeBlockage, + dictionary, volumeFractionSource, - dictionary + "volumeFractionSource" ); } } @@ -50,7 +53,7 @@ namespace fv // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::volumeFractionSource::readCoeffs() +void Foam::fv::volumeBlockage::readCoeffs() { phiName_ = coeffs().lookupOrDefault("phi", "phi"); rhoName_ = coeffs().lookupOrDefault("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_); @@ -87,7 +90,7 @@ const Foam::volScalarField& Foam::fv::volumeFractionSource::volumeAlpha() const } -Foam::tmp Foam::fv::volumeFractionSource::D +Foam::tmp Foam::fv::volumeBlockage::D ( const word& fieldName ) const @@ -128,7 +131,7 @@ Foam::tmp Foam::fv::volumeFractionSource::D template -void Foam::fv::volumeFractionSource::addGeneralSupType +void Foam::fv::volumeBlockage::addGeneralSupType ( const AlphaFieldType& alpha, fvMatrix& eqn @@ -157,7 +160,7 @@ void Foam::fv::volumeFractionSource::addGeneralSupType template -void Foam::fv::volumeFractionSource::addAlphaSupType +void Foam::fv::volumeBlockage::addAlphaSupType ( const AlphaFieldType& alpha, const VolField& field, @@ -169,7 +172,7 @@ void Foam::fv::volumeFractionSource::addAlphaSupType template -void Foam::fv::volumeFractionSource::addAlphaSupType +void Foam::fv::volumeBlockage::addAlphaSupType ( const AlphaFieldType& alpha, const volScalarField& field, @@ -195,7 +198,7 @@ void Foam::fv::volumeFractionSource::addAlphaSupType template -void Foam::fv::volumeFractionSource::addAlphaSupType +void Foam::fv::volumeBlockage::addAlphaSupType ( const AlphaFieldType& alpha, const volVectorField& field, @@ -223,7 +226,7 @@ void Foam::fv::volumeFractionSource::addAlphaSupType template -void Foam::fv::volumeFractionSource::addSupType +void Foam::fv::volumeBlockage::addSupType ( const VolField& field, fvMatrix& eqn @@ -234,7 +237,7 @@ void Foam::fv::volumeFractionSource::addSupType template -void Foam::fv::volumeFractionSource::addSupType +void Foam::fv::volumeBlockage::addSupType ( const volScalarField& rho, const VolField& field, @@ -246,7 +249,7 @@ void Foam::fv::volumeFractionSource::addSupType template -void Foam::fv::volumeFractionSource::addSupType +void Foam::fv::volumeBlockage::addSupType ( const volScalarField& alpha, const volScalarField& rho, @@ -260,7 +263,7 @@ void Foam::fv::volumeFractionSource::addSupType // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::volumeFractionSource::volumeFractionSource +Foam::fv::volumeBlockage::volumeBlockage ( const word& name, const word& modelType, @@ -281,64 +284,56 @@ Foam::fv::volumeFractionSource::volumeFractionSource // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::fv::volumeFractionSource::~volumeFractionSource() +Foam::fv::volumeBlockage::~volumeBlockage() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -bool Foam::fv::volumeFractionSource::addsSupToField(const word& fieldName) const +bool Foam::fv::volumeBlockage::addsSupToField(const word& fieldName) const { return true; } -Foam::wordList Foam::fv::volumeFractionSource::addSupFields() const +Foam::wordList Foam::fv::volumeBlockage::addSupFields() const { return wordList(); } -FOR_ALL_FIELD_TYPES -( - IMPLEMENT_FV_MODEL_ADD_FIELD_SUP, - fv::volumeFractionSource -) +FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_FIELD_SUP, fv::volumeBlockage) -FOR_ALL_FIELD_TYPES -( - IMPLEMENT_FV_MODEL_ADD_RHO_FIELD_SUP, - fv::volumeFractionSource -) +FOR_ALL_FIELD_TYPES(IMPLEMENT_FV_MODEL_ADD_RHO_FIELD_SUP, fv::volumeBlockage) FOR_ALL_FIELD_TYPES ( IMPLEMENT_FV_MODEL_ADD_ALPHA_RHO_FIELD_SUP, - fv::volumeFractionSource + fv::volumeBlockage ) -bool Foam::fv::volumeFractionSource::movePoints() +bool Foam::fv::volumeBlockage::movePoints() { 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)) { diff --git a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H b/src/fvModels/derived/volumeBlockage/volumeBlockage.H similarity index 92% rename from src/fvModels/derived/volumeFractionSource/volumeFractionSource.H rename to src/fvModels/derived/volumeBlockage/volumeBlockage.H index 37d14b06ca..c6c4da4a54 100644 --- a/src/fvModels/derived/volumeFractionSource/volumeFractionSource.H +++ b/src/fvModels/derived/volumeBlockage/volumeBlockage.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::volumeFractionSource + Foam::fv::volumeBlockage Description 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 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 sub-modelling. @@ -50,9 +50,9 @@ Usage Example specification: \verbatim - volumeFractionSource1 + volumeBlockage1 { - type volumeFractionSource; + type volumeBlockage; phi phi; rho rho; @@ -63,12 +63,12 @@ Usage \endverbatim SourceFiles - volumeFractionSource.C + volumeBlockage.C \*---------------------------------------------------------------------------*/ -#ifndef volumeFractionSource_H -#define volumeFractionSource_H +#ifndef volumeBlockage_H +#define volumeBlockage_H #include "fvModel.H" #include "surfaceFields.H" @@ -82,10 +82,10 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class volumeFractionSource Declaration + Class volumeBlockage Declaration \*---------------------------------------------------------------------------*/ -class volumeFractionSource +class volumeBlockage : public fvModel { @@ -184,13 +184,13 @@ class volumeFractionSource public: //- Runtime type information - TypeName("volumeFractionSource"); + TypeName("volumeBlockage"); // Constructors //- Construct from components - volumeFractionSource + volumeBlockage ( const word& name, const word& modelType, @@ -199,11 +199,11 @@ public: ); //- Disallow default bitwise copy construction - volumeFractionSource(const volumeFractionSource&) = delete; + volumeBlockage(const volumeBlockage&) = delete; //- Destructor - virtual ~volumeFractionSource(); + virtual ~volumeBlockage(); // Member Functions @@ -255,7 +255,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const volumeFractionSource&) = delete; + void operator=(const volumeBlockage&) = delete; }; diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.C similarity index 82% rename from src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C rename to src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.C index 634af86e2d..447c6f2104 100644 --- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C +++ b/src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "interRegionExplicitPorositySource.H" +#include "interRegionPorosityForce.H" #include "fvMesh.H" #include "fvMatrices.H" #include "porosityModel.H" @@ -35,12 +35,15 @@ namespace Foam { namespace fv { - defineTypeNameAndDebug(interRegionExplicitPorositySource, 0); - addToRunTimeSelectionTable + defineTypeNameAndDebug(interRegionPorosityForce, 0); + addToRunTimeSelectionTable(fvModel, interRegionPorosityForce, dictionary); + addBackwardCompatibleToRunTimeSelectionTable ( fvModel, + interRegionPorosityForce, + dictionary, interRegionExplicitPorositySource, - dictionary + "interRegionExplicitPorositySource" ); } } @@ -48,7 +51,7 @@ namespace fv // * * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * // -void Foam::fv::interRegionExplicitPorositySource::readCoeffs() +void Foam::fv::interRegionPorosityForce::readCoeffs() { UName_ = coeffs().lookupOrDefault("U", "U"); } @@ -56,7 +59,7 @@ void Foam::fv::interRegionExplicitPorositySource::readCoeffs() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource +Foam::fv::interRegionPorosityForce::interRegionPorosityForce ( const word& name, const word& modelType, @@ -143,14 +146,13 @@ Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::wordList -Foam::fv::interRegionExplicitPorositySource::addSupFields() const +Foam::wordList Foam::fv::interRegionPorosityForce::addSupFields() const { return wordList(1, UName_); } -void Foam::fv::interRegionExplicitPorositySource::addSup +void Foam::fv::interRegionPorosityForce::addSup ( const volVectorField& U, fvMatrix& eqn @@ -162,7 +164,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup } -void Foam::fv::interRegionExplicitPorositySource::addSup +void Foam::fv::interRegionPorosityForce::addSup ( const volScalarField& rho, 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& rho, @@ -189,41 +191,32 @@ void Foam::fv::interRegionExplicitPorositySource::addSup } -bool Foam::fv::interRegionExplicitPorositySource::movePoints() +bool Foam::fv::interRegionPorosityForce::movePoints() { NotImplemented; return true; } -void Foam::fv::interRegionExplicitPorositySource::topoChange -( - const polyTopoChangeMap& -) +void Foam::fv::interRegionPorosityForce::topoChange(const polyTopoChangeMap&) { NotImplemented; } -void Foam::fv::interRegionExplicitPorositySource::mapMesh -( - const polyMeshMap& -) +void Foam::fv::interRegionPorosityForce::mapMesh(const polyMeshMap&) { NotImplemented; } -void Foam::fv::interRegionExplicitPorositySource::distribute -( - const polyDistributionMap& -) +void Foam::fv::interRegionPorosityForce::distribute(const polyDistributionMap&) { NotImplemented; } -bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict) +bool Foam::fv::interRegionPorosityForce::read(const dictionary& dict) { if (interRegionModel::read(dict)) { diff --git a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.H similarity index 87% rename from src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H rename to src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.H index 195acc729d..9f79da2dc2 100644 --- a/src/fvModels/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H +++ b/src/fvModels/interRegion/interRegionPorosityForce/interRegionPorosityForce.H @@ -22,15 +22,16 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::interRegionExplicitPorositySource + Foam::fv::interRegionPorosityForce 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 Example usage, here employing the Darcy-Forchheimer model: \verbatim - interRegionExplicitPorositySourceCoeffs + interRegionPorosityForceCoeffs { type DarcyForchheimer; @@ -55,12 +56,12 @@ Usage \endverbatim SourceFiles - interRegionExplicitPorositySource.C + interRegionPorosityForce.C \*---------------------------------------------------------------------------*/ -#ifndef interRegionExplicitPorositySource_H -#define interRegionExplicitPorositySource_H +#ifndef interRegionPorosityForce_H +#define interRegionPorosityForce_H #include "interRegionModel.H" @@ -76,10 +77,10 @@ namespace fv /*---------------------------------------------------------------------------*\ - Class interRegionExplicitPorositySource Declaration + Class interRegionPorosityForce Declaration \*---------------------------------------------------------------------------*/ -class interRegionExplicitPorositySource +class interRegionPorosityForce : public interRegionModel { @@ -104,13 +105,13 @@ class interRegionExplicitPorositySource public: //- Runtime type information - TypeName("interRegionExplicitPorositySource"); + TypeName("interRegionPorosityForce"); // Constructors //- Construct from components - interRegionExplicitPorositySource + interRegionPorosityForce ( const word& name, const word& modelType, @@ -119,14 +120,14 @@ public: ); //- Disallow default bitwise copy construction - interRegionExplicitPorositySource + interRegionPorosityForce ( - const interRegionExplicitPorositySource& + const interRegionPorosityForce& ) = delete; //- Destructor - virtual ~interRegionExplicitPorositySource() + virtual ~interRegionPorosityForce() {} @@ -190,7 +191,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const interRegionExplicitPorositySource&) = delete; + void operator=(const interRegionPorosityForce&) = delete; }; diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H index 4229120631..e10ee00c31 100644 --- a/src/meshTools/coordinateSystems/coordinateSystems.H +++ b/src/meshTools/coordinateSystems/coordinateSystems.H @@ -32,9 +32,9 @@ Description \verbatim porosity { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { select cellZone; cellZone porousBlockage; diff --git a/tutorials/fluid/angledDuct/constant/fvModels b/tutorials/fluid/angledDuct/constant/fvModels index d26e2c038b..c24c9d0cac 100644 --- a/tutorials/fluid/angledDuct/constant/fvModels +++ b/tutorials/fluid/angledDuct/constant/fvModels @@ -16,9 +16,9 @@ FoamFile porosity1 { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { cellZone porosity; diff --git a/tutorials/fluid/angledDuctExplicitFixedCoeff/constant/fvModels b/tutorials/fluid/angledDuctExplicitFixedCoeff/constant/fvModels index 53ce182026..f7f6345457 100644 --- a/tutorials/fluid/angledDuctExplicitFixedCoeff/constant/fvModels +++ b/tutorials/fluid/angledDuctExplicitFixedCoeff/constant/fvModels @@ -16,9 +16,9 @@ FoamFile porosity { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { cellZone porosity; diff --git a/tutorials/fluid/angledDuctLTS/constant/fvModels b/tutorials/fluid/angledDuctLTS/constant/fvModels index c4cb726509..2e8a4a1f1d 100644 --- a/tutorials/fluid/angledDuctLTS/constant/fvModels +++ b/tutorials/fluid/angledDuctLTS/constant/fvModels @@ -16,9 +16,9 @@ FoamFile porosity1 { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { cellZone porosity; diff --git a/tutorials/fluid/blockedChannel/constant/fvModels b/tutorials/fluid/blockedChannel/constant/fvModels index 43e639fd84..619b7bb6da 100644 --- a/tutorials/fluid/blockedChannel/constant/fvModels +++ b/tutorials/fluid/blockedChannel/constant/fvModels @@ -14,21 +14,21 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -volumeFraction +volumeBlockage { - type volumeFractionSource; + type volumeBlockage; volumePhase volume; } -solidFraction +solidBlockage { - type volumeFractionSource; + type volumeBlockage; volumePhase solid; } -solidEquilibriumEnergy +solidThermalEquilibrium { - type solidEquilibriumEnergySource; + type solidThermalEquilibrium; solidPhase solid; } diff --git a/tutorials/fluid/mixerVessel2DMRF/constant/fvModels b/tutorials/fluid/mixerVessel2DMRF/constant/fvModels index 641e57c560..c7210c0345 100644 --- a/tutorials/fluid/mixerVessel2DMRF/constant/fvModels +++ b/tutorials/fluid/mixerVessel2DMRF/constant/fvModels @@ -16,9 +16,9 @@ FoamFile porosity1 { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { cellZone stator; diff --git a/tutorials/incompressibleFluid/blockedChannel/constant/fvModels b/tutorials/incompressibleFluid/blockedChannel/constant/fvModels index fc0fb5a491..e83906272f 100644 --- a/tutorials/incompressibleFluid/blockedChannel/constant/fvModels +++ b/tutorials/incompressibleFluid/blockedChannel/constant/fvModels @@ -14,9 +14,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -volumeFraction +volumeBlockage { - type volumeFractionSource; + type volumeBlockage; volumePhase volume; } diff --git a/tutorials/incompressibleFluid/porousBlockage/constant/fvModels b/tutorials/incompressibleFluid/porousBlockage/constant/fvModels index 75c737299c..3db88e98f6 100644 --- a/tutorials/incompressibleFluid/porousBlockage/constant/fvModels +++ b/tutorials/incompressibleFluid/porousBlockage/constant/fvModels @@ -16,9 +16,9 @@ FoamFile porosity { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { cellZone porousBlockage; diff --git a/tutorials/incompressibleFluid/turbineSiting/constant/fvModels b/tutorials/incompressibleFluid/turbineSiting/constant/fvModels index 4b8e882b3f..253af3c242 100644 --- a/tutorials/incompressibleFluid/turbineSiting/constant/fvModels +++ b/tutorials/incompressibleFluid/turbineSiting/constant/fvModels @@ -16,7 +16,7 @@ FoamFile disk1 { - type actuationDiskSource; + type actuationDisk; cellSet actuationDisk1; @@ -29,7 +29,7 @@ disk1 disk2 { - type actuationDiskSource; + type actuationDisk; cellSet actuationDisk2; diff --git a/tutorials/incompressibleVoF/angledDuct/constant/fvModels b/tutorials/incompressibleVoF/angledDuct/constant/fvModels index abcf650670..d446b1be3e 100644 --- a/tutorials/incompressibleVoF/angledDuct/constant/fvModels +++ b/tutorials/incompressibleVoF/angledDuct/constant/fvModels @@ -16,9 +16,9 @@ FoamFile porosity1 { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { cellZone porosity; diff --git a/tutorials/multiRegion/CHT/heatExchanger/constant/air/fvModels b/tutorials/multiRegion/CHT/heatExchanger/constant/air/fvModels index 16e3ee07b1..be112d97a5 100644 --- a/tutorials/multiRegion/CHT/heatExchanger/constant/air/fvModels +++ b/tutorials/multiRegion/CHT/heatExchanger/constant/air/fvModels @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -airToporous +airToPorous { type interRegionHeatTransfer; @@ -26,11 +26,11 @@ airToporous semiImplicit no; } -porosityBlockage +porosity { - type interRegionExplicitPorositySource; + type interRegionPorosityForce; - interRegionExplicitPorositySourceCoeffs + interRegionPorosityForceCoeffs { nbrRegion porous; diff --git a/tutorials/multiRegion/CHT/heatExchanger/constant/porous/fvModels b/tutorials/multiRegion/CHT/heatExchanger/constant/porous/fvModels index 1f2185e51d..f26b81d62f 100644 --- a/tutorials/multiRegion/CHT/heatExchanger/constant/porous/fvModels +++ b/tutorials/multiRegion/CHT/heatExchanger/constant/porous/fvModels @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -porousToair +porousToAir { type interRegionHeatTransfer; diff --git a/tutorials/multicomponentFluid/filter/constant/fvModels b/tutorials/multicomponentFluid/filter/constant/fvModels index d1b83a10ca..c4a53644a3 100644 --- a/tutorials/multicomponentFluid/filter/constant/fvModels +++ b/tutorials/multicomponentFluid/filter/constant/fvModels @@ -27,9 +27,9 @@ clouds filter1 { - type explicitPorositySource; + type porosityForce; - explicitPorositySourceCoeffs + porosityForceCoeffs { cellZone filter;