From ef95c576ffa4f97a3932f550454eb8103ea353a8 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 13 Feb 2015 21:39:48 +0000 Subject: [PATCH] porousInterFoam is no longer needed Use interFoam with fvOptions --- .../interFoam/porousInterFoam/Make/files | 3 - .../interFoam/porousInterFoam/Make/options | 23 ---- .../interFoam/porousInterFoam/UEqn.H | 42 ------ .../porousInterFoam/createPorousZones.H | 1 - .../porousInterFoam/porousInterFoam.C | 121 ------------------ 5 files changed, 190 deletions(-) delete mode 100644 applications/solvers/multiphase/interFoam/porousInterFoam/Make/files delete mode 100644 applications/solvers/multiphase/interFoam/porousInterFoam/Make/options delete mode 100644 applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H delete mode 100644 applications/solvers/multiphase/interFoam/porousInterFoam/createPorousZones.H delete mode 100644 applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/files b/applications/solvers/multiphase/interFoam/porousInterFoam/Make/files deleted file mode 100644 index dda65f11ff..0000000000 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -porousInterFoam.C - -EXE = $(FOAM_APPBIN)/porousInterFoam diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options b/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options deleted file mode 100644 index 7a3dd1e71f..0000000000 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options +++ /dev/null @@ -1,23 +0,0 @@ -EXE_INC = \ - -I.. \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - -EXE_LIBS = \ - -limmiscibleIncompressibleTwoPhaseMixture \ - -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lfiniteVolume \ - -lmeshTools \ - -lfvOptions \ - -lsampling diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H b/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H deleted file mode 100644 index e175dcb92c..0000000000 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H +++ /dev/null @@ -1,42 +0,0 @@ - surfaceScalarField muEff - ( - "muEff", - mixture.muf() - + fvc::interpolate(rho*turbulence->nut()) - ); - - // Calculate and cache mu for the porous media - volScalarField mu(mixture.mu()); - - fvVectorMatrix UEqn - ( - //pZones.ddt(rho, U) - fvm::ddt(rho, U) - + fvm::div(rhoPhi, U) - - fvm::laplacian(muEff, U) - - (fvc::grad(U) & fvc::grad(muEff)) - //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf())) - == - fvOptions(rho, U) - ); - - UEqn.relax(); - pZones.addResistance(UEqn); - fvOptions.constrain(UEqn); - - if (pimple.momentumPredictor()) - { - solve - ( - UEqn - == - fvc::reconstruct - ( - ( - mixture.surfaceTensionForce() - - ghf*fvc::snGrad(rho) - - fvc::snGrad(p_rgh) - ) * mesh.magSf() - ) - ); - } diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/createPorousZones.H b/applications/solvers/multiphase/interFoam/porousInterFoam/createPorousZones.H deleted file mode 100644 index 983906074a..0000000000 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/createPorousZones.H +++ /dev/null @@ -1 +0,0 @@ - IOporosityModelList pZones(mesh); diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C deleted file mode 100644 index a8d621bed1..0000000000 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C +++ /dev/null @@ -1,121 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 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 . - -Application - porousInterFoam - -Description - Solver for 2 incompressible, isothermal immiscible fluids using a VOF - (volume of fluid) phase-fraction based interface capturing approach. - The momentum and other fluid properties are of the "mixture" and a single - momentum equation is solved. - - Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - - For a two-fluid approach see twoPhaseEulerFoam. - - Explicit handling of porous zones is included. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "CMULES.H" -#include "subCycle.H" -#include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulentTransportModel.H" -#include "IOporosityModelList.H" -#include "pimpleControl.H" -#include "fvIOoptionList.H" -#include "CorrectPhi.H" -#include "fixedFluxPressureFvPatchScalarField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - #include "createTime.H" - #include "createMesh.H" - - pimpleControl pimple(mesh); - - #include "initContinuityErrs.H" - #include "createFields.H" - #include "createFvOptions.H" - #include "createPorousZones.H" - #include "readTimeControls.H" - #include "correctPhi.H" - #include "CourantNo.H" - #include "setInitialDeltaT.H" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - #include "readTimeControls.H" - #include "CourantNo.H" - #include "alphaCourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - #include "alphaControls.H" - #include "alphaEqnSubCycle.H" - - mixture.correct(); - - #include "UEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - turbulence->correct(); - } - } - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* //