683fd04828
pre-calculate sqrt(3.0)
...
merged from PUBLIC
2017-08-28 15:42:13 +02:00
9650aff318
protect against division by zero
...
merged from PUBLIC
2017-08-28 15:41:44 +02:00
d5fbf402cb
fix missing include
2017-08-28 15:37:16 +02:00
1b9f7020ac
fix parameter in function call
2017-08-28 15:30:51 +02:00
68d9035225
clean up formatting, add some comments
2017-08-28 14:20:51 +02:00
2230dcaa57
rearrange code in MeiLift to save some operations
2017-08-28 12:32:11 +02:00
6e23baba7f
fix Mei lift force
...
The equation was probably taken from the paper of Kurose and Komori
1999, which does not repoduce the original formula given by Mei 1992
correctly (which itself is missing a left parenthesis).
The correct formula can be looked up for example in Mei and Klausner
1994 or Loth and Dorgan 2009
2017-08-25 14:33:50 +02:00
bf0ff235b6
use proper data type for counters
2017-08-24 17:19:24 +02:00
e6d12f6790
make debug info live in separate block
2017-08-24 17:18:40 +02:00
9a1abb5f19
clean up whitespaces in mathExtra.H
2017-08-24 17:07:33 +02:00
8df363cf97
add some mathematical constants
...
cf. OpenFOAM mathematicalConstants.H
2017-08-24 17:06:23 +02:00
5b8072b11a
Merge pull request #27 from ParticulateFlow/feature/cherry_pick_PUBLIC
...
Feature/cherry pick public
2017-08-24 16:17:53 +02:00
2e2701ccf7
remove unneeded parameter finaliser from IOModel::streamDataToPath
2017-08-24 09:58:01 +02:00
5e7b332dd9
clean up whitespaces
2017-08-23 18:02:29 +02:00
adc79029a1
use actual cell id of particles instead of dummy finaliser string
2017-08-23 18:01:22 +02:00
ad6a169ffd
output position as position type instead of vector type
2017-08-23 18:00:00 +02:00
53d0988a4e
IOModel::streamDataToPath - separate handling of position and vector
...
vector needs no finaliser
2017-08-23 17:58:41 +02:00
165a2b9611
no need for finalizer in case of 'label'
2017-08-23 17:55:57 +02:00
2e4c93f8ee
use info from OFstream to create output file header
2017-08-23 17:52:51 +02:00
668b85582b
simplify logic
...
don't waste any time if type == "origProcId"
2017-08-23 17:50:22 +02:00
6343a6a09c
create OFstream on stack instead of heap
2017-08-23 17:45:58 +02:00
76b90cc3cc
remove unnecessary copy to temp vector
2017-08-23 17:40:17 +02:00
bce10d17c1
clean up whitespaces
2017-08-23 17:36:22 +02:00
dd2e21be64
create OFstream on stack instead of heap
2017-08-23 17:35:08 +02:00
e1116e471b
Merge pull request #26 from ParticulateFlow/feature/environment_setup
...
Feature/environment setup
2017-08-23 08:58:02 +02:00
67019b0c0b
Merge branch 'feature/environment_setup' into feature/cherry_pick_PUBLIC
2017-08-22 15:55:47 +02:00
7ade0c27a7
Sourcing CFDEMcoupling: one-stop bashrc / cshrc
...
* a single bashrc / cshrc file for CFDEMcoupling, similar to OpenFOAM
* user-editable section on top, for:
- setting the versions of OpenFOAM and CFDEMcoupling
- setting installation paths
- setting user directory path
* allows to set/unset values from command-line parameters (important for
test harness installation)
* removed unused and deprecated environment variables
2017-08-22 14:36:12 +02:00
df1bf48938
clean up whitespaces in cfdemSystemTest.sh
2017-08-22 13:24:54 +02:00
a87ed03b61
display PATH env var in cfdemSysTest
...
We will add bin and library paths for cfdemcoupling binaries and
libraries in the future -> display PATH to see if they are set correctly
2017-08-22 13:23:30 +02:00
9f7c801fbe
remove output of liggghts lib name in cfdemSysTest
...
with cmake compilation in place, it's always libliggghts.so
2017-08-22 13:19:57 +02:00
52eed4b351
remove check for pizza dir from cfdemSysTest
...
we don't use pizza anymore, just lpp
2017-08-22 13:18:09 +02:00
8f11235d08
update make options for compressible library
...
use same flags as for incompressible library
2017-08-22 13:15:13 +02:00
15b7c43839
remove unneeded environment variables
...
libraries do not exist or are never used
2017-08-22 10:41:35 +02:00
579264952f
remove unneeded includes
2017-08-21 13:17:52 +02:00
116bf952ab
remove commented out code
2017-08-21 13:17:26 +02:00
1213c90a50
clean up whitespaces and formatting
2017-08-21 13:09:33 +02:00
b2b3363104
add procBoundaryCorrection for dividedVoidfraction in case of engineIB
2017-08-21 12:40:10 +02:00
8b6222ba79
remove method no longer needed
...
using base class method
2017-08-21 12:34:45 +02:00
8e73260cb4
limit voidfractionNext and scale to values >= 0
2017-08-21 12:33:02 +02:00
777a9e06ec
refactor IBVoidFraction class
...
move duplicate to separate function
2017-08-21 12:32:09 +02:00
4ac84930c5
add braces
2017-08-21 12:24:25 +02:00
10fd332943
correct boundary conditions of voidfraction field
...
correct BCs after modifying the voidfraction field
2017-08-21 12:23:41 +02:00
3dc7b6a150
pre-generate marker points in dividedVoidFraction class
...
generate marker points for unit sphere once and just scale these points
for each particle instead of constantly recalculating them
2017-08-18 11:35:30 +02:00
3f8885c9b7
add functions to get min dist of point to periodic particle image
...
add functions to voidFractionModel class to determine minimal distance
of a point to one of the periodic images of a particle
2017-08-17 17:13:16 +02:00
dc3f93f401
change cg incompatibility error to warning by default
...
added switch 'cgWarnOnly' to choose between warning (default) and error
2017-08-17 16:50:51 +02:00
5f123bb6a1
use flag from cfdemCloud for checking periodic cells in dividedVoidFraction class
2017-08-17 16:34:56 +02:00
123280958b
use flag from cfdemCloud for checking periodic cells in IBVoidFraction class
2017-08-17 16:33:43 +02:00
1a98e6eaee
determine necessity of periodic cell check in cfdemCloud class
...
only check for periodic cells in submodels if all boundary patches are
cyclic
2017-08-17 16:30:09 +02:00
807c6e30e7
fix memory leak
...
anything new shall be deleted;
2017-08-17 15:09:40 +02:00
1b51d5ce21
proper member initialization
...
allocating memory of zero size will produce useless pointer
set to NULL instead
2017-08-17 15:09:39 +02:00
