Commit Graph

1677 Commits

Author SHA1 Message Date
ef294070cd Commented out references to recurrence base in terminalVelocity model. 2021-04-27 10:08:40 +02:00
d75befae08 Option to deactivate model check. 2021-04-27 10:07:36 +02:00
e7851bb005 epsilon can be updated from the dataBase 2021-04-26 18:12:16 +02:00
6d5005bf10 added freeStreaming solver 2021-04-26 17:55:41 +02:00
55de145ab9 define recurrenceBase as objectRegistry 2021-04-26 17:52:11 +02:00
d583e5c4df OtherForceModel providing source term for momentum equation due to buoyancy of secondary phase. 2021-04-26 16:12:02 +02:00
0fc15d8912 Refactored turbulent fluctuations for particle motion. 2021-04-26 16:11:16 +02:00
dc36ae2e66 Option in cfdemCloud to push particle velocities to LIGGGHTS. 2021-04-26 16:10:26 +02:00
3e5be0f42e Added otherForceModels to PISO solver. 2021-04-26 16:09:51 +02:00
4bb49fdd1f Update only those fields specified in 0 folder. 2021-02-04 09:36:29 +01:00
4bae8b0bf8 adding terminal rising velocity model 2021-02-03 14:51:51 +01:00
8c90cbbdd3 Merge pull request #114 from ParticulateFlow/develop
modified MarkovPath random generation
2020-12-11 10:43:26 +01:00
953cf4d4ff modified MarkovPath random generation 2020-12-11 10:36:23 +01:00
5994792de2 New rCFD solver to move tracers according to the forces acting on them. 2020-11-18 12:16:09 +01:00
0fd56c9333 Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib 2020-11-13 10:14:31 +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
3d971884c1 Revert "Allow turbulentDispersion model to use kinetic energy either from object registry or calculated from turbulence models."
This reverts commit 6e9ead9fb6.
2020-11-13 10:11:49 +01:00
6e9ead9fb6 Allow turbulentDispersion model to use kinetic energy either from object registry or calculated from turbulence models. 2020-11-13 10:08:18 +01:00
d58ff86621 Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib 2020-11-13 08:52:03 +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
d1ce573cc9 Merge pull request #110 from ParticulateFlow/develop
merging develop in recurrenceLib
2020-09-17 11:37:31 +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
b6f44b3338 recurrence solver for modal decomposition of flow fleids 2020-08-17 14:12:26 +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
bb4083f570 optional checkTimeStep & reading virtualTimeIndex in the solver 2020-08-13 15:48:12 +02:00
7dcb63f790 reading several recProperties 2020-08-13 15:44:29 +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