From ef08058ce6e085bfbaa2d1226aac6206ff892b2e Mon Sep 17 00:00:00 2001 From: goniva Date: Tue, 11 Mar 2014 15:15:12 +0100 Subject: [PATCH] release on 2014-03-11_15-15-12 --- README | 81 ------------------ .../solvers/cfdemSolverIB/cfdemSolverIB.C | 19 +++- doc/CFDEMcoupling_Manual.pdf | Bin 511619 -> 511914 bytes doc/forceModel_GidaspowDrag.html | 4 + doc/forceModel_GidaspowDrag.txt | 3 + doc/githubAccess_public.html | 31 ++++--- doc/githubAccess_public.pdf | Bin 362495 -> 362749 bytes doc/githubAccess_public.txt | 31 ++++--- src/lagrangian/cfdemParticle/Make/files | 37 ++++++-- .../cfdemParticle/cfdTools/versionInfo.H | 4 +- .../cfdemParticle/cfdemCloud/cfdemCloudI.H | 10 +++ .../derived/cfdemCloudIB/cfdemCloudIB.C | 46 ++++++---- .../derived/cfdemCloudIB/cfdemCloudIB.H | 3 + .../cfdemParticle/etc/OFversion/OFversion.H | 2 +- .../etc/compileCFDEMcoupling_sol.sh | 9 +- .../etc/compileCFDEMcoupling_src.sh | 2 + src/lagrangian/cfdemParticle/etc/functions.sh | 31 ++++++- .../cfdemParticle/etc/library-list.txt | 10 +++ .../cfdemParticle/etc/solver-list.txt | 10 ++- .../cfdemParticle/etc/tutorial-list.txt | 41 +++++++-- .../forceModel/GidaspowDrag/GidaspowDrag.C | 22 ++++- .../forceModel/GidaspowDrag/GidaspowDrag.H | 4 + .../forceModel/gradPForce/gradPForce.C | 11 ++- .../forceModel/gradPForce/gradPForce.H | 2 + .../forceModel/viscForce/viscForce.C | 11 ++- .../forceModel/viscForce/viscForce.H | 2 + .../IBVoidFraction/IBVoidFraction.C | 12 +-- .../CFD/constant/couplingProperties | 2 - .../cfdemSolverPimple/ErgunTestMPI/Allrun.sh | 2 - .../CFD/octave/totalPressureDrop.m | 2 +- .../ErgunTestMPI/DEM/post/dummy | 1 + .../ErgunTestCG/DEM/liggghts.restart | Bin 604924 -> 0 bytes .../DEM/liggghts.restart_coarseGraining_2 | Bin 0 -> 862301 bytes .../CFD/constant/couplingProperties | 3 + .../ErgunTestMPI_cgs/parCFDDEMrun.sh | 1 + .../ErgunTestMPI_restart/DEM/post/dummy | 2 + 36 files changed, 282 insertions(+), 169 deletions(-) delete mode 100755 README delete mode 100644 tutorials/cfdemSolverPiso/ErgunTestCG/DEM/liggghts.restart create mode 100644 tutorials/cfdemSolverPiso/ErgunTestCG/DEM/liggghts.restart_coarseGraining_2 diff --git a/README b/README deleted file mode 100755 index fd2ca756..00000000 --- a/README +++ /dev/null @@ -1,81 +0,0 @@ -/*---------------------------------------------------------------------------*\ - CFDEMcoupling - Open Source CFD-DEM coupling - - CFDEMcoupling is part of the CFDEMproject - www.cfdem.com - Christoph Goniva, christoph.goniva@cfdem.com - Copyright 2009-2012 JKU Linz - Copyright 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, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - This code is designed to realize coupled CFD-DEM simulations using LIGGGHTS - and OpenFOAM. Note: this code is not part of OpenFOAM (see DISCLAIMER). -\*---------------------------------------------------------------------------*/ - - -CFDEM coupling provides an open source parallel coupled CFD-DEM framework -combining the strengths of LIGGGHTS DEM code and the Open Source -CFD package OpenFOAM(R)(*). The CFDEMcoupling toolbox allows to expand -standard CFD solvers of OpenFOAM(R)(*) to include a coupling to the DEM -code LIGGGHTS. In this toolbox the particle representation within the -CFD solver is organized by "cloud" classes. Key functionalities are organised -in sub-models (e.g. force models, data exchange models, etc.) which can easily -be selected and combined by dictionary settings. - -The coupled solvers run fully parallel on distributed-memory clusters. - -Features are: - -- its modular approach allows users to easily implement new models -- its MPI parallelization enables to use it for large scale problems -- the "forum"_lws on CFD-DEM gives the possibility to exchange with other - users / developers -- the use of GIT allows to easily update to the latest version -- basic documentation is provided - -The file structure: - -- "src" directory including the source files of the coupling toolbox and models -- "applications" directory including the solver files for coupled CFD-DEM simulations -- "doc" directory including the documentation of CFDEMcoupling -- "tutorials" directory including basic tutorial cases showing the functionality - - - -Details on installation are given on the "www.cfdem.com" - -The functionality of this CFD-DEM framwork is described via "tutorial cases" showing -how to use different solvers and models. - -CFDEMcoupling stands for Computational Fluid Dynamics (CFD) - -Discrete Element Method (DEM) coupling. - -CFDEMcoupling is an open-source code, distributed freely under the terms of the -GNU Public License (GPL). - -Core development of CFDEMcoupling is done by -Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012 - - -\*---------------------------------------------------------------------------*/ -(*) "OpenFOAM(R)"_of is a registered trade mark of the ESI Group. -This offering is not affiliated, approved or endorsed by ESI Group, -the producer of the OpenFOAM® software and owner of the OpenFOAM® trade mark. -\*---------------------------------------------------------------------------*/ diff --git a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C index 834d0962..2df2a46e 100755 --- a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C +++ b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C @@ -51,8 +51,11 @@ Contributions #include "dynamicFvMesh.H" //dyM #include "cellSet.H" -#include "meshToMeshNew.H" -#include "fvIOoptionList.H" + +#if defined(version22) + #include "meshToMeshNew.H" + #include "fvIOoptionList.H" +#endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -68,7 +71,9 @@ int main(int argc, char *argv[]) #include "initContinuityErrs.H" - #include "createFvOptions.H" + #if defined(version22) + #include "createFvOptions.H" + #endif // create cfdemCloud #include "readGravitationalAcceleration.H" @@ -102,13 +107,17 @@ int main(int argc, char *argv[]) fvm::ddt(voidfraction,U) + fvm::div(phi, U) + turbulence->divDevReff(U) + #if defined(version22) == fvOptions(U) + #endif ); UEqn.relax(); + #if defined(version22) fvOptions.constrain(UEqn); + #endif if (momentumPredictor) { @@ -126,7 +135,9 @@ int main(int argc, char *argv[]) adjustPhi(phi, U, p); + #if defined(version22) fvOptions.relativeFlux(phi); + #endif // Non-orthogonal pressure corrector loop for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) @@ -172,7 +183,9 @@ int main(int argc, char *argv[]) volScalarField voidfractionNext=mesh.lookupObject("voidfractionNext"); particleCloud.calcVelocityCorrection(p,U,phiIB,voidfractionNext); + #if defined(version22) fvOptions.correct(U); + #endif runTime.write(); diff --git a/doc/CFDEMcoupling_Manual.pdf b/doc/CFDEMcoupling_Manual.pdf index 9cc04e71d9a168f9d4275e7ee356d304af5a5bbc..6a57831fe1a46e6bdbb3840cf453b3f49ba9f1c8 100644 GIT binary patch delta 15942 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 delta 15740 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 @@ -28,6 +29,8 @@ GidaspowDragProps
  • density = name of the finite volume gravity field +
  • voidfraction = name of the finite volume voidfraction field +
  • phi = drag correction factor (in doubt 1) @@ -42,6 +45,7 @@ GidaspowDragProps { velFieldName "U"; densityFieldName "rho"; + voidfractionFieldName "voidfraction"; }

    Description: diff --git a/doc/forceModel_GidaspowDrag.txt b/doc/forceModel_GidaspowDrag.txt index 9a5af514..a4e5718f 100644 --- a/doc/forceModel_GidaspowDrag.txt +++ b/doc/forceModel_GidaspowDrag.txt @@ -19,11 +19,13 @@ GidaspowDragProps \{ velFieldName "U"; densityFieldName "density"; + voidfractionFieldName "voidfraction"; phi "scalar"; \}; :pre {U} = name of the finite volume fluid velocity field :ulb,l {density} = name of the finite volume gravity field :l +{voidfraction} = name of the finite volume voidfraction field :l {phi} = drag correction factor (in doubt 1) :l :ule @@ -37,6 +39,7 @@ GidaspowDragProps \{ velFieldName "U"; densityFieldName "rho"; + voidfractionFieldName "voidfraction"; \} :pre [Description:] diff --git a/doc/githubAccess_public.html b/doc/githubAccess_public.html index b3e3a316..2ca41186 100644 --- a/doc/githubAccess_public.html +++ b/doc/githubAccess_public.html @@ -17,8 +17,8 @@

    Description:

    -

    This routine describes how to setup a github account and pull repositories of the CFDEMproject. -After setting some environment variables LIGGGHTS and CFDEMcoupling can be compiled +

    This routine describes how to setup a github account and pull repositories of the CFDEM(R)project. +After setting some environment variables LIGGGHTS(R) and CFDEM(R)coupling can be compiled

    Procedure:

    @@ -30,7 +30,7 @@ After setting some environment variables LIGGGHTS and CFDEMcoupling can be compi
  • set environment variables -
  • compile LIGGGHTS and CFDEMcoupling +
  • compile LIGGGHTS(R) and CFDEM(R)coupling
  • run your own cases @@ -38,7 +38,7 @@ After setting some environment variables LIGGGHTS and CFDEMcoupling can be compi

    git clone the desired repository:

    -

    If not already done, open a terminal and create a directory for LIGGGHTS in $HOME: +

    If not already done, open a terminal and create a directory for LIGGGHTS(R) in $HOME: 

    cd
    @@ -50,7 +50,7 @@ After setting some environment variables LIGGGHTS and CFDEMcoupling can be compi 

    git clone git://github.com/CFDEMproject/LIGGGHTS-PUBLIC.git LIGGGHTS-PUBLIC
    -

    If not already done, open a terminal and create a directory for CFDEMcoupling in $HOME: +

    If not already done, open a terminal and create a directory for CFDEM(R)coupling in $HOME: 

    cd
    @@ -58,9 +58,9 @@ After setting some environment variables LIGGGHTS and CFDEMcoupling can be compi 
    cd CFDEM
    -

    Make sure that OpenFOAM(R)-2.1.x is already set up correctly! +

    Make sure that OpenFOAM(R) is already set up correctly!

    -

    To clone the public CFDEMcoupling repository, open a terminal and execute: +

    To clone the public CFDEM(R)coupling repository, open a terminal and execute: 

    git clone git://github.com/CFDEMproject/CFDEMcoupling-PUBLIC.git CFDEMcoupling-PUBLIC-$WM_PROJECT_VERSION
    @@ -117,13 +117,13 @@ $CFDEM_LIGGGHTS_SRC_DIR

    to get some information if the paths are set correctly.

    -

    Compile LIGGGHTS and CFDEMcoupling: +

    Compile LIGGGHTS(R) and CFDEM(R)coupling:

    -

    If above settings were done correctly, you can compile LIGGGHTS by typing: +

    If above settings were done correctly, you can compile LIGGGHTS(R) by typing: 

    cfdemCompLIG
    -

    and you can then compile CFDEMcoupling by typing: +

    and you can then compile CFDEM(R)coupling by typing: 

    cfdemCompCFDEM
    @@ -149,6 +149,17 @@ Changes in $CFDEM_TUT_DIR will be lost after every git stash! 
    git clone git://cfdem.git.sourceforge.net/gitroot/cfdem/lpp mylpp
    +

    Backward Compatibility: +

    +

    Basically CFDEM(R)coupling supports one OpenFOAM(R) version therefore all settings are prepared for that. Nevertheless we try to maintain backward compatibility as long as it works with reasonable effort. +

    +

    The supported OpenFOAM(R) and LIGGGHTS(R) versions are stated in: +src/lagrangian/cfdemParticle/cfdTools/versionInfo.H +

    +

    For using other versions you can manipulate: +src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H +(still not all functionality might work then!) +

    Troubleshooting: