b777ae6e9b
clean up whitespaces and comments [ci skip]
2019-08-08 12:34:16 +02:00
3d186d3dcd
Merge with develop resolve and resolve conflicts
2019-02-21 15:35:30 +01:00
c441753ff9
clean up whitespaces
...
no tabs, no extra whitespaces!
2019-02-21 14:53:31 +01:00
c8eb21bedc
clean up whitespaces
...
no tabs, no extra whitespaces!
2019-02-21 14:45:03 +01:00
77b8d587a1
clean up whitespaces
2019-02-21 14:32:14 +01:00
209fc5c78f
clean up whitespaces
2019-02-21 14:05:36 +01:00
edd77aa751
clean up whitespaces
2019-02-21 13:02:35 +01:00
94d7ef5b78
add verbose switch to check reactionHeat per particle
2019-01-10 15:35:51 +01:00
5b4ec1f67e
Merge branch 'develop' into feature/cfdemSolverRhoPimple
...
Previous merge didn't pull from latest rep, merge again with
origin/develop branch.
Fix conflicts in heatTransferGunn, now using multiType for
coarseGraining, EEqn (using Tref for thermodynamic data)
Update rest without conflicts.
2019-01-07 16:10:50 +01:00
8edf5ac409
Merge remote-tracking branch 'origin/develop' into feature/cfdemSolverRhoPimple
2019-01-07 15:27:36 +01:00
2f0a2854a4
Debug information output
2019-01-07 15:15:41 +01:00
8ec17ce965
Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop
2019-01-03 14:14:10 +01:00
ebdc5253e6
HeattransferGunn with coarse graining for several types and parcels.
2019-01-03 14:13:27 +01:00
c3534493b6
Adapt o2o to untangling of getCG() by @danielque
2018-12-04 15:08:34 +01:00
66e0fc59e8
add scale factor for coarse graining
2018-11-27 10:09:07 +01:00
51d10d7d0f
remove superfluous method getNumberOfParticles.
2018-11-16 16:04:42 +01:00
e589f3876a
remove dependency on duplicated library_cfd_coupling_one2one.*
2018-11-16 15:50:48 +01:00
fb63f86bec
improve constness of setters in dataExchangeModel.
2018-11-16 15:21:58 +01:00
487f3f9614
pass label by ref rather than copying it.
2018-11-16 15:18:14 +01:00
4959ffc79f
include suggestions by @danielque.
2018-11-16 15:15:31 +01:00
a68a15272b
improve constness.
2018-11-16 10:25:34 +01:00
191d1b84a0
make merge from develop compile.
2018-11-16 10:21:01 +01:00
27708dd9b7
Merge branch 'develop' into feature/o2o
2018-11-13 10:47:50 +01:00
52709a1537
Give out information about Temperature
2018-11-08 16:08:36 +01:00
bd17bf0e49
Update the copyright info in surfaceTensionForce files
2018-10-16 09:19:54 +02:00
1c44a3a09f
remove bottleneck in locating particles by using appropriate container for cell ids.
2018-10-13 13:35:35 +02:00
953cdb5b8b
renaming to avoid same nameing
2018-10-12 12:08:14 +02:00
eaa11b4781
Added option for arbitrary field name in surfaceTensionForce
2018-10-12 10:31:05 +02:00
542261bbf8
Change notation in temporal smoothing model
2018-10-11 13:37:29 +02:00
146e783415
Merge 'develop' into feature/OF4x-multiphase
2018-10-11 13:10:33 +02:00
288ddfaf86
make propsDict of noDrag model optional again
...
since all entries this propsDict are optional, it is only convenient to
make it optional
2018-10-09 09:59:35 +02:00
e4c26a3004
retain original behaviour
2018-10-09 09:49:11 +02:00
74ed993b1a
simplify expression
2018-10-09 09:48:25 +02:00
3e1c09930b
fix bug introduced in commit 2230f51421
...
wrong default value
2018-10-08 18:59:16 +02:00
ba9f28a5ff
fix order of construction / destruction
...
dataExchangeModel is needed by the destructor of several models, thus
should be destroyed last and in further consequence must be constructed
first
2018-10-08 15:40:35 +02:00
af087b29b5
bump version number to 18.10
2018-10-04 12:29:52 +02:00
5cb044a62e
remove obsolete heatTransferGunnImplicit class
...
use heatTransferGunn instead which allows for an explicit or an implicit
formulation
closes #71
2018-10-04 10:47:42 +02:00
ffe9014b66
Merge pull request #70 from ParticulateFlow/feature/constness
...
fix up const/mutable usage
2018-10-04 10:40:40 +02:00
91c22cd1e1
fix up some mutables in momCoupleModels
2018-10-04 10:42:10 +02:00
c7fd297b68
make couple() method of dataExchangeModel non-const
...
method modifies at least one member that can be observed from outside
(i.e. couplingStep_)
2018-10-03 13:13:22 +02:00
7a32a19679
clean up function specifiers in cfdemCloudEnergy
2018-10-03 12:27:24 +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
2c46466a06
remove mutables from voidFractionModel classes
2018-10-01 17:56:04 +02:00
583e1ff3bb
surviving without mutable
...
use proper function signatures
provide getters for (const and) non-const references
2018-10-01 16:49:07 +02:00
f7716a67a6
make some getter methods of liggghtsCommandModel const
2018-10-01 16:03:06 +02:00
304b7328c4
fix up some more mutable stuff in cfdemCloud and cfdemCloudIB
2018-10-01 16:01:50 +02:00
be2a4ad87b
make some getter methods in cfdemCloud const
2018-10-01 15:34:21 +02:00
e25a25f294
remove unneeded mutable keywords in cfdemCloud
2018-10-01 15:33:32 +02:00
2c028ed37b
remove unneeded conversion to bool
2018-10-01 15:31:13 +02:00
3ad0fa0ac7
make parameters of IOModel methods const
...
parameters do not get changed in any of these methods
2018-10-01 15:30:43 +02:00
