Commit Graph

1618 Commits

Author SHA1 Message Date
f07b8f370f restore twoWayOne2One::getNumberOfParticles() method
twoWayOne2One was calling base class method and crashed;
reverts 51d10d7d0f and parts of
4959ffc79f where this method was
mistakenly removed
closes #105
2020-07-16 20:59:26 +02:00
dd5dfb6662 remove outdated rcfdem solver from docs [ci skip] 2020-06-22 09:57:45 +02:00
f3c46fd09f Merge pull request #103 from ParticulateFlow/master
Update from release 20.05
2020-06-22 09:52:21 +02:00
fa584672ab Removed outdated rcfdem solver from compilation list. 2020-06-22 07:56:46 +02:00
aab29ab9bf No fines deposition in too dilute regions. 2020-06-22 07:55:51 +02:00
bba5d13264 Merge pull request #100 from ParticulateFlow/release
Release 20.05
20.05
2020-06-17 16:13:42 +02:00
9e38718f7f [DOC] update models list 2020-06-17 15:57:28 +02:00
424c680359 [DOC] update solver list
remove documentation off deleted solver
2020-06-17 15:55:36 +02:00
3b7ba89f7a [DOC] add note about OpenFOAM version required for cfdemSolverMultiphase 2020-06-17 15:29:32 +02:00
68e625defe [DOC] update installation instructions to OpenFOAM 6 2020-06-17 15:07:39 +02:00
408c8a36dc bump version number to 20.05 2020-06-15 15:52:20 +02:00
14d5c30dac Added tutorial case for coupled heat transfer with rCFD. Removed old solver and tutorial. 2020-06-03 11:52:52 +02:00
8489811677 Added option to phase in particle-fluid interaction at beginning of simulation. 2020-06-03 11:50:47 +02:00
37bbb436c2 Updated BF tutorial case. 2020-05-13 11:11:59 +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
52bcfc5dd3 Update tutorial case. 2020-04-23 07:23:58 +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
a3166f2aca Made tutorial case for dynamic CZ ready for OF 6. 2020-02-10 08:44:31 +01:00
1a85c87851 More options for thermal conduction through walls. 2020-02-10 07:42:35 +01:00
332dc5e057 New tutorial case for BF with dynamic cohesive zone. 2020-02-10 07:41:33 +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
a42e6577b5 [OF6] update CircleCI configuration
by default test against OF6 from now on, thus install openfoam6 package
instead of openfoam4
2019-11-14 15:00:10 +01:00
44eabca09b Merge pull request #98 from ParticulateFlow/feature/openfoam6
Update to OpenFOAM 6
2019-11-14 14:15:43 +01:00
86697d0993 minor changes to some case files related to OF4/OF5/OF6
make switching between OpenFOAM versions a bit easier
2019-11-14 14:12:08 +01:00
b089229109 remove unneded mesh files from tutorial case
these files can be generated by a call to blockMesh
2019-11-14 13:26:44 +01:00
9700a366fe [OF6] update cshrc 2019-11-14 11:41:45 +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
d7375f198e Merge branch 'feature/openfoam6' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/openfoam6 2019-11-13 15:54:41 +01:00
34d5e1dc59 [OF6] exit if cfdemSolverMultiphase is compiled against OF6
cfdemSolverMultiphase malfunctions in combination with OpenFOAM 6.
The root of this erroneous behaviour remains unclear at this point.
2019-11-13 15:53:27 +01:00
fe4016eb52 Update of random number generation. Removed deprecated multiIntervalPath model. 2019-11-13 15:53:27 +01:00
8f94dba403 [OF6] adjust chemistry cases to OF6 syntax
OF4 -> OF5:
functionObjects
volRegion/surfaceRegion -> volFieldValue/surfaceFieldValue
fvOptions
limitTemperatureCoeffs: Tmin/Tmax -> min/max

OF5 -> OF6:
combustionProperties: noCombustion<> -> none (template parameters are no
longer required)
2019-11-13 13:42:38 +01:00
1643f8d908 [OF6] fix volScalarField for heat release rate
OF4 -> OF5/OF6:
dimension of dQ() = dimEnergy/dimTime
->
dimension of Qdot() = dimEnergy/dimVolume/dimTime
2019-11-13 13:05:19 +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
fe81287d8d [OF6] nCorrPIMPLE() -> nCorrPimple()
adjust to renamed function
2019-11-12 18:04:47 +01:00
f2f6c4bf8c add missing methods in gerhardsRecModel
just copied from standadRecModel, not tested
2019-11-12 18:02:14 +01:00
a31d9f129e re-add include that got lost in auto-merge 2019-11-12 13:16:35 +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