Date: Tue, 15 Apr 2014 09:22:02 +0200
Subject: [PATCH] release on 2014-04-15_09-22-01
---
README | 81 ++++++++++++++
.../solvers/cfdemSolverIB/cfdemSolverIB.C | 5 +-
.../solvers/cfdemSolverPiso/cfdemSolverPiso.C | 6 +-
.../cfdemSolverPisoScalar.C | 4 +
doc/CFDEMcoupling_Manual.html | 18 +--
doc/CFDEMcoupling_Manual.pdf | Bin 511914 -> 512035 bytes
doc/CFDEMcoupling_Manual.txt | 18 +--
doc/IOModel_basicIO.html | 2 +-
doc/IOModel_basicIO.txt | 2 +-
doc/IOModel_trackIO.html | 2 +-
doc/IOModel_trackIO.txt | 2 +-
doc/averagingModel.html | 2 +-
doc/averagingModel.txt | 2 +-
doc/cfdemSolverIB.html | 2 +-
doc/cfdemSolverIB.txt | 2 +-
doc/cfdemSolverPiso.html | 2 +-
doc/cfdemSolverPiso.txt | 2 +-
doc/clockModel_standardClock.html | 2 +-
doc/clockModel_standardClock.txt | 2 +-
doc/dataExchangeModel_oneWayVTK.html | 2 +-
doc/dataExchangeModel_oneWayVTK.txt | 2 +-
doc/dataExchangeModel_twoWayFiles.html | 4 +-
doc/dataExchangeModel_twoWayFiles.txt | 4 +-
doc/forceModel_ArchimedesIB.html | 2 +-
doc/forceModel_ArchimedesIB.txt | 2 +-
doc/forceModel_DiFeliceDrag.html | 2 +-
doc/forceModel_DiFeliceDrag.txt | 2 +-
doc/forceModel_GidaspowDrag.html | 9 +-
doc/forceModel_GidaspowDrag.txt | 8 +-
doc/forceModel_KochHillDrag.html | 4 +-
doc/forceModel_KochHillDrag.txt | 4 +-
doc/forceModel_LaEuScalarTemp.html | 8 +-
doc/forceModel_LaEuScalarTemp.txt | 6 +-
doc/forceModel_ShirgaonkarIB.html | 2 +-
doc/forceModel_ShirgaonkarIB.txt | 2 +-
doc/forceModel_gradPForce.html | 2 +-
doc/forceModel_gradPForce.txt | 2 +-
doc/forceModel_particleCellVolume.html | 6 +-
doc/forceModel_particleCellVolume.txt | 6 +-
doc/forceModel_viscForce.html | 4 +-
doc/forceModel_viscForce.txt | 4 +-
doc/githubAccess_public.html | 14 +--
doc/githubAccess_public.pdf | Bin 362749 -> 362748 bytes
doc/githubAccess_public.txt | 14 +--
doc/liggghtsCommandModel_execute.html | 3 +
doc/liggghtsCommandModel_execute.txt | 2 +
...liggghtsCommandModel_readLiggghtsData.html | 4 +-
doc/liggghtsCommandModel_readLiggghtsData.txt | 4 +-
doc/liggghtsCommandModel_runLiggghts.html | 5 +-
doc/liggghtsCommandModel_runLiggghts.txt | 5 +-
doc/liggghtsCommandModel_writeLiggghts.html | 3 +
doc/liggghtsCommandModel_writeLiggghts.txt | 2 +
doc/locateModel_engineSearchIB.html | 4 +-
doc/locateModel_engineSearchIB.txt | 4 +-
doc/momCoupleModel_explicitCouple.html | 2 +-
doc/momCoupleModel_explicitCouple.txt | 2 +-
doc/momCoupleModel_implicitCouple.html | 4 +-
doc/momCoupleModel_implicitCouple.txt | 4 +-
doc/momCoupleModel_noCouple.html | 4 +-
doc/momCoupleModel_noCouple.txt | 4 +-
doc/probeModel.html | 2 +-
doc/probeModel.txt | 2 +-
doc/smoothingModel_constDiffSmoothing.html | 6 +-
doc/smoothingModel_constDiffSmoothing.txt | 6 +-
doc/voidFractionModel_GaussVoidFraction.html | 18 +--
doc/voidFractionModel_GaussVoidFraction.txt | 18 +--
doc/voidFractionModel_IBVoidFraction.html | 10 +-
doc/voidFractionModel_IBVoidFraction.txt | 10 +-
...FractionModel_bigParticleVoidFraction.html | 20 ++--
...dFractionModel_bigParticleVoidFraction.txt | 20 ++--
doc/voidFractionModel_centreVoidFraction.html | 4 +-
doc/voidFractionModel_centreVoidFraction.txt | 4 +-
...voidFractionModel_dividedVoidFraction.html | 22 ++--
doc/voidFractionModel_dividedVoidFraction.txt | 20 ++--
src/lagrangian/cfdemParticle/Make/files | 42 +++++--
src/lagrangian/cfdemParticle/Make/options | 6 +-
.../cfdemParticle/cfdTools/versionInfo.H | 4 +-
.../cfdemParticle/cfdemCloud/cfdemCloud.C | 56 ++++------
.../cfdemParticle/cfdemCloud/cfdemCloud.H | 2 +
.../derived/cfdemCloudIB/cfdemCloudIB.C | 9 ++
.../derived/cfdemCloudMS/cfdemCloudMS.C | 38 ++++++-
.../derived/cfdemCloudMS/cfdemCloudMS.H | 7 ++
.../derived/cfdemCloudMS/cfdemCloudMSI.H | 5 +
.../cfdemParticle/etc/OFversion/OFversion.H | 11 +-
src/lagrangian/cfdemParticle/etc/bashrc | 20 ++--
.../cfdemParticle/etc/cfdemSystemTest.sh | 3 +-
.../etc/compileCFDEMcoupling_all.sh | 8 +-
.../etc/compileCFDEMcoupling_sol.sh | 99 +++++++++++++++--
.../cfdemParticle/etc/compileLIGGGHTS.sh | 11 ++
.../cfdemParticle/etc/compileLIGGGHTS_lib.sh | 71 ++++++++++++
src/lagrangian/cfdemParticle/etc/cshrc | 10 +-
src/lagrangian/cfdemParticle/etc/functions.sh | 62 +++++++++--
.../cfdemParticle/etc/library-list.txt | 10 ++
.../cfdemParticle/etc/solver-list.txt | 13 ++-
.../cfdemParticle/etc/tutorial-list.txt | 44 ++++++--
.../averagingModel/averagingModel.C | 31 +++++-
.../averagingModel/averagingModel.H | 8 ++
.../twoWayM2M/library/error.o | Bin 9696 -> 9688 bytes
.../twoWayM2M/library/files.o | Bin 14064 -> 14056 bytes
.../twoWayM2M/library/irregular.o | Bin 37224 -> 37216 bytes
.../twoWayM2M/library/lammps_data_write.o | Bin 35440 -> 35432 bytes
.../twoWayM2M/library/libcouple.a | Bin 351814 -> 351958 bytes
.../twoWayM2M/library/many2many.o | Bin 121216 -> 121208 bytes
.../twoWayM2M/library/many2one.o | Bin 17496 -> 17488 bytes
.../twoWayM2M/library/memory.o | Bin 18712 -> 18704 bytes
.../twoWayM2M/library/one2many.o | Bin 76632 -> 76624 bytes
.../twoWayM2M/library/send2one.o | Bin 17440 -> 17432 bytes
.../dataExchangeModel/twoWayM2M/twoWayM2M.C | 43 +++++++-
.../dataExchangeModel/twoWayM2M/twoWayM2M.H | 1 +
.../forceModel/GidaspowDrag/GidaspowDrag.C | 98 +++++++++++++----
.../forceModel/GidaspowDrag/GidaspowDrag.H | 5 +
.../forceModel/KochHillDrag/KochHillDrag.C | 23 ++--
.../forceModel/KochHillDrag/KochHillDrag.H | 4 +-
.../LaEuScalarTemp/LaEuScalarTemp.C | 82 +++++++++-----
.../LaEuScalarTemp/LaEuScalarTemp.H | 7 +-
.../subModels/forceModel/noDrag/noDrag.C | 18 +--
.../DiFeliceDragMS/DiFeliceDragMS.C | 28 +----
.../forceModelMS/forceModelMS/forceModelMS.C | 39 +++++++
.../forceModelMS/forceModelMS/forceModelMS.H | 2 +-
.../liggghtsCommandModel/execute/execute.C | 6 +-
.../liggghtsCommandModel/execute/execute.H | 2 -
.../liggghtsCommandModel.C | 20 ++--
.../liggghtsCommandModel.H | 2 +
.../readLiggghtsData/readLiggghtsData.C | 3 +
.../runLiggghts/runLiggghts.C | 3 +
.../writeLiggghts/writeLiggghts.C | 3 +
.../locateModel/engineSearch/engineSearch.C | 9 +-
.../locateModel/engineSearch/engineSearch.H | 4 +-
.../standardSearch/standardSearch.C | 4 +-
.../turboEngineSearch/turboEngineSearch.C | 3 +-
.../probeModel/particleProbe/particleProbe.H | 2 +-
.../constDiffSmoothing/constDiffSmoothing.C | 103 +++++++++++-------
.../constDiffSmoothing/constDiffSmoothing.H | 1 +
.../GaussVoidFraction/GaussVoidFraction.C | 27 ++---
.../GaussVoidFraction/GaussVoidFraction.H | 8 +-
.../IBVoidFraction/IBVoidFraction.C | 2 +-
.../bigParticleVoidFraction.C | 24 ++--
.../bigParticleVoidFraction.H | 6 +-
.../centreVoidFraction/centreVoidFraction.C | 22 ++--
.../dividedVoidFraction/dividedVoidFraction.C | 17 ++-
.../dividedVoidFraction/dividedVoidFraction.H | 6 +-
.../dividedVoidFractionMS.C | 14 +--
.../dividedVoidFractionMS.H | 4 +-
.../voidFractionModel/voidFractionModel.C | 3 +-
.../voidFractionModel/voidFractionModel.H | 12 +-
.../CFD/octave/totalPressureDrop.m | 2 -
.../ErgunTestCG/DEM/in.liggghts_init | 3 +-
.../ErgunTestCG/DEM/in.liggghts_resume | 7 +-
.../CFD/constant/couplingProperties | 3 +-
.../ErgunTestMPI/DEM/in.liggghts_init | 2 +-
.../ErgunTestMPI/DEM/liggghts.restart | Bin 3923813 -> 2481193 bytes
.../ErgunTestMPI/DEM/post/dummy | 1 -
.../ErgunTestMPI/parCFDDEMrun.sh | 24 +---
.../ErgunTestMPI_restart/Allrun.sh | 24 ++--
.../ErgunTestMPI_restart/CFD/0/U | 6 +-
.../ErgunTestMPI_restart/CFD/0/p | 3 +-
.../CFD/constant/couplingProperties_init | 78 +++++++++++--
.../CFD/constant/couplingProperties_restart | 74 +++++++++++--
.../CFD/constant/liggghtsCommands_init | 4 +
.../CFD/constant/liggghtsCommands_restart | 6 +-
.../CFD/system/controlDict | 8 +-
.../CFD/system/controlDict_init | 8 +-
.../CFD/system/controlDict_restart | 8 +-
.../CFD/system/decomposeParDict | 4 +-
.../CFD/system/fvSolution | 34 +-----
.../ErgunTestMPI_restart/DEM/in.liggghts_init | 8 +-
.../DEM/in.liggghts_restart | 13 +--
.../DEM/in.liggghts_resume | 9 +-
.../ErgunTestMPI_restart/DEM/liggghts.restart | Bin 3923813 -> 2481193 bytes
.../ErgunTestMPI_restart/DEM/post/dummy | 60 ----------
.../ErgunTestMPI_restart/parCFDDEMrun.sh | 5 +-
.../cfdemSolverPiso/settlingTestMPI/CFD/0/Ksl | 8 +-
.../cfdemSolverPiso/settlingTestMPI/CFD/0/U | 7 +-
.../cfdemSolverPiso/settlingTestMPI/CFD/0/Us | 7 +-
.../cfdemSolverPiso/settlingTestMPI/CFD/0/k | 8 +-
.../settlingTestMPI/CFD/0/nuSgs | 7 +-
.../cfdemSolverPiso/settlingTestMPI/CFD/0/p | 12 +-
.../cfdemSolverPiso/settlingTestMPI/CFD/0/rho | 10 +-
.../settlingTestMPI/CFD/0/voidfraction | 13 +--
.../CFD/constant/couplingProperties | 4 +-
.../CFD/constant/polyMesh/blockMeshDict | 13 ++-
.../settlingTestMPI/CFD/system/fvSolution | 5 +
.../settlingTestMPI/parCFDDEMrun.sh | 2 +-
.../CFD/constant/couplingProperties | 2 +-
.../ErgunTestMPI/CFD/system/controlDict | 2 +-
.../ErgunTestMPI/DEM/in.liggghts_init | 12 +-
.../ErgunTestMPI/DEM/liggghts.restart | Bin 1110 -> 8661352 bytes
.../ErgunTestMPI/DEM/post/dummy | 82 ++++++++++++++
188 files changed, 1532 insertions(+), 775 deletions(-)
create mode 100755 README
create mode 100755 src/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh
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/applications/solvers/cfdemSolverIB/cfdemSolverIB.C b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
index 2df2a46e..93f0d41d 100755
--- a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
+++ b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
@@ -130,9 +130,12 @@ int main(int argc, char *argv[])
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
+ #ifdef version23
+ phi = (fvc::interpolate(U) & mesh.Sf()); // there is a new version in 23x
+ #else
phi = (fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, U, phi);
-
+ #endif
adjustPhi(phi, U, p);
#if defined(version22)
diff --git a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
index 73c97d60..76a6b58d 100644
--- a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
+++ b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
// do particle stuff
particleCloud.clockM().start(2,"Coupling");
particleCloud.evolve(voidfraction,Us,U);
-
+
Info << "update Ksl.internalField()" << endl;
Ksl = particleCloud.momCoupleM(0).impMomSource();
particleCloud.smoothingM().smoothen(Ksl);
@@ -88,8 +88,8 @@ int main(int argc, char *argv[])
// Momentum predictor
fvVectorMatrix UEqn
(
- fvm::ddt(voidfraction,U) //particleCloud.ddtVoidfractionU(U,voidfraction) //
- + fvm::div(phi, U)
+ fvm::ddt(voidfraction,U) + fvm::Sp(fvc::ddt(voidfraction),U)
+ + fvm::div(phi,U) + fvm::Sp(fvc::div(phi),U)
// + turbulence->divDevReff(U)
+ particleCloud.divVoidfractionTau(U, voidfraction)
==
diff --git a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
index af3134d5..ac015944 100644
--- a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
+++ b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
@@ -133,8 +133,12 @@ int main(int argc, char *argv[])
U = rUA*UEqn.H();
+ #ifdef version23
+ phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() );
+ #else
phi = ( fvc::interpolate(U*voidfraction) & mesh.Sf() )
+ fvc::ddtPhiCorr(rUAvoidfraction, U, phi);
+ #endif
surfaceScalarField phiS(fvc::interpolate(Us*voidfraction) & mesh.Sf());
surfaceScalarField phiGes = phi + rUAf*(fvc::interpolate(Ksl/rho) * phiS);
if (modelType=="A")
diff --git a/doc/CFDEMcoupling_Manual.html b/doc/CFDEMcoupling_Manual.html
index e8dd38f1..0fc3dcb6 100644
--- a/doc/CFDEMcoupling_Manual.html
+++ b/doc/CFDEMcoupling_Manual.html
@@ -21,7 +21,7 @@
1. Contents
-The CFDEMcoupling documentation is organized into the following sections. If you find errors or omissions in this manual or have suggestions for useful information to add, please send an email to the developers so we can improve the CFDEMcoupling documentation.
+
The CFDEMcoupling documentation is organized into the following sections. If you find any errors or omissions in this manual or have suggestions for useful information to add, please send an email to the developers so the CFDEMcoupling documentation can be improved.
1.1 About CFDEMcoupling
1.2 Installation
@@ -63,11 +63,11 @@
Details on installation are given on the CFDEMproject WWW Site .
-The functionality of this CFD-DEM framwork is described via tutorial cases showing how to use different solvers and models.
+The functionality of this CFD-DEM framework 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).
+
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
@@ -90,7 +90,7 @@ In order to get the latest code version, please use the git repository at http:/
General:
-Each solver of the CFDEMcoupling is comes with at least one tutorial example, showing its functionality and correct useage. Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell scripts. These scripts perform all necessary steps (preprocessing, run, postprocessing, visualization).
+
Each solver of the CFDEMcoupling comes with at least one tutorial example, showing its functionality and correct usage. Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell scripts. These scripts perform all necessary steps (preprocessing, run, postprocessing, visualization).
Location:
@@ -108,7 +108,7 @@ In order to get the latest code version, please use the git repository at http:/