Commit Graph

753 Commits

Author SHA1 Message Date
87c54c0fba [DOC] forceModel dSauter. 2018-06-04 16:30:25 +02:00
e08e63c38b also write pField. 2018-06-04 16:30:25 +02:00
2151dbf0f8 bugfix + switch to run on write time only. 2018-06-04 16:30:25 +02:00
8cd9ca56b9 bugfixing and simplification. 2018-06-04 16:30:25 +02:00
3361956058 build new model. 2018-06-04 16:30:25 +02:00
19f27d279d add postprocessing model for momentum-diameter correlation. 2018-06-04 16:30:25 +02:00
d29b467397 Look for static hold up only if fines are present. 2018-06-04 15:28:11 +02:00
4a030f15e2 Merge pull request #56 from ParticulateFlow/feature/cfdemSolverRhoSimple
Feature/cfdem solver rho simple
2018-05-22 15:26:32 +02:00
06633e9e4d Reset array where necessary. 2018-05-22 15:24:36 +02:00
0d7916746a Added return NULL to silence compiler. 2018-05-22 15:23:35 +02:00
c1cb77f08c Replaced hardcoded temperature limits with user-defined ones. 2018-05-22 09:42:24 +02:00
554577d0ba Some more improvements. 2018-05-18 14:30:42 +02:00
05fb204dc3 Some improvements based on helpful comments. 2018-05-18 14:10:35 +02:00
19dd9c9646 Beetstra drag model. For polydisp case, BeetstraDragPoly overrides functions for diameter. Effect of fines phase in terms of static hold-up field is included in BeetstraDragPoly. 2018-05-18 12:08:56 +02:00
e0530dcf5b Cleaned up solver, removed testing code. 2018-05-18 12:04:57 +02:00
7b59ed2ffa Fix sequence of arguments in function calculating drag. 2018-05-17 14:13:13 +02:00
500db10717 Forgot to set bool getParticleEffVolFactors. 2018-04-30 15:04:21 +02:00
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
d5d37233ef update .gitignore file for tutorials
* ignore any files in any DEM/post/ folder
* ignore any processor directories in CFD folders
* ignore all time directories except '0' in CFD folders
2018-04-04 17:30:35 +02:00
68a683e053 Merge pull request #52 from ParticulateFlow/master
update develop with release commits
2018-04-04 16:39:54 +02:00
ca5a69d8ad Merge pull request #51 from ParticulateFlow/release
CFDEMcoupling-PFM Release 18.03
version passed all regression tests
18.03
2018-04-04 16:37:20 +02:00
e66de2bbc9 bump version number to 18.03 2018-04-04 14:54:00 +02:00
0411ae0d80 clean up whitespaces 2018-04-04 14:46:53 +02:00
e7a3e8de8f clean up whitespaces 2018-04-04 12:48:53 +02:00
5baa91df81 use shell script variable to indicate meaning of parameter 2018-03-27 17:55:51 +02:00
05907081c0 fix spelling of shell script variable 2018-03-27 17:54:14 +02:00
4063a2a103 fix reconstruction of twoSpheresGlowinskiMPI
fixes #42
2018-03-27 17:52:49 +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
dcc289ac71 added documentation for engineSearchMany2Many (#50), resolves #38. 2018-03-20 08:48:57 +01:00
2fe1f88084 Merge pull request #37 from ParticulateFlow/feature/cleanUp
Feature/clean up
2018-02-26 09:02:33 +01:00
13fe14abf7 Merge pull request #45 from ParticulateFlow/postProc
Post proc
2018-01-30 08:38:43 +01:00
5231566793 Minor cleaning up of cfdemPostproc. 2018-01-30 08:20:45 +01: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
e447ca82db Allow to specify DEM dump interval to be read in from couplingProperties. 2018-01-29 15:08:16 +01:00
b8f07097ce clean-up of tutorials
* removed all references to non-existent turboEngineM2M locateModel
* proper formatting of turboEngineProps dictionaries
2017-11-08 10:35:27 +01:00
1d1ebd132f Merge pull request #36 from ParticulateFlow/feature/cleanUpDoxygenDocumentation
Feature/clean up doxygen documentation
2017-10-23 14:48:17 +02:00
2a11fd78e6 Doxygen setup: minor modifications
Now, environment variables are used, e.g. $CFDEM_VERSION. This closely
follows the set-up of OpenFOAM. Also, some settings were made similar
to OpenFOAM's setup.
2017-09-28 11:08:47 +02:00
95ba62b8e5 Initial commit for Doxygen setup 2017-09-27 17:08:45 +02:00
8f92ff2551 clean-up: remove all references to totalMomentumExchange force model
There is no force model "totalMomentumExchange". There are some references in
the tutorials and the doxygen files. All references to "totalMomentumExchange" have
been removed from the tutorials.
2017-09-27 15:44:15 +02:00
a12a5cbcfa increase ignorance
ignore the "lnInclude" directories
generalized .gitignore setting for build directories
2017-09-27 15:20:09 +02:00
3f4058206a clean-up: remove all references to RongDrag force model
There is no force model named "RongDrag", it is also not mentioned in the
documentation. Thus, it is safe to remove all references to it from the
tutorials.
2017-09-27 15:16:20 +02:00
cd425337dd clean-up: remove all references to DEMbasedDrag
There is force model named "DEMbasedDrag", thus all references to it
in the tutorials can be removed. It is not even mentioned in the
documentation.
2017-09-27 15:10:41 +02:00