From 6677dfbc43e43cf86b5f6e531397be6f30ae9551 Mon Sep 17 00:00:00 2001
From: cfdem
Date: Mon, 30 Jul 2012 10:43:03 +0200
Subject: [PATCH] release on 2012-07-30_10-43-02
---
README | 82 ----------
.../solvers/cfdemSolverPiso/cfdemSolverPiso.C | 2 -
.../utilities/cfdemPostproc/cfdemPostproc.C | 29 ++--
applications/utilities/writeUfluid/Make/files | 3 +
.../utilities/writeUfluid/Make/options | 10 ++
.../utilities/writeUfluid/createFields.H | 25 +++
.../writeUfluid/particleTrackProperties | 25 +++
.../utilities/writeUfluid/writeUfluid.C | 99 ++++++++++++
doc/CFDEMcoupling_Manual.html | 53 +++----
doc/CFDEMcoupling_Manual.pdf | Bin 507230 -> 509488 bytes
doc/CFDEMcoupling_Manual.txt | 23 +++
doc/IOModel_trackIO.html | 32 ++++
doc/IOModel_trackIO.txt | 29 ++++
doc/githubAccess_public.html | 12 ++
doc/githubAccess_public.pdf | Bin 361661 -> 361900 bytes
doc/githubAccess_public.txt | 11 ++
src/lagrangian/cfdemParticle/Make/files | 24 +++
.../cfdemParticle/cfdTools/versionInfo.H | 2 +-
.../cfdemParticle/cfdemCloud/cfdemCloud.H | 2 +
.../cfdemParticle/cfdemCloud/cfdemCloudI.H | 5 +
src/lagrangian/cfdemParticle/etc/functions.sh | 15 ++
.../subModels/IOModel/IOModel/IOModel.C | 9 ++
.../subModels/IOModel/IOModel/IOModel.H | 2 +
.../subModels/IOModel/basicIO/basicIO.C | 19 +--
.../subModels/IOModel/basicIO/basicIO.H | 4 +-
.../subModels/IOModel/trackIO/trackIO.C | 146 ++++++++++++++++++
.../subModels/IOModel/trackIO/trackIO.H | 107 +++++++++++++
.../forceModel/KochHillDrag/KochHillDrag.C | 9 +-
.../forceModel/forceModel/forceModel.C | 3 +-
.../forceModel/forceModel/forceModel.H | 2 +
.../forceModel/gradPForce/gradPForce.C | 2 +-
.../explicitCouple/explicitCouple.C | 7 +-
.../explicitCouple/explicitCouple.H | 3 +
.../momCoupleModel/momCoupleModel.C | 5 +
.../momCoupleModel/momCoupleModel.H | 2 +
.../ErgunTestMPI_restart/DEM/post/dummy | 1 +
.../CFD/constant/couplingProperties | 3 +-
.../CFD/constant/particleTrackProperties | 23 +++
38 files changed, 688 insertions(+), 142 deletions(-)
delete mode 100644 README
create mode 100644 applications/utilities/writeUfluid/Make/files
create mode 100644 applications/utilities/writeUfluid/Make/options
create mode 100644 applications/utilities/writeUfluid/createFields.H
create mode 100644 applications/utilities/writeUfluid/particleTrackProperties
create mode 100644 applications/utilities/writeUfluid/writeUfluid.C
create mode 100644 doc/IOModel_trackIO.html
create mode 100644 doc/IOModel_trackIO.txt
create mode 100644 src/lagrangian/cfdemParticle/subModels/IOModel/trackIO/trackIO.C
create mode 100644 src/lagrangian/cfdemParticle/subModels/IOModel/trackIO/trackIO.H
create mode 100644 tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/particleTrackProperties
diff --git a/README b/README
deleted file mode 100644
index a677e0a8..00000000
--- a/README
+++ /dev/null
@@ -1,82 +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 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/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
index 4fc1d08b..352236d7 100644
--- a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
+++ b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
@@ -50,13 +50,11 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
-
#include "initContinuityErrs.H"
// create cfdemCloud
#include "readGravitationalAcceleration.H"
cfdemCloud particleCloud(mesh);
-
#include "checkModelType.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/cfdemPostproc/cfdemPostproc.C b/applications/utilities/cfdemPostproc/cfdemPostproc.C
index 69bc5d3d..04400a96 100644
--- a/applications/utilities/cfdemPostproc/cfdemPostproc.C
+++ b/applications/utilities/cfdemPostproc/cfdemPostproc.C
@@ -1,33 +1,34 @@
/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
- \\/ M anipulation |
+ 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 OpenFOAM.
+ This file is part of CFDEMcoupling.
- OpenFOAM 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 2 of the License, or (at your
- option) any later version.
+ 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.
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ 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 OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with CFDEMcoupling. If not, see .
Application
cfdemPostproc
Description
Tool for DEM->CFD (Lagrange->Euler) mapping to calculate local voidfraction
-
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
diff --git a/applications/utilities/writeUfluid/Make/files b/applications/utilities/writeUfluid/Make/files
new file mode 100644
index 00000000..26244494
--- /dev/null
+++ b/applications/utilities/writeUfluid/Make/files
@@ -0,0 +1,3 @@
+writeUfluid.C
+
+EXE = $(FOAM_APPBIN)/writeUfluid
diff --git a/applications/utilities/writeUfluid/Make/options b/applications/utilities/writeUfluid/Make/options
new file mode 100644
index 00000000..0bc784e4
--- /dev/null
+++ b/applications/utilities/writeUfluid/Make/options
@@ -0,0 +1,10 @@
+EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude
+
+EXE_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lgenericPatchFields \
+ -llagrangian
diff --git a/applications/utilities/writeUfluid/createFields.H b/applications/utilities/writeUfluid/createFields.H
new file mode 100644
index 00000000..c5316d89
--- /dev/null
+++ b/applications/utilities/writeUfluid/createFields.H
@@ -0,0 +1,25 @@
+
+IOdictionary propsDict
+(
+ IOobject
+ (
+ "particleTrackProperties",
+ runTime.constant(),
+ mesh,
+ IOobject::MUST_READ_IF_MODIFIED
+ )
+);
+
+const word cloudName(propsDict.lookup("cloudName"));
+
+//label sampleFrequency(readLabel(propsDict.lookup("sampleFrequency")));
+
+// outputMode: compositeFile, filePerTrack
+//word outputmode(propsDict.lookup("outputMode"))
+
+//label maxPositions(readLabel(propsDict.lookup("maxPositions")));
+
+// outputFormat: raw, vtk
+//word outputFormat(propsDict.lookup("outputFormat"));
+
+
diff --git a/applications/utilities/writeUfluid/particleTrackProperties b/applications/utilities/writeUfluid/particleTrackProperties
new file mode 100644
index 00000000..b2caae7a
--- /dev/null
+++ b/applications/utilities/writeUfluid/particleTrackProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 2.1.x |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object particleTrackProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+cloudName cfdemCloud1;
+
+sampleFrequency 1;
+
+maxPositions 1000000;
+
+maxPositions 20000;
+// ************************************************************************* //
diff --git a/applications/utilities/writeUfluid/writeUfluid.C b/applications/utilities/writeUfluid/writeUfluid.C
new file mode 100644
index 00000000..cde6c88f
--- /dev/null
+++ b/applications/utilities/writeUfluid/writeUfluid.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+ 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
+ writeUfluidwriteUfluid
+
+Description
+ Writes the the cell center fluid velocity to particles in the lagrangian
+ time directory.
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Cloud.H"
+#include "IOdictionary.H"
+#include "fvCFD.H"
+#include "fvMesh.H"
+#include "Time.H"
+#include "timeSelector.H"
+#include "OFstream.H"
+#include "passiveParticleCloud.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+ timeSelector::addOptions();
+ #include "addRegionOption.H"
+
+ #include "setRootCase.H"
+
+ #include "createTime.H"
+ instantList timeDirs = timeSelector::select0(runTime, args);
+ #include "createMesh.H"
+ #include "createFields.H"
+
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int nParticle=0;
+ forAll(timeDirs, timeI)
+ {
+ runTime.setTime(timeDirs[timeI], timeI);
+ Info<< "Time = " << runTime.timeName() << endl;
+ IOobject UHeader
+ (
+ "U",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ
+ );
+ if (UHeader.headerOk())
+ {
+ volVectorField U(UHeader,mesh);
+ passiveParticleCloud myCloud(mesh, cloudName);
+ myCloud.write();
+ nParticle = myCloud.size();
+ IOField Ufluid(myCloud.fieldIOobject("Ufluid",IOobject::NO_READ),nParticle);
+ label i = 0;
+ forAllConstIter(passiveParticleCloud, myCloud, iter)
+ {
+ Ufluid[i]=U[iter().cell()];
+ i++;
+ }
+ Ufluid.write();
+ }
+ else
+ {
+ Info << "velocity field not found" << endl;
+ }
+ }
+ return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/doc/CFDEMcoupling_Manual.html b/doc/CFDEMcoupling_Manual.html
index 175b3086..148ce0c3 100644
--- a/doc/CFDEMcoupling_Manual.html
+++ b/doc/CFDEMcoupling_Manual.html
@@ -189,32 +189,33 @@ listing below of styles within certain commands.