Commit Graph

1660 Commits

Author SHA1 Message Date
6fe6137921 Merge pull request #115 from ParticulateFlow/release
Release 21.03
21.03
2021-03-22 17:59:49 +01:00
4ebd073845 add -Wno-deprecated-copy to options
to silence warnings stemming from OpenFOAM in g++ 9
2021-03-12 11:41:25 +01:00
affa8b1aa8 add -Wno-cast-function-type to compiler flags in Makefile
silence -Wcast-function-type warnings (stemming from OpenMPI) enabled by
default in g++8
earlier g++ versions might print a message about unrecognized command
line option '-Wno-cast-function-type' but that is the lesser evil
2021-03-12 10:36:48 +01:00
8c70e97db6 bump version number to 21.03 [ci skip] 2021-03-10 12:41:42 +01:00
953cf4d4ff modified MarkovPath random generation 2020-12-11 10:36:23 +01:00
1a37e99dfd Allow turbulentDispersion model to use kinetic energy either from object registry or calculated from turbulence models. 2020-11-13 10:13:37 +01:00
d3c10ba24d Merge pull request #113 from ParticulateFlow/feature/particledispersion
Feature/particledispersion
2020-11-06 11:20:49 +01:00
9aa0c94bf9 Avoid turbulent fluctuations through boundary. 2020-11-04 07:33:18 +01:00
57e98b2f0e Some testing on the turbulent dispersion model. 2020-11-03 09:51:28 +01:00
25efaffdd2 Lookup turbulent kinetic energy in execution loop. 2020-11-02 10:27:05 +01:00
7eacdef7eb Turbulent dispersion model. 2020-10-30 12:26:09 +01:00
5b07b7d03c Merge pull request #107 from ParticulateFlow/feature/register_atom_props
Register and supply per-particle data pointers centrally in cfdemCloud
2020-10-02 13:03:04 +02:00
80c8d29114 Merge pull request #112 from ParticulateFlow/master
updates from release 20.09
2020-10-02 12:40:25 +02:00
71a78be4c9 Merge pull request #111 from ParticulateFlow/release
Release 20.09
20.09
2020-10-01 12:33:40 +02:00
e2b454b036 fix up voidfractionTest case [ci skip]
add post folder and testharness configuration
2020-10-01 10:30:13 +02:00
a0ae8b90f7 bump version number to 20.09 2020-09-22 16:00:04 +02:00
78620f134f define member variables as const where appropriate
turn 'word' member variables into 'const word' if they are initialized
once (in the constructor) and never changed
2020-09-22 11:26:57 +02:00
b8c987ae94 use const word class member variables to store particle property names
internal variable naming convention for registered particle properties:
* suffix 'RegName_' indicates class-internal particle property usage;
these names use the typeName of the class as prefix for uniqueness
* suffix 'Name_' indicates particle properties also used in
give/getData; these names can potentially cause a conflict if multiple
models try to communicate a property with the same name (some of them
can be customized via the couplingProperties dict to resolve this
situation)
2020-09-22 11:20:12 +02:00
139506a28c fix up function parameters of getData/giveData
use 'const word&' instead of 'word' to avoid duplication of word and
correct constness
2020-09-21 17:54:29 +02:00
d605ea1701 add some comments [ci skip] 2020-09-21 12:36:58 +02:00
c13aece161 update chemistry tutorials [ci skip]
adjust setup to changes made in the fix chem/shrink/core implementation
in LIGGGHTS (cf. commit abe32ee)
2020-09-17 16:58:51 +02:00
59d5a1f1fd Merge pull request #109 from ParticulateFlow/feature/drag_schiller_naumann
added coarse graining to SchillerNaumann drag
2020-09-16 11:44:53 +02:00
aa82dad8be Update SchillerNaumannDrag.C
The changes are added.
2020-09-16 10:45:51 +02:00
2f5f10c6a5 added coarse graining to SchillerNaumann drag 2020-09-15 15:38:12 +02:00
40e464ab5e add reset flag for particle properties
use a reset flag to indicate if particle properties should be reset to
the initial value each coupling step (note that the property value is
always reset if re-allocation happens when the number of particles has
changed)
2020-09-08 13:02:16 +02:00
75ffbe02ae reset particle properties only if initVal == 0
else old value may still be required;
potentially, an extra flag in registerParticleProperty to indicate
resetting may be a better approach
2020-09-08 11:12:55 +02:00
b06bb1f98a test memory allocation of registered properties by cfdemCloud
perform per-particle property allocation in cfdemCloud instead of model
if registered size > 0
if no reallocation is triggered due to a change in particle number,
reset data to initial values (if registered size > 0)
2020-08-14 14:16:44 +02:00
647c84d323 use particle property registration in force, region and therm. cond. models 2020-08-11 11:32:35 +02:00
214e10e5a3 use particle property registration in chemistry and energy models 2020-08-10 17:56:44 +02:00
b0533b79ab streamline particle property registration 2020-08-10 15:25:50 +02:00
a83d0290c9 retain backward compatibility with OF4 2020-08-06 20:02:56 +02:00
3ea5bf774a test concept for centralized per-particle properties
register any per-particle properties (here: cellsPerParticle_ of
voidFractionModel) in hashtables in cfdemCloud class and in further
consequence handle access to per-particle data pointers centrally
2020-08-05 17:02:09 +02:00
3b29d96c05 [DOC] update particleCellVolume and volWeightedAverage [ci skip]
add new options
2020-08-03 13:26:56 +02:00
71586e1192 add trilinear voidfraction test case [ci skip]
as in CFDEMcoupling-PUBLIC
2020-08-03 13:06:23 +02:00
39d66506a1 add output option and min/max field values to particleCellVolume
as in CFDEMcoupling-PUBLIC
2020-08-03 12:45:11 +02:00
50bd4a6de3 add output option to volWeightedAverage
as in CFDEMcoupling-PUBLIC
2020-08-03 11:24:57 +02:00
4a11ade3b1 mitigate rounding errors
values should be in range [0;1]
2020-07-30 14:28:37 +02:00
3ffc8eef65 fix per-particle voidfraction in trilinear model
all particles incorrectly received the voidfraction of the same 8 cells
closes #106
2020-07-30 13:18:08 +02:00
d4e6ec2e39 add cfdemCompLIGlib shortcut to bashrc [ci skip]
to just compile LIGGGHTS sublibraries but not LIGGGHTS itself
2020-07-29 18:00:59 +02:00
e8766829cd fix incompatible dimensions in volWeightedAverage
ref() gives access to dimensioned field reference
primitiveFieldRef() gives access to primitive type field reference
(both actually return a 'this'-pointer reference)
2020-07-29 17:26:57 +02:00
d67ee0d63e add testharness config for one2one coupling test [ci skip] 2020-07-17 11:31:43 +02:00
893a8ddf31 add alternative files for one2one coupling in ErgunTestMPI case
for testing one2one coupling model
2020-07-17 11:23:49 +02:00
f07b8f370f restore twoWayOne2One::getNumberOfParticles() method
twoWayOne2One was calling base class method and crashed;
reverts 51d10d7d0f and parts of
4959ffc79f where this method was
mistakenly removed
closes #105
2020-07-16 20:59:26 +02:00
dd5dfb6662 remove outdated rcfdem solver from docs [ci skip] 2020-06-22 09:57:45 +02:00
f3c46fd09f Merge pull request #103 from ParticulateFlow/master
Update from release 20.05
2020-06-22 09:52:21 +02:00
fa584672ab Removed outdated rcfdem solver from compilation list. 2020-06-22 07:56:46 +02:00
aab29ab9bf No fines deposition in too dilute regions. 2020-06-22 07:55:51 +02:00
bba5d13264 Merge pull request #100 from ParticulateFlow/release
Release 20.05
20.05
2020-06-17 16:13:42 +02:00
9e38718f7f [DOC] update models list 2020-06-17 15:57:28 +02:00
424c680359 [DOC] update solver list
remove documentation off deleted solver
2020-06-17 15:55:36 +02:00