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
d8682c6a79
Some experiments to get more stability.
2018-04-19 15:07:24 +02:00
24c5c25f7c
Specific heat and thermal conductivities for various species.
2018-04-16 11:44:48 +02:00
76ea1af1ab
CFDEMcloud can now hold particle types and densities. Heat transfer model needs to know heat capacities to solve T eqn.
2018-04-13 11:19:08 +02:00
771dd7e6d0
Initial commit for cfdemSolverRhoSimple. New heat transfer model to treat granular temperature as field to be solved on a grid.
2018-04-12 11:06:46 +02:00
e66de2bbc9
bump version number to 18.03
2018-04-04 14:54:00 +02:00
e7a3e8de8f
clean up whitespaces
2018-04-04 12:48:53 +02:00
67ef631a6c
add -f option to rm in clean target of make files
...
avoid make error in clean installations
2018-03-27 15:26:39 +02:00
8754ca5952
replace vector(0,0,0) with vector::zero
2018-03-27 15:25:30 +02:00
148990499d
clean up whitespaces
...
use spaces, not tabs
2018-03-27 14:43:04 +02:00
424f21e734
Data exchange model oneWayVTK can now take files from dump custom/vtk and from LPP.
2018-01-30 08:07:24 +01:00
69d4e6ff02
bump version number
2017-08-31 16:55:39 +02:00
006d9c7cd2
add comment
2017-08-31 09:57:12 +02:00
652e7b3f74
clean up whitespaces
2017-08-31 09:56:50 +02:00
d1c8707c3e
fix issue with voidfraction slightly > 1 in SyamlalThermCond
2017-08-30 13:18:31 +02:00
91b84ca607
fix calculation of timeStepFraction & voidfraction interpolation
...
merged from PUBLIC
2017-08-29 18:33:55 +02:00
c4bb208a6a
remove unneeded include and clean up whitespaces
2017-08-29 09:26:24 +02:00
dec9b7f959
pre-generate satellite points in engineSearchIB
...
mostly merged from PUBLIC
2017-08-29 09:15:16 +02:00
93faf28a9f
use checkPeriodicCells flag from particleCloud
2017-08-28 17:57:45 +02:00
23616877fb
use implicit type conversion
2017-08-28 16:02:58 +02:00
4e50b3e06c
clean up whitespaces
2017-08-28 15:57:45 +02:00
8b3878de65
abort on Gauss void fraction model
...
merged from PUBLIC
2017-08-28 15:57:22 +02:00
f946c5765f
use const variable from mathExtra.H
2017-08-28 15:51:02 +02:00
683fd04828
pre-calculate sqrt(3.0)
...
merged from PUBLIC
2017-08-28 15:42:13 +02:00
9650aff318
protect against division by zero
...
merged from PUBLIC
2017-08-28 15:41:44 +02:00
d5fbf402cb
fix missing include
2017-08-28 15:37:16 +02:00
1b9f7020ac
fix parameter in function call
2017-08-28 15:30:51 +02:00
68d9035225
clean up formatting, add some comments
2017-08-28 14:20:51 +02:00
2230dcaa57
rearrange code in MeiLift to save some operations
2017-08-28 12:32:11 +02:00
6e23baba7f
fix Mei lift force
...
The equation was probably taken from the paper of Kurose and Komori
1999, which does not repoduce the original formula given by Mei 1992
correctly (which itself is missing a left parenthesis).
The correct formula can be looked up for example in Mei and Klausner
1994 or Loth and Dorgan 2009
2017-08-25 14:33:50 +02:00
bf0ff235b6
use proper data type for counters
2017-08-24 17:19:24 +02:00
e6d12f6790
make debug info live in separate block
2017-08-24 17:18:40 +02:00
9a1abb5f19
clean up whitespaces in mathExtra.H
2017-08-24 17:07:33 +02:00
8df363cf97
add some mathematical constants
...
cf. OpenFOAM mathematicalConstants.H
2017-08-24 17:06:23 +02:00
5b8072b11a
Merge pull request #27 from ParticulateFlow/feature/cherry_pick_PUBLIC
...
Feature/cherry pick public
2017-08-24 16:17:53 +02:00
2e2701ccf7
remove unneeded parameter finaliser from IOModel::streamDataToPath
2017-08-24 09:58:01 +02:00
5e7b332dd9
clean up whitespaces
2017-08-23 18:02:29 +02:00
adc79029a1
use actual cell id of particles instead of dummy finaliser string
2017-08-23 18:01:22 +02:00
ad6a169ffd
output position as position type instead of vector type
2017-08-23 18:00:00 +02:00
53d0988a4e
IOModel::streamDataToPath - separate handling of position and vector
...
vector needs no finaliser
2017-08-23 17:58:41 +02:00
165a2b9611
no need for finalizer in case of 'label'
2017-08-23 17:55:57 +02:00
2e4c93f8ee
use info from OFstream to create output file header
2017-08-23 17:52:51 +02:00
668b85582b
simplify logic
...
don't waste any time if type == "origProcId"
2017-08-23 17:50:22 +02:00
6343a6a09c
create OFstream on stack instead of heap
2017-08-23 17:45:58 +02:00
76b90cc3cc
remove unnecessary copy to temp vector
2017-08-23 17:40:17 +02:00
bce10d17c1
clean up whitespaces
2017-08-23 17:36:22 +02:00
dd2e21be64
create OFstream on stack instead of heap
2017-08-23 17:35:08 +02:00
8f11235d08
update make options for compressible library
...
use same flags as for incompressible library
2017-08-22 13:15:13 +02:00