zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solved merge conflict

Browse Source
This commit is contained in:
Andreas Aigner
2014-12-11 18:35:06 +01:00
parent fb3e8011d1 6d8e15561a
commit b4949ebd52
141 changed files with 1261 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tutorials/cfdemPostproc/fillCylinder/DEM/post/dummy
View File

@ -1 +0,0 @@
dummyfile

2
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/CFD/constant/couplingProperties
View File

@ -70,14 +70,12 @@ turbulenceModelType RASProperties;//LESProperties; //
ShirgaonkarIBProps
{
velFieldName "U";
densityFieldName "rho";
pressureFieldName "p";
verbose;
}
ArchimedesIBProps
{
densityFieldName "rho";
gravityFieldName "g";
voidfractionFieldName "voidfractionNext";
}

0
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/DEM/post/.gitignore vendored Normal file
View File

9
tutorials/cfdemSolverPiso/ErgunTestCG/Allrun.sh
View File

@ -2,15 +2,18 @@
#===================================================================#
# allrun script for testcase as part of test routine
# run settlingTest
# run ErgunTestCG
# Christoph Goniva - Sept. 2010
#===================================================================#
#- define variables
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
# check if mesh was built
if [ -d "$casePath/CFD/constant/polyMesh/boundary" ]; then
if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then
echo "mesh was built before - using old mesh"
else
echo "mesh needs to be built"
@ -18,7 +21,7 @@ else
blockMesh
fi
if [ -f "$casePath/DEM/post/restart/liggghts.restart*" ]; then
if [ -f "$casePath/DEM/post/restart/liggghts.restart"* ]; then
echo "LIGGGHTS init was run before - using existing restart file"
else
#- run DEM in new terminal

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

@ -99,23 +99,20 @@ implicitCoupleProps
ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
}
gradPForceProps
{
pFieldName "p";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
velocityFieldName "U";
interpolation;
interpolation true;
}
viscForceProps
{
velocityFieldName "U";
densityFieldName "rho";
interpolation;
interpolation true;
}
noDragProps
{
@ -133,7 +130,7 @@ volWeightedAverageProps
);
upperThreshold 0.999;
lowerThreshold 0;
verbose;
verbose true;
}
totalMomentumExchangeProps
{
@ -141,57 +138,51 @@ totalMomentumExchangeProps
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
densityFieldName "rho";
}
GidaspowDragProps
{
verbose;
verbose true;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
granVelFieldName "Us";
phi 1;
//interpolation; // this case does not like interpolation
//interpolation true; // this case does not like interpolation
implDEM_;
}
KochHillDragProps
{
//verbose;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
//interpolation;
//interpolation true;
implDEM_;
verbose;
verbose true;
}
BeetstraDragProps
{
velFieldName "U";
densityFieldName "rho";
gravityFieldName "g";
rhoParticle 2000.;
voidfractionFieldName "voidfraction";
interpolation ;
interpolation true;
useFilteredDragModel ;
useParcelSizeDependentFilteredDrag ;
k 0.05;
aLimit 0.0;
// verbose ;
// verbose true;
}
virtualMassForceProps
{
velFieldName "U";
densityFieldName "rho";
}
particleCellVolumeProps
{
upperThreshold 0.999;
lowerThreshold 0.;
verbose;
verbose true;
}
oneWayVTKProps

4
tutorials/cfdemSolverPiso/ErgunTestCG/CFD/octave/totalPressureDrop.m
View File

@ -104,8 +104,4 @@ axis([0,Uend,0,dpErgun(length(dpErgun))])
%print('cfdemSolverPiso_settlingTest.eps','-deps2')
print -color "cfdemSolverPiso_ErgunTestCG.eps"
replot;

2
tutorials/cfdemSolverPiso/ErgunTestCG/parCFDDEMrun.sh
View File

@ -86,7 +86,7 @@ source $WM_PROJECT_DIR/bin/tools/CleanFunctions
cd $casePath/CFD
cleanCase
rm -r $casePath/CFD/clockData
rm -r $casePath/DEM/post/*.*
rm $casePath/DEM/post/*.*
#rm -r $casePath/DEM/post/restart/*.*
touch $casePath/DEM/post/.gitignore
touch $casePath/DEM/post/restart/.gitignore

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

@ -55,9 +55,11 @@ forceModels
//GidaspowDrag
//BeetstraDrag
//DiFeliceDrag
KochHillDrag
gradPForce
viscForce
KochHillDrag
//DEMbasedDrag
//RongDrag
//Archimedes
//volWeightedAverage
//totalMomentumExchange
@ -99,23 +101,20 @@ implicitCoupleProps
ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
}
gradPForceProps
{
pFieldName "p";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
velocityFieldName "U";
interpolation;
interpolation true;
}
viscForceProps
{
velocityFieldName "U";
densityFieldName "rho";
interpolation;
interpolation true;
}
volWeightedAverageProps
{
@ -128,7 +127,7 @@ volWeightedAverageProps
);
upperThreshold 0.999;
lowerThreshold 0;
verbose;
verbose true;
}
totalMomentumExchangeProps
{
@ -136,46 +135,48 @@ totalMomentumExchangeProps
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
densityFieldName "rho";
}
GidaspowDragProps
{
verbose;
verbose true;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
interpolation;
interpolation true;
phi 1;
}
DEMbasedDragProps
{
velFieldName "U";
voidfractionFieldName "voidfraction";
}
DiFeliceDragProps
{
//verbose;
//verbose true;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
granVelFieldName "Us";
interpolation;
interpolation true;
}
KochHillDragProps
{
//verbose;
//verbose true;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
interpolation;
interpolation true;
//forceSubModels
//(
// ImExCorr
//);
//implDEM true;
implForceDEM true;
//implForceDEMaccumulated true;
//explicitInterpCorr true;
}
BeetstraDragProps
{
velFieldName "U";
densityFieldName "rho";
gravityFieldName "g";
rhoParticle 2000.;
voidfractionFieldName "voidfraction";
@ -184,20 +185,30 @@ BeetstraDragProps
useParcelSizeDependentFilteredDrag ;
k 0.05;
aLimit 0.0;
// verbose ;
// verbose true;
}
RongDragProps
{
verbose true;
velFieldName "U";
voidfractionFieldName "voidfraction";
interpolation true;
implForceDEM true;
implForceDEMaccumulated true;
granVelFieldName "Us";
}
virtualMassForceProps
{
velFieldName "U";
densityFieldName "rho";
}
particleCellVolumeProps
{
upperThreshold 0.999;
lowerThreshold 0.;
verbose;
verbose true;
}
oneWayVTKProps

8
tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/liggghtsCommands
View File

@ -26,6 +26,7 @@ FoamFile
liggghtsCommandModels
(
runLiggghts
//writeLiggghts
);
// ************************************************************************* //
@ -33,3 +34,10 @@ liggghtsCommandModels
{
preNo false;
}*/
/*writeLiggghtsProps
{
writeLast off;
writeName "post/restart/liggghts.restartCFDEM";
overwrite on;
}*/

6
tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m
View File

@ -53,7 +53,7 @@ fprintf('so the result does not depend on density\n')
%==================================
% min fluidization velocity in m/s
%==================================
rhoP = 2000 % particle density in kg/m3
rhoP = 2000 % particle density in kg/m3
g = 9.81 % gravity m/s2
Umf = dp^2*(rhoP-rhoG)*g/(150*muG)*(epsilon^3*phip^2)/(1-epsilon);
@ -96,8 +96,4 @@ axis([0,Uend,0,dpErgun(length(dpErgun))])
%print('cfdemSolverPiso_settlingTest.eps','-deps2')
print -color "cfdemSolverPiso_ErgunTestMPI.eps"
replot;

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

@ -44,6 +44,8 @@ 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
fix integr all nve/sphere

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

@ -87,7 +87,8 @@ cd $casePath/CFD
cleanCase
rm -r $casePath/CFD/clockData
rm $casePath/DEM/post/*.*
#rm -r $casePath/DEM/post/restart/*.*
touch $casePath/DEM/post/.gitignore
#rm $casePath/DEM/post/restart/*.*
rm $casePath/DEM/post/restart/liggghts.restartCFDEM*
touch $casePath/DEM/post/restart/.gitignore
echo "done"

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

@ -81,23 +81,20 @@ implicitCoupleProps
ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
}
gradPForceProps
{
pFieldName "p";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
velocityFieldName "U";
//interpolation;
//interpolation true;
}
viscForceProps
{
velocityFieldName "U";
densityFieldName "rho";
interpolation;
interpolation true;
}
volWeightedAverageProps
{
@ -118,17 +115,14 @@ totalMomentumExchangeProps
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
densityFieldName "rho";
}
GidaspowDragProps
{
velFieldName "U";
densityFieldName "rho";
}
DiFeliceDragProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
granVelFieldName "Us";
}
@ -136,14 +130,12 @@ DiFeliceDragProps
KochHillDragProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
}
virtualMassForceProps
{
velFieldName "U";
densityFieldName "rho";
}
oneWayVTKProps

4
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/octave/totalPressureDrop.m
View File

@ -97,8 +97,4 @@ ylabel("pressure drop [Pa]")
%print('cfdemSolverPiso_settlingTest.eps','-deps2')
print -color "cfdemSolverPiso_ErgunTestMPI.eps"
replot;

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

@ -98,23 +98,20 @@ implicitCoupleProps
ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
}
gradPForceProps
{
pFieldName "p";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
velocityFieldName "U";
//interpolation;
//interpolation true;
}
viscForceProps
{
velocityFieldName "U";
densityFieldName "rho";
interpolation;
interpolation true;
}
volWeightedAverageProps
{
@ -135,20 +132,17 @@ totalMomentumExchangeProps
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
densityFieldName "rho";
}
GidaspowDragProps
{
verbose;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
phi 1;
}
DiFeliceDragProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
}
@ -156,14 +150,12 @@ KochHillDragProps
{
//verbose;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
}
BeetstraDragProps
{
velFieldName "U";
densityFieldName "rho";
gravityFieldName "g";
rhoParticle 2000.;
voidfractionFieldName "voidfraction";
@ -178,7 +170,6 @@ BeetstraDragProps
virtualMassForceProps
{
velFieldName "U";
densityFieldName "rho";
}
particleCellVolumeProps

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

@ -98,23 +98,20 @@ implicitCoupleProps
ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
}
gradPForceProps
{
pFieldName "p";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
velocityFieldName "U";
//interpolation;
//interpolation true;
}
viscForceProps
{
velocityFieldName "U";
densityFieldName "rho";
interpolation;
interpolation true;
}
volWeightedAverageProps
{
@ -135,20 +132,17 @@ totalMomentumExchangeProps
explicitMomExFieldName "none";
fluidVelFieldName "U";
granVelFieldName "Us";
densityFieldName "rho";
}
GidaspowDragProps
{
verbose;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
phi 1;
}
DiFeliceDragProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
}
@ -156,14 +150,12 @@ KochHillDragProps
{
//verbose;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
}
BeetstraDragProps
{
velFieldName "U";
densityFieldName "rho";
gravityFieldName "g";
rhoParticle 2000.;
voidfractionFieldName "voidfraction";
@ -178,7 +170,6 @@ BeetstraDragProps
virtualMassForceProps
{
velFieldName "U";
densityFieldName "rho";
}
particleCellVolumeProps

3
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/liggghtsCommands_run
View File

@ -37,8 +37,9 @@ runLiggghtsProps
//- optional
writeLiggghtsProps
{
writeLast on;
writeLast off;
writeName "post/restart/liggghts.restartCFDEM";
overwrite on;
}
// ************************************************************************* //

4
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/octave/totalPressureDrop.m
View File

@ -112,8 +112,4 @@ axis([0,Uend,0,dpErgun(length(dpErgun))])
%print('cfdemSolverPiso_settlingTest.eps','-deps2')
print -color "cfdemSolverPiso_ErgunTestMPI.eps"
replot;

30
tutorials/cfdemSolverPiso/settlingTestMPI/CFD/0/f Normal file
View File

@ -0,0 +1,30 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volVectorField;
object f;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -2 -2 0 0 0 0];
internalField uniform (0 0 0);
boundaryField
{
"(inlet|outlet|walls)"
{
type zeroGradient;
value uniform (0 0 0);
}
}
// ************************************************************************* //

31
tutorials/cfdemSolverPiso/settlingTestMPI/CFD/0/sSmoothField Executable file
View File

@ -0,0 +1,31 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object sSmoothField;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
".*"
{
type zeroGradient;
}
}
// ************************************************************************* //

31
tutorials/cfdemSolverPiso/settlingTestMPI/CFD/0/vSmoothField Normal file
View File

@ -0,0 +1,31 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volVectorField;
location "0";
object vSmoothField;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform (0 0 0);
boundaryField
{
".*"
{
type zeroGradient;
}
}
// ************************************************************************* //

8
tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties
View File

@ -91,10 +91,13 @@ implicitCoupleProps
DiFeliceDragProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
granVelFieldName "Us";
verbose;
verbose true;
//- use of scalar viscosity for drag
//scalarViscosity true;
//nu nu [ 0 2 -1 0 0 0 0 ] 1e-04;
}
SchillerNaumannDragProps
@ -120,7 +123,6 @@ ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
treatDEM;
}
virtualMassForceProps

11
tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/liggghtsCommands
View File

@ -25,7 +25,16 @@ FoamFile
liggghtsCommandModels
(
runLiggghts
runLiggghts
writeLiggghts
);
// ************************************************************************* //
writeLiggghtsProps
{
writeLast off;
//writeName "name";
overwrite on;
verbose;
}

2
tutorials/cfdemSolverPiso/settlingTestMPI/CFD/system/fvSolution
View File

@ -41,7 +41,7 @@ solvers
relTol 0;
}
"(voidfraction|Ksl|UsNext|voidfractionNext)"
"(voidfraction|Ksl|UsNext|voidfractionNext|sSmoothField|vSmoothField|fSmooth)"
{
solver PCG;
preconditioner DIC;

0
tutorials/cfdemSolverPiso/settlingTestMPI/DEM/post/.gitignore vendored Normal file
View File

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

@ -24,7 +24,7 @@ machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true"
cleanCase="true"
cleanUp="true"
postproc="false"
#--------------------------------------------------------------------------------#
@ -77,7 +77,7 @@ if [ $postproc == "true" ]
fi
#- clean up case
if [ $cleanCase == "true" ]
if [ $cleanUp == "true" ]
then
echo "deleting data at: $casePath :\n"
source $WM_PROJECT_DIR/bin/tools/CleanFunctions
@ -86,6 +86,7 @@ if [ $cleanCase == "true" ]
cd $casePath
rm -r $casePath/CFD/clockData
rm -r $casePath/DEM/post/*
rm -r $casePath/DEM/liggghts.restartCFDEM*
echo "done"
fi

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

@ -105,7 +105,6 @@ volWeightedAverageProps
DiFeliceDragMSProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
granVelFieldName "Us";
//verbose;
@ -114,14 +113,12 @@ DiFeliceDragMSProps
GidaspowDragMSProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
hydraulicDiameter 0.002;
}
ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
}

1
tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/octave/totalPressureDrop.m
View File

@ -109,7 +109,6 @@ axis([0,Uend,0,dpErgun(length(dpErgun))])
%print('cfdemSolverPiso_settlingTest.eps','-deps2')
print -color "cfdemSolverPisoMS_ErgunTestMPI.eps"
replot;
SimName="ErgunTestMPI_sphereOfSpheres"
print(fig,strcat("figure_",SimName,".png"));

12
tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/couplingProperties
View File

@ -77,7 +77,6 @@ LaEuScalarTempProps
partHeatFluxName "convectiveHeatFlux";
lambda 0.0256;
Cp 1007;
densityFieldName "rho";
}
implicitCoupleProps
@ -91,36 +90,31 @@ implicitCoupleProps
KochHillDragProps
{
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
}
DiFeliceDragProps
{
velFieldName "U";
densityFieldName "rho";
//verbose;
//verbose true;
}
ArchimedesProps
{
densityFieldName "rho";
gravityFieldName "g";
}
gradPForceProps
{
pFieldName "p";
densityFieldName "rho";
voidfractionFieldName "voidfraction";
velocityFieldName "U";
//interpolation;
//interpolation true;
}
viscForceProps
{
velocityFieldName "U";
densityFieldName "rho";
interpolation;
interpolation true;
}
oneWayVTKProps

3
tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m
View File

@ -51,7 +51,6 @@ legend("analytical - Ergun","simulation")
%print('cfdemSolverPiso_settlingTest.eps','-deps2')
print -color "cfdemSolverPisoScalar_pressureDrop.eps"
replot;
%*********************************************************************%
% heat transfer
@ -126,7 +125,6 @@ legend("analytical - ","simulation")
%print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2')
print -color "cfdemSolverPisoScalar_Nusselt.eps"
replot;
figure(3)
plot(t_sim,Tin_sim,t_sim,Tout_sim)
@ -135,5 +133,4 @@ legend("inlet","outlet")
%print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2')
print -color "cfdemSolverPisoScalar_temperatures.eps"
replot;