Commit Graph

75 Commits

Author SHA1 Message Date
5245083201 remove remaining traces of 'dummy' files [ci skip]
using .gitignore instead
2022-03-25 09:32:29 +01:00
21b338fb05 Merge branch 'develop' into feature/immersed_multisphere
resolved Conflicts:
- applications/solvers/cfdemSolverIB/Make/options
- etc/solver-list.txt
- src/lagrangian/cfdemParticle/Make/files
- src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C
resolved Issues:
src/lagrangian/cfdemParticle/subModels/ShirgaonkarIBTorque/ShirgaonkarIBTorque.C
2022-02-09 16:37:40 +01:00
e3ec594f73 rename cfdemSolverIBRO.C to cfdemSolverIBContinuousForcing.C
more appropriate naming:
RO (reduced order) referred to the RO model of red blood cells, but the
key difference in this solver is the momentum forcing term in the UEqn
2022-02-09 16:05:21 +01:00
aaf9c17608 Merge branch 'feature/immersed_multisphere' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/immersed_multisphere
resolved Conflicts:
- etc/solver-list.txt
2022-02-09 15:02:34 +01:00
d38be10d99 move tutorial to different folder
move falling_sphere_two_way_coupling from cfdemSolverIBTorque to
cfdemSolverIB folder
2022-02-09 14:23:07 +01:00
5291dfb1bc remove cfdemSolverIBTorque
remove cfdemSolverIBTorque as it is essentially a copy of cfdemSolverIB
2022-02-09 14:13:01 +01:00
764e6bd458 remove test solver cfdemSolverPimpleIB
cfdemSolverPimpleIB was a test solver to see the performance using
pimpleFoam; not intended for use in a production environment
2022-01-13 11:31:55 +01:00
62b22d191f bump version number to 21.11 [ci skip] 2021-12-23 17:44:34 +01:00
30662789fa let parCFDrun() function decompose case for parallel CFD runs [ci skip]
analogous to parCFDDEMrun()
2021-12-21 16:39:27 +01:00
497ddb3120 let exit value of shell script indicate compilation result
if compilation of all solvers succeeded exit 0
else exit with number of failed solver compilations
2021-12-06 11:22:32 +01:00
fdc183abb4 remove duplicate entry from solver list [ci skip]
revert duplication introduced in commit 28aaa25
2021-12-03 20:36:58 +01:00
ad5a39ceac Merge pull request #123 from tmjnijssen/develop
TUe/SMR developments
2021-11-05 09:07:27 +01:00
28aaa258f0 Extended solver list. 2021-10-21 15:30:32 +02:00
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
c6815c9156 Added a reduced-order immersed boundary solver with continuous momentum forcing
cfdemSolverIBRO - Immersed boundary method (continuous focring approach)
solver for particulate flows. Does not provide the rigid body constrain
and provides approximate solutions for the faster simulations.
2019-05-15 12:00:21 +02:00
b4f7303337 Added the cfdemSolverPimpleIB to solver list 2019-05-02 14:27:51 +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