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
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
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
3b7ba89f7a
[DOC] add note about OpenFOAM version required for cfdemSolverMultiphase
2020-06-17 15:29:32 +02:00
68e625defe
[DOC] update installation instructions to OpenFOAM 6
2020-06-17 15:07:39 +02:00
408c8a36dc
bump version number to 20.05
2020-06-15 15:52:20 +02:00
14d5c30dac
Added tutorial case for coupled heat transfer with rCFD. Removed old solver and tutorial.
2020-06-03 11:52:52 +02:00
8489811677
Added option to phase in particle-fluid interaction at beginning of simulation.
2020-06-03 11:50:47 +02:00
37bbb436c2
Updated BF tutorial case.
2020-05-13 11:11:59 +02:00
e417d0dc40
Added option to specify deposition time.
2020-04-24 14:45:27 +02:00
116fd3b810
Merge pull request #99 from ParticulateFlow/feature/fines
...
Feature/fines
2020-04-23 16:02:54 +02:00
52bcfc5dd3
Update tutorial case.
2020-04-23 07:23:58 +02:00
63f1f8fb68
Limiter for isotropic fluctuations.
2020-04-22 14:37:44 +02:00
5f16dce15b
Particle deformation in predefined cell set.
2020-04-09 10:57:26 +02:00
9e8a418576
Coarse-graining factors in BeetstraDrag needs to be mutable.
2020-03-16 11:20:21 +01:00
07828a01f8
Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop
2020-03-16 10:35:53 +01:00
5710166ccd
Fixed error message.
2020-03-16 10:35:38 +01:00
ea7f37b3e1
Check for particle type.
2020-03-16 09:56:04 +01:00
1f5dcc5f33
Extend particleDeformation model for multiple types.
2020-03-12 16:24:18 +01:00
548df2cd3c
Merge with develop and some accompanying cleaning up.
2020-02-10 11:05:44 +01:00
a3166f2aca
Made tutorial case for dynamic CZ ready for OF 6.
2020-02-10 08:44:31 +01:00
1a85c87851
More options for thermal conduction through walls.
2020-02-10 07:42:35 +01:00
332dc5e057
New tutorial case for BF with dynamic cohesive zone.
2020-02-10 07:41:33 +01:00
9a81b875f1
Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop
2019-11-27 16:15:37 +01:00