Commit Graph

30 Commits

Author SHA1 Message Date
b6f44b3338 recurrence solver for modal decomposition of flow fleids 2020-08-17 14:12:26 +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
7ce1c7d7be bump version number to 19.09 2019-09-20 13:22:45 +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
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
a87ed03b61 display PATH env var in cfdemSysTest
We will add bin and library paths for cfdemcoupling binaries and
libraries in the future -> display PATH to see if they are set correctly
2017-08-22 13:23:30 +02:00
9f7c801fbe remove output of liggghts lib name in cfdemSysTest
with cmake compilation in place, it's always libliggghts.so
2017-08-22 13:19:57 +02:00
52eed4b351 remove check for pizza dir from cfdemSysTest
we don't use pizza anymore, just lpp
2017-08-22 13:18:09 +02:00
15b7c43839 remove unneeded environment variables
libraries do not exist or are never used
2017-08-22 10:41:35 +02:00
7673564896 fix up shortcuts for running LIGGGHTS 2017-05-11 15:23:36 +02:00
4cbec2cffe adjust shell scripts to new etc location 2017-05-02 17:50:02 +02:00
2a77e96af0 rename dummy file to .gitignore 2017-05-02 16:51:28 +02:00
57a929dce2 move etc directory to CFDEM_PROJECT_DIR 2017-05-02 16:49:22 +02:00