278706f4c9
merge tue/master > tue/develop
2021-10-08 14:16:39 +02:00
be9b19ff76
merge PFM/master > TUe/master
2021-10-07 09:30:51 +02:00
e06069d49b
Merge with develop. Removed old rBaseMirrorVec which is now part of rBaseMirror.
2021-07-08 11:36:54 +02:00
bc1ded2ade
Utility displacement field to map finite-time displacements on mesh and optionally fill remaining holes.
2021-07-08 10:55:04 +02:00
2130d8b698
Replace mirror utilities of scalars and vectors with general one.
2021-06-07 16:20:08 +02:00
6cc9bfcdbb
Merge to recurrenceLib.
2021-04-27 10:09:51 +02:00
6d5005bf10
added freeStreaming solver
2021-04-26 17:55:41 +02:00
8c70e97db6
bump version number to 21.03 [ci skip]
2021-03-10 12:41:42 +01:00
5994792de2
New rCFD solver to move tracers according to the forces acting on them.
2020-11-18 12:16:09 +01:00
d58ff86621
Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/recurrenceLib
2020-11-13 08:52:03 +01:00
b1798863cc
Merge with develop. Extended bed conductivity model.
2020-10-30 09:21:32 +01:00
a0ae8b90f7
bump version number to 20.09
2020-09-22 16:00:04 +02:00
d1ce573cc9
Merge pull request #110 from ParticulateFlow/develop
...
merging develop in recurrenceLib
2020-09-17 11:37:31 +02:00
b6f44b3338
recurrence solver for modal decomposition of flow fleids
2020-08-17 14:12:26 +02:00
d4e6ec2e39
add cfdemCompLIGlib shortcut to bashrc [ci skip]
...
to just compile LIGGGHTS sublibraries but not LIGGGHTS itself
2020-07-29 18:00:59 +02:00
0b820906ae
Merge pull request #104 from ParticulateFlow/develop
...
Update branch feature/recurrence_chemistry with develop
2020-07-01 14:32:13 +02:00
f3c46fd09f
Merge pull request #103 from ParticulateFlow/master
...
Update from release 20.05
2020-06-22 09:52:21 +02:00
fa584672ab
Removed outdated rcfdem solver from compilation list.
2020-06-22 07:56:46 +02:00
408c8a36dc
bump version number to 20.05
2020-06-15 15:52:20 +02:00
dd5407db99
added cfdemSolverMultiphaseScalar/multiphaseMixure to library list
2020-03-16 16:22:12 +01:00
eb2e9286b4
merge TU/e changes into PFM master branch
2020-03-02 15:10:36 +01:00
63b2aa37ea
start implementation of recurrence chemistry solver
...
not quite sure yet what to do with rhoEqn
2019-12-12 12:41:51 +01:00
f4c0a25431
Merge branch 'feature/OF4x-multiphase-scalar' into 'feature/OF4x-multiphase'
...
Feature/of4x multiphase scalar
See merge request SMM/C-code/Euler-Lagrange/CFD-DEM_Tim/CFDEMcoupling!54
2019-12-11 16:18:38 +01:00
9700a366fe
[OF6] update cshrc
2019-11-14 11:41:45 +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
db693ef7b8
Updated solver list.
2019-11-07 14:12:16 +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
7ce1c7d7be
bump version number to 19.09
2019-09-20 13:22:45 +02:00
d0400cdc74
update sourcing of OpenFOAM bashrc to OF6
2019-05-17 14:24:55 +02:00
25a619514f
specify python version for vizClock alias for python3 compatibility
2019-04-02 11:52:19 +02:00
ec095a490c
bump version number to 19.02
2019-02-21 15:05:54 +01:00
2ace3db6d1
Add solver to solver-list.txt.
2018-11-20 16:47:30 +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
146e783415
Merge 'develop' into feature/OF4x-multiphase
2018-10-11 13:10:33 +02:00
af087b29b5
bump version number to 18.10
2018-10-04 12:29:52 +02:00
44ade76820
Solver development
2018-06-26 11:24:39 +02:00
839c66a283
Merge with develop.
2018-06-05 09:57:53 +02:00
09baa0d6d5
Merged with develop to get polydisp Beetstra etc.
2018-06-04 15:26:35 +02:00
771dd7e6d0
Initial commit for cfdemSolverRhoSimple. New heat transfer model to treat granular temperature as field to be solved on a grid.
2018-04-12 11:06:46 +02:00
e66de2bbc9
bump version number to 18.03
2018-04-04 14:54:00 +02:00
7fc3caf245
Basics of new rCFD solver for varying conditions.
2018-03-20 13:23:26 +01:00
c8176256cf
Added new utilities to list.
2017-12-20 09:23:40 +01:00
eb752cbdd6
Merge branch 'develop' into feature/OF4x-multiphase
2017-09-22 10:31:39 +02:00
8c2726bc99
Updates from current master branch.
2017-09-08 10:32:20 +02:00
69d4e6ff02
bump version number
2017-08-31 16:55:39 +02:00
03ac321754
Merge with dev and corresponding changes.
2017-08-28 10:44:08 +02:00
7ade0c27a7
Sourcing CFDEMcoupling: one-stop bashrc / cshrc
...
* a single bashrc / cshrc file for CFDEMcoupling, similar to OpenFOAM
* user-editable section on top, for:
- setting the versions of OpenFOAM and CFDEMcoupling
- setting installation paths
- setting user directory path
* allows to set/unset values from command-line parameters (important for
test harness installation)
* removed unused and deprecated environment variables
2017-08-22 14:36:12 +02:00
df1bf48938
clean up whitespaces in cfdemSystemTest.sh
2017-08-22 13:24:54 +02:00
