Commit Graph

1320 Commits

Author SHA1 Message Date
32e41e2fa6 Merge pull request #130 from ParticulateFlow/feature/immersed_multisphere
close #127
2022-03-25 09:14:06 +01:00
8cb7184a7c only look up fieldname and field if required
only look up solidVolFractionName_ and lambda_ field if calculation of
multisphere drag (in calcForce() method) is requested via the option
'multisphere' - otherwise just set both to null
this way, specifying solidVolFractionName is optional and old case
setups will still work without modifications
2022-03-24 16:56:20 +01:00
937dcc2023 use Pout instead of printf
I suppose the original author's intention was to print out the forces
from all procs, but Info just prints on master proc. Pout is the proper
alternative here.
2022-03-24 16:49:43 +01:00
3e1126a55d make ShirgaonkarIB::calcForce method private
currently not used by other classes
2022-03-24 16:41:24 +01:00
28d9dfacac clear Us field to zero each time step
clear particle velocity values from previous time step
2022-03-23 17:26:02 +01:00
43cc5a9ecd add option to enforce cartesian coordinates in lagrangian position output
add the option 'cartesianOutput' for the couplingProperties dict to
output particle positions as cartesian coordinates + cell index instead
of barycentric coordinates + cell index + tet face index + tet point
index in  OF > 4
this format does not require parafoam but works fine with paraview, plus
it avoids the temporary creation of OF particles for writing the output
2022-03-22 17:20:30 +01:00
6fdda583c2 fix deadlock in IOModel
force construction of face-diagonal decomposition (called from all procs!) before call of particle constructor (potentially not on all procs!) to avoid blocking sync operation, when it looks for tet face index and tet point index.
fix #131
2022-03-18 13:25:04 +01:00
d47e4d01a7 Changed way to read in large data file. 2022-03-08 16:28:14 +01:00
a908ffc979 Added maximum number of search layers to initialize multi-layer shrinking core model. 2022-02-21 11:05:56 +01:00
ede9546e80 merge cfdemCloudIB and cfdemCloudIBContinuousForcing
note that Us field is only use by cfdemSolverIBContinuousForcing but not
by cfdemSolverIB, so it may be better to call
cfdemCloudIB::calcForcingTerm(...) from cfdemSolverIBContinuousForcing
instead of cfdemCloudIB::evolve()
2022-02-16 15:56:15 +01:00
5ebb7e18cb correct BC of Us filed after setting
add a call to correctBoundaryConditions() once we have finished setting
the velocities from the particle data
2022-02-16 14:59:34 +01:00
0820d99e85 move calculation of Us field to separate function in cfdemCloudIB
refactoring, use same name as the function doing Us field calculations
in cfdemCloudIBContinuousForcing;
note that cfdemCloudIB is considering angular velocities of particles
while cfdemCloudIBContinuousForcing does not
2022-02-16 14:58:23 +01:00
4bb95e66a8 merge ShirgaonkarIB and ShirgaonkarIBTorque models
reduce code duplication
2022-02-14 14:15:04 +01:00
3463f5ccc0 update handling of model options in ShirgaonkarIB*
make options const bool if possible and bring in line with rest of code,
i.e. read values from dict already in initializer list
2022-02-14 13:43:05 +01:00
21b338fb05 Merge branch 'develop' into feature/immersed_multisphere
resolved Conflicts:
- applications/solvers/cfdemSolverIB/Make/options
- etc/solver-list.txt
- src/lagrangian/cfdemParticle/Make/files
- src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C
resolved Issues:
src/lagrangian/cfdemParticle/subModels/ShirgaonkarIBTorque/ShirgaonkarIBTorque.C
2022-02-09 16:37:40 +01:00
7d2f5067c2 rename cfdemCloudIBmodified.* files to cfdemCloudIBContinuousForcing.*
more appropriate naming
2022-02-09 15:40:58 +01:00
f7e7c1ab06 rename class cfdemCloudIBmodified to cfdemCloudIBContinuousForcing
more appropriate naming
2022-02-09 15:33:24 +01:00
508450007b clean up whitespaces 2022-02-09 14:57:51 +01:00
093c292570 remove outdated Info message
particle rotational velocity is taken into account now
2022-02-09 14:56:28 +01:00
8530b6d303 remove inclusion of mpi.h file
there is no need to include mpi.h in these files
2022-02-09 14:37:42 +01:00
127c21e548 update comment sections [ci skip]
fix up copyrights and contributions
2022-02-09 14:09:38 +01:00
ff2ff4d251 Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop 2022-01-19 09:50:46 +01:00
845cbdd34c Removed unnecessary voidfraction limiter. In this case, even negative values (from massive overpacking) could be tolerated and should be retained to conserve energy. 2022-01-14 09:10:39 +01:00
5f8ac39fad Removed unnecessary and wrong if-clause from FE. Would always return 1.0. Adapted reliable maximum voidfraction for B-B correlation. TODO: Check literature value from original publication. 2022-01-14 09:09:18 +01:00
62b22d191f bump version number to 21.11 [ci skip] 2021-12-23 17:44:34 +01:00
5ec9393aba use Stefan-Boltzmann constant provided by OpenFOAM
Stefan-Boltzmann constant is already given via
Foam::constant::physicoChemical::sigma
no need to define it again
2021-12-20 16:55:54 +01:00
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
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
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
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
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
2f81209804 store size of FHist_ in member variable 2021-10-22 14:06:20 +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
f12fef0f85 Some changes to drag and pressure force in the presence of fines. 2021-10-20 09:02:25 +02:00