From c4113f388d4ffecda0ad9efea8e14709206d11e9 Mon Sep 17 00:00:00 2001
From: cfdem
Date: Thu, 7 Jun 2012 16:26:02 +0200
Subject: [PATCH] test
---
.../solvers/cfdemSolverIB/cfdemSolverIB.C | 2 +-
.../solvers/cfdemSolverPiso/cfdemSolverPiso.C | 2 +-
.../cfdemSolverPisoScalar.C | 2 +-
doc/CFDEMcoupling_Manual.html | 37 ++++++------------
doc/CFDEMcoupling_Manual.pdf | Bin 498504 -> 503043 bytes
doc/CFDEMcoupling_Manual.txt | 15 +++++--
doc/averagingModel.txt | 1 +
doc/githubAccess_public.pdf | Bin 361244 -> 361244 bytes
src/lagrangian/cfdemParticle/Make/files | 3 ++
.../forceModel/KochHillDrag/KochHillDrag.H | 3 +-
.../ErgunTestMPI/DEM/post/dummy | 1 +
.../ErgunTestMPI_restart/DEM/post/dummy | 1 +
12 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
index c6ec5e4..912cb6c 100755
--- a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
+++ b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C
@@ -29,7 +29,7 @@ Application
Description
Transient solver for incompressible flow.
- The code is an evolution of the solver pisoFoam in OpenFOAM 1.6,
+ The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6,
where additional functionality for CFD-DEM coupling using immersed body
(fictitious domain) method is added.
Contributions
diff --git a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
index 56f1cbd..84f8f72 100644
--- a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
+++ b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
@@ -30,7 +30,7 @@ Application
Description
Transient solver for incompressible flow.
Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
- The code is an evolution of the solver pisoFoam in OpenFOAM 1.6,
+ The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6,
where additional functionality for CFD-DEM coupling is added.
\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
index 17c846d..86656e0 100644
--- a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
+++ b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
@@ -30,7 +30,7 @@ Application
Description
Transient solver for incompressible flow.
Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
- The code is an evolution of the solver pisoFoam in OpenFOAM 1.6,
+ The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6,
where additional functionality for CFD-DEM coupling is added.
\*---------------------------------------------------------------------------*/
diff --git a/doc/CFDEMcoupling_Manual.html b/doc/CFDEMcoupling_Manual.html
index 8b23173..9ecb9f3 100644
--- a/doc/CFDEMcoupling_Manual.html
+++ b/doc/CFDEMcoupling_Manual.html
@@ -188,32 +188,17 @@ In order to get the latest code version, please use the git repository at http:/
listing below of styles within certain commands.