Commit Graph

1660 Commits

Author SHA1 Message Date
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
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
4ac94e82c7 fix up Allclean.sh scripts [ci skip]
note that #!/bin/sh may invoke a different shell than #!/bin/bash
2019-09-19 16:40:07 +02:00
e452aa7929 clean up parCFDDEMrun.sh files
perform clean up via Allclean.sh scripts
2019-09-19 16:38:12 +02:00
75f132450f use different controlDict for test harness runs
original case runtime is too long for test harness execution
2019-09-19 15:48:05 +02:00
838e0851b1 adjust case decomposition 2019-09-19 15:45:44 +02:00
6da1afb450 add execution of DEM init script to Allrun.sh 2019-09-19 15:45:28 +02:00
069aaed120 ignore temporary files from VIM [ci skip] 2019-09-19 13:52:54 +02:00
4cb4132cf0 remove temporary file [ci skip] 2019-09-19 13:47:43 +02:00
ef43a2b5e4 replace $casePath/CFD with $FOAM_CASE [ci skip] 2019-09-19 13:33:34 +02:00
be0fee8938 clean up whitespaces and comments 2019-09-19 13:32:58 +02:00
a31e6b0f86 delete temporary files 2019-09-19 13:30:16 +02:00
04c77886e8 fix test harness run configuration 2019-09-19 13:29:33 +02:00
35bb6ba7eb replace $casePath/CFD with $FOAM_CASE [ci skip] 2019-09-19 12:30:24 +02:00
b4a3c358ff fix test harness run configurations 2019-09-19 12:29:23 +02:00
a854a89116 clean up whitespaces and comments 2019-09-19 12:28:50 +02:00
faba96f750 delete temporary files 2019-09-19 12:24:33 +02:00
d5b12a5e30 delete temporary file and clean up whitespaces 2019-09-19 12:24:02 +02:00
0c1ddfb0cc clean up whitespaces 2019-09-19 12:12:50 +02:00
4b86d32807 Added error message if databases contain less than three times. 2019-09-19 10:29:38 +02:00
211a29bb0e Removed outdated force model from list. 2019-09-19 10:29:14 +02:00