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 'develop' into feature/OF4x-multiphase

Browse Source
This commit is contained in:
mathiasvangoe
2018-10-11 13:10:33 +02:00
parent ec8220c63b 64512450a7
commit 146e783415
1098 changed files with 17770 additions and 51227 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

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

@ -162,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;

48
tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
View File

@ -35,7 +35,7 @@ couplingInterval 100;
voidFractionModel divided;//centre;//
locateModel engine;//turboEngineM2M;//
locateModel engine;//turboEngine;//
meshMotionModel noMeshMotion;
@ -51,7 +51,7 @@ averagingModel dense;//dilute;//
clockModel standardClock;//off;
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
smoothingModel off;// constDiffSmoothing; //
forceModels
(
@ -61,11 +61,8 @@ forceModels
gradPForce
viscForce
KochHillDrag
//DEMbasedDrag
//RongDrag
//Archimedes
//volWeightedAverage
//totalMomentumExchange
//particleCellVolume
//fieldTimeAverage
);
@ -80,14 +77,6 @@ turbulenceModelType "turbulenceProperties";//"LESProperties";//
//===========================================================================//
// sub-model properties
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
@ -132,13 +121,7 @@ volWeightedAverageProps
lowerThreshold 0;
verbose true;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
verbose true;
@ -148,11 +131,6 @@ GidaspowDragProps
interpolation true;
phi 1;
}
DEMbasedDragProps
{
velFieldName "U";
voidfractionFieldName "voidfraction";
}
DiFeliceDragProps
{
@ -165,7 +143,7 @@ DiFeliceDragProps
KochHillDragProps
{
//verbose true;
verbose true;
velFieldName "U";
voidfractionFieldName "voidfraction";
interpolation true;
@ -192,17 +170,6 @@ BeetstraDragProps
// verbose true;
}
RongDragProps
{
verbose true;
velFieldName "U";
voidfractionFieldName "voidfraction";
interpolation true;
implForceDEM true;
implForceDEMaccumulated true;
granVelFieldName "Us";
}
virtualMassForceProps
{
velFieldName "U";
@ -248,12 +215,9 @@ engineProps
treeSearch true;
}
turboEngineM2MProps
turboEngineProps
{
turboEngineProps
{
treeSearch true;
}
treeSearch true;
}
dividedProps

1
tutorials/cfdemSolverPiso/ErgunTestMPI/DEM/in.liggghts_run
View File

@ -44,7 +44,6 @@ set group all density 2000
# cfd coupling
fix cfd all couple/cfd couple_every 100 mpi
fix cfd2 all couple/cfd/force/implicit
#fix cfd2 all couple/cfd/force/accumulator RongDrag 10 1.5e-3
#fix cfd2 all couple/cfd/force/implicit/accumulated #CrankNicolson 0.5
# apply nve integration to all particles that are inserted as single particles

18
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties
View File

@ -32,7 +32,7 @@ couplingInterval 100;
voidFractionModel divided;
locateModel engine;//turboEngineM2M;//
locateModel engine;//turboEngine;//
meshMotionModel noMeshMotion;
@ -59,7 +59,6 @@ forceModels
viscForce
//Archimedes
//volWeightedAverage
//totalMomentumExchange
);
momCoupleModels
@ -109,13 +108,7 @@ volWeightedAverageProps
lowerThreshold 0;
verbose;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
velFieldName "U";
@ -159,12 +152,9 @@ engineProps
treeSearch true;
}
turboEngineM2MProps
turboEngineProps
{
turboEngineProps
{
treeSearch true;
}
treeSearch true;
}
dividedProps

19
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart
View File

@ -48,7 +48,7 @@ averagingModel dense;//dilute;//
clockModel standardClock;//off;//
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
smoothingModel off;// constDiffSmoothing; //
forceModels
(
@ -60,7 +60,6 @@ forceModels
viscForce
//Archimedes
//volWeightedAverage
//totalMomentumExchange
//particleCellVolume
);
@ -74,14 +73,6 @@ turbulenceModelType "turbulenceProperties";
//===========================================================================//
// sub-model properties
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
@ -126,13 +117,7 @@ volWeightedAverageProps
lowerThreshold 0;
verbose;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
verbose;

19
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run
View File

@ -48,7 +48,7 @@ averagingModel dense;//dilute;//
clockModel standardClock;//off;
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
smoothingModel off;// constDiffSmoothing; //
forceModels
(
@ -60,7 +60,6 @@ forceModels
viscForce
//Archimedes
//volWeightedAverage
//totalMomentumExchange
//particleCellVolume
);
@ -74,14 +73,6 @@ turbulenceModelType "turbulenceProperties";
//===========================================================================//
// sub-model properties
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
@ -126,13 +117,7 @@ volWeightedAverageProps
lowerThreshold 0;
verbose;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
verbose;

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

2
tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/couplingProperties
View File

@ -51,7 +51,7 @@ averagingModel dense;
clockModel off;
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
smoothingModel off;// constDiffSmoothing; //
forceModels
(

51
tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties
View File

@ -35,7 +35,7 @@ couplingInterval 25;
voidFractionModel divided;//centre;//
locateModel engine;//turboEngineM2M;//
locateModel engine;//turboEngine;//
meshMotionModel noMeshMotion;
@ -51,7 +51,7 @@ averagingModel dense;//dilute;//
clockModel standardClock;//off;
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
smoothingModel off;// constDiffSmoothing; //
forceModels
(
@ -61,11 +61,8 @@ forceModels
gradPForce
viscForce
//KochHillDrag
//DEMbasedDrag
//RongDrag
//Archimedes
//volWeightedAverage
//totalMomentumExchange
//particleCellVolume
//fieldTimeAverage
);
@ -75,7 +72,10 @@ energyModels
heatTransferGunn
);
chemistryModel off;
chemistryModels
(
off
);
thermCondModel SyamlalThermCond;
@ -102,14 +102,6 @@ SyamlalThermCondProps
{
}
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
@ -154,13 +146,7 @@ volWeightedAverageProps
lowerThreshold 0;
verbose true;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
verbose true;
@ -170,11 +156,6 @@ GidaspowDragProps
interpolation true;
phi 1;
}
DEMbasedDragProps
{
velFieldName "U";
voidfractionFieldName "voidfraction";
}
DiFeliceDragProps
{
@ -214,17 +195,6 @@ BeetstraDragProps
// verbose true;
}
RongDragProps
{
verbose true;
velFieldName "U";
voidfractionFieldName "voidfraction";
interpolation true;
implForceDEM true;
implForceDEMaccumulated true;
granVelFieldName "Us";
}
virtualMassForceProps
{
velFieldName "U";
@ -270,12 +240,9 @@ engineProps
treeSearch true;
}
turboEngineM2MProps
turboEngineProps
{
turboEngineProps
{
treeSearch true;
}
treeSearch true;
}
dividedProps

14
tutorials/cfdemSolverRhoPimple/FinesColumn/CFD/constant/couplingProperties
View File

@ -32,7 +32,7 @@ couplingInterval 10;
voidFractionModel divided;
locateModel engine;//turboEngineM2M;//
locateModel engine;//turboEngine;//
meshMotionModel noMeshMotion;
@ -80,7 +80,10 @@ energyModels
thermCondModel SyamlalThermCond;
chemistryModel off;
chemistryModels
(
off
);
turbulenceModelType "turbulenceProperties";
@ -195,12 +198,9 @@ engineProps
treeSearch true;
}
turboEngineM2MProps
turboEngineProps
{
turboEngineProps
{
treeSearch true;
}
treeSearch true;
}
dividedProps