0dd61addde
remove unused method fluidVel from cfdemCloud
2019-04-09 14:48:53 +02:00
7b91c8f014
Added RanzMarshall heat transfer model. Fixed issue with thermal conductivity models.
2019-04-02 08:51:16 +02:00
471cb3baae
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2019-04-02 07:28:12 +02:00
68ab82ce69
Cleaning up code.
2019-04-02 07:27:44 +02:00
c7e58306bb
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2019-03-28 15:29:14 +01:00
11e53185e7
Tutorial case for rCFD. Minor bug fixes. Some code cleaning.
2019-03-28 15:28:33 +01:00
74ef6b9207
Merge pull request #65 from ParticulateFlow/feature/recurrenceLibMinorTweaks
...
Minor tweaks
2019-02-22 09:31:47 +01:00
3d186d3dcd
Merge with develop resolve and resolve conflicts
2019-02-21 15:35:30 +01:00
ec095a490c
bump version number to 19.02
2019-02-21 15:05:54 +01:00
c441753ff9
clean up whitespaces
...
no tabs, no extra whitespaces!
2019-02-21 14:53:31 +01:00
c8eb21bedc
clean up whitespaces
...
no tabs, no extra whitespaces!
2019-02-21 14:45:03 +01:00
77b8d587a1
clean up whitespaces
2019-02-21 14:32:14 +01:00
209fc5c78f
clean up whitespaces
2019-02-21 14:05:36 +01:00
edd77aa751
clean up whitespaces
2019-02-21 13:02:35 +01:00
36d253303d
Therm cond models lookup field and modify it instead of returning it on demand. Furthermore, they do not need specific heat values anymore.
2019-01-11 08:47:17 +01:00
94d7ef5b78
add verbose switch to check reactionHeat per particle
2019-01-10 15:35:51 +01:00
5b4ec1f67e
Merge branch 'develop' into feature/cfdemSolverRhoPimple
...
Previous merge didn't pull from latest rep, merge again with
origin/develop branch.
Fix conflicts in heatTransferGunn, now using multiType for
coarseGraining, EEqn (using Tref for thermodynamic data)
Update rest without conflicts.
2019-01-07 16:10:50 +01:00
8edf5ac409
Merge remote-tracking branch 'origin/develop' into feature/cfdemSolverRhoPimple
2019-01-07 15:27:36 +01:00
2f0a2854a4
Debug information output
2019-01-07 15:15:41 +01:00
0b57c2400c
Heat transfer model to describe inter-grain conduction in terms of volume fraction instead of explicit contacts.
2019-01-07 09:44:36 +01:00
8ec17ce965
Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop
2019-01-03 14:14:10 +01:00
ebdc5253e6
HeattransferGunn with coarse graining for several types and parcels.
2019-01-03 14:13:27 +01:00
c3534493b6
Adapt o2o to untangling of getCG() by @danielque
2018-12-04 15:08:34 +01:00
66e0fc59e8
add scale factor for coarse graining
2018-11-27 10:09:07 +01:00
87a730fbe1
Some changes of const / non-const etc.
2018-11-21 09:28:43 +01:00
570037e8a5
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2018-11-20 14:05:53 +01:00
058648ef25
Solver for recurrent or steady particle motion and steady flow fields.
2018-11-20 14:05:00 +01:00
51d10d7d0f
remove superfluous method getNumberOfParticles.
2018-11-16 16:04:42 +01:00
e589f3876a
remove dependency on duplicated library_cfd_coupling_one2one.*
2018-11-16 15:50:48 +01:00
fb63f86bec
improve constness of setters in dataExchangeModel.
2018-11-16 15:21:58 +01:00
487f3f9614
pass label by ref rather than copying it.
2018-11-16 15:18:14 +01:00
4959ffc79f
include suggestions by @danielque.
2018-11-16 15:15:31 +01:00
a68a15272b
improve constness.
2018-11-16 10:25:34 +01:00
191d1b84a0
make merge from develop compile.
2018-11-16 10:21:01 +01:00
1e5b8c9302
Merge with develop.
2018-11-13 15:42:56 +01:00
27708dd9b7
Merge branch 'develop' into feature/o2o
2018-11-13 10:47:50 +01:00
52709a1537
Give out information about Temperature
2018-11-08 16:08:36 +01:00
588c4d12c3
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2018-10-30 15:53:15 +01:00
c37469e415
use absolute margins instead of scaling factors.
2018-10-30 15:44:29 +01:00
bd03f422dc
make cell ids members of the twoWayOne2One class. get rid of leak in the process.
2018-10-30 15:43:41 +01:00
7f7c17f788
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2018-10-29 07:24:18 +01:00
658cebfcf2
Compile one2one data exchange model.
2018-10-29 07:24:04 +01:00
b60ffb829a
fix memory leak.
2018-10-26 13:00:00 +02:00
b56bf6b838
bugfix for the case that liggghts and openfoam bounding boxes match EXACTLY.
2018-10-26 11:38:35 +02:00
3520f0735e
use a reference to cell id list instead of copying it.
2018-10-26 11:37:44 +02:00
7648045bc2
add clocking to one2one
2018-10-22 11:28:45 +02:00
fbd2bde594
Merge with o2o.
2018-10-22 10:30:41 +02:00
bd17bf0e49
Update the copyright info in surfaceTensionForce files
2018-10-16 09:19:54 +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
