Commit Graph

1985 Commits

Author SHA1 Message Date
caa98441f9 clean up whitespaces 2021-10-14 17:27:58 +02:00
2f9d410800 fix compilation of multiphaseMixture.C with OF 6 2021-10-14 17:08:14 +02:00
8330e3a8ff remove lnInclude folder
generated during compilation
2021-10-14 16:42:40 +02:00
b41b2f8d8d update tutorial readme [ci skip] 2021-10-14 12:52:25 +02:00
524d5a30e0 Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop 2021-10-14 12:45:46 +02:00
73e21bec5d add bubbling fluidized bed test case
based on Khawaja, H.A., J. Comput. Multiph. Flows 7(4), 227-240 (2015)
2021-10-14 12:44:47 +02:00
4dda7cbea2 fix heat transfer for general heat capacities
same as for cfdemSolverRhoPimple in commit
0fa1f023d6
2021-10-12 10:37:36 +02:00
278706f4c9 merge tue/master > tue/develop 2021-10-08 14:16:39 +02:00
c5716b5a04 added liquid FB tutorial 2021-10-07 16:27:21 +02:00
be9b19ff76 merge PFM/master > TUe/master 2021-10-07 09:30:51 +02:00
598bd93085 added small_hearth tutorial case 2021-09-28 12:18:42 +02:00
6a175f3450 added docs 2021-09-02 14:27:47 +02:00
e871612ac7 DisplacementField utility can now take fields as default values. 2021-08-24 08:49:08 +02:00
f8a5b9c9df Merge pull request #120 from ParticulateFlow/feature/recurrence_chemistry
Feature/recurrence chemistry
2021-07-30 11:42:29 +02:00
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
6deb665164 Merge branch 'feature/recurrence_chemistry' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrence_chemistry 2021-07-30 07:44:12 +02:00
db14b2c7c2 Clean up tutorial case for displacementField. 2021-07-30 07:43:42 +02:00
7b4032cbe3 remove unused variables 2021-07-29 16:22:36 +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
67a2a7e90f Removed clockData files. 2021-07-28 14:58:05 +02:00
f1b4baa410 DisplacementField: Allow for default background values. 2021-07-27 07:39:32 +02:00
215125fb2b Changed way to execute calculation every Nth step. 2021-07-27 07:38:33 +02:00
2a83785bcb Added monitoring option to displacementField. 2021-07-13 11:57:05 +02:00
56e8a6257c Minor change to displacementField. Allows for time-averaged treatment now. 2021-07-09 11:39:43 +02:00
e06069d49b Merge with develop. Removed old rBaseMirrorVec which is now part of rBaseMirror. 2021-07-08 11:36:54 +02:00
f8a6c9522a Tutorial case for displacementField utility. 2021-07-08 11:31:52 +02:00
bc1ded2ade Utility displacement field to map finite-time displacements on mesh and optionally fill remaining holes. 2021-07-08 10:55:04 +02:00
571e2ce3c8 Turbulent dispersion model can read precalculated random displacements. 2021-07-08 10:53:50 +02:00
2d0fc46086 Minor changes to make solver more general and allow user to specify names for fields in database. 2021-07-08 10:52:04 +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
8d99122d64 Add missing file. 2021-06-10 13:43:20 +02:00
191881ac05 Minor changes in rcfdemSolverBase to make it up-to-date with recPath generation. 2021-06-09 14:33:55 +02:00
aeef30d615 clean up spacing 2021-06-08 19:18:53 +02:00
9460256fa3 clean up cfdemCloudIBmodified
remove commented code (and methods that are thus no longer needed)
2021-06-08 19:16:26 +02:00
f218d7a23d remove unneeded mutable keywords 2021-06-08 18:43:52 +02:00
3c7160bdbc remove extra whitespace in IBVoidFraction.C
accidentally added in 91dbeb42e4
2021-06-08 18:00:57 +02:00
a20ee5ee34 fix output of kin. energy in cfdemSolverIBTorque test case
set dynamic to 'no' as number of particles does not change;
for a single particle we need to set extra dof to 0 to obtain correct ke
2021-06-08 17:30:15 +02:00
6febaec345 move octave script and adjust paths; disable execution by default
for the octave script to work, the case needs to be run twice (without
cleanup in-between);
(remove the useTorque option of ShirgaonkarIBTorqueProps in the
couplingProperties file and adjust the output filenames of the fix print
commands, i.e. adding "_no_coupling")
2021-06-08 17:23:49 +02:00
064cc9ae3d clean up cfdemSolverIBTorque test case files 2021-06-08 16:54:56 +02:00
c6642c0205 clean up Info messages in creatFields of cfdemSolverIBTorque 2021-06-08 13:12:56 +02:00