d7375f198e
Merge branch 'feature/openfoam6' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/openfoam6
2019-11-13 15:54:41 +01:00
34d5e1dc59
[OF6] exit if cfdemSolverMultiphase is compiled against OF6
...
cfdemSolverMultiphase malfunctions in combination with OpenFOAM 6.
The root of this erroneous behaviour remains unclear at this point.
2019-11-13 15:53:27 +01:00
fe4016eb52
Update of random number generation. Removed deprecated multiIntervalPath model.
2019-11-13 15:53:27 +01:00
8f94dba403
[OF6] adjust chemistry cases to OF6 syntax
...
OF4 -> OF5:
functionObjects
volRegion/surfaceRegion -> volFieldValue/surfaceFieldValue
fvOptions
limitTemperatureCoeffs: Tmin/Tmax -> min/max
OF5 -> OF6:
combustionProperties: noCombustion<> -> none (template parameters are no
longer required)
2019-11-13 13:42:38 +01:00
1643f8d908
[OF6] fix volScalarField for heat release rate
...
OF4 -> OF5/OF6:
dimension of dQ() = dimEnergy/dimTime
->
dimension of Qdot() = dimEnergy/dimVolume/dimTime
2019-11-13 13:05:19 +01:00
dc3194c857
introduce OpenFOAM version flag/make code compile with OF4-OF6
...
extract major openfoam version from WM_PROJECT_VERSION environment
variable in make/options files and use it for a preprocessor flag
(OPENFOAM_VERSION_MAJOR) for conditional compilation
make CFDEMcoupling compile with OF 4.x, 5.x and 6
2019-11-13 09:11:40 +01:00
fe81287d8d
[OF6] nCorrPIMPLE() -> nCorrPimple()
...
adjust to renamed function
2019-11-12 18:04:47 +01:00
f2f6c4bf8c
add missing methods in gerhardsRecModel
...
just copied from standadRecModel, not tested
2019-11-12 18:02:14 +01:00
a31d9f129e
re-add include that got lost in auto-merge
2019-11-12 13:16:35 +01:00
ef43147dc8
update libs to OF6: replace calls to osRandomInteger() and integer(...)
...
osRandomInteger() does no longer exist in OF6; using zero as seed value
for random number generator instead
integer(lower, upper) does no longer exist in OF6, instead using
sampleAB(lower upper); note that there is a slight difference in the
used range: (upper+1-lower) vs (upper-lower)
2019-11-12 12:05:46 +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
73b4879b06
RanzMarshall heat transfer model extended to initialize particle temperatures with a given field.
2019-11-11 11:00:06 +01:00
db693ef7b8
Updated solver list.
2019-11-07 14:12:16 +01:00
6a96ec4f3d
Merge pull request #33 from ParticulateFlow/feature/recurrenceLib
...
Feature/recurrence lib
2019-11-07 13:17:56 +01:00
1fb208082b
Obsolete code. Found better solution in steadyDEM.
2019-11-07 12:24:08 +01:00
29cc09a876
Removed double line break.
2019-11-07 12:23:19 +01:00
db465c334a
Removed debugging info / moved it into verbose mode.
2019-11-07 12:22:49 +01:00
7f0c4f8efe
Slight modification in tutorial case.
2019-11-07 08:15:11 +01:00
33895f0cbd
Removed more outdated code.
2019-11-07 08:12:33 +01:00
70a6c634d6
Removed obsolete code.
2019-11-07 07:41:44 +01:00
7399f4b929
Particle deformation model. Option to initialize particle temperatures from field values.
2019-10-31 13:50:28 +01:00
993593aa83
Merge branch 'develop' into feature/recurrenceLib
...
# Conflicts:
# src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
2019-10-24 13:18:53 +02:00
9063c7b7d1
Merge pull request #96 from ParticulateFlow/feature/adaptive_resolution_universe
...
Merge some general mods from feature/adaptive_resolution_universe
2019-10-24 11:58:19 +02:00
31ba2f01fd
add -Wno-unused-parameter compilation flag for twoWayMany2Many lib [ci skip]
...
silence warnings from (older) MPI lib
2019-10-24 10:55:34 +02:00
896f497323
add some comments [ci skip]
2019-10-24 10:51:17 +02:00
4cfce8bc6c
Merge branch 'develop' into feature/adaptive_resolution_universe
...
# Conflicts:
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
2019-10-23 20:11:49 +02:00
7854673f21
apply minor change of setCellIDs parameter
...
change originally made in branch feature/recurrenceLib
2019-10-23 19:47:28 +02:00
cab6b7e88f
Merge branch 'develop' into feature/adaptive_resolution_universe
...
# Conflicts:
# src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
2019-10-23 18:03:23 +02:00
7de941746f
use LIGGGHTS memory namespace instead of memory class
...
resolve issue #95
2019-10-23 16:36:02 +02:00
fdb2748fbb
clean up header file includes
...
* include only necessary files
* whenever possible, include headers in .C file not in .H file
2019-10-23 12:53:52 +02:00
4a328144ea
fix memory issues in twoWayOne2One
...
fixes made in branch feature/recurrenceLib
2019-10-23 10:20:06 +02: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
439f3c602b
Some remodeling of fines models.
2019-10-16 16:43:03 +02:00
713677cd3c
improve compatibility with newer OpenFOAM versions
...
use constructor that explicitly sets the list elements to zero, i.e.
List(const label, const zero);
available in OpenFOAM 4 and newer
2019-10-14 10:26:46 +02:00
69ec630051
Feature for calculation of spatial autocorrelation function.
2019-10-10 16:36:18 +02:00
cef2d3afb1
Merge pull request #94 from ParticulateFlow/master
...
Update from release 19.09
2019-09-27 08:52:54 +02:00
e3765ec50d
Merge pull request #93 from ParticulateFlow/release
...
Release 19.09
2019-09-26 17:08:15 +02:00
2292493e35
increase runtime of test case
2019-09-26 15:44:30 +02:00
ba35af963a
fix probe location
2019-09-26 15:13:28 +02:00
5bf3402415
write DEM data to DEM/post folder
2019-09-26 13:01:04 +02:00
29afb0e920
fix up probe locations in chemistry tutorials
2019-09-26 12:38:43 +02:00
b24acc76fa
fix up thermo_temp settings
...
- set dynamic to 'no' as number of particles does not change
- for a single particle set 'extra' dof to 0 to obtain correct ke
2019-09-26 09:51:11 +02:00
6d69a6effe
[DOC] adjust breadcrumbs.html
...
link to cfdem website instead of lammps
remove quick-link that only exists in LIGGGHTS/LAMMPS
2019-09-25 17:45:44 +02:00
c79226da68
[DOC] add missing theme files
2019-09-25 09:13:53 +02:00
4c25d64af6
define probes directly in controlDict
...
test harness is not yet prepared to handle '#include' properly or read
probes from probesDict
2019-09-24 17:50:44 +02:00
f4b62ab0e0
fix typos in liggghts input scripts
2019-09-24 16:04:18 +02:00
fd26c2cb88
update testharness run configurations
...
remove post_scripts that we currently don't need for testing
2019-09-24 16:03:45 +02:00
7ce1c7d7be
bump version number to 19.09
2019-09-20 13:22:45 +02:00
24f7273e75
Merge pull request #79 from ParticulateFlow/feature/cfdemSolverRhoPimple
...
feature/cfdemRhoPimpleChem
2019-09-19 17:02:04 +02:00
