|
|
6bcd54f549
|
Merge branch 'feature/aLittleConstBeauty' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/aLittleConstBeauty
|
2018-10-01 13:32:05 +02:00 |
|
|
|
779dca2401
|
clean up reading of settings some more
|
2018-10-01 13:31:32 +02:00 |
|
|
|
b88d8521bf
|
Merge branch 'feature/aLittleConstBeauty' of github.com:ParticulateFlow/CFDEMcoupling into feature/aLittleConstBeauty
|
2018-10-01 11:13:08 +02:00 |
|
|
|
059f2356dd
|
noDrag: fix the creation of the properties dictionary
|
2018-10-01 11:12:53 +02:00 |
|
|
|
1ab91a4dd3
|
Merge branch 'develop' into feature/aLittleConstBeauty
|
2018-09-24 13:48:07 +02:00 |
|
|
|
5d6714d5d2
|
addressed comments from review
|
2018-09-24 11:07:42 +02:00 |
|
|
|
2230f51421
|
changed back the handling of verbose flag
|
2018-09-24 10:20:30 +02:00 |
|
|
|
5c21513b64
|
Addressed comments brought up in review
Changed back the way the propsDict is read/constructed
Changed back the behaviour of verbose
|
2018-09-24 09:57:42 +02:00 |
|
|
|
9dcd9351c5
|
make fvOptions work in cfdemSolverPiso.
|
2018-08-07 09:08:42 +02:00 |
|
|
|
84d05d7d3b
|
fix error message
|
2018-07-23 12:26:43 +02:00 |
|
|
|
5259324950
|
fix error message
|
2018-07-23 12:25:15 +02:00 |
|
|
|
c47584d6de
|
fix error message
|
2018-07-23 12:14:52 +02:00 |
|
|
|
9cf940661a
|
fix comment
|
2018-07-23 10:25:00 +02:00 |
|
|
|
ea9ccabeee
|
Merge pull request #60 from ParticulateFlow/feature/cfdemSolverRhoPimple
Feature/cfdem solver rho pimple
|
2018-07-10 13:16:32 +02:00 |
|
|
|
1a8b4aa5c2
|
clean up whitespaces
remove extra spaces, convert tabs to spaces
|
2018-07-05 16:25:40 +02:00 |
|
|
|
b5b04c0fb0
|
Fix functions according to comments
- fixed noChemistry model accordingly
- changed description in some files
|
2018-07-05 15:33:58 +02:00 |
|
|
|
963f1aa4bf
|
Fix double&
|
2018-07-05 13:33:03 +02:00 |
|
|
|
a8e5493837
|
Fix according to comments
|
2018-07-05 13:29:35 +02:00 |
|
|
|
901e7fcede
|
Rewrite in proper Englisch
- remove duplication
|
2018-07-05 13:29:20 +02:00 |
|
|
|
ace28b1674
|
Don't limit the molarfraction
|
2018-07-05 13:23:06 +02:00 |
|
|
|
3c33ef17bc
|
Correct pressure relation
|
2018-07-05 13:22:14 +02:00 |
|
|
|
5ee4efcb24
|
remove linux64GccDPInt32Opt
from pull request comments
|
2018-07-05 13:19:14 +02:00 |
|
|
|
9adbbac0eb
|
Delete old tutorial cases
- New cases will be added shortly
|
2018-06-29 15:44:34 +02:00 |
|
|
|
7914dffb52
|
Documentation for chemistryModels
|
2018-06-29 15:14:19 +02:00 |
|
|
|
7f11ed31dd
|
Merge branch 'develop' into feature/cfdemSolverRhoPimple
|
2018-06-29 14:42:50 +02:00 |
|
|
|
e67eb542b1
|
Merge branch 'feature/cfdemSolverRhoPimple' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/cfdemSolverRhoPimple
|
2018-06-29 14:39:20 +02:00 |
|
|
|
bbb46df35c
|
Check total negative molar fractions
|
2018-06-29 14:34:10 +02:00 |
|
|
|
24d05d696c
|
Fix comments
|
2018-06-29 13:06:35 +02:00 |
|
|
|
972ee8eeb0
|
Check max and min h(e)
|
2018-06-29 12:32:42 +02:00 |
|
|
|
b2f5221076
|
Added check for adjustable timestep.
|
2018-06-06 11:25:39 +02:00 |
|
|
|
653237a641
|
[DOC] for forceModel pdCorrelation.
|
2018-06-04 16:30:25 +02:00 |
|
|
|
ec62d94d8f
|
add description in header.
|
2018-06-04 16:30:25 +02:00 |
|
|
|
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 |
|
|
|
09baa0d6d5
|
Merged with develop to get polydisp Beetstra etc.
|
2018-06-04 15:26:35 +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 |
|
