Commit Graph

964 Commits

Author SHA1 Message Date
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
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
391a50e6dc Merge branch 'feature/cfdemSolverRhoPimple' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/cfdemSolverRhoPimple 2018-04-11 16:10:41 +02:00
d8a343181c check addition of molar fractions 2018-04-11 15:37:48 +02:00
09dba5d5d5 Additional options for treatment of Y fields. 2018-04-09 12:30:31 +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
a2e3ad76ab cleanup comments 2018-03-29 14:10:59 +02:00
7ee394fb4c Fix memory leak_continuation
- didnt stage
2018-03-29 13:42:05 +02:00
c5622f9090 Fix memory leak
- remove double pointer pointer formatting
2018-03-29 13:40:33 +02:00
7161b23c7f Free memory correctly 2018-03-28 14:30:58 +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