From b0c9a14b8d7bb549042c7c7bf46cad52fa134eb1 Mon Sep 17 00:00:00 2001 From: goniva Date: Thu, 17 Jul 2014 11:24:53 +0200 Subject: [PATCH] release on 2014-07-17_11-24-52 --- README | 81 ++++++++++++++++++ doc/CFDEMcoupling_Manual.pdf | Bin 511299 -> 511299 bytes doc/githubAccess_public.pdf | Bin 362748 -> 362748 bytes src/lagrangian/cfdemParticle/Make/files | 51 +++++++++-- src/lagrangian/cfdemParticle/Make/options | 11 ++- .../cfdemParticle/etc/library-list.txt | 9 ++ .../cfdemParticle/etc/solver-list.txt | 12 ++- .../cfdemParticle/etc/tutorial-list.txt | 46 ++++++++-- .../library/Makefile.fedora_fpic | 43 ++++++++++ .../cfdemPostproc/fillCylinder/Allrun.sh | 2 +- .../twoSpheresGlowinskiMPI/Allrun.sh | 2 +- .../cfdemSolverPiso/ErgunTestMPI/Allrun.sh | 2 +- .../ErgunTestMPI_cgs/Allrun.sh | 2 +- .../ErgunTestMPI_restart/Allrun.sh | 2 +- .../cfdemSolverPiso/settlingTestMPI/Allrun.sh | 2 +- .../packedBedTemp/Allrun.sh | 2 +- 16 files changed, 243 insertions(+), 24 deletions(-) create mode 100755 README create mode 100644 src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/Makefile.fedora_fpic diff --git a/README b/README new file mode 100755 index 00000000..fd2ca756 --- /dev/null +++ b/README @@ -0,0 +1,81 @@ +/*---------------------------------------------------------------------------*\ + 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/doc/CFDEMcoupling_Manual.pdf b/doc/CFDEMcoupling_Manual.pdf index a08be3a3ca9b874b67d5daa0119e288589d7500a..6aa898581c4faf456a9a1448e74024aca674ea3f 100644 GIT binary patch delta 134 zcmX>+OaAaI`3c>uhDIi)hK&41Ra}x-R8motn#N^fX=-9*%B8C6 I>hHz{00ajr3IG5A delta 134 zcmX>+OaAaI`3c>u28Jf4CXEwXCor~7U}~Mf+&Y1!bpmVa1h%ac*hA068JVV9nk5?> zr41Ra}x-R8motn#N^fX=-9*%B8C6 I>hHz{0M=S5fdBvi diff --git a/doc/githubAccess_public.pdf b/doc/githubAccess_public.pdf index bb680c829e47f61c289d9bca6bf80007179f6159..281da649c30f5d01ad3b7888ea776f61eee7c01a 100644 GIT binary patch delta 105 zcmew}QS8q|u?gL*hDIi)hK&jYN54krs^!=xmmlvG0#3nNog gW8+kF6N6NfRO1vA15?X1LlZk2LMo;|=wOur03T}~=Kufz delta 105 zcmew}QS8q|u?gL*28Jf4CXEwXCor~7U}~Mf+&Y0}>jYN54ksf6Lqp?K6AN=AQ_Cb1 gi`2v $@ + +# Individual dependencies + +DEPENDS = $(OBJ:.o=.d) +include $(DEPENDS) diff --git a/tutorials/cfdemPostproc/fillCylinder/Allrun.sh b/tutorials/cfdemPostproc/fillCylinder/Allrun.sh index 24c64a69..3ebdb7df 100755 --- a/tutorials/cfdemPostproc/fillCylinder/Allrun.sh +++ b/tutorials/cfdemPostproc/fillCylinder/Allrun.sh @@ -19,7 +19,7 @@ cfdemPostProc="true" postproc="true" # check if mesh was built -if [ -d "$casePath/CFD/constant/polyMesh/boundary" ]; then +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then echo "mesh was built before - using old mesh" else echo "mesh needs to be built" diff --git a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh index 23837007..183fe2e4 100755 --- a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh +++ b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh @@ -14,7 +14,7 @@ casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" echo $casePath # check if mesh was built -if [ -f "$casePath/CFD/constant/polyMesh/boundary" ]; then +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then echo "mesh was built before - using old mesh" else echo "mesh needs to be built" diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh index 409a7694..ad29c48e 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh @@ -10,7 +10,7 @@ casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" # check if mesh was built -if [ -d "$casePath/CFD/constant/polyMesh/boundary" ]; then +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then echo "mesh was built before - using old mesh" else echo "mesh needs to be built" diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/Allrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/Allrun.sh index 9b4354a9..1d3a6bdc 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/Allrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/Allrun.sh @@ -10,7 +10,7 @@ casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" # check if mesh was built -if [ -d "$casePath/CFD/constant/polyMesh/boundary" ]; then +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then echo "mesh was built before - using old mesh" else echo "mesh needs to be built" diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh index 3e330e24..a05c80b7 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh @@ -12,7 +12,7 @@ runOctave="true" postproc="false" # check if mesh was built -if [ -d "$casePath/CFD/constant/polyMesh/boundary" ]; then +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then echo "mesh was built before - using old mesh" else echo "mesh needs to be built" diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh b/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh index 34252655..5cf3e338 100755 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh @@ -10,7 +10,7 @@ casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" # check if mesh was built -if [ -d "$casePath/CFD/constant/polyMesh/boundary" ]; then +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then echo "mesh was built before - using old mesh" else echo "mesh needs to be built" diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/Allrun.sh b/tutorials/cfdemSolverPisoScalar/packedBedTemp/Allrun.sh index 9375e5e9..5696225a 100755 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/Allrun.sh +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/Allrun.sh @@ -10,7 +10,7 @@ casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" # check if mesh was built -if [ -f "$casePath/CFD/constant/polyMesh/boundary" ]; then +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then echo "mesh was built before - using old mesh" else echo "mesh needs to be built"