Commit Graph

1176 Commits

Author SHA1 Message Date
1fdf400149 clean up whitespaces 2021-07-30 11:38:16 +02:00
9dc995cd38 backwards compatibility with OF4/OF5
since cfdemSolverMultiphase does not work properly with OF6, make sure
code works with OF4/OF5
2021-07-30 11:15:42 +02:00
121ef06f19 Clean up of turbulentDispersion, turbulentVelocityFluctuations and tutorial case oreReducingBlastFurnaceSlot. 2021-07-30 09:57:03 +02:00
71c9e1f795 Cleaned up terminalVelocity. 2021-07-30 09:27:19 +02:00
d9dad12922 Let initMultiLayers register particle-arrays via cfdemCloud. 2021-07-30 08:13:06 +02:00
ee75ce8e67 rename variable
avoid confusion between INTerval and INTeger
2021-07-29 15:29:33 +02:00
7f696cb3f1 remove unused variable 2021-07-29 15:21:12 +02:00
ae2eba53dd fix old-style-cast warning
apply proper type casting
2021-07-29 15:19:43 +02:00
1def0b8516 fix reorder warnings
fix order of constructor initializer list
2021-07-29 15:09:28 +02:00
b27d0fc39b Added function that is pure virtual in mother class and needs to be defined in child class. 2021-07-29 09:45:48 +02:00
f6cf8daa95 Option to create random path in MarkovPath. 2021-07-29 09:44:45 +02:00
215125fb2b Changed way to execute calculation every Nth step. 2021-07-27 07:38:33 +02:00
e06069d49b Merge with develop. Removed old rBaseMirrorVec which is now part of rBaseMirror. 2021-07-08 11:36:54 +02:00
571e2ce3c8 Turbulent dispersion model can read precalculated random displacements. 2021-07-08 10:53:50 +02:00
a5a811e436 fix usage of cg-scaling transfered from LIGGGHTS
fixes https://github.com/ParticulateFlow/CFDEMcoupling-PFM/issues/1
2021-07-01 16:02:53 +02:00
f847ceeefe replace custom myType() method by built-in type() method 2021-06-28 16:47:05 +02:00
ffb6444fe1 Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrence_chemistry 2021-05-19 11:56:37 +02:00
377d5dc665 Minor changes. 2021-05-19 11:54:47 +02:00
f00e8e8442 added k function to turbulent dispersion model 2021-05-06 10:12:51 +02:00
6dedb8112e Turbulent dispersion model can now read nut or k from database. 2021-05-06 07:58:44 +02:00
fc9b7e726b Make recurrence database fields from current virtual time index available in object registry. Hence, they can be looked up via lookupObject. 2021-05-05 14:08:01 +02:00
325f9c2163 Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrence_chemistry 2021-04-28 08:49:16 +02:00
0fb9ce5478 Make monitoring output in terminalVelocity optional. 2021-04-28 08:48:38 +02:00
26732f29ca Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrence_chemistry 2021-04-27 13:46:58 +02:00
977c7b064a Deactivated momentum coupling model extended. 2021-04-27 13:46:28 +02:00
c50bf18767 Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrence_chemistry 2021-04-27 11:27:25 +02:00
19305850c7 Fixed missing declaration. 2021-04-27 11:25:58 +02:00
5724a6c7da Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrence_chemistry 2021-04-27 11:10:27 +02:00
de33220bc1 Allow for general direction of gravity. 2021-04-27 11:09:58 +02:00
9fca80b6bb Preparing code for cleaning up. 2021-04-27 11:09:28 +02:00
430bc1c51f Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrence_chemistry 2021-04-27 10:10:15 +02:00
6cc9bfcdbb Merge to recurrenceLib. 2021-04-27 10:09:51 +02:00
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
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
acd38183fc rename and reinstate gerhardsRecModel
the model is renamed lruRecModel since its management of recurrence-snapshots
is based on the LRU algorithm
2021-03-29 09:23:34 +02: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
4bae8b0bf8 adding terminal rising velocity model 2021-02-03 14:51:51 +01:00
a7ad60eba1 Removed wrong scaling factor. 2020-12-17 15:24:33 +01:00
440232b0fe Make radiative heat transfer implicit. 2020-12-15 14:30:45 +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
61817b3f51 Limit radiative thermal conductivity. 2020-12-02 12:51:14 +01:00
ae3da6f6b4 Numerical stabilization for radiative heat transfer. 2020-11-30 10:36:58 +01:00