danielque 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

..

log

rename dummy file to .gitignore

2017-05-02 16:51:28 +02:00

OFversion

move etc directory to CFDEM_PROJECT_DIR

2017-05-02 16:49:22 +02:00

additionalLibs

move etc directory to CFDEM_PROJECT_DIR

2017-05-02 16:49:22 +02:00

bashrc

Merge branch 'develop' into feature/openfoam6

2019-11-12 10:06:50 +01:00

cfdemSystemTest.sh

clean up whitespaces in cfdemSystemTest.sh

2017-08-22 13:24:54 +02:00

cleanCFDEMcoupling.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

compileCFDEMcoupling_all.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

compileCFDEMcoupling_sol.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

compileCFDEMcoupling_src.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

compileCFDEMcoupling_uti.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

compileCFDEMcoupling.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

compileLIGGGHTS_lib.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

compileLIGGGHTS.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

controlDict_cgs_2.1.x

move etc directory to CFDEM_PROJECT_DIR

2017-05-02 16:49:22 +02:00

controlDict_cgs_2.2.x

move etc directory to CFDEM_PROJECT_DIR

2017-05-02 16:49:22 +02:00

cshrc

bump version number to 19.09

2019-09-20 13:22:45 +02:00

functions.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

library-liggghts-list.txt

move etc directory to CFDEM_PROJECT_DIR

2017-05-02 16:49:22 +02:00

library-list.txt

Merge with develop.

2018-11-13 15:42:56 +01:00

pullLIGGGHTS.sh

adjust shell scripts to new etc location

2017-05-02 17:50:02 +02:00

solver-list.txt

Updated solver list.

2019-11-07 14:12:16 +01:00

testTutorials.sh

move etc directory to CFDEM_PROJECT_DIR

2017-05-02 16:49:22 +02:00

tutorial-list.txt

move etc directory to CFDEM_PROJECT_DIR

2017-05-02 16:49:22 +02:00

utilities-list.txt

Added new utilities to list.

2017-12-20 09:23:40 +01:00