aa82dad8be
Update SchillerNaumannDrag.C
...
The changes are added.
2020-09-16 10:45:51 +02:00
2f5f10c6a5
added coarse graining to SchillerNaumann drag
2020-09-15 15:38:12 +02:00
a83d0290c9
retain backward compatibility with OF4
2020-08-06 20:02:56 +02:00
39d66506a1
add output option and min/max field values to particleCellVolume
...
as in CFDEMcoupling-PUBLIC
2020-08-03 12:45:11 +02:00
50bd4a6de3
add output option to volWeightedAverage
...
as in CFDEMcoupling-PUBLIC
2020-08-03 11:24:57 +02:00
4a11ade3b1
mitigate rounding errors
...
values should be in range [0;1]
2020-07-30 14:28:37 +02:00
3ffc8eef65
fix per-particle voidfraction in trilinear model
...
all particles incorrectly received the voidfraction of the same 8 cells
closes #106
2020-07-30 13:18:08 +02:00
e8766829cd
fix incompatible dimensions in volWeightedAverage
...
ref() gives access to dimensioned field reference
primitiveFieldRef() gives access to primitive type field reference
(both actually return a 'this'-pointer reference)
2020-07-29 17:26:57 +02:00
f07b8f370f
restore twoWayOne2One::getNumberOfParticles() method
...
twoWayOne2One was calling base class method and crashed;
reverts 51d10d7d0f4959ffc79fcloses #105
2020-07-16 20:59:26 +02:00
f3c46fd09f
Merge pull request #103 from ParticulateFlow/master
...
Update from release 20.05
2020-06-22 09:52:21 +02:00
aab29ab9bf
No fines deposition in too dilute regions.
2020-06-22 07:55:51 +02:00
408c8a36dc
bump version number to 20.05
2020-06-15 15:52:20 +02:00
8489811677
Added option to phase in particle-fluid interaction at beginning of simulation.
2020-06-03 11:50:47 +02:00
e417d0dc40
Added option to specify deposition time.
2020-04-24 14:45:27 +02:00
116fd3b810
Merge pull request #99 from ParticulateFlow/feature/fines
...
Feature/fines
2020-04-23 16:02:54 +02:00
63f1f8fb68
Limiter for isotropic fluctuations.
2020-04-22 14:37:44 +02:00
5f16dce15b
Particle deformation in predefined cell set.
2020-04-09 10:57:26 +02:00
9e8a418576
Coarse-graining factors in BeetstraDrag needs to be mutable.
2020-03-16 11:20:21 +01:00
07828a01f8
Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop
2020-03-16 10:35:53 +01:00
5710166ccd
Fixed error message.
2020-03-16 10:35:38 +01:00
ea7f37b3e1
Check for particle type.
2020-03-16 09:56:04 +01:00
1f5dcc5f33
Extend particleDeformation model for multiple types.
2020-03-12 16:24:18 +01:00
548df2cd3c
Merge with develop and some accompanying cleaning up.
2020-02-10 11:05:44 +01:00
1a85c87851
More options for thermal conduction through walls.
2020-02-10 07:42:35 +01:00
9a81b875f1
Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop
2019-11-27 16:15:37 +01:00
bb47fc3583
Initialize particle temperatures within given bounds.
2019-11-27 16:14:26 +01:00
44eabca09b
Merge pull request #98 from ParticulateFlow/feature/openfoam6
...
Update to OpenFOAM 6
2019-11-14 14:15:43 +01:00
6c25adaa31
[OF6] adjust particle position IO
...
OF5 and above write barycentric coordinates of particles and include
tetFace and tetPt in position file
2019-11-14 10:51:23 +01:00
91a4f03dcc
[OF6] update versionInfo.h
...
compatibility information
2019-11-13 16:57:45 +01:00
7a02baff6d
Allow to specify additional LIGGGHTS script to be executed directly before end of coupled run, e.g. for specific cleaning-up tasks.
2019-11-13 16:55:57 +01:00
3351b85908
Bug fix: use of pointers instead of autoPtr in BeetstraDragPoly prevents double destruction at the end of run.
2019-11-13 16:54:25 +01:00
fe4016eb52
Update of random number generation. Removed deprecated multiIntervalPath model.
2019-11-13 15:53:27 +01:00
dc3194c857
introduce OpenFOAM version flag/make code compile with OF4-OF6
...
extract major openfoam version from WM_PROJECT_VERSION environment
variable in make/options files and use it for a preprocessor flag
(OPENFOAM_VERSION_MAJOR) for conditional compilation
make CFDEMcoupling compile with OF 4.x, 5.x and 6
2019-11-13 09:11:40 +01:00
f2f6c4bf8c
add missing methods in gerhardsRecModel
...
just copied from standadRecModel, not tested
2019-11-12 18:02:14 +01:00
ef43147dc8
update libs to OF6: replace calls to osRandomInteger() and integer(...)
...
osRandomInteger() does no longer exist in OF6; using zero as seed value
for random number generator instead
integer(lower, upper) does no longer exist in OF6, instead using
sampleAB(lower upper); note that there is a slight difference in the
used range: (upper+1-lower) vs (upper-lower)
2019-11-12 12:05:46 +01:00
314bfdc0ac
Merge branch 'develop' into feature/openfoam6
...
Just resolve merge conflicts, does not yet compile with OF6 !
applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C
2019-11-12 10:06:50 +01:00
73b4879b06
RanzMarshall heat transfer model extended to initialize particle temperatures with a given field.
2019-11-11 11:00:06 +01:00
1fb208082b
Obsolete code. Found better solution in steadyDEM.
2019-11-07 12:24:08 +01:00
29cc09a876
Removed double line break.
2019-11-07 12:23:19 +01:00
db465c334a
Removed debugging info / moved it into verbose mode.
2019-11-07 12:22:49 +01:00
70a6c634d6
Removed obsolete code.
2019-11-07 07:41:44 +01:00
7399f4b929
Particle deformation model. Option to initialize particle temperatures from field values.
2019-10-31 13:50:28 +01:00
993593aa83
Merge branch 'develop' into feature/recurrenceLib
...
# Conflicts:
# src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
2019-10-24 13:18:53 +02:00
31ba2f01fd
add -Wno-unused-parameter compilation flag for twoWayMany2Many lib [ci skip]
...
silence warnings from (older) MPI lib
2019-10-24 10:55:34 +02:00
896f497323
add some comments [ci skip]
2019-10-24 10:51:17 +02:00
4cfce8bc6c
Merge branch 'develop' into feature/adaptive_resolution_universe
...
# Conflicts:
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
2019-10-23 20:11:49 +02:00
7854673f21
apply minor change of setCellIDs parameter
...
change originally made in branch feature/recurrenceLib
2019-10-23 19:47:28 +02:00
cab6b7e88f
Merge branch 'develop' into feature/adaptive_resolution_universe
...
# Conflicts:
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
2019-10-23 18:03:23 +02:00
7de941746f
use LIGGGHTS memory namespace instead of memory class
...
resolve issue #95
2019-10-23 16:36:02 +02:00
fdb2748fbb
clean up header file includes
...
* include only necessary files
* whenever possible, include headers in .C file not in .H file
2019-10-23 12:53:52 +02:00
