zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge with develop.

Browse Source
This commit is contained in:
Thomas Lichtenegger
2018-06-05 09:57:53 +02:00
parent f34c00d5dd 653237a641
commit 839c66a283
83 changed files with 2905 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tutorials/.gitignore vendored
View File

@ -6,3 +6,16 @@
log_*
log.*
*~
**/DEM/post/*
**/CFD/processor*/
**/CFD/0*/
**/CFD/1*/
**/CFD/2*/
**/CFD/3*/
**/CFD/4*/
**/CFD/5*/
**/CFD/6*/
**/CFD/7*/
**/CFD/8*/
**/CFD/9*/
!**/CFD/0/

12
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh Normal file → Executable file
View File

@ -22,6 +22,7 @@ solverName="cfdemSolverIB"
nrProcs="4"
machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict
reconstructCase="false" # true | false
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true"
postproc="false"
@ -30,6 +31,14 @@ postproc="false"
#- call function to run a parallel CFD-DEM case
parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode
#- case needs special reconstruction
if [ $reconstructCase == "true" ]
then
cd $casePath/CFD
reconstructParMesh -mergeTol 1e-06
reconstructPar -noLagrangian
fi
if [ $runOctave == "true" ]
then
@ -60,9 +69,6 @@ if [ $postproc == "true" ]
read
fi
#- copy log file to test harness
cp ../../$logfileName $testHarnessPath
#- clean up case
echo "deleting data at: $casePath"
source $WM_PROJECT_DIR/bin/tools/CleanFunctions

32
tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties
View File

@ -33,7 +33,7 @@ couplingInterval 100;
voidFractionModel divided;//centre;//
locateModel engine;//turboEngine;//
locateModel engine;//turboEngineM2M;//
meshMotionModel noMeshMotion;
@ -49,7 +49,7 @@ averagingModel dense;//dilute;//
clockModel off;//standardClock;//
smoothingModel off;// constDiffSmoothing; //
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
forceModels
(
@ -61,6 +61,7 @@ forceModels
GidaspowDrag
//Archimedes
//volWeightedAverage
//totalMomentumExchange
particleCellVolume
);
@ -74,6 +75,14 @@ turbulenceModelType "turbulenceProperties";
//===========================================================================//
// sub-model properties
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
@ -123,7 +132,13 @@ volWeightedAverageProps
lowerThreshold 0;
verbose true;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
verbose true;
@ -147,12 +162,15 @@ KochHillDragProps
BeetstraDragProps
{
velFieldName "U";
gravityFieldName "g";
rhoParticle 2000.;
voidfractionFieldName "voidfraction";
granVelFieldName "Us";
interpolation true;
useFilteredDragModel ;
useParcelSizeDependentFilteredDrag ;
// useFilteredDragModel;
// useParcelSizeDependentFilteredDrag;
g 9.81;
rhoP 7000.;
rho 10.;
nuf 1.5e-4;
k 0.05;
aLimit 0.0;
// verbose true;

4
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parCFDDEMrun.sh
View File

@ -22,10 +22,10 @@ solverName="cfdemSolverPiso"
nrProcs="4"
machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict
reconstuctCase="true" # true | false
reconstructCase="true" # true | false
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
#--------------------------------------------------------------------------------#
#- call function to run a parallel CFD-DEM case
parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode $reconstuctCase
parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode $reconstructCase

3
tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh
View File

@ -22,6 +22,7 @@ solverName="cfdemSolverPiso"
nrProcs="2"
machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict
reconstructCase="true" # true | false
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true"
cleanUp="true"
@ -29,7 +30,7 @@ postproc="false"
#--------------------------------------------------------------------------------#
#- call function to run a parallel CFD-DEM case
parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode "true"
parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode $reconstructCase
if [ $runOctave == "true" ]
then