diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files index 4457f8ea02..9a0afbd76b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files @@ -1,6 +1,5 @@ dragModels/dragModel/dragModel.C dragModels/dragModel/newDragModel.C -dragModels/noDrag/noDrag.C dragModels/segregated/segregated.C dragModels/Ergun/Ergun.C dragModels/Gibilaro/Gibilaro.C @@ -25,7 +24,6 @@ liftModels/TomiyamaLift/TomiyamaLift.C heatTransferModels/heatTransferModel/heatTransferModel.C heatTransferModels/heatTransferModel/newHeatTransferModel.C -heatTransferModels/noHeatTransfer/noHeatTransfer.C heatTransferModels/RanzMarshall/RanzMarshall.C virtualMassModels/virtualMassModel/virtualMassModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C deleted file mode 100644 index d955c9e796..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C +++ /dev/null @@ -1,91 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "noDrag.H" -#include "phasePair.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace dragModels -{ - defineTypeNameAndDebug(noDrag, 0); - addToRunTimeSelectionTable(dragModel, noDrag, dictionary); -} -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::dragModels::noDrag::noDrag -( - const dictionary& dict, - const phasePair& pair, - const bool registerObject -) -: - dragModel(pair, registerObject) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::dragModels::noDrag::~noDrag() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::tmp Foam::dragModels::noDrag::CdRe() const -{ - const fvMesh& mesh(this->pair_.phase1().mesh()); - - return - tmp - ( - new volScalarField - ( - IOobject - ( - "Cd", - mesh.time().timeName(), - mesh - ), - mesh, - dimensionedScalar("Cd", dimless, 0) - ) - ); -} - - -Foam::tmp Foam::dragModels::noDrag::K() const -{ - return CdRe()*dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0), 0); -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H deleted file mode 100644 index b24267ee1b..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H +++ /dev/null @@ -1,97 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::dragModels::noDrag - -Description - -SourceFiles - noDrag.C - -\*---------------------------------------------------------------------------*/ - -#ifndef noDrag_H -#define noDrag_H - -#include "dragModel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -class phasePair; - -namespace dragModels -{ - -/*---------------------------------------------------------------------------*\ - Class noDrag Declaration -\*---------------------------------------------------------------------------*/ - -class noDrag -: - public dragModel -{ -public: - - //- Runtime type information - TypeName("none"); - - - // Constructors - - //- Construct from a dictionary and a phase pair - noDrag - ( - const dictionary& dict, - const phasePair& pair, - const bool registerObject - ); - - - //- Destructor - virtual ~noDrag(); - - - // Member Functions - - //- Drag coefficient - virtual tmp CdRe() const; - - //- The drag function used in the momentum equation - virtual tmp K() const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace dragModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.C deleted file mode 100644 index 1a4b3744e8..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.C +++ /dev/null @@ -1,87 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "noHeatTransfer.H" -#include "phasePair.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ -namespace heatTransferModels -{ - defineTypeNameAndDebug(noHeatTransfer, 0); - addToRunTimeSelectionTable(heatTransferModel, noHeatTransfer, dictionary); -} -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::heatTransferModels::noHeatTransfer::noHeatTransfer -( - const dictionary& dict, - const phasePair& pair -) -: - heatTransferModel(dict, pair) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::heatTransferModels::noHeatTransfer::~noHeatTransfer() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::tmp -Foam::heatTransferModels::noHeatTransfer::K() const -{ - const fvMesh& mesh(this->pair_.phase1().mesh()); - - return - tmp - ( - new volScalarField - ( - IOobject - ( - "zero", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - dimensionedScalar("zero", dimensionSet(1, -1, -3, -1, 0), 0) - ) - ); -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.H deleted file mode 100644 index 5b17181434..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/noHeatTransfer/noHeatTransfer.H +++ /dev/null @@ -1,93 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::heatTransferModels::noHeatTransfer - -Description - -SourceFiles - noHeatTransfer.C - -\*---------------------------------------------------------------------------*/ - -#ifndef noHeatTransfer_H -#define noHeatTransfer_H - -#include "heatTransferModel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -class phasePair; - -namespace heatTransferModels -{ - -/*---------------------------------------------------------------------------*\ - Class noHeatTransfer Declaration -\*---------------------------------------------------------------------------*/ - -class noHeatTransfer -: - public heatTransferModel -{ -public: - - //- Runtime type information - TypeName("none"); - - - // Constructors - - //- Construct from a dictionary and a phase pair - noHeatTransfer - ( - const dictionary& dict, - const phasePair& pair - ); - - - //- Destructor - virtual ~noHeatTransfer(); - - - // Member Functions - - //- The heat transfer function K used in the enthalpy equation - tmp K() const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace heatTransferModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* //