a31d9f129e
re-add include that got lost in auto-merge
2019-11-12 13:16:35 +01:00
314bfdc0ac
Merge branch 'develop' into feature/openfoam6
...
Just resolve merge conflicts, does not yet compile with OF6 !
applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C
2019-11-12 10:06:50 +01:00
db465c334a
Removed debugging info / moved it into verbose mode.
2019-11-07 12:22:49 +01:00
33895f0cbd
Removed more outdated code.
2019-11-07 08:12:33 +01:00
96c621416d
Merge branch 'develop' into feature/recurrenceLib
...
# Conflicts:
# src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
# src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
2019-10-22 19:44:00 +02:00
88bc5cbee9
Merge tag '19.02' into feature/recurrenceLib
...
# Conflicts:
# applications/solvers/rcfdemSolverRhoSteadyPimple/EEqn.H
# applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C
# doc/CFDEMcoupling_Manual.txt
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H
# src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
# src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.H
# src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H
# src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C
# src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.H
# src/lagrangian/cfdemParticle/subModels/thermCondModel/thermCondModel/thermCondModel.H
2019-10-22 17:24:33 +02:00
b777ae6e9b
clean up whitespaces and comments [ci skip]
2019-08-08 12:34:16 +02:00
2d4fc39eef
Added missing files.
2019-04-24 13:25:30 +02:00
a9b8718c3f
adapt cfdemSolverRhoPimpleChem for OF-6.
2019-04-10 14:36:06 +02:00
2fa735a2d4
adapt cfdemSolverRhoSimple for OF6.
2019-04-10 14:17:18 +02:00
c40d8e8907
adapt cfdemSolverRhoPimple for OF-6.
2019-04-10 14:11:18 +02:00
7b91c8f014
Added RanzMarshall heat transfer model. Fixed issue with thermal conductivity models.
2019-04-02 08:51:16 +02:00
471cb3baae
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2019-04-02 07:28:12 +02:00
68ab82ce69
Cleaning up code.
2019-04-02 07:27:44 +02:00
11e53185e7
Tutorial case for rCFD. Minor bug fixes. Some code cleaning.
2019-03-28 15:28:33 +01:00
1cf1babc8c
[OF6] parameters of MULES::limit
...
MULES and CMULES have been extended so that the limits can be supplied
as fields. These arguments are templated so that zeroField, oneField or
UniformField<scalar> can be used in place of a scalar value with no
additional overhead.
2019-03-27 11:57:44 +01:00
3d186d3dcd
Merge with develop resolve and resolve conflicts
2019-02-21 15:35:30 +01:00
e52b1028a2
add dSauter field read
2019-02-21 15:29:32 +01:00
581fae739b
Fix application name and description of cfdemSolverRhoSimple
2019-02-21 10:40:52 +01:00
696d73b10b
clean up whitespaces
2019-02-20 15:02:49 +01:00
5665e75005
clean up whitespaces
2019-02-20 14:47:42 +01:00
5bb94b9695
use spaces not tabs
2019-02-20 14:19:42 +01:00
36d253303d
Therm cond models lookup field and modify it instead of returning it on demand. Furthermore, they do not need specific heat values anymore.
2019-01-11 08:47:17 +01:00
c28b2418b2
add volScalarField dSauter
2019-01-07 17:13:45 +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
04445e0797
Uncomment mass sources
2019-01-07 15:14:55 +01:00
a285c98082
Info outpute order change
2019-01-07 15:14:29 +01:00
8256dd861b
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2019-01-07 09:45:30 +01:00
0b57c2400c
Heat transfer model to describe inter-grain conduction in terms of volume fraction instead of explicit contacts.
2019-01-07 09:44:36 +01:00
3f2afc838d
addSource need not be present anymore.
2019-01-04 13:12:48 +01:00
b2aa11ffaf
Add limiters of p and U in steady-state calculation.
2018-11-29 12:17:05 +01:00
930b2a4158
bugfix: correct explicit part of heat source term for different thermodynamic temperature when using "sophisticated" thermodynamic models like JANAF.
2018-11-26 17:18:12 +01:00
570037e8a5
Merge branch 'feature/recurrenceLib' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2018-11-20 14:05:53 +01:00
058648ef25
Solver for recurrent or steady particle motion and steady flow fields.
2018-11-20 14:05:00 +01:00
1e5b8c9302
Merge with develop.
2018-11-13 15:42:56 +01:00
4b8b50b427
Added solver for pseudo-steady conditions.
2018-11-13 15:23:48 +01:00
eab214a0c4
No mass source changes for testing purposes
2018-11-08 16:09:04 +01:00
2c476432c9
remove the need for createFieldRefs
2018-11-08 16:08:02 +01:00
e9a3b544c0
Revert to implicit
2018-11-08 16:07:31 +01:00
bd444010bc
Add info output about heat source and specific heat
2018-11-08 16:06:56 +01:00
fbd2bde594
Merge with o2o.
2018-10-22 10:30:41 +02:00
b841abd46f
Remove implicit term,
...
add information outputs for Qsource/coeff and Cpv
2018-10-12 12:07:16 +02:00
e2b1a2fa9f
Untrack files that should not be tracked
2018-10-11 15:57:45 +02:00
146e783415
Merge 'develop' into feature/OF4x-multiphase
2018-10-11 13:10:33 +02:00
fd71f367d7
rCFD solver for turbulent single-phase transport
2018-09-06 12:54:35 +02:00
9dcd9351c5
make fvOptions work in cfdemSolverPiso.
2018-08-07 09:08:42 +02:00
1b4a41a319
make fvOptions work in cfdemSolverPiso.
2018-08-06 15:56:11 +02:00
1a8b4aa5c2
clean up whitespaces
...
remove extra spaces, convert tabs to spaces
2018-07-05 16:25:40 +02:00
5ee4efcb24
remove linux64GccDPInt32Opt
...
from pull request comments
2018-07-05 13:19:14 +02:00
