From 75f6b64ffe7621af3ab56880383cff057281ca8b Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 9 May 2008 19:06:44 +0100 Subject: [PATCH] adding les/ras cavitating solvers and barotropicCompressibilityModel library --- .../multiphase/cavitatingFoam/Make/files | 5 - .../multiphase/cavitatingFoam/Make/options | 5 +- .../cavitatingFoam/cavitatingFoam.C | 2 +- .../compressibilityModels/Chung/Chung.H | 107 ------------ .../compressibilityModels/Wallis/Wallis.C | 86 ---------- .../compressibilityModels/Wallis/Wallis.H | 107 ------------ .../compressibilityModel.C | 77 --------- .../newCompressibilityModel.C | 67 -------- .../compressibilityModels/linear/linear.C | 82 ---------- .../multiphase/cavitatingFoam/createFields.H | 13 +- .../multiphase/lesCavitatingFoam/Make/files | 7 +- .../multiphase/lesCavitatingFoam/Make/options | 5 +- .../compressibilityModels/Chung/Chung.C | 95 ----------- .../compressibilityModels/Wallis/Wallis.C | 86 ---------- .../compressibilityModels/Wallis/Wallis.H | 107 ------------ .../compressibilityModel.H | 154 ------------------ .../newCompressibilityModel.C | 67 -------- .../compressibilityModels/linear/linear.C | 82 ---------- .../compressibilityModels/linear/linear.H | 104 ------------ .../lesCavitatingFoam/createFields.H | 11 +- .../lesCavitatingFoam/lesCavitatingFoam.C | 2 +- .../multiphase/rasCavitatingFoam/Make/files | 7 +- .../multiphase/rasCavitatingFoam/Make/options | 5 +- .../compressibilityModels/Chung/Chung.C | 95 ----------- .../compressibilityModels/Chung/Chung.H | 107 ------------ .../compressibilityModel.C | 77 --------- .../compressibilityModel.H | 154 ------------------ .../compressibilityModels/linear/linear.H | 104 ------------ .../rasCavitatingFoam/createFields.H | 11 +- .../rasCavitatingFoam/rasCavitatingFoam.C | 2 +- src/thermophysicalModels/Allwmake | 1 + .../Chung/Chung.C | 6 +- .../Chung/Chung.H | 4 +- .../barotropicCompressibilityModel/Make/files | 7 + .../Make/options | 5 + .../Wallis/Wallis.C | 6 +- .../Wallis/Wallis.H | 4 +- .../barotropicCompressibilityModel.C | 12 +- .../barotropicCompressibilityModel.H | 28 ++-- .../newBarotropicCompressibilityModel.C | 23 +-- .../linear/linear.C | 6 +- .../linear/linear.H | 4 +- 42 files changed, 93 insertions(+), 1846 deletions(-) delete mode 100644 applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Chung/Chung.H delete mode 100644 applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.C delete mode 100644 applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.H delete mode 100644 applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C delete mode 100644 applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C delete mode 100644 applications/solvers/multiphase/cavitatingFoam/compressibilityModels/linear/linear.C delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Chung/Chung.C delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.C delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.H delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.C delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.H delete mode 100644 applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.C delete mode 100644 applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.H delete mode 100644 applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C delete mode 100644 applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H delete mode 100644 applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/linear/linear.H rename {applications/solvers/multiphase/cavitatingFoam/compressibilityModels => src/thermophysicalModels/barotropicCompressibilityModel}/Chung/Chung.C (92%) rename {applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels => src/thermophysicalModels/barotropicCompressibilityModel}/Chung/Chung.H (96%) create mode 100644 src/thermophysicalModels/barotropicCompressibilityModel/Make/files create mode 100644 src/thermophysicalModels/barotropicCompressibilityModel/Make/options rename {applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels => src/thermophysicalModels/barotropicCompressibilityModel}/Wallis/Wallis.C (92%) rename {applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels => src/thermophysicalModels/barotropicCompressibilityModel}/Wallis/Wallis.H (96%) rename applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C => src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.C (86%) rename applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H => src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H (83%) rename applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C => src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C (74%) rename {applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels => src/thermophysicalModels/barotropicCompressibilityModel}/linear/linear.C (91%) rename {applications/solvers/multiphase/cavitatingFoam/compressibilityModels => src/thermophysicalModels/barotropicCompressibilityModel}/linear/linear.H (96%) diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/files b/applications/solvers/multiphase/cavitatingFoam/Make/files index 0538afb2fa..832391f03f 100644 --- a/applications/solvers/multiphase/cavitatingFoam/Make/files +++ b/applications/solvers/multiphase/cavitatingFoam/Make/files @@ -1,8 +1,3 @@ cavitatingFoam.C -compressibilityModels/compressibilityModel/compressibilityModel.C -compressibilityModels/compressibilityModel/newCompressibilityModel.C -compressibilityModels/linear/linear.C -compressibilityModels/Wallis/Wallis.C -compressibilityModels/Chung/Chung.C EXE = $(FOAM_APPBIN)/cavitatingFoam diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options index fc217bef43..5e28a0d50f 100644 --- a/applications/solvers/multiphase/cavitatingFoam/Make/options +++ b/applications/solvers/multiphase/cavitatingFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -IcompressibilityModels/compressibilityModel + -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude EXE_LIBS = \ - -lfiniteVolume + -lfiniteVolume \ + -lbarotropicCompressibilityModel diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C index a1e03afdd7..53960d57c1 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Chung/Chung.H b/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Chung/Chung.H deleted file mode 100644 index 316054231e..0000000000 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Chung/Chung.H +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModels::Chung - -Description - Chung compressibility model. - -SourceFiles - Chung.C - -\*---------------------------------------------------------------------------*/ - -#ifndef Chung_H -#define Chung_H - -#include "compressibilityModel.H" -#include "dimensionedScalar.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -/*---------------------------------------------------------------------------*\ - Class Chung Declaration -\*---------------------------------------------------------------------------*/ - -class Chung -: - public compressibilityModel -{ - // Private data - - dimensionedScalar psiv_; - dimensionedScalar psil_; - - dimensionedScalar rhovSat_; - dimensionedScalar rholSat_; - - -public: - - //- Runtime type information - TypeName("Chung"); - - - // Constructors - - //- construct from components - Chung - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - ~Chung() - {} - - - // Member Functions - - //- Correct the Chung compressibility - void correct(); - - //- Read transportProperties dictionary - bool read(const dictionary& compressibilityProperties); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressibilityModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.C b/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.C deleted file mode 100644 index 370cd1413f..0000000000 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.C +++ /dev/null @@ -1,86 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "Wallis.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -defineTypeNameAndDebug(Wallis, 0); -addToRunTimeSelectionTable(compressibilityModel, Wallis, dictionary); - -} -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModels::Wallis::Wallis -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityModel(compressibilityProperties, gamma), - psiv_(compressibilityProperties_.lookup("psiv")), - psil_(compressibilityProperties_.lookup("psil")), - rhovSat_(compressibilityProperties_.lookup("rhovSat")), - rholSat_(compressibilityProperties_.lookup("rholSat")) -{ - correct(); -} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -void Foam::compressibilityModels::Wallis::correct() -{ - psi_ = (gamma_*rhovSat_ + (scalar(1) - gamma_)*rholSat_) - *(gamma_*psiv_/rhovSat_ + (scalar(1) - gamma_)*psil_/rholSat_); -} - - -bool Foam::compressibilityModels::Wallis::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityModel::read(compressibilityProperties); - - compressibilityProperties_.lookup("psiv") >> psiv_; - compressibilityProperties_.lookup("psil") >> psil_; - compressibilityProperties_.lookup("rhovSat") >> rhovSat_; - compressibilityProperties_.lookup("rholSat") >> rholSat_; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.H b/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.H deleted file mode 100644 index df576fc63a..0000000000 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Wallis/Wallis.H +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModels::Wallis - -Description - Wallis compressibility model. - -SourceFiles - Wallis.C - -\*---------------------------------------------------------------------------*/ - -#ifndef Wallis_H -#define Wallis_H - -#include "compressibilityModel.H" -#include "dimensionedScalar.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -/*---------------------------------------------------------------------------*\ - Class Wallis Declaration -\*---------------------------------------------------------------------------*/ - -class Wallis -: - public compressibilityModel -{ - // Private data - - dimensionedScalar psiv_; - dimensionedScalar psil_; - - dimensionedScalar rhovSat_; - dimensionedScalar rholSat_; - - -public: - - //- Runtime type information - TypeName("Wallis"); - - - // Constructors - - //- construct from components - Wallis - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - ~Wallis() - {} - - - // Member Functions - - //- Correct the Wallis compressibility - void correct(); - - //- Read transportProperties dictionary - bool read(const dictionary& compressibilityProperties); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressibilityModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C b/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C deleted file mode 100644 index c879f05a82..0000000000 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -InClass - compressibilityModel - -\*---------------------------------------------------------------------------*/ - -#include "compressibilityModel.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(compressibilityModel, 0); - defineRunTimeSelectionTable(compressibilityModel, dictionary); -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModel::compressibilityModel -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityProperties_(compressibilityProperties), - psi_ - ( - IOobject - ( - "psi", - gamma.mesh().time().timeName(), - gamma.mesh() - ), - gamma.mesh(), - dimensionedScalar("psi", dimensionSet(0, -2, 2, 0, 0), 0) - ), - gamma_(gamma) -{} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -bool Foam::compressibilityModel::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityProperties_ = compressibilityProperties; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C b/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C deleted file mode 100644 index 9604b563f5..0000000000 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C +++ /dev/null @@ -1,67 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "compressibilityModel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::compressibilityModel::New -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -{ - word compressibilityModelTypeName - ( - compressibilityProperties.lookup("compressibilityModel") - ); - - Info<< "Selecting compressibility model " - << compressibilityModelTypeName << endl; - - dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(compressibilityModelTypeName); - - if (cstrIter == dictionaryConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "compressibilityModel::New(const volScalarField&)" - ) << "Unknown compressibilityModel type " - << compressibilityModelTypeName << endl << endl - << "Valid compressibilityModels are : " << endl - << dictionaryConstructorTablePtr_->toc() - << exit(FatalError); - } - - return autoPtr - ( - cstrIter()(compressibilityProperties, gamma) - ); -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/linear/linear.C b/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/linear/linear.C deleted file mode 100644 index 8bd2316cdc..0000000000 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/linear/linear.C +++ /dev/null @@ -1,82 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "linear.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -defineTypeNameAndDebug(linear, 0); -addToRunTimeSelectionTable(compressibilityModel, linear, dictionary); - -} -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModels::linear::linear -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityModel(compressibilityProperties, gamma), - psiv_(compressibilityProperties_.lookup("psiv")), - psil_(compressibilityProperties_.lookup("psil")) -{ - correct(); - psi_.oldTime(); -} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -void Foam::compressibilityModels::linear::correct() -{ - psi_ = gamma_*psiv_ + (scalar(1) - gamma_)*psil_; -} - - -bool Foam::compressibilityModels::linear::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityModel::read(compressibilityProperties); - - compressibilityProperties_.lookup("psiv") >> psiv_; - compressibilityProperties_.lookup("psil") >> psil_; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H index 505c68d4c1..e385ef1229 100644 --- a/applications/solvers/multiphase/cavitatingFoam/createFields.H +++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H @@ -39,12 +39,13 @@ ); gamma.oldTime(); - Info<< "Creating compressibilityModel\n" << endl; - autoPtr psiModel = compressibilityModel::New - ( - thermodynamicProperties, - gamma - ); + Info<< "Creating barotropicompressibilityModel\n" << endl; + autoPtr psiModel = + barotropicCompressibilityModel::New + ( + thermodynamicProperties, + gamma + ); const volScalarField& psi = psiModel->psi(); diff --git a/applications/solvers/multiphase/lesCavitatingFoam/Make/files b/applications/solvers/multiphase/lesCavitatingFoam/Make/files index 51055479ca..b577562e27 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/Make/files +++ b/applications/solvers/multiphase/lesCavitatingFoam/Make/files @@ -1,10 +1,5 @@ lesCavitatingFoam.C -compressibilityModels/compressibilityModel/compressibilityModel.C -compressibilityModels/compressibilityModel/newCompressibilityModel.C -compressibilityModels/linear/linear.C -compressibilityModels/Wallis/Wallis.C -compressibilityModels/Chung/Chung.C devOneEqEddy/devOneEqEddy.C -EXE = $(FOAM_USER_APPBIN)/lesCavitatingFoam +EXE = $(FOAM_APPBIN)/lesCavitatingFoam diff --git a/applications/solvers/multiphase/lesCavitatingFoam/Make/options b/applications/solvers/multiphase/lesCavitatingFoam/Make/options index a86b97dbbd..100c5a0cac 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/Make/options +++ b/applications/solvers/multiphase/lesCavitatingFoam/Make/options @@ -6,10 +6,11 @@ EXE_INC = \ -I$(LIB_SRC)/LESmodels \ -I$(LIB_SRC)/LESmodels/incompressible/lnInclude \ -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \ - -IcompressibilityModels/compressibilityModel + -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude EXE_LIBS = \ -lincompressibleTransportModels \ -lincompressibleLESmodels \ - -lfiniteVolume + -lfiniteVolume \ + -lbarotropicCompressibilityModel diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Chung/Chung.C b/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Chung/Chung.C deleted file mode 100644 index 6010d8f6df..0000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Chung/Chung.C +++ /dev/null @@ -1,95 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "Chung.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -defineTypeNameAndDebug(Chung, 0); -addToRunTimeSelectionTable(compressibilityModel, Chung, dictionary); - -} -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModels::Chung::Chung -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityModel(compressibilityProperties, gamma), - psiv_(compressibilityProperties_.lookup("psiv")), - psil_(compressibilityProperties_.lookup("psil")), - rhovSat_(compressibilityProperties_.lookup("rhovSat")), - rholSat_(compressibilityProperties_.lookup("rholSat")) -{ - correct(); -} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -void Foam::compressibilityModels::Chung::correct() -{ - volScalarField sfa = sqrt - ( - (rhovSat_/psiv_) - /((scalar(1) - gamma_)*rhovSat_/psiv_ + gamma_*rholSat_/psil_) - ); - - psi_ = sqr - ( - ((scalar(1) - gamma_)/sqrt(psiv_) + gamma_*sfa/sqrt(psil_)) - *sqrt(psiv_*psil_)/sfa - ); -} - - -bool Foam::compressibilityModels::Chung::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityModel::read(compressibilityProperties); - - compressibilityProperties_.lookup("psiv") >> psiv_; - compressibilityProperties_.lookup("psil") >> psil_; - compressibilityProperties_.lookup("rhovSat") >> rhovSat_; - compressibilityProperties_.lookup("rholSat") >> rholSat_; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.C b/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.C deleted file mode 100644 index 370cd1413f..0000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.C +++ /dev/null @@ -1,86 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "Wallis.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -defineTypeNameAndDebug(Wallis, 0); -addToRunTimeSelectionTable(compressibilityModel, Wallis, dictionary); - -} -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModels::Wallis::Wallis -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityModel(compressibilityProperties, gamma), - psiv_(compressibilityProperties_.lookup("psiv")), - psil_(compressibilityProperties_.lookup("psil")), - rhovSat_(compressibilityProperties_.lookup("rhovSat")), - rholSat_(compressibilityProperties_.lookup("rholSat")) -{ - correct(); -} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -void Foam::compressibilityModels::Wallis::correct() -{ - psi_ = (gamma_*rhovSat_ + (scalar(1) - gamma_)*rholSat_) - *(gamma_*psiv_/rhovSat_ + (scalar(1) - gamma_)*psil_/rholSat_); -} - - -bool Foam::compressibilityModels::Wallis::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityModel::read(compressibilityProperties); - - compressibilityProperties_.lookup("psiv") >> psiv_; - compressibilityProperties_.lookup("psil") >> psil_; - compressibilityProperties_.lookup("rhovSat") >> rhovSat_; - compressibilityProperties_.lookup("rholSat") >> rholSat_; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.H b/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.H deleted file mode 100644 index df576fc63a..0000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Wallis/Wallis.H +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModels::Wallis - -Description - Wallis compressibility model. - -SourceFiles - Wallis.C - -\*---------------------------------------------------------------------------*/ - -#ifndef Wallis_H -#define Wallis_H - -#include "compressibilityModel.H" -#include "dimensionedScalar.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -/*---------------------------------------------------------------------------*\ - Class Wallis Declaration -\*---------------------------------------------------------------------------*/ - -class Wallis -: - public compressibilityModel -{ - // Private data - - dimensionedScalar psiv_; - dimensionedScalar psil_; - - dimensionedScalar rhovSat_; - dimensionedScalar rholSat_; - - -public: - - //- Runtime type information - TypeName("Wallis"); - - - // Constructors - - //- construct from components - Wallis - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - ~Wallis() - {} - - - // Member Functions - - //- Correct the Wallis compressibility - void correct(); - - //- Read transportProperties dictionary - bool read(const dictionary& compressibilityProperties); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressibilityModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H b/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H deleted file mode 100644 index e0df9d99f5..0000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H +++ /dev/null @@ -1,154 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModel - -Description - -SourceFiles - compressibilityModel.C - newCompressibilityModel.C - -\*---------------------------------------------------------------------------*/ - -#ifndef compressibilityModel_H -#define compressibilityModel_H - -#include "IOdictionary.H" -#include "typeInfo.H" -#include "runTimeSelectionTables.H" -#include "volFields.H" -#include "dimensionedScalar.H" -#include "autoPtr.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class compressibilityModel Declaration -\*---------------------------------------------------------------------------*/ - -class compressibilityModel -{ - -protected: - - // Protected data - - dictionary compressibilityProperties_; - - volScalarField psi_; - const volScalarField& gamma_; - - - // Private Member Functions - - //- Disallow copy construct - compressibilityModel(const compressibilityModel&); - - //- Disallow default bitwise assignment - void operator=(const compressibilityModel&); - - -public: - - //- Runtime type information - TypeName("compressibilityModel"); - - - // Declare run-time constructor selection table - - declareRunTimeSelectionTable - ( - autoPtr, - compressibilityModel, - dictionary, - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ), - (compressibilityProperties, gamma) - ); - - - // Selectors - - //- Return a reference to the selected compressibility model - static autoPtr New - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Constructors - - //- Construct from components - compressibilityModel - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - virtual ~compressibilityModel() - {} - - - // Member Functions - - //- Return the phase transport properties dictionary - const dictionary& compressibilityProperties() const - { - return compressibilityProperties_; - } - - //- Return the compressibility - const volScalarField& psi() const - { - return psi_; - } - - //- Correct the compressibility - virtual void correct() = 0; - - //- Read compressibilityProperties dictionary - virtual bool read(const dictionary& compressibilityProperties) = 0; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C b/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C deleted file mode 100644 index 9604b563f5..0000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C +++ /dev/null @@ -1,67 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "compressibilityModel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::compressibilityModel::New -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -{ - word compressibilityModelTypeName - ( - compressibilityProperties.lookup("compressibilityModel") - ); - - Info<< "Selecting compressibility model " - << compressibilityModelTypeName << endl; - - dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(compressibilityModelTypeName); - - if (cstrIter == dictionaryConstructorTablePtr_->end()) - { - FatalErrorIn - ( - "compressibilityModel::New(const volScalarField&)" - ) << "Unknown compressibilityModel type " - << compressibilityModelTypeName << endl << endl - << "Valid compressibilityModels are : " << endl - << dictionaryConstructorTablePtr_->toc() - << exit(FatalError); - } - - return autoPtr - ( - cstrIter()(compressibilityProperties, gamma) - ); -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.C b/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.C deleted file mode 100644 index 8bd2316cdc..0000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.C +++ /dev/null @@ -1,82 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "linear.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -defineTypeNameAndDebug(linear, 0); -addToRunTimeSelectionTable(compressibilityModel, linear, dictionary); - -} -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModels::linear::linear -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityModel(compressibilityProperties, gamma), - psiv_(compressibilityProperties_.lookup("psiv")), - psil_(compressibilityProperties_.lookup("psil")) -{ - correct(); - psi_.oldTime(); -} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -void Foam::compressibilityModels::linear::correct() -{ - psi_ = gamma_*psiv_ + (scalar(1) - gamma_)*psil_; -} - - -bool Foam::compressibilityModels::linear::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityModel::read(compressibilityProperties); - - compressibilityProperties_.lookup("psiv") >> psiv_; - compressibilityProperties_.lookup("psil") >> psil_; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.H b/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.H deleted file mode 100644 index fbb614cf45..0000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/linear/linear.H +++ /dev/null @@ -1,104 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModels::linear - -Description - linear compressibility model. - -SourceFiles - linear.C - -\*---------------------------------------------------------------------------*/ - -#ifndef linear_H -#define linear_H - -#include "compressibilityModel.H" -#include "dimensionedScalar.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -/*---------------------------------------------------------------------------*\ - Class linear Declaration -\*---------------------------------------------------------------------------*/ - -class linear -: - public compressibilityModel -{ - // Private data - - dimensionedScalar psiv_; - dimensionedScalar psil_; - - -public: - - //- Runtime type information - TypeName("linear"); - - - // Constructors - - //- construct from components - linear - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - ~linear() - {} - - - // Member Functions - - //- Correct the linear compressibility - void correct(); - - //- Read transportProperties dictionary - bool read(const dictionary& compressibilityProperties); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressibilityModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H b/applications/solvers/multiphase/lesCavitatingFoam/createFields.H index 69fe4ba411..47ac1c9387 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/createFields.H +++ b/applications/solvers/multiphase/lesCavitatingFoam/createFields.H @@ -40,11 +40,12 @@ gamma.oldTime(); Info<< "Creating compressibilityModel\n" << endl; - autoPtr psiModel = compressibilityModel::New - ( - thermodynamicProperties, - gamma - ); + autoPtr psiModel = + barotropicCompressibilityModel::New + ( + thermodynamicProperties, + gamma + ); const volScalarField& psi = psiModel->psi(); diff --git a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C index 4cf652063f..c1dba14b9f 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C +++ b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" #include "twoPhaseMixture.H" #include "incompressible/LESmodel/LESmodel.H" diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/files b/applications/solvers/multiphase/rasCavitatingFoam/Make/files index 35ad5c90c7..4509463796 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/Make/files +++ b/applications/solvers/multiphase/rasCavitatingFoam/Make/files @@ -1,8 +1,3 @@ rasCavitatingFoam.C -compressibilityModels/compressibilityModel/compressibilityModel.C -compressibilityModels/compressibilityModel/newCompressibilityModel.C -compressibilityModels/linear/linear.C -compressibilityModels/Wallis/Wallis.C -compressibilityModels/Chung/Chung.C -EXE = $(FOAM_USER_APPBIN)/rasCavitatingFoam +EXE = $(FOAM_APPBIN)/rasCavitatingFoam diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/options b/applications/solvers/multiphase/rasCavitatingFoam/Make/options index b124119a11..ffd4930257 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/Make/options +++ b/applications/solvers/multiphase/rasCavitatingFoam/Make/options @@ -4,10 +4,11 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ - -IcompressibilityModels/compressibilityModel + -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude EXE_LIBS = \ -lincompressibleTransportModels \ -lincompressibleTurbulenceModels \ - -lfiniteVolume + -lfiniteVolume \ + -lbarotropicCompressibilityModel diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.C b/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.C deleted file mode 100644 index 6010d8f6df..0000000000 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.C +++ /dev/null @@ -1,95 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "Chung.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -defineTypeNameAndDebug(Chung, 0); -addToRunTimeSelectionTable(compressibilityModel, Chung, dictionary); - -} -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModels::Chung::Chung -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityModel(compressibilityProperties, gamma), - psiv_(compressibilityProperties_.lookup("psiv")), - psil_(compressibilityProperties_.lookup("psil")), - rhovSat_(compressibilityProperties_.lookup("rhovSat")), - rholSat_(compressibilityProperties_.lookup("rholSat")) -{ - correct(); -} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -void Foam::compressibilityModels::Chung::correct() -{ - volScalarField sfa = sqrt - ( - (rhovSat_/psiv_) - /((scalar(1) - gamma_)*rhovSat_/psiv_ + gamma_*rholSat_/psil_) - ); - - psi_ = sqr - ( - ((scalar(1) - gamma_)/sqrt(psiv_) + gamma_*sfa/sqrt(psil_)) - *sqrt(psiv_*psil_)/sfa - ); -} - - -bool Foam::compressibilityModels::Chung::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityModel::read(compressibilityProperties); - - compressibilityProperties_.lookup("psiv") >> psiv_; - compressibilityProperties_.lookup("psil") >> psil_; - compressibilityProperties_.lookup("rhovSat") >> rhovSat_; - compressibilityProperties_.lookup("rholSat") >> rholSat_; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.H b/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.H deleted file mode 100644 index 316054231e..0000000000 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Chung/Chung.H +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModels::Chung - -Description - Chung compressibility model. - -SourceFiles - Chung.C - -\*---------------------------------------------------------------------------*/ - -#ifndef Chung_H -#define Chung_H - -#include "compressibilityModel.H" -#include "dimensionedScalar.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -/*---------------------------------------------------------------------------*\ - Class Chung Declaration -\*---------------------------------------------------------------------------*/ - -class Chung -: - public compressibilityModel -{ - // Private data - - dimensionedScalar psiv_; - dimensionedScalar psil_; - - dimensionedScalar rhovSat_; - dimensionedScalar rholSat_; - - -public: - - //- Runtime type information - TypeName("Chung"); - - - // Constructors - - //- construct from components - Chung - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - ~Chung() - {} - - - // Member Functions - - //- Correct the Chung compressibility - void correct(); - - //- Read transportProperties dictionary - bool read(const dictionary& compressibilityProperties); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressibilityModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C b/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C deleted file mode 100644 index c879f05a82..0000000000 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -InClass - compressibilityModel - -\*---------------------------------------------------------------------------*/ - -#include "compressibilityModel.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(compressibilityModel, 0); - defineRunTimeSelectionTable(compressibilityModel, dictionary); -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::compressibilityModel::compressibilityModel -( - const dictionary& compressibilityProperties, - const volScalarField& gamma -) -: - compressibilityProperties_(compressibilityProperties), - psi_ - ( - IOobject - ( - "psi", - gamma.mesh().time().timeName(), - gamma.mesh() - ), - gamma.mesh(), - dimensionedScalar("psi", dimensionSet(0, -2, 2, 0, 0), 0) - ), - gamma_(gamma) -{} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -bool Foam::compressibilityModel::read -( - const dictionary& compressibilityProperties -) -{ - compressibilityProperties_ = compressibilityProperties; - - return true; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H b/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H deleted file mode 100644 index e0df9d99f5..0000000000 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H +++ /dev/null @@ -1,154 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModel - -Description - -SourceFiles - compressibilityModel.C - newCompressibilityModel.C - -\*---------------------------------------------------------------------------*/ - -#ifndef compressibilityModel_H -#define compressibilityModel_H - -#include "IOdictionary.H" -#include "typeInfo.H" -#include "runTimeSelectionTables.H" -#include "volFields.H" -#include "dimensionedScalar.H" -#include "autoPtr.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class compressibilityModel Declaration -\*---------------------------------------------------------------------------*/ - -class compressibilityModel -{ - -protected: - - // Protected data - - dictionary compressibilityProperties_; - - volScalarField psi_; - const volScalarField& gamma_; - - - // Private Member Functions - - //- Disallow copy construct - compressibilityModel(const compressibilityModel&); - - //- Disallow default bitwise assignment - void operator=(const compressibilityModel&); - - -public: - - //- Runtime type information - TypeName("compressibilityModel"); - - - // Declare run-time constructor selection table - - declareRunTimeSelectionTable - ( - autoPtr, - compressibilityModel, - dictionary, - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ), - (compressibilityProperties, gamma) - ); - - - // Selectors - - //- Return a reference to the selected compressibility model - static autoPtr New - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Constructors - - //- Construct from components - compressibilityModel - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - virtual ~compressibilityModel() - {} - - - // Member Functions - - //- Return the phase transport properties dictionary - const dictionary& compressibilityProperties() const - { - return compressibilityProperties_; - } - - //- Return the compressibility - const volScalarField& psi() const - { - return psi_; - } - - //- Correct the compressibility - virtual void correct() = 0; - - //- Read compressibilityProperties dictionary - virtual bool read(const dictionary& compressibilityProperties) = 0; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/linear/linear.H b/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/linear/linear.H deleted file mode 100644 index fbb614cf45..0000000000 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/linear/linear.H +++ /dev/null @@ -1,104 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::compressibilityModels::linear - -Description - linear compressibility model. - -SourceFiles - linear.C - -\*---------------------------------------------------------------------------*/ - -#ifndef linear_H -#define linear_H - -#include "compressibilityModel.H" -#include "dimensionedScalar.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressibilityModels -{ - -/*---------------------------------------------------------------------------*\ - Class linear Declaration -\*---------------------------------------------------------------------------*/ - -class linear -: - public compressibilityModel -{ - // Private data - - dimensionedScalar psiv_; - dimensionedScalar psil_; - - -public: - - //- Runtime type information - TypeName("linear"); - - - // Constructors - - //- construct from components - linear - ( - const dictionary& compressibilityProperties, - const volScalarField& gamma - ); - - - // Destructor - - ~linear() - {} - - - // Member Functions - - //- Correct the linear compressibility - void correct(); - - //- Read transportProperties dictionary - bool read(const dictionary& compressibilityProperties); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressibilityModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H b/applications/solvers/multiphase/rasCavitatingFoam/createFields.H index e7877c947b..21f5b136bb 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/createFields.H +++ b/applications/solvers/multiphase/rasCavitatingFoam/createFields.H @@ -40,11 +40,12 @@ gamma.oldTime(); Info<< "Creating compressibilityModel\n" << endl; - autoPtr psiModel = compressibilityModel::New - ( - thermodynamicProperties, - gamma - ); + autoPtr psiModel = + barotropicCompressibilityModel::New + ( + thermodynamicProperties, + gamma + ); const volScalarField& psi = psiModel->psi(); diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C index c945676d90..b2ebdb46af 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C +++ b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" #include "twoPhaseMixture.H" #include "incompressible/turbulenceModel/turbulenceModel.H" diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 289a608823..69a99a09ad 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -14,4 +14,5 @@ wmake libso laminarFlameSpeed wmake libso chemistryModel wmake libso pdfs wmake libso radiation +wmake libso barotropicCompressibilityModel diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Chung/Chung.C b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C similarity index 92% rename from applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Chung/Chung.C rename to src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C index 6010d8f6df..9cc6f52b4a 100644 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/Chung/Chung.C +++ b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C @@ -35,7 +35,7 @@ namespace compressibilityModels { defineTypeNameAndDebug(Chung, 0); -addToRunTimeSelectionTable(compressibilityModel, Chung, dictionary); +addToRunTimeSelectionTable(barotropicCompressibilityModel, Chung, dictionary); } } @@ -48,7 +48,7 @@ Foam::compressibilityModels::Chung::Chung const volScalarField& gamma ) : - compressibilityModel(compressibilityProperties, gamma), + barotropicCompressibilityModel(compressibilityProperties, gamma), psiv_(compressibilityProperties_.lookup("psiv")), psil_(compressibilityProperties_.lookup("psil")), rhovSat_(compressibilityProperties_.lookup("rhovSat")), @@ -81,7 +81,7 @@ bool Foam::compressibilityModels::Chung::read const dictionary& compressibilityProperties ) { - compressibilityModel::read(compressibilityProperties); + barotropicCompressibilityModel::read(compressibilityProperties); compressibilityProperties_.lookup("psiv") >> psiv_; compressibilityProperties_.lookup("psil") >> psil_; diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Chung/Chung.H b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H similarity index 96% rename from applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Chung/Chung.H rename to src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H index 316054231e..75427463fa 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/Chung/Chung.H +++ b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H @@ -36,7 +36,7 @@ SourceFiles #ifndef Chung_H #define Chung_H -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" #include "dimensionedScalar.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +52,7 @@ namespace compressibilityModels class Chung : - public compressibilityModel + public barotropicCompressibilityModel { // Private data diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Make/files b/src/thermophysicalModels/barotropicCompressibilityModel/Make/files new file mode 100644 index 0000000000..999ee53918 --- /dev/null +++ b/src/thermophysicalModels/barotropicCompressibilityModel/Make/files @@ -0,0 +1,7 @@ +barotropicCompressibilityModel/barotropicCompressibilityModel.C +barotropicCompressibilityModel/newBarotropicCompressibilityModel.C +linear/linear.C +Wallis/Wallis.C +Chung/Chung.C + +LIB = $(FOAM_LIBBIN)/libbarotropicCompressibilityModel diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options new file mode 100644 index 0000000000..fa15f12452 --- /dev/null +++ b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options @@ -0,0 +1,5 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude + +EXE_LIBS = \ + -lfiniteVolume diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Wallis/Wallis.C b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C similarity index 92% rename from applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Wallis/Wallis.C rename to src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C index 370cd1413f..311b22a747 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Wallis/Wallis.C +++ b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C @@ -35,7 +35,7 @@ namespace compressibilityModels { defineTypeNameAndDebug(Wallis, 0); -addToRunTimeSelectionTable(compressibilityModel, Wallis, dictionary); +addToRunTimeSelectionTable(barotropicCompressibilityModel, Wallis, dictionary); } } @@ -48,7 +48,7 @@ Foam::compressibilityModels::Wallis::Wallis const volScalarField& gamma ) : - compressibilityModel(compressibilityProperties, gamma), + barotropicCompressibilityModel(compressibilityProperties, gamma), psiv_(compressibilityProperties_.lookup("psiv")), psil_(compressibilityProperties_.lookup("psil")), rhovSat_(compressibilityProperties_.lookup("rhovSat")), @@ -72,7 +72,7 @@ bool Foam::compressibilityModels::Wallis::read const dictionary& compressibilityProperties ) { - compressibilityModel::read(compressibilityProperties); + barotropicCompressibilityModel::read(compressibilityProperties); compressibilityProperties_.lookup("psiv") >> psiv_; compressibilityProperties_.lookup("psil") >> psil_; diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Wallis/Wallis.H b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H similarity index 96% rename from applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Wallis/Wallis.H rename to src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H index df576fc63a..c5261d7cde 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/Wallis/Wallis.H +++ b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H @@ -36,7 +36,7 @@ SourceFiles #ifndef Wallis_H #define Wallis_H -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" #include "dimensionedScalar.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +52,7 @@ namespace compressibilityModels class Wallis : - public compressibilityModel + public barotropicCompressibilityModel { // Private data diff --git a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.C similarity index 86% rename from applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C rename to src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.C index c879f05a82..6619cbc988 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.C +++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.C @@ -23,23 +23,23 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA InClass - compressibilityModel + barotropicCompressibilityModel \*---------------------------------------------------------------------------*/ -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(compressibilityModel, 0); - defineRunTimeSelectionTable(compressibilityModel, dictionary); + defineTypeNameAndDebug(barotropicCompressibilityModel, 0); + defineRunTimeSelectionTable(barotropicCompressibilityModel, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::compressibilityModel::compressibilityModel +Foam::barotropicCompressibilityModel::barotropicCompressibilityModel ( const dictionary& compressibilityProperties, const volScalarField& gamma @@ -63,7 +63,7 @@ Foam::compressibilityModel::compressibilityModel // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -bool Foam::compressibilityModel::read +bool Foam::barotropicCompressibilityModel::read ( const dictionary& compressibilityProperties ) diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H similarity index 83% rename from applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H rename to src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H index e0df9d99f5..87110a662a 100644 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/compressibilityModel/compressibilityModel.H +++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H @@ -23,18 +23,18 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressibilityModel + Foam::barotropicCompressibilityModel Description SourceFiles - compressibilityModel.C - newCompressibilityModel.C + barotropicCompressibilityModel.C + newbarotropicCompressibilityModel.C \*---------------------------------------------------------------------------*/ -#ifndef compressibilityModel_H -#define compressibilityModel_H +#ifndef barotropicCompressibilityModel_H +#define barotropicCompressibilityModel_H #include "IOdictionary.H" #include "typeInfo.H" @@ -49,10 +49,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class compressibilityModel Declaration + Class barotropicCompressibilityModel Declaration \*---------------------------------------------------------------------------*/ -class compressibilityModel +class barotropicCompressibilityModel { protected: @@ -68,16 +68,16 @@ protected: // Private Member Functions //- Disallow copy construct - compressibilityModel(const compressibilityModel&); + barotropicCompressibilityModel(const barotropicCompressibilityModel&); //- Disallow default bitwise assignment - void operator=(const compressibilityModel&); + void operator=(const barotropicCompressibilityModel&); public: //- Runtime type information - TypeName("compressibilityModel"); + TypeName("barotropicCompressibilityModel"); // Declare run-time constructor selection table @@ -85,7 +85,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - compressibilityModel, + barotropicCompressibilityModel, dictionary, ( const dictionary& compressibilityProperties, @@ -98,7 +98,7 @@ public: // Selectors //- Return a reference to the selected compressibility model - static autoPtr New + static autoPtr New ( const dictionary& compressibilityProperties, const volScalarField& gamma @@ -108,7 +108,7 @@ public: // Constructors //- Construct from components - compressibilityModel + barotropicCompressibilityModel ( const dictionary& compressibilityProperties, const volScalarField& gamma @@ -117,7 +117,7 @@ public: // Destructor - virtual ~compressibilityModel() + virtual ~barotropicCompressibilityModel() {} diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C similarity index 74% rename from applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C rename to src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C index 9604b563f5..9895b7100b 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/compressibilityModel/newCompressibilityModel.C +++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C @@ -24,40 +24,41 @@ License \*---------------------------------------------------------------------------*/ -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::compressibilityModel::New +Foam::autoPtr +Foam::barotropicCompressibilityModel::New ( const dictionary& compressibilityProperties, const volScalarField& gamma ) { - word compressibilityModelTypeName + word bcModelTypeName ( - compressibilityProperties.lookup("compressibilityModel") + compressibilityProperties.lookup("barotropicCompressibilityModel") ); Info<< "Selecting compressibility model " - << compressibilityModelTypeName << endl; + << bcModelTypeName << endl; dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(compressibilityModelTypeName); + dictionaryConstructorTablePtr_->find(bcModelTypeName); if (cstrIter == dictionaryConstructorTablePtr_->end()) { FatalErrorIn ( - "compressibilityModel::New(const volScalarField&)" - ) << "Unknown compressibilityModel type " - << compressibilityModelTypeName << endl << endl - << "Valid compressibilityModels are : " << endl + "barotropicCompressibilityModel::New(const volScalarField&)" + ) << "Unknown barotropicCompressibilityModel type " + << bcModelTypeName << endl << endl + << "Valid barotropicCompressibilityModels are : " << endl << dictionaryConstructorTablePtr_->toc() << exit(FatalError); } - return autoPtr + return autoPtr ( cstrIter()(compressibilityProperties, gamma) ); diff --git a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/linear/linear.C b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C similarity index 91% rename from applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/linear/linear.C rename to src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C index 8bd2316cdc..c4e646e046 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/compressibilityModels/linear/linear.C +++ b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C @@ -35,7 +35,7 @@ namespace compressibilityModels { defineTypeNameAndDebug(linear, 0); -addToRunTimeSelectionTable(compressibilityModel, linear, dictionary); +addToRunTimeSelectionTable(barotropicCompressibilityModel, linear, dictionary); } } @@ -48,7 +48,7 @@ Foam::compressibilityModels::linear::linear const volScalarField& gamma ) : - compressibilityModel(compressibilityProperties, gamma), + barotropicCompressibilityModel(compressibilityProperties, gamma), psiv_(compressibilityProperties_.lookup("psiv")), psil_(compressibilityProperties_.lookup("psil")) { @@ -70,7 +70,7 @@ bool Foam::compressibilityModels::linear::read const dictionary& compressibilityProperties ) { - compressibilityModel::read(compressibilityProperties); + barotropicCompressibilityModel::read(compressibilityProperties); compressibilityProperties_.lookup("psiv") >> psiv_; compressibilityProperties_.lookup("psil") >> psil_; diff --git a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/linear/linear.H b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H similarity index 96% rename from applications/solvers/multiphase/cavitatingFoam/compressibilityModels/linear/linear.H rename to src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H index fbb614cf45..69a6cf8c20 100644 --- a/applications/solvers/multiphase/cavitatingFoam/compressibilityModels/linear/linear.H +++ b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H @@ -36,7 +36,7 @@ SourceFiles #ifndef linear_H #define linear_H -#include "compressibilityModel.H" +#include "barotropicCompressibilityModel.H" #include "dimensionedScalar.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +52,7 @@ namespace compressibilityModels class linear : - public compressibilityModel + public barotropicCompressibilityModel { // Private data