From 1567f5c620deab69c5a5bfdd92ac0ad9901996f5 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 26 Sep 2014 15:05:11 +0100 Subject: [PATCH] Remove from release --- .../pUCoupledFullPicardFoam/Make/files | 3 - .../pUCoupledFullPicardFoam/Make/options | 12 -- .../coupled/pUCoupledFullPicardFoam/UEqn.H | 12 -- .../pUCoupledFullPicardFoam/createFields.H | 52 -------- .../coupled/pUCoupledFullPicardFoam/pEqn.H | 23 ---- .../pUCoupledFullPicardFoam.C | 116 ------------------ .../readBlockSolverControls.H | 3 - .../pUCoupledSemiPicardFoam/Make/files | 3 - .../pUCoupledSemiPicardFoam/Make/options | 12 -- .../coupled/pUCoupledSemiPicardFoam/UEqn.H | 11 -- .../pUCoupledSemiPicardFoam/createFields.H | 52 -------- .../coupled/pUCoupledSemiPicardFoam/pEqn.H | 23 ---- .../pUCoupledSemiPicardFoam.C | 116 ------------------ .../readBlockSolverControls.H | 3 - 14 files changed, 441 deletions(-) delete mode 100644 applications/solvers/coupled/pUCoupledFullPicardFoam/Make/files delete mode 100644 applications/solvers/coupled/pUCoupledFullPicardFoam/Make/options delete mode 100644 applications/solvers/coupled/pUCoupledFullPicardFoam/UEqn.H delete mode 100644 applications/solvers/coupled/pUCoupledFullPicardFoam/createFields.H delete mode 100644 applications/solvers/coupled/pUCoupledFullPicardFoam/pEqn.H delete mode 100644 applications/solvers/coupled/pUCoupledFullPicardFoam/pUCoupledFullPicardFoam.C delete mode 100644 applications/solvers/coupled/pUCoupledFullPicardFoam/readBlockSolverControls.H delete mode 100644 applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/files delete mode 100644 applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/options delete mode 100644 applications/solvers/coupled/pUCoupledSemiPicardFoam/UEqn.H delete mode 100644 applications/solvers/coupled/pUCoupledSemiPicardFoam/createFields.H delete mode 100644 applications/solvers/coupled/pUCoupledSemiPicardFoam/pEqn.H delete mode 100644 applications/solvers/coupled/pUCoupledSemiPicardFoam/pUCoupledSemiPicardFoam.C delete mode 100644 applications/solvers/coupled/pUCoupledSemiPicardFoam/readBlockSolverControls.H diff --git a/applications/solvers/coupled/pUCoupledFullPicardFoam/Make/files b/applications/solvers/coupled/pUCoupledFullPicardFoam/Make/files deleted file mode 100644 index 7bda4a174..000000000 --- a/applications/solvers/coupled/pUCoupledFullPicardFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -pUCoupledFullPicardFoam.C - -EXE = $(FOAM_APPBIN)/pUCoupledFullPicardFoam diff --git a/applications/solvers/coupled/pUCoupledFullPicardFoam/Make/options b/applications/solvers/coupled/pUCoupledFullPicardFoam/Make/options deleted file mode 100644 index 5d2b99e6d..000000000 --- a/applications/solvers/coupled/pUCoupledFullPicardFoam/Make/options +++ /dev/null @@ -1,12 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/finiteVolume/lnInclude - -EXE_LIBS = \ - -lincompressibleRASModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -llduSolvers diff --git a/applications/solvers/coupled/pUCoupledFullPicardFoam/UEqn.H b/applications/solvers/coupled/pUCoupledFullPicardFoam/UEqn.H deleted file mode 100644 index aaf374e78..000000000 --- a/applications/solvers/coupled/pUCoupledFullPicardFoam/UEqn.H +++ /dev/null @@ -1,12 +0,0 @@ -// Momentum equation -fvVectorMatrix UEqn -( - fvm::div(phi, U) - + fvc::div(-phi, U, "div(phi,U)") - + turbulence->divDevReff(U) -); - -UEqn.relax(); - -UpEqn.insertEquation(0, UEqn); -UpEqn.insertPicardTensor(0, U, phi); diff --git a/applications/solvers/coupled/pUCoupledFullPicardFoam/createFields.H b/applications/solvers/coupled/pUCoupledFullPicardFoam/createFields.H deleted file mode 100644 index 1ea6ea880..000000000 --- a/applications/solvers/coupled/pUCoupledFullPicardFoam/createFields.H +++ /dev/null @@ -1,52 +0,0 @@ -Info << "Reading field p\n" << endl; -volScalarField p -( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -Info << "Reading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "createPhi.H" - -singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence -( - incompressible::RASModel::New(U, phi, laminarTransport) -); - -// Block vector field for velocity (first entry) and pressure (second -// entry). -Info << "Creating field Up\n" << endl; -volVector4Field Up -( - IOobject - ( - "Up", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedVector4("zero", dimless, vector4::zero) -); diff --git a/applications/solvers/coupled/pUCoupledFullPicardFoam/pEqn.H b/applications/solvers/coupled/pUCoupledFullPicardFoam/pEqn.H deleted file mode 100644 index 9029b873f..000000000 --- a/applications/solvers/coupled/pUCoupledFullPicardFoam/pEqn.H +++ /dev/null @@ -1,23 +0,0 @@ -// Pressure parts of the continuity equation -surfaceScalarField rUAf -( - "rUAf", - fvc::interpolate(1.0/UEqn.A()) -); - -surfaceScalarField presSource -( - "presSource", - rUAf*(fvc::interpolate(fvc::grad(p, "grad(pSource)")) & mesh.Sf()) -); - -fvScalarMatrix pEqn -( - - fvm::laplacian(rUAf, p) - == - - fvc::div(presSource) -); - -pEqn.setReference(pRefCell, pRefValue); - -UpEqn.insertEquation(3, pEqn); diff --git a/applications/solvers/coupled/pUCoupledFullPicardFoam/pUCoupledFullPicardFoam.C b/applications/solvers/coupled/pUCoupledFullPicardFoam/pUCoupledFullPicardFoam.C deleted file mode 100644 index 17aa125a8..000000000 --- a/applications/solvers/coupled/pUCoupledFullPicardFoam/pUCoupledFullPicardFoam.C +++ /dev/null @@ -1,116 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ 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 - -Application - pUCoupledFullPicardFoam - -Description - Steady-state solver for incompressible, turbulent flow, with implicit - coupling between pressure and velocity achieved by fvBlockMatrix. - Turbulence is in this version solved using the existing turbulence - structure. - Convective term is properly linearised using Picard linearisation and - additional block coefficients. This is full, proper variant! - VV, 23/July/2014. - -Authors - Klas Jareteg, Chalmers University of Technology, - Vuko Vukcevic, FMENA Zagreb. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "RASModel.H" -#include "fvBlockMatrix.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" -# include "createFields.H" -# include "initContinuityErrs.H" -# include "readBlockSolverControls.H" - - // Calculate div U coupling only once since it is only geometry dependant. - BlockLduSystem UInp(fvm::div(U)); - - Info<< "\nStarting time loop\n" << endl; - while (runTime.loop()) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - p.storePrevIter(); - - // Initialize the Up block system (matrix, source and reference to Up) - fvBlockMatrix UpEqn(Up); - - // Assemble and insert momentum equation -# include "UEqn.H" - - // Assemble and insert pressure equation -# include "pEqn.H" - - // Calculate grad p coupling matrix. Needs to be here if one uses - // gradient schemes with limiters. VV, 9/June/2014 - BlockLduSystem pInU(fvm::grad(p)); - - // Last argument in insertBlockCoupling says if the column direction - // should be incremented. This is needed for arbitrary positioning - // of U and p in the system. This could be better. VV, 30/April/2014 - UpEqn.insertBlockCoupling(0, 3, pInU, true); - UpEqn.insertBlockCoupling(3, 0, UInp, false); - - // Solve the block matrix - UpEqn.solve(); - - // Retrieve solution - UpEqn.retrieveSolution(0, U.internalField()); - UpEqn.retrieveSolution(3, p.internalField()); - - U.correctBoundaryConditions(); - p.correctBoundaryConditions(); - - phi = (fvc::interpolate(U) & mesh.Sf()) + pEqn.flux() + presSource; - -# include "continuityErrs.H" - - p.relax(); - - turbulence->correct(); - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} diff --git a/applications/solvers/coupled/pUCoupledFullPicardFoam/readBlockSolverControls.H b/applications/solvers/coupled/pUCoupledFullPicardFoam/readBlockSolverControls.H deleted file mode 100644 index 4ee98e519..000000000 --- a/applications/solvers/coupled/pUCoupledFullPicardFoam/readBlockSolverControls.H +++ /dev/null @@ -1,3 +0,0 @@ -label pRefCell = 0; -scalar pRefValue = 0; -setRefCell(p, mesh.solutionDict().subDict("blockSolver"), pRefCell, pRefValue); diff --git a/applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/files b/applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/files deleted file mode 100644 index b7659c7d3..000000000 --- a/applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -pUCoupledSemiPicardFoam.C - -EXE = $(FOAM_APPBIN)/pUCoupledSemiPicardFoam diff --git a/applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/options b/applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/options deleted file mode 100644 index 5d2b99e6d..000000000 --- a/applications/solvers/coupled/pUCoupledSemiPicardFoam/Make/options +++ /dev/null @@ -1,12 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/finiteVolume/lnInclude - -EXE_LIBS = \ - -lincompressibleRASModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -llduSolvers diff --git a/applications/solvers/coupled/pUCoupledSemiPicardFoam/UEqn.H b/applications/solvers/coupled/pUCoupledSemiPicardFoam/UEqn.H deleted file mode 100644 index f0e2d9d75..000000000 --- a/applications/solvers/coupled/pUCoupledSemiPicardFoam/UEqn.H +++ /dev/null @@ -1,11 +0,0 @@ -// Momentum equation -fvVectorMatrix UEqn -( - fvm::div(2*phi, U,"div(phi,U)") - + fvc::div(-phi, U,"div(phi,U)") - + turbulence->divDevReff(U) -); - -UEqn.relax(); - -UpEqn.insertEquation(0, UEqn); diff --git a/applications/solvers/coupled/pUCoupledSemiPicardFoam/createFields.H b/applications/solvers/coupled/pUCoupledSemiPicardFoam/createFields.H deleted file mode 100644 index 1ea6ea880..000000000 --- a/applications/solvers/coupled/pUCoupledSemiPicardFoam/createFields.H +++ /dev/null @@ -1,52 +0,0 @@ -Info << "Reading field p\n" << endl; -volScalarField p -( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -Info << "Reading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "createPhi.H" - -singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence -( - incompressible::RASModel::New(U, phi, laminarTransport) -); - -// Block vector field for velocity (first entry) and pressure (second -// entry). -Info << "Creating field Up\n" << endl; -volVector4Field Up -( - IOobject - ( - "Up", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedVector4("zero", dimless, vector4::zero) -); diff --git a/applications/solvers/coupled/pUCoupledSemiPicardFoam/pEqn.H b/applications/solvers/coupled/pUCoupledSemiPicardFoam/pEqn.H deleted file mode 100644 index 9029b873f..000000000 --- a/applications/solvers/coupled/pUCoupledSemiPicardFoam/pEqn.H +++ /dev/null @@ -1,23 +0,0 @@ -// Pressure parts of the continuity equation -surfaceScalarField rUAf -( - "rUAf", - fvc::interpolate(1.0/UEqn.A()) -); - -surfaceScalarField presSource -( - "presSource", - rUAf*(fvc::interpolate(fvc::grad(p, "grad(pSource)")) & mesh.Sf()) -); - -fvScalarMatrix pEqn -( - - fvm::laplacian(rUAf, p) - == - - fvc::div(presSource) -); - -pEqn.setReference(pRefCell, pRefValue); - -UpEqn.insertEquation(3, pEqn); diff --git a/applications/solvers/coupled/pUCoupledSemiPicardFoam/pUCoupledSemiPicardFoam.C b/applications/solvers/coupled/pUCoupledSemiPicardFoam/pUCoupledSemiPicardFoam.C deleted file mode 100644 index 160ff488e..000000000 --- a/applications/solvers/coupled/pUCoupledSemiPicardFoam/pUCoupledSemiPicardFoam.C +++ /dev/null @@ -1,116 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ 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 - -Application - pUCoupledSemiPicardFoam - -Description - Steady-state solver for incompressible, turbulent flow, with implicit - coupling between pressure and velocity achieved by fvBlockMatrix. - Turbulence is in this version solved using the existing turbulence - structure. - Convective term is properly linearised using Picard linearisation and - additional block coefficients. This is semi variant where the difference - between succesive velocity fields is neglected! VV, 23/July/2014. - -Authors - Klas Jareteg, Chalmers University of Technology, - Vuko Vukcevic, FMENA Zagreb. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "RASModel.H" -#include "fvBlockMatrix.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" -# include "createFields.H" -# include "initContinuityErrs.H" -# include "readBlockSolverControls.H" - - // Calculate div U coupling only once since it is only geometry dependant. - BlockLduSystem UInp(fvm::div(U)); - - Info<< "\nStarting time loop\n" << endl; - while (runTime.loop()) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - p.storePrevIter(); - - // Initialize the Up block system (matrix, source and reference to Up) - fvBlockMatrix UpEqn(Up); - - // Assemble and insert momentum equation -# include "UEqn.H" - - // Assemble and insert pressure equation -# include "pEqn.H" - - // Calculate grad p coupling matrix. Needs to be here if one uses - // gradient schemes with limiters. VV, 9/June/2014 - BlockLduSystem pInU(fvm::grad(p)); - - // Last argument in insertBlockCoupling says if the column direction - // should be incremented. This is needed for arbitrary positioning - // of U and p in the system. This could be better. VV, 30/April/2014 - UpEqn.insertBlockCoupling(0, 3, pInU, true); - UpEqn.insertBlockCoupling(3, 0, UInp, false); - - // Solve the block matrix - UpEqn.solve(); - - // Retrieve solution - UpEqn.retrieveSolution(0, U.internalField()); - UpEqn.retrieveSolution(3, p.internalField()); - - U.correctBoundaryConditions(); - p.correctBoundaryConditions(); - - phi = (fvc::interpolate(U) & mesh.Sf()) + pEqn.flux() + presSource; - -# include "continuityErrs.H" - - p.relax(); - - turbulence->correct(); - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} diff --git a/applications/solvers/coupled/pUCoupledSemiPicardFoam/readBlockSolverControls.H b/applications/solvers/coupled/pUCoupledSemiPicardFoam/readBlockSolverControls.H deleted file mode 100644 index 4ee98e519..000000000 --- a/applications/solvers/coupled/pUCoupledSemiPicardFoam/readBlockSolverControls.H +++ /dev/null @@ -1,3 +0,0 @@ -label pRefCell = 0; -scalar pRefValue = 0; -setRefCell(p, mesh.solutionDict().subDict("blockSolver"), pRefCell, pRefValue);