fbd2bde594
Merge with o2o.
2018-10-22 10:30:41 +02:00
0c7396e565
Control communication of fluctuations.
2018-10-15 13:10:18 +02:00
1c44a3a09f
remove bottleneck in locating particles by using appropriate container for cell ids.
2018-10-13 13:35:35 +02:00
9a3cf6a4c2
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2018-09-07 09:37:25 +02:00
346334d639
Time dilation factor for databases recorded at "high speed".
2018-09-07 09:36:52 +02:00
7fdc466a76
edit read norm to read the whole recurrence matrix
2018-09-06 12:58:57 +02:00
67cd1bf561
Relax time step criterion.
2018-09-05 10:52:33 +02:00
bed9647047
Check if databases exist.
2018-08-30 07:41:20 +02:00
780b99389c
Allow calculation of distance matrix for selected subdomain.
2018-08-29 14:43:32 +02:00
8d0661d83e
Merge branch 'develop' into feature/o2o
2018-07-02 10:44:40 +02:00
a1e4182f71
Merge branch 'feature/o2o' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2018-06-21 16:58:39 +02:00
2929a1d2a7
New communication scheme.
2018-06-21 16:58:25 +02:00
3f98108ab8
correctly destroy prev_cell_ids as suggested by @danielque.
2018-06-20 09:53:33 +02:00
a7bd3191a2
fix memory leak.
2018-06-19 15:39:42 +02:00
070fcbe15c
communicate particle cell ids to liggghts and back.
...
this allows for use of a turboEngine-like locate section
with an initial guess for the cell.
to use this, add a
`fix prev_cell_ids all property/atom prev_cell_ids scalar no
no no -1`
to the liggghts run script and set `useCellIdComm yes` in the
twoWayOne2OneProps section of the couplingProperties.
a check whether the particle is contained in the bounding box
of the domain is added regardless of the setting.
2018-06-19 12:45:46 +02:00
32098fb977
Fixed possible problem for MarkovPath by introducing correlation steps.
2018-06-19 09:22:57 +02:00
9b1fb4474e
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2018-06-18 13:16:06 +02:00
4ded7ce4ac
Merge with feature/o2o.
2018-06-18 13:15:25 +02:00
b759fc05e0
Merge pull request #55 from ParticulateFlow/feature/recurrenceLib_recurrenceTurbulence
...
Feature/recurrence lib recurrence turbulence
2018-06-12 17:13:55 +02:00
839c66a283
Merge with develop.
2018-06-05 09:57:53 +02:00
ec62d94d8f
add description in header.
2018-06-04 16:30:25 +02:00
e08e63c38b
also write pField.
2018-06-04 16:30:25 +02:00
2151dbf0f8
bugfix + switch to run on write time only.
2018-06-04 16:30:25 +02:00
8cd9ca56b9
bugfixing and simplification.
2018-06-04 16:30:25 +02:00
3361956058
build new model.
2018-06-04 16:30:25 +02:00
19f27d279d
add postprocessing model for momentum-diameter correlation.
2018-06-04 16:30:25 +02:00
d29b467397
Look for static hold up only if fines are present.
2018-06-04 15:28:11 +02:00
f34c00d5dd
Fix compilation issue with missing method exportAveragedVolVectorField()
...
This method has been made abstract in recModel.H
This method is implemented by the class gerhardRecModel
Now, the utility rSmoother compiles without error
2018-05-25 10:22:31 +02:00
fc93012268
Added diffNorm.
2018-05-25 10:08:57 +02:00
40c23ffb42
Added Euclidean norm model, cleaned up recNorms based on differences of fields.
2018-05-24 11:01:27 +02:00
3132d9bf4e
* readNorm: refactor recurrence matrix reading into its own recNorm -> less duplication
...
* predefinedPath: backport ability to follow prescribed recurrence path
2018-05-23 14:21:30 +02:00
ca29eaff3a
Corrected reading of bool.
2018-05-23 12:29:55 +02:00
c25aa8ed46
Allow to use precalculated recurrence matrix.
2018-05-23 12:16:31 +02:00
06633e9e4d
Reset array where necessary.
2018-05-22 15:24:36 +02:00
0d7916746a
Added return NULL to silence compiler.
2018-05-22 15:23:35 +02:00
c1cb77f08c
Replaced hardcoded temperature limits with user-defined ones.
2018-05-22 09:42:24 +02:00
554577d0ba
Some more improvements.
2018-05-18 14:30:42 +02:00
05fb204dc3
Some improvements based on helpful comments.
2018-05-18 14:10:35 +02:00
19dd9c9646
Beetstra drag model. For polydisp case, BeetstraDragPoly overrides functions for diameter. Effect of fines phase in terms of static hold-up field is included in BeetstraDragPoly.
2018-05-18 12:08:56 +02:00
5615b27130
Recurrence-based turbulence: initial commit
...
extend recModel to return the names of the recurrence-fields
2018-05-17 15:30:01 +02:00
7b59ed2ffa
Fix sequence of arguments in function calculating drag.
2018-05-17 14:13:13 +02:00
5ad063f848
make getRecPath() virtual following suggestion by @danielque.
2018-05-17 13:53:58 +02:00
917cd345cb
reduce code duplication in recPath models.
2018-05-17 12:45:34 +02:00
500db10717
Forgot to set bool getParticleEffVolFactors.
2018-04-30 15:04:21 +02:00
e9a7a0f15a
Beetstra drag mono can take multiple cg factors, added Beetstra drag poly for polydisp systems, including polydisp parcels and effect of fines phase.
2018-04-26 13:26:40 +02:00
948a909da8
Adapted Sauter mean diameter and void fraction models for eff. particle volume factor in case of polydisp. parcels.
2018-04-25 15:28:03 +02:00
bdfdb23cdd
Some debugging (initialization of arrays etc.).
2018-04-23 14:15:34 +02:00
b7bc6cd1b7
Added absolut norm to recurrence norms.
2018-04-20 10:28:54 +02:00
d8682c6a79
Some experiments to get more stability.
2018-04-19 15:07:24 +02:00
06d589a2f0
Added maximum norm.
2018-04-19 15:06:09 +02:00
