From 5291dfb1bc86766f2a8a28755f00d910b8ffd7c2 Mon Sep 17 00:00:00 2001 From: danielque Date: Wed, 9 Feb 2022 14:13:01 +0100 Subject: [PATCH] remove cfdemSolverIBTorque remove cfdemSolverIBTorque as it is essentially a copy of cfdemSolverIB --- .../solvers/cfdemSolverIBTorque/Make/files | 3 - .../solvers/cfdemSolverIBTorque/Make/options | 33 ---- .../cfdemSolverIBTorque/cfdemSolverIBTorque.C | 180 ------------------ .../cfdemSolverIBTorque/createFields.H | 126 ------------ etc/solver-list.txt | 1 - 5 files changed, 343 deletions(-) delete mode 100755 applications/solvers/cfdemSolverIBTorque/Make/files delete mode 100755 applications/solvers/cfdemSolverIBTorque/Make/options delete mode 100755 applications/solvers/cfdemSolverIBTorque/cfdemSolverIBTorque.C delete mode 100755 applications/solvers/cfdemSolverIBTorque/createFields.H diff --git a/applications/solvers/cfdemSolverIBTorque/Make/files b/applications/solvers/cfdemSolverIBTorque/Make/files deleted file mode 100755 index b5937cc1..00000000 --- a/applications/solvers/cfdemSolverIBTorque/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -cfdemSolverIBTorque.C - -EXE=$(CFDEM_APP_DIR)/cfdemSolverIBTorque diff --git a/applications/solvers/cfdemSolverIBTorque/Make/options b/applications/solvers/cfdemSolverIBTorque/Make/options deleted file mode 100755 index c4e8ada5..00000000 --- a/applications/solvers/cfdemSolverIBTorque/Make/options +++ /dev/null @@ -1,33 +0,0 @@ -include $(CFDEM_ADD_LIBS_DIR)/additionalLibs - -EXE_INC = \ - -I$(CFDEM_OFVERSION_DIR) \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(CFDEM_LIGGGHTS_SRC_DIR) - -EXE_LIBS = \ - -L$(CFDEM_LIB_DIR)\ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lmeshTools \ - -ldynamicFvMesh \ - -ldynamicMesh \ - -lfvOptions \ - -l$(CFDEM_LIB_NAME) \ - $(CFDEM_ADD_LIB_PATHS) \ - $(CFDEM_ADD_LIBS) - diff --git a/applications/solvers/cfdemSolverIBTorque/cfdemSolverIBTorque.C b/applications/solvers/cfdemSolverIBTorque/cfdemSolverIBTorque.C deleted file mode 100755 index dc30cac2..00000000 --- a/applications/solvers/cfdemSolverIBTorque/cfdemSolverIBTorque.C +++ /dev/null @@ -1,180 +0,0 @@ -/*---------------------------------------------------------------------------*\ - CFDEMcoupling - Open Source CFD-DEM coupling - - CFDEMcoupling is part of the CFDEMproject - www.cfdem.com - Christoph Goniva, christoph.goniva@cfdem.com - Copyright (C) 1991-2009 OpenCFD Ltd. - Copyright (C) 2009-2012 JKU, Linz - Copyright (C) 2012- DCS Computing GmbH,Linz -------------------------------------------------------------------------------- -License - This file is part of CFDEMcoupling. - - CFDEMcoupling 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. - - CFDEMcoupling 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 CFDEMcoupling. If not, see . - -Application - cfdemSolverIBTorque - -Description - Transient solver for incompressible flow. - The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6, - where additional functionality for CFD-DEM coupling using immersed body - (fictitious domain) method is added. -Contributions - Alice Hager -\*---------------------------------------------------------------------------*/ - - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" -#include "pisoControl.H" - -#include "cfdemCloudIB.H" -#include "implicitCouple.H" - -#include "averagingModel.H" -#include "regionModel.H" -#include "voidFractionModel.H" - -#include "dynamicFvMesh.H" //dyM - -#include "cellSet.H" - -#include "fvOptions.H" // added the fvOptions library - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - #include "createTime.H" - #include "createDynamicFvMesh.H" - #include "createControl.H" - #include "createTimeControls.H" - #include "createFields.H" - #include "initContinuityErrs.H" - #include "createFvOptions.H" - - // create cfdemCloud - #include "readGravitationalAcceleration.H" - cfdemCloudIB particleCloud(mesh); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.loop()) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - //=== dyM =================== - interFace = mag(mesh.lookupObject("voidfractionNext")); - mesh.update(); //dyM - - #include "readTimeControls.H" - #include "CourantNo.H" - #include "setDeltaT.H" - - // do particle stuff - Info << "- evolve()" << endl; - particleCloud.evolve(Us); - - // Pressure-velocity PISO corrector - { - - // Momentum predictor - - fvVectorMatrix UEqn - ( - fvm::ddt(voidfraction,U) - + fvm::div(phi, U) - + turbulence->divDevReff(U) - == - fvOptions(U) - ); - - UEqn.relax(); - - fvOptions.constrain(UEqn); - - if (piso.momentumPredictor()) - { - solve(UEqn == -fvc::grad(p)); - } - - // --- PISO loop - while (piso.correct()) - { - volScalarField rUA = 1.0/UEqn.A(); - surfaceScalarField rUAf(fvc::interpolate(rUA)); - - U = rUA*UEqn.H(); - - phi = (fvc::interpolate(U) & mesh.Sf()) - + rUAf*fvc::ddtCorr(U, phi); - - adjustPhi(phi, U, p); - - - while (piso.correctNonOrthogonal()) - { - // Pressure corrector - - fvScalarMatrix pEqn - ( - fvm::laplacian(rUA, p) == fvc::div(phi) + particleCloud.ddtVoidfraction() - ); - - pEqn.setReference(pRefCell, pRefValue); - - pEqn.solve(mesh.solver(p.select(piso.finalInnerIter()))); - - if (piso.finalNonOrthogonalIter()) - { - phi -= pEqn.flux(); - } - } - - #include "continuityErrs.H" - - U -= rUA*fvc::grad(p); - U.correctBoundaryConditions(); - } - } - - laminarTransport.correct(); - turbulence->correct(); - - Info << "particleCloud.calcVelocityCorrection() " << endl; - volScalarField voidfractionNext=mesh.lookupObject("voidfractionNext"); - particleCloud.calcVelocityCorrection(p,U,phiIB,voidfractionNext); - - fvOptions.correct(U); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/cfdemSolverIBTorque/createFields.H b/applications/solvers/cfdemSolverIBTorque/createFields.H deleted file mode 100755 index 49a08062..00000000 --- a/applications/solvers/cfdemSolverIBTorque/createFields.H +++ /dev/null @@ -1,126 +0,0 @@ - Info<< "Reading field p\n" << endl; - volScalarField p - ( - IOobject - ( - "p", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - Info<< "Reading physical velocity field U" << endl; - Info<< "Note: only if voidfraction at boundary is 1, U is superficial velocity!!!\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - Info<< "Reading particle velocity field Us\n" << endl; - volVectorField Us - ( - IOobject - ( - "Us", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - -//======================== -// drag law modelling -//======================== - - Info<< "\nCreating dummy density field rho = 1\n" << endl; - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedScalar("0", dimensionSet(1, -3, 0, 0, 0), 1.0) - ); - - - Info<< "Reading field phiIB\n" << endl; - volScalarField phiIB - ( - IOobject - ( - "phiIB", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - //mod by alice - Info<< "Reading field voidfraction\n" << endl; - volScalarField voidfraction - ( - IOobject - ( - "voidfraction", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); -//======================== - -# include "createPhi.H" - - label pRefCell = 0; - scalar pRefValue = 0.0; - setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue); - - - singlePhaseTransportModel laminarTransport(U, phi); - - autoPtr turbulence - ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) - ); - -//=== dyM =================== - - Info<< "Reading field interFace\n" << endl; - volScalarField interFace - ( - IOobject - ( - "interFace", - runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - mesh, - //dimensionedScalar("0", dimensionSet(0, -1, 0, 0, 0), 0.0) - dimensionedScalar("0", dimensionSet(0, 0, 0, 0, 0), 0.0) - ); - -//=========================== diff --git a/etc/solver-list.txt b/etc/solver-list.txt index 61cf4113..39c6f63f 100644 --- a/etc/solver-list.txt +++ b/etc/solver-list.txt @@ -3,6 +3,5 @@ cfdemSolverPiso/dir cfdemSolverRhoPimple/dir cfdemSolverIB/dir cfdemSolverPisoScalar/dir -cfdemSolverIBTorque/dir cfdemSolverPimpleIB/dir cfdemSolverIBRO/dir