95ba62b8e5
Initial commit for Doxygen setup
2017-09-27 17:08:45 +02:00
ae6902dbd6
Merge pull request #32 from ParticulateFlow/fix/blockMeshDictLocation
...
Moved blockMeshDict file to system folder
2017-09-13 15:43:17 +02:00
3ab97478a7
Merge branch 'master' into develop
2017-09-07 13:26:37 +02:00
b3c451dbc9
Moved blockMeshDict file to system folder
...
Since OpenFOAM-3.0 it is the convention to put blockMeshDict into system
instead of constant/polyMesh
Having blockMeshDict in system is supported since OpenFOAM-2.3
2017-09-06 10:04:29 +02:00
b8921ec6ca
Merge pull request #30 from ParticulateFlow/release
...
Release 17.08
2017-09-05 16:42:02 +02:00
69d4e6ff02
bump version number
2017-08-31 16:55:39 +02:00
2e14d14a60
Merge pull request #29 from ParticulateFlow/feature/cherry_pick_PUBLIC
...
Feature/cherry pick public
2017-08-31 16:19:05 +02:00
70617eb360
replace deprecated outputControl and outputInterval
...
replace with writeControl and writeInterval
2017-08-31 14:50:59 +02:00
c7ee75839b
clean up LIGGGHTS scripts
2017-08-31 10:05:19 +02:00
006d9c7cd2
add comment
2017-08-31 09:57:12 +02:00
652e7b3f74
clean up whitespaces
2017-08-31 09:56:50 +02:00
d1c8707c3e
fix issue with voidfraction slightly > 1 in SyamlalThermCond
2017-08-30 13:18:31 +02:00
91b84ca607
fix calculation of timeStepFraction & voidfraction interpolation
...
merged from PUBLIC
2017-08-29 18:33:55 +02:00
777a50d8b6
Merge pull request #28 from ParticulateFlow/feature/cherry_pick_PUBLIC
...
Feature/cherry pick public
2017-08-29 10:36:09 +02:00
c4bb208a6a
remove unneeded include and clean up whitespaces
2017-08-29 09:26:24 +02:00
dec9b7f959
pre-generate satellite points in engineSearchIB
...
mostly merged from PUBLIC
2017-08-29 09:15:16 +02:00
93faf28a9f
use checkPeriodicCells flag from particleCloud
2017-08-28 17:57:45 +02:00
23616877fb
use implicit type conversion
2017-08-28 16:02:58 +02:00
4e50b3e06c
clean up whitespaces
2017-08-28 15:57:45 +02:00
8b3878de65
abort on Gauss void fraction model
...
merged from PUBLIC
2017-08-28 15:57:22 +02:00
f946c5765f
use const variable from mathExtra.H
2017-08-28 15:51:02 +02:00
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
