9814464fcf
Merge branch 'feature/cfdemSolverRhoPimple' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/cfdemSolverRhoPimple
2017-09-04 15:11:51 +02:00
2adc864f0a
use pre-increment
2017-09-04 14:59:24 +02:00
da37804145
More path correction for tutorial cases
2017-09-04 14:56:06 +02:00
027592cd95
fix functions.sh path for tutorial cases
2017-09-04 14:53:10 +02:00
ace0e60c8c
Merge branch 'feature/cfdemSolverRhoPimple' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/cfdemSolverRhoPimple
2017-09-04 13:43:28 +02:00
4e7246381d
Some changes for tutorial case with single shrinking particle.
2017-09-04 13:42:53 +02:00
f14ce1b7d2
Output mass source in separate line.
2017-09-04 13:40:55 +02:00
1e7fc386cc
test case for unreacted shrinking core model
2017-09-04 13:40:35 +02:00
4bd7f6529e
Fix original pressure equation, add alternative formulation.
2017-09-04 13:40:16 +02:00
ac4fa13745
Monitor mass changes.
2017-09-04 13:38:52 +02:00
557a9d3fad
Changed boundary conditions for tutorial case and some numerical settings.
2017-08-30 19:16:21 +02:00
a761c22ede
New path to source.
2017-08-30 14:46:25 +02:00
03ac321754
Merge with dev and corresponding changes.
2017-08-28 10:44:08 +02:00
fd1bffd0e8
Made pressure source term implicit, added debugging option of YEqn.
2017-08-28 07:46:38 +02:00
42ecc8656a
remove out-dated tutorial cases
2017-08-25 10:33:01 +02:00
5b8072b11a
Merge pull request #27 from ParticulateFlow/feature/cherry_pick_PUBLIC
...
Feature/cherry pick public
2017-08-24 16:17:53 +02:00
2e2701ccf7
remove unneeded parameter finaliser from IOModel::streamDataToPath
2017-08-24 09:58:01 +02:00
5e7b332dd9
clean up whitespaces
2017-08-23 18:02:29 +02:00
adc79029a1
use actual cell id of particles instead of dummy finaliser string
2017-08-23 18:01:22 +02:00
ad6a169ffd
output position as position type instead of vector type
2017-08-23 18:00:00 +02:00
53d0988a4e
IOModel::streamDataToPath - separate handling of position and vector
...
vector needs no finaliser
2017-08-23 17:58:41 +02:00
165a2b9611
no need for finalizer in case of 'label'
2017-08-23 17:55:57 +02:00
2e4c93f8ee
use info from OFstream to create output file header
2017-08-23 17:52:51 +02:00
668b85582b
simplify logic
...
don't waste any time if type == "origProcId"
2017-08-23 17:50:22 +02:00
6343a6a09c
create OFstream on stack instead of heap
2017-08-23 17:45:58 +02:00
76b90cc3cc
remove unnecessary copy to temp vector
2017-08-23 17:40:17 +02:00
bce10d17c1
clean up whitespaces
2017-08-23 17:36:22 +02:00
dd2e21be64
create OFstream on stack instead of heap
2017-08-23 17:35:08 +02:00
0aa8672ab1
Renaming diffusion coefficient values
2017-08-23 17:15:06 +02:00
67a5e7cc02
Carry T_exp outside of loop
...
- Depending on conditions it might be used for either loop
- Added extra comments for info
2017-08-23 17:12:35 +02:00
e1116e471b
Merge pull request #26 from ParticulateFlow/feature/environment_setup
...
Feature/environment setup
2017-08-23 08:58:02 +02:00
67019b0c0b
Merge branch 'feature/environment_setup' into feature/cherry_pick_PUBLIC
2017-08-22 15:55:47 +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
8f11235d08
update make options for compressible library
...
use same flags as for incompressible library
2017-08-22 13:15:13 +02:00
15b7c43839
remove unneeded environment variables
...
libraries do not exist or are never used
2017-08-22 10:41:35 +02:00
579264952f
remove unneeded includes
2017-08-21 13:17:52 +02:00
116bf952ab
remove commented out code
2017-08-21 13:17:26 +02:00
1213c90a50
clean up whitespaces and formatting
2017-08-21 13:09:33 +02:00
b2b3363104
add procBoundaryCorrection for dividedVoidfraction in case of engineIB
2017-08-21 12:40:10 +02:00
8b6222ba79
remove method no longer needed
...
using base class method
2017-08-21 12:34:45 +02:00
8e73260cb4
limit voidfractionNext and scale to values >= 0
2017-08-21 12:33:02 +02:00
777a9e06ec
refactor IBVoidFraction class
...
move duplicate to separate function
2017-08-21 12:32:09 +02:00
4ac84930c5
add braces
2017-08-21 12:24:25 +02:00
10fd332943
correct boundary conditions of voidfraction field
...
correct BCs after modifying the voidfraction field
2017-08-21 12:23:41 +02:00
3dc7b6a150
pre-generate marker points in dividedVoidFraction class
...
generate marker points for unit sphere once and just scale these points
for each particle instead of constantly recalculating them
2017-08-18 11:35:30 +02:00
3f8885c9b7
add functions to get min dist of point to periodic particle image
...
add functions to voidFractionModel class to determine minimal distance
of a point to one of the periodic images of a particle
2017-08-17 17:13:16 +02:00
