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 pull request #37 from ParticulateFlow/feature/cleanUp

Browse Source 
Feature/clean up
This commit is contained in:
Daniel
2018-02-26 09:02:33 +01:00
committed by GitHub
parent 13fe14abf7 b8f07097ce
commit 2fe1f88084
12 changed files with 29 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -5,4 +5,7 @@
log_*
log.*
*~
**/linux64GccDPInt32Opt
**/linux*Gcc*/
lnInclude

2
doc/smoothingModel.html
View File

@ -23,8 +23,6 @@
</PRE>
<PRE>smoothingModel constDiffSmoothing;
</PRE>
<PRE>smoothingModel localPSizeDiffSmoothing;
</PRE>
<P>Note: This examples list might not be complete - please look for other models (smoothingModel_XY) in this documentation.
</P>
<P>ATTENTION: In case a smoothing model is used in conjunction with "PimpleImEx" solvers, the fields "f" and "fSmooth" must be placed in the initial time directory! This is because zeroGradient boundary conditions for the fields "f" and "fSmooth" must be specified, otherwise the smoothing operation will give an Error.

1
doc/smoothingModel.txt
View File

@ -19,7 +19,6 @@ model = name of the smoothingModel to be applied :ul
smoothingModel off; :pre
smoothingModel constDiffSmoothing; :pre
smoothingModel localPSizeDiffSmoothing; :pre
Note: This examples list might not be complete - please look for other models (smoothingModel_XY) in this documentation.

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

@ -33,7 +33,7 @@ couplingInterval 100;
voidFractionModel divided;//centre;//
locateModel engine;//turboEngineM2M;//
locateModel engine;//turboEngine;//
meshMotionModel noMeshMotion;
@ -49,7 +49,7 @@ averagingModel dense;//dilute;//
clockModel off;//standardClock;//
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
smoothingModel off;// constDiffSmoothing; //
forceModels
(
@ -61,7 +61,6 @@ forceModels
GidaspowDrag
//Archimedes
//volWeightedAverage
//totalMomentumExchange
particleCellVolume
);
@ -75,14 +74,6 @@ turbulenceModelType "turbulenceProperties";
//===========================================================================//
// sub-model properties
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
@ -132,13 +123,7 @@ volWeightedAverageProps
lowerThreshold 0;
verbose true;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
verbose true;

46
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
{
@ -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;

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
(

46
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
);
@ -102,14 +99,6 @@ SyamlalThermCondProps
{
}
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
@ -154,13 +143,7 @@ volWeightedAverageProps
lowerThreshold 0;
verbose true;
}
totalMomentumExchangeProps
{
implicitMomExFieldName "Ksl";
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
}
GidaspowDragProps
{
verbose true;
@ -170,11 +153,6 @@ GidaspowDragProps
interpolation true;
phi 1;
}
DEMbasedDragProps
{
velFieldName "U";
voidfractionFieldName "voidfraction";
}
DiFeliceDragProps
{
@ -214,17 +192,6 @@ BeetstraDragProps
// verbose true;
}
RongDragProps
{
verbose true;
velFieldName "U";
voidfractionFieldName "voidfraction";
interpolation true;
implForceDEM true;
implForceDEMaccumulated true;
granVelFieldName "Us";
}
virtualMassForceProps
{
velFieldName "U";
@ -270,12 +237,9 @@ engineProps
treeSearch true;
}
turboEngineM2MProps
turboEngineProps
{
turboEngineProps
{
treeSearch true;
}
treeSearch true;
}
dividedProps

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

@ -32,7 +32,7 @@ couplingInterval 10;
voidFractionModel divided;
locateModel engine;//turboEngineM2M;//
locateModel engine;//turboEngine;//
meshMotionModel noMeshMotion;
@ -195,12 +195,9 @@ engineProps
treeSearch true;
}
turboEngineM2MProps
turboEngineProps
{
turboEngineProps
{
treeSearch true;
}
treeSearch true;
}
dividedProps