Commit Graph

78 Commits

Author SHA1 Message Date
09baa0d6d5 Merged with develop to get polydisp Beetstra etc. 2018-06-04 15:26:35 +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
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
2fe1f88084 Merge pull request #37 from ParticulateFlow/feature/cleanUp
Feature/clean up
2018-02-26 09:02:33 +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
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
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
8553d55f02 clean up: remove all references to localPSizeDiffSmoothing
The smoothing model "localPSizeDiffSmoothing" does not exist.
Thus, we can clear-out all references to it in the tutorials and
the documentation.
2017-09-27 14:55:03 +02:00
b3c451dbc9 Moved blockMeshDict file to system folder
Since OpenFOAM-3.0 it is the convention to put blockMeshDict into system
instead of constant/polyMesh
Having blockMeshDict in system is supported since OpenFOAM-2.3
2017-09-06 10:04:29 +02:00
70617eb360 replace deprecated outputControl and outputInterval
replace with writeControl and writeInterval
2017-08-31 14:50:59 +02:00
c7ee75839b clean up LIGGGHTS scripts 2017-08-31 10:05:19 +02:00
03ac321754 Merge with dev and corresponding changes. 2017-08-28 10:44:08 +02:00
14f5af4727 clean up whitespaces in tutorial run scripts 2017-08-16 15:43:41 +02:00
1fed0679a9 adjust tutorial run scripts to new etc location 2017-08-16 15:41:11 +02:00
579054e9c2 Merge branch 'master' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/cfdemSolverRhoPimple 2017-06-23 08:32:49 +02:00
e488ef863f update tutorial case 2017-06-21 11:45:12 +02:00
6a636658aa added grid coarsening/particle coarsening corrections to Beetstra drag model 2017-05-16 13:55:12 +02:00
84c4b2945e restore original inlet settings 2017-03-07 16:16:31 +01:00
98cd5ce09f adjust run.config 2017-03-03 14:29:36 +01:00
97fd42e376 explicitly set liggghts log file 2017-03-02 18:42:30 +01:00
307588ccc7 remove extra semicolons in controlDict files 2017-03-02 15:51:42 +01:00
aff47d3588 restore previous testcase settings
to make regression testing easier
2017-01-09 17:34:20 +01:00
6e71533e60 fix post-processing of ErgunTest cases for OpenFOAM 4.0
fix number of headerlines expected in probe files for ErgunTestCG,
ErgunTestMPI_cgs and ErgunTestMPI_restart
2016-12-13 16:44:35 +01:00
308cdf27c4 Updated tutorials. 2016-08-01 15:51:59 +02:00
ec60bf8eee Updated Piso/ErgunTestMPI_cgs tutorial. 2016-08-01 15:48:27 +02:00
4ce5838238 Updated Piso/ErgunTestCG tutorial. 2016-08-01 15:43:33 +02:00
0a2f1c793a Cleaning up cfdemSolverPiso tutorial ErgunMPI. 2016-07-21 12:16:09 +02:00
9b3ed8eda6 CfdemSolverPiso tutorial adapted to OF 4.x. 2016-07-20 14:53:48 +02:00
a1d8c61241 merge with CFDEMcoupling-PUBLIC 2.9.0 2015-03-25 14:23:49 +01:00
88743b79fd release on 2015-01-05_13-56-45 2015-01-05 13:56:45 +01:00
7fa304d58b Removed the '../DEM' reference from the liggghts init file 2014-12-12 10:34:35 +01:00
b4949ebd52 Solved merge conflict 2014-12-11 18:35:06 +01:00
fb3e8011d1 Cleanup + update for TH files 2014-12-11 18:33:49 +01:00
c562f96f4a release on 2014-11-10_08-22-06 2014-11-10 08:22:06 +01:00
409283acc3 release on 2014-11-10_07-57-15 2014-11-10 07:57:15 +01:00
791bf252aa release on 2014-07-25_13-42-41 2014-07-25 13:42:41 +02:00
bcf54bf223 release on 2014-07-17_15-58-48 2014-07-17 15:58:49 +02:00
b0c9a14b8d release on 2014-07-17_11-24-52 2014-07-17 11:24:53 +02:00
1d04b8c164 release on 2014-07-17_09-51-22 2014-07-17 09:51:22 +02:00
89fa69ab8d release on 2014-07-04_08-57-37 2014-07-04 08:57:38 +02:00
9c78ca97f7 release on 2014-06-02_18-34-52 2014-06-02 18:34:53 +02:00
dd31a87772 release on 2014-05-13_08-58-58 2014-05-13 08:58:58 +02:00
5c96dca984 release on 2014-04-15_09-46-45 2014-04-15 09:46:45 +02:00
21934b329c release on 2014-04-15_09-22-01 2014-04-15 09:22:02 +02:00
ef08058ce6 release on 2014-03-11_15-15-12 2014-03-11 15:15:12 +01:00
6ed3472747 release on 2014-02-12_09-49-34 2014-02-12 09:49:34 +01:00
0e78266b87 release on 2014-02-12_09-39-12 2014-02-12 09:39:12 +01:00
f9cc1abe31 release on 2013-11-26_16-32-25 2013-11-26 16:32:25 +01:00