diff --git a/README b/README
new file mode 100644
index 00000000..a677e0a8
--- /dev/null
+++ b/README
@@ -0,0 +1,82 @@
+/*---------------------------------------------------------------------------*\
+ 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 Silicon Graphics
+International Corp. This offering is not affiliated, approved or endorsed by
+Silicon Graphics International Corp., the producer of the OpenFOAM(R) software
+and owner of the OpenFOAM(R) trademark.
+\*---------------------------------------------------------------------------*/
diff --git a/doc/CFDEMcoupling_Manual.pdf b/doc/CFDEMcoupling_Manual.pdf
index 8974fc41..081aed46 100644
Binary files a/doc/CFDEMcoupling_Manual.pdf and b/doc/CFDEMcoupling_Manual.pdf differ
diff --git a/doc/githubAccess_public.pdf b/doc/githubAccess_public.pdf
index 00d397ac..f11185b4 100644
Binary files a/doc/githubAccess_public.pdf and b/doc/githubAccess_public.pdf differ
diff --git a/doc/regionModel.html b/doc/regionModel.html
index a85e4e82..7d2304f6 100644
--- a/doc/regionModel.html
+++ b/doc/regionModel.html
@@ -11,7 +11,7 @@
Syntax:
-Defined in couplingProperties dictionary.
+
Note: In the current CFDEMcoupling version, this model is no longer used. Defined in couplingProperties dictionary.
regionModel model;
diff --git a/doc/regionModel.txt b/doc/regionModel.txt
index a829eca0..e83d0132 100644
--- a/doc/regionModel.txt
+++ b/doc/regionModel.txt
@@ -9,7 +9,7 @@ regionModel command :h3
[Syntax:]
-Defined in couplingProperties dictionary.
+Note: In the current CFDEMcoupling version, this model is no longer used. Defined in couplingProperties dictionary.
regionModel model; :pre
diff --git a/doc/regionModel_allRegion.html b/doc/regionModel_allRegion.html
index 85f35b0f..048c863e 100644
--- a/doc/regionModel_allRegion.html
+++ b/doc/regionModel_allRegion.html
@@ -11,7 +11,7 @@
Syntax:
-Defined in couplingProperties dictionary.
+
Note: In the current CFDEMcoupling version, this model is no longer used. Defined in couplingProperties dictionary.
regionModel allRegion;
diff --git a/doc/regionModel_allRegion.txt b/doc/regionModel_allRegion.txt
index 7798339e..c0e37441 100644
--- a/doc/regionModel_allRegion.txt
+++ b/doc/regionModel_allRegion.txt
@@ -9,7 +9,7 @@ regionModel_allRegion command :h3
[Syntax:]
-Defined in couplingProperties dictionary.
+Note: In the current CFDEMcoupling version, this model is no longer used. Defined in couplingProperties dictionary.
regionModel allRegion; :pre
diff --git a/src/lagrangian/cfdemParticle/Make/files b/src/lagrangian/cfdemParticle/Make/files
index d1578924..c939c8b0 100644
--- a/src/lagrangian/cfdemParticle/Make/files
+++ b/src/lagrangian/cfdemParticle/Make/files
@@ -6,7 +6,6 @@ voidFractionModels = subModels/voidFractionModel
locateModels = subModels/locateModel
meshMotionModels = subModels/meshMotionModel
momCoupleModels = subModels/momCoupleModel
-regionModels = subModels/regionModel
dataExchangeModels = subModels/dataExchangeModel
averagingModels = subModels/averagingModel
clockModels = subModels/clockModel
@@ -20,18 +19,33 @@ $(forceModels)/forceModel/forceModel.C
$(forceModels)/forceModel/newForceModel.C
$(forceModels)/noDrag/noDrag.C
$(forceModels)/DiFeliceDrag/DiFeliceDrag.C
+$(forceModels)/DiFeliceDragNLift/DiFeliceDragNLift.C
$(forceModels)/GidaspowDrag/GidaspowDrag.C
$(forceModels)/SchillerNaumannDrag/SchillerNaumannDrag.C
$(forceModels)/Archimedes/Archimedes.C
$(forceModels)/ArchimedesIB/ArchimedesIB.C
$(forceModels)/interface/interface.C
$(forceModels)/ShirgaonkarIB/ShirgaonkarIB.C
+$(forceModels)/fieldTimeAverage/fieldTimeAverage.C
+$(forceModels)/fieldBound/fieldBound.C
+$(forceModels)/volWeightedAverage/volWeightedAverage.C
+$(forceModels)/totalMomentumExchange/totalMomentumExchange.C
$(forceModels)/KochHillDrag/KochHillDrag.C
+$(forceModels)/BeetstraDrag/multiphaseFlowBasic/multiphaseFlowBasic.C
+$(forceModels)/BeetstraDrag/BeetstraDrag.C
+$(forceModels)/LaEuScalarLiquid/LaEuScalarLiquid.C
$(forceModels)/LaEuScalarTemp/LaEuScalarTemp.C
+$(forceModels)/LaEuScalarDust/LaEuScalarDust.C
$(forceModels)/virtualMassForce/virtualMassForce.C
$(forceModels)/gradPForce/gradPForce.C
+$(forceModels)/gradULiftForce/gradULiftForce.C
$(forceModels)/viscForce/viscForce.C
$(forceModels)/MeiLift/MeiLift.C
+$(forceModels)/KochHillDragNLift/KochHillDragNLift.C
+$(forceModels)/solidsPressureForce/solidsPressureForce.C
+$(forceModels)/periodicPressure/periodicPressure.C
+$(forceModels)/periodicPressureControl/periodicPressureControl.C
+$(forceModels)/averageSlipVel/averageSlipVel.C
$(forceModelsMS)/forceModelMS/forceModelMS.C
$(forceModelsMS)/forceModelMS/newForceModelMS.C
@@ -42,6 +56,7 @@ $(IOModels)/IOModel/newIOModel.C
$(IOModels)/noIO/noIO.C
$(IOModels)/basicIO/basicIO.C
$(IOModels)/trackIO/trackIO.C
+$(IOModels)/sophIO/sophIO.C
$(voidFractionModels)/voidFractionModel/voidFractionModel.C
$(voidFractionModels)/voidFractionModel/newVoidFractionModel.C
@@ -60,21 +75,18 @@ $(locateModels)/turboEngineSearch/turboEngineSearch.C
$(locateModels)/turboEngineSearchM2M/turboEngineSearchM2M.C
$(locateModels)/engineSearchIB/engineSearchIB.C
-
$(meshMotionModels)/meshMotionModel/meshMotionModel.C
$(meshMotionModels)/meshMotionModel/newMeshMotionModel.C
$(meshMotionModels)/noMeshMotion/noMeshMotion.C
+$(meshMotionModels)/DEMdrivenMeshMotion/DEMdrivenMeshMotion.C
$(momCoupleModels)/momCoupleModel/momCoupleModel.C
$(momCoupleModels)/momCoupleModel/newMomCoupleModel.C
$(momCoupleModels)/explicitCouple/explicitCouple.C
+$(momCoupleModels)/explicitCoupleSource/explicitCoupleSource.C
$(momCoupleModels)/implicitCouple/implicitCouple.C
$(momCoupleModels)/noCouple/noCouple.C
-$(regionModels)/regionModel/regionModel.C
-$(regionModels)/regionModel/newRegionModel.C
-$(regionModels)/allRegion/allRegion.C
-
$(dataExchangeModels)/dataExchangeModel/dataExchangeModel.C
$(dataExchangeModels)/dataExchangeModel/newDataExchangeModel.C
$(dataExchangeModels)/oneWayVTK/oneWayVTK.C
diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
index 94c8504f..f5cd91a8 100644
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
@@ -236,7 +236,7 @@ Foam::cfdemCloud::~cfdemCloud()
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //
inline void Foam::cfdemCloud::free2D(double** array)
{
- free(array[0]);
+ if(array) free(array[0]);
free(array);
}
diff --git a/src/lagrangian/cfdemParticle/etc/functions.sh b/src/lagrangian/cfdemParticle/etc/functions.sh
index dd9563fb..f12f134c 100755
--- a/src/lagrangian/cfdemParticle/etc/functions.sh
+++ b/src/lagrangian/cfdemParticle/etc/functions.sh
@@ -314,7 +314,8 @@ parCFDDEMrun()
if [ $debugMode == "on" ]; then
debugMode="valgrind"
elif [ $debugMode == "strict" ]; then
- debugMode="valgrind --leak-check=full -v --trace-children=yes --track-origins=yes"
+ #debugMode="valgrind --leak-check=full -v --trace-children=yes --track-origins=yes"
+ debugMode="valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes"
else
debugMode=""
fi
diff --git a/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C b/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
index 5e8319f0..5b1919b1 100644
--- a/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/clockModel/clockModel/clockModel.C
@@ -364,8 +364,8 @@ void Foam::clockModel::plotHist(double buffIn,std::string identifier,int numproc
printf("%4f ",globalTime_all[j]);
Info << "\t" <memory->destroy(tmpI_);
- lmp->memory->destroy(tmp_);
+ destroy(tmpI_);
+ destroy(tmp_);
+ destroy(pos_lammps_);
delete lmp2foam_;
delete lmp2foam_vec_;
delete foam2lmp_vec_;
@@ -270,7 +271,7 @@ void Foam::twoWayM2M::allocateArray
) const
{
int len = max(length,1);
- lmp->memory->grow(array, len, width, "m2m:data");
+ lmp->memory->grow(array, len, width, "m2m:dbl**");
for (int i = 0; i < len; i++)
for (int j = 0; j < width; j++)
array[i][j] = initVal;
@@ -285,12 +286,15 @@ void Foam::twoWayM2M::allocateArray
) const
{
int len = max(particleCloud_.numberOfParticles(),1);
- lmp->memory->grow(array, len, width, "m2m:data");
+ lmp->memory->grow(array, len, width, "m2m:dbl**:autolen");
for (int i = 0; i < len; i++)
for (int j = 0; j < width; j++)
array[i][j] = initVal;
}
-
+void Foam::twoWayM2M::destroy(double** array) const
+{
+ lmp->memory->destroy(array);
+}
//============
// int **
void Foam::twoWayM2M::allocateArray
@@ -302,7 +306,7 @@ void Foam::twoWayM2M::allocateArray
) const
{
int len = max(length,1);
- lmp->memory->grow(array, len, width, "m2m:data");
+ lmp->memory->grow(array, len, width, "m2m:int**");
for (int i = 0; i < len; i++)
for (int j = 0; j < width; j++)
array[i][j] = initVal;
@@ -317,29 +321,41 @@ void Foam::twoWayM2M::allocateArray
) const
{
int len = max(particleCloud_.numberOfParticles(),1);
- lmp->memory->grow(array, len, width, "m2m:data");
+ lmp->memory->grow(array, len, width, "m2m:int**:autolen");
for (int i = 0; i < len; i++)
for (int j = 0; j < width; j++)
array[i][j] = initVal;
}
+void Foam::twoWayM2M::destroy(int** array) const
+{
+ lmp->memory->destroy(array);
+}
//============
// double *
void Foam::twoWayM2M::allocateArray(double*& array, double initVal, int length) const
{
int len = max(length,1);
- lmp->memory->grow(array, len, "m2m:data");
+ lmp->memory->grow(array, len, "m2m:dbl*");
for (int i = 0; i < len; i++)
array[i] = initVal;
}
+void Foam::twoWayM2M::destroy(double* array) const
+{
+ lmp->memory->destroy(array);
+}
//==============
// int *
void Foam::twoWayM2M::allocateArray(int*& array, int initVal, int length) const
{
int len = max(length,1);
- lmp->memory->grow(array, len, "m2m:data");
+ lmp->memory->grow(array, len, "m2m:int*");
for (int i = 0; i < len; i++)
array[i] = initVal;
}
+void Foam::twoWayM2M::destroy(int* array) const
+{
+ lmp->memory->destroy(array);
+}
//==============
@@ -457,7 +473,6 @@ void Foam::twoWayM2M::syncIDs() const
foam2lmp_vec_->setup(nlocal_foam_*3,id_foam_vec_,nlocal_lammps_*3,id_lammpsVec_);
// map data according to last TS
- id_lammps_=NULL;
allocateArray(id_lammps_,-1.,nlocal_foam_);
allocateArray(tmpI_,-1.,nlocal_foam_);
lmp2foam_->exchange(id_lammpsSync, tmpI_);
@@ -469,7 +484,6 @@ void Foam::twoWayM2M::syncIDs() const
allocateArray(tmp_,-1.,nlocal_foam_*3);
lmp2foam_vec_->exchange(pos_lammpsSync ? pos_lammpsSync[0] : NULL, tmp_);
- pos_lammps_ = NULL; // points to lig data before
allocateArray(pos_lammps_,0,3,nlocal_foam_);
for(int i=0;isetup(nlocal_lammps_,id_lammps_,nlocal_foam_,id_foam_);
lmp2foam_vec_->setup(nlocal_lammps_*3,id_lammpsVec_,nlocal_foam_*3,id_foam_vec_);
foam2lmp_vec_->setup(nlocal_foam_*3,id_foam_vec_,nlocal_lammps_*3,id_lammpsVec_);
+ id_lammps_=NULL; // free pointer from LIG
+ pos_lammps_ = NULL; // free pointer from LIG
}else
{
lmp2foam_->setup(nlocal_lammps_,id_lammpsSync,nlocal_foam_,id_foam_);
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/twoWayM2M.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/twoWayM2M.H
index aab1d961..06d5ab56 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/twoWayM2M.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/twoWayM2M.H
@@ -95,7 +95,6 @@ private:
mutable Many2Many * foam2lmp_vec_;
mutable int nlocal_lammps_;
mutable int *id_lammps_;
- //mutable int *id_lammpsComm_;
mutable int *id_lammpsVec_;
mutable int nlocal_foam_;
mutable int *id_foam_;
@@ -181,23 +180,23 @@ public:
//============
// double **
void allocateArray(double**&, double, int, int) const;
-
void allocateArray(double**&, double, int,const char* ="nparticles") const;
-
+ void destroy(double**) const;
//============
// int **
void allocateArray(int**&, int, int, int) const;
-
void allocateArray(int**&, int, int,const char* ="nparticles") const;
+ void destroy(int**) const;
//==============
//==============
// double *
void allocateArray(double*&, double, int) const;
-
+ void destroy(double*) const;
//==============
// int *
void allocateArray(int*&, int, int) const;
+ void destroy(int*) const;
//==============
bool couple() const;
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
index 8081f3c1..a59ba8d4 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
@@ -172,7 +172,8 @@ void twoWayMPI::giveData
char* charDatatype= const_cast (datatype);
data_of_to_liggghts(charName,charType, lmp, (void*) field,charDatatype);
}
-
+//============
+// double **
void Foam::twoWayMPI::allocateArray
(
double**& array,
@@ -197,7 +198,12 @@ void Foam::twoWayMPI::allocateArray
char* charLength= const_cast (length);
allocate_external_double(array, width,charLength,initVal,lmp);
}
-
+void Foam::twoWayMPI::destroy(double** array) const
+{
+ if (array == NULL) return;
+ free(array[0]);
+ free(array);
+}
//============
// int **
void Foam::twoWayMPI::allocateArray
@@ -224,6 +230,12 @@ void Foam::twoWayMPI::allocateArray
char* charLength= const_cast (length);
allocate_external_int(array, width,charLength,initVal,lmp);
}
+void Foam::twoWayMPI::destroy(int** array) const
+{
+ if (array == NULL) return;
+ free(array[0]);
+ free(array);
+}
//============
bool Foam::twoWayMPI::couple() const
diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
index 2673e5ba..d006458c 100644
--- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
+++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
@@ -142,14 +142,13 @@ public:
//============
// double **
void allocateArray(double**&, double, int, int) const;
-
void allocateArray(double**&, double, int,const char* ="nparticles") const;
-
+ void destroy(double**) const;
//============
// int **
void allocateArray(int**&, int, int, int) const;
-
void allocateArray(int**&, int, int,const char* ="nparticles") const;
+ void destroy(int**) const;
//==============
bool couple() const;
diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C
index 9d22689f..94cc822d 100644
--- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C
@@ -94,7 +94,7 @@ voidFractionModel::voidFractionModel
voidFractionModel::~voidFractionModel()
{
- free(cellsPerParticle_);
+ particleCloud_.dataExchangeM().destroy(cellsPerParticle_);
}
// * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * //