Commit Graph

1038 Commits

Author SHA1 Message Date
6e59b6bb54 Merge pull request #69 from ParticulateFlow/feature/adaptive_resolution_universe
unravel cfdemCloud and models
2018-10-03 13:00:47 +02:00
3538d29f53 Merge branch 'develop' into feature/adaptive_resolution_universe
# Resolved Conflicts:
#	src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
2018-10-01 18:04:42 +02:00
33c81073a2 Merge pull request #67 from ParticulateFlow/feature/aLittleConstBeauty
Feature/a little const beauty
2018-10-01 14:03:04 +02:00
fea4ee326e mark some more members explicitly read-only 2018-10-01 13:54:44 +02:00
72351fb578 clean up some more const properties 2018-10-01 13:47:08 +02:00
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
6bcf8e76e4 fix bug introduced with merge of PR #66
forAll was intended replace the original for loop
2018-09-26 15:28:06 +02:00
982dcc07a7 Merge pull request #68 from ParticulateFlow/feature/SphinxDocumentation
Sphinx documentation for CFDEMcoupling
2018-09-26 14:18:54 +02:00
502e115581 Merge pull request #66 from ParticulateFlow/feature/PtrLists
Use PtrList for submodels instead of arrays of autoPtrs.
Resolves #61
2018-09-24 14:32:20 +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
4bfe6777f9 remove outdated pdf manual 2018-09-21 14:21:08 +02:00
00e260d6ca remove github access info that is not applicable to our version 2018-09-21 14:20:33 +02:00
573c51e52f use OF PtrList for submodels and iterators in energyCloud. 2018-09-13 15:58:08 +02:00
88e3bcf2dd use PtrLists for subModels. includes some cleanup for commandModel acessors. 2018-09-13 15:57:42 +02:00
9dcd9351c5 make fvOptions work in cfdemSolverPiso. 2018-08-07 09:08:42 +02:00
0aa659196b [DOC] fix conf.py start file settings for other doc formats 2018-07-27 16:33:43 +02:00
c89e0b792b [DOC] add installation instructions 2018-07-27 15:38:04 +02:00
cdd416ec0a [DOC] fix spelling 2018-07-26 13:04:30 +02:00
d9abd3df0b [DOC] update model options 2018-07-23 15:20:44 +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
dbabe3285d [DOC] update force model options 2018-07-23 09:03:40 +02:00
5a50153347 [DOC] fix up special characters 2018-07-19 09:18:41 +02:00
d314aa0ae1 [DOC] clean up conf.py file 2018-07-18 15:48:28 +02:00
77419c4ee0 [DOC] fix up formatting of references 2018-07-18 15:44:02 +02:00
395bc08b6c [DOC] add sphinx setup and theme files 2018-07-18 14:58:15 +02:00
fa1369278b [DOC] add missing documentation 2018-07-18 14:56:31 +02:00
b1f35372e6 [DOC] add to description 2018-07-18 14:55:24 +02:00
ccbc2b9cba [DOC] add some missing documentation (partly from PUBLIC) 2018-07-18 14:54:12 +02:00
4c7fd88b28 [DOC] minor rewording 2018-07-18 14:52:28 +02:00
29278314c2 [DOC] formatting / fix links 2018-07-18 14:51:29 +02:00
df685b67ef [DOC] fix typos 2018-07-18 14:48:51 +02:00
466897a06c [DOC] add external links 2018-07-18 14:47:07 +02:00
8899c495d4 [DOC] fix bullet lists 2018-07-18 14:45:36 +02:00
c31a692499 [DOC] formatting: limit line length 2018-07-18 14:43:45 +02:00
b61db3f4a9 [DOC] homogenize formatting 2018-07-18 14:33:41 +02:00
61d7a88793 [DOC]fix up formatting for (IMPORTANT) NOTEs 2018-07-18 14:25:12 +02:00
b56390e3de [DOC] fix up typos and formatting of model syntax/example 2018-07-18 14:17:27 +02:00
26d30e122d [DOC] add cross-linking 2018-07-18 14:08:26 +02:00
2def3b2f97 [DOC] fix up model names 2018-07-18 13:50:07 +02:00
51d1af906a [DOC] fix top links for old html docs format 2018-07-18 13:43:11 +02:00
b6784afb1a [DOC] fix up OpenFOAM disclaimer 2018-07-18 13:36:48 +02:00