Commit Graph

1902 Commits

Author SHA1 Message Date
f72fcf68ba make prefactor in Ranz-Marshall correlation customizable
For a single sphere the data of Ranz suggests
2 + 0.6 * Re^(1/2) * Pr^(1/3)
but for gas flow through a packed bed of particles this may change to
2 + 1.8 * Re^(1/2) * Pr^(1/3)
cf. Kunii and Levenspiel, Fluidization Engineering (1991)
Hence, this commit will make this prefactor configurable in the
couplingProperties dict; if it is not set, use a value of 0.6 to retain
previous behavior;
Also, use the specialized math functions for square root and cube root
instead of the pow function;
2021-12-20 10:50:07 +01:00
ab3f69db66 Added monitoring field for fluid-phase heat conduction. 2021-12-09 06:56:18 +01:00
b5ab312744 Make sure cases without any chemistry models are initialized correctly. 2021-12-09 06:55:14 +01:00
a305383123 The former default value for massTransferModels_ caused a crash if no word list was provided. Works now. 2021-12-07 15:15:58 +01:00
640731e07d Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop 2021-12-07 12:21:11 +01:00
ac1e4c5396 Minor fixes in MarkovPath. 2021-12-07 12:20:40 +01:00
2b5fba4ece clean up whitespaces [ci skip] 2021-12-06 13:13:12 +01:00
497ddb3120 let exit value of shell script indicate compilation result
if compilation of all solvers succeeded exit 0
else exit with number of failed solver compilations
2021-12-06 11:22:32 +01:00
b23b1aa0d2 fix compilation of solvers
commit 4897e9b759 was incomplete
2021-12-06 09:48:20 +01:00
4897e9b759 refactor createFields.H files to eliminate unused variable warnings
these warnings are mainly caused by postProcesss.H including
createFields.H in a sub-block
2021-12-06 07:59:58 +01:00
dec6d77baa remove unneeded options from solver Make file 2021-12-06 07:51:11 +01:00
fdc183abb4 remove duplicate entry from solver list [ci skip]
revert duplication introduced in commit 28aaa25
2021-12-03 20:36:58 +01:00
1576391e51 clean up test case file [ci skip] 2021-12-02 13:23:07 +01:00
5214948671 fix warning reorder
member initialization is executed in the order the members are defined
in the class, hence the member initializer list in the constructor
should be in the same order
2021-12-02 10:23:49 +01:00
981ff462c9 fix warning old-style-cast
use static_cast instead of old style cast
2021-12-02 10:14:56 +01:00
c39c0da9f4 add test case for particle-fluid convection using Ranz Marshall [ci skip] 2021-12-01 17:59:52 +01:00
6222d3b6bb [DOC] update list of available models 2021-12-01 14:58:33 +01:00
c626fa5c53 allow omission of massTransferModels list in couplingProperties dict
create an empty list if 'massTransferModels' list is not defined in
couplingProperties
2021-12-01 14:57:08 +01:00
a2f9772ce3 allow omission of diffCoeffModel in couplingProperties dict
if 'diffCoeffModel' is not defined in couplingProperties, create an
instance of noDiffCoeff ("off") and also do not try to read 'D' from
transportProperties dict
2021-12-01 14:52:54 +01:00
60df64826a Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop 2021-11-05 11:16:56 +01:00
3ea46f470e Let rCFD solvers update fields with integer counter instead of scalar elapsed time. 2021-11-05 11:15:29 +01:00
d9ba7d1a7a Allow different time step sizes for different recurrence databases. 2021-11-05 11:05:24 +01:00
ad5a39ceac Merge pull request #123 from tmjnijssen/develop
TUe/SMR developments
2021-11-05 09:07:27 +01:00
b3fd82e81b Let MarkovPath provide more information how much time is spent in which database. Also allow user to specify minimal time spent in one database before switching. 2021-11-03 16:49:16 +01:00
ea5e113d0f [OF6] exit if cfdemSolverMultiphaseScalar is compiled against OF6
similar to cfdemSolverMultiphase, cfdemSolverMultiphaseScalar
malfunctions in combination with OpenFOAM 6.
The root of this erroneous behaviour remains unclear at this point.
2021-11-03 12:49:54 +01:00
1900a7cd28 fix runAllPar.sh script
also runAllPar.sh needs to copy initial restart file to work with same
liggghts run script
2021-11-03 12:24:40 +01:00
64aaa5825b change fvSolution to work with OF 6
OF 6 requires pcorrFinal to be defined
2021-11-03 12:22:57 +01:00
b03c91bfc3 make spelling of logpath variable consistent throughout case scripts 2021-11-03 12:13:18 +01:00
f2bd0ad0aa make spelling of logpath variable consistent throughout case scripts 2021-11-03 12:03:41 +01:00
2f81209804 store size of FHist_ in member variable 2021-10-22 14:06:20 +02:00
28aaa258f0 Extended solver list. 2021-10-21 15:30:32 +02:00
1a28aaf6b4 Limit reactant available for particle reactions. Corrected such that it works with coarse-grained parcels. 2021-10-21 15:30:15 +02:00
bb0ab31d26 change order of nested loops, more cbrt() 2021-10-20 17:07:38 +02:00
ae49113dbb use cbrt() 2021-10-20 16:43:51 +02:00
5a5b743057 fix logic operator 2021-10-20 16:39:53 +02:00
02d1fbadc0 fix deconstructor 2021-10-20 16:38:48 +02:00
36f739d32f formatting/clean-up 2021-10-20 12:53:21 +02:00
cbd0d9c3cb use vector::zero instead of vector(0,0,0) 2021-10-20 12:38:49 +02:00
ca1b581ee5 turn scalar variables into label variables 2021-10-20 12:32:48 +02:00
9df98073b7 make internal methods private; change vector to const vector& parameters
methods that are only used internally by the class should be
private/protected;
avoid construction of temporary objects by passing references to
methods;
2021-10-20 12:08:39 +02:00
2e0ff86b01 Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop 2021-10-20 09:03:03 +02:00
f12fef0f85 Some changes to drag and pressure force in the presence of fines. 2021-10-20 09:02:25 +02:00
f8c410a3d4 fix error check in ParmarBassetForce.C 2021-10-15 15:46:49 +02:00
3338d1ea32 revert pEqn.H of cfdemSolverPiso
revert change made in commit 39f6e7d056
2021-10-15 14:55:45 +02:00
c53dd25f20 clean up file 2021-10-15 14:53:45 +02:00
1e7e6a3b7a clean up gradPForceSmooth 2021-10-15 14:40:44 +02:00
dea1d2e922 revert list of probed fields in BeetstraDrag 2021-10-15 14:35:12 +02:00
39519983ee make sure restart folder exists for simulation 2021-10-15 14:26:17 +02:00
249cbc8e3a use particle property registration in wall heat transfer model
cf. pull request #107
2021-10-15 11:33:03 +02:00
0beb4b5329 use particle property registration in mass transfer model
cf. pull request #107
2021-10-15 10:52:57 +02:00