release on 2014-01-21_18-51-18

This commit is contained in:
goniva
2014-01-21 18:51:21 +01:00
parent 0e940d0363
commit 949cdc22f5
144 changed files with 4208 additions and 442 deletions

View File

@ -9,7 +9,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#- define variables
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
@ -86,7 +86,7 @@ fi
#- clean up case
echo "deleting data at: $casePath"
rm -r $casePath/CFD/0.*
rm -r $casePath/CFD/particles
rm -r $casePath/CFD/lagrangian
rm -r $casePath/CFD/VTK
rm -r $casePath/DEM/post/*
rm -r $casePath/DEM/log.*

View File

@ -40,15 +40,19 @@ regionModel allRegion;
IOModel basicIO;
probeModel off;
dataExchangeModel oneWayVTK;
averagingModel dense;
clockModel off;
smoothingModel off;
forceModels
(
off
noDrag
);
momCoupleModels

View File

@ -6,7 +6,7 @@
# Christoph Goniva - July. 2011, mod by Alice Hager - July 2011
#===================================================================#
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#- define variables
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"

View File

@ -44,6 +44,8 @@ dataExchangeModel twoWayMPI;//twoWayFiles;
IOModel basicIO;
probeModel off;
averagingModel dilute;
clockModel off;

View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables

View File

@ -0,0 +1,39 @@
/*--------------------------------*- 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 volScalarField;
object dSmoothing;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
wall
{
type zeroGradient;
}
inlet
{
type zeroGradient;
}
outlet
{
type zeroGradient;
}
}
// ************************************************************************* //

View File

@ -30,7 +30,7 @@ modelType "A"; // A or B
couplingInterval 100;
voidFractionModel divided;
voidFractionModel divided;//centre;//
locateModel engine;//turboEngineM2M;//
@ -40,13 +40,15 @@ regionModel allRegion;
IOModel basicIO;
probeModel off;
dataExchangeModel twoWayMPI;//twoWayM2M;//twoWayFiles;//oneWayVTK;//
averagingModel dense;//dilute;//
clockModel standardClock;//off;
smoothingModel off;
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
forceModels
(
@ -72,6 +74,21 @@ turbulenceModelType "RASProperties";//"LESProperties";//
//===========================================================================//
// sub-model properties
localPSizeDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
dSmoothingLength 1.5e-3;
Csmoothing 1.0;
}
constDiffSmoothingProps
{
lowerLimit 0.1;
upperLimit 1e10;
smoothingLength 1.5e-3;
}
implicitCoupleProps
{
velFieldName "U";
@ -134,6 +151,7 @@ DiFeliceDragProps
KochHillDragProps
{
//verbose;
velFieldName "U";
densityFieldName "rho";
voidfractionFieldName "voidfraction";

View File

@ -6,8 +6,8 @@ clc;
% simulation data 1
%====================================%
rhoG = 10 % density in kg/m3
%path = '../probes/0/p';
path = '../probes/0/p';
%path = '../probes/0/p'; % 2.1.x
path = '../postProcessing/probes/0/p'; % 2.2.x
columns=22;
headerlines=4;
data = loaddata(path,columns,headerlines);
@ -30,7 +30,7 @@ phip = 1 % sphericity
epsilon = 0.451335 % void fraction
Ustart = 0.002
Uend = 0.02
timeStepSize = 0.0005; % time interval of pressure data
timeStepSize = 0.001; % time interval of pressure data
Tstart = 0;
Tend = t_sim(length(t_sim));
deltaU=(Uend-Ustart)/((Tend-Tstart)/timeStepSize);

View File

@ -25,7 +25,7 @@ stopAt endTime;
endTime 0.1;
deltaT 0.0005;
deltaT 0.001;
writeControl adjustableRunTime;

View File

@ -17,7 +17,7 @@ FoamFile
solvers
{
p
"(p)"
{
solver PCG;
preconditioner DIC;
@ -33,7 +33,7 @@ solvers
relTol 0;
}
U
"(U|k|epsilon|R|nuTilda)"
{
solver PBiCG;
preconditioner DILU;
@ -41,34 +41,10 @@ solvers
relTol 0;
}
k
"(voidfraction|Us|Ksl|dSmoothing)"
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
epsilon
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
R
{
solver PBiCG;
preconditioner DILU;
tolerance 1e-05;
relTol 0;
}
nuTilda
{
solver PBiCG;
preconditioner DILU;
solver PCG;
preconditioner DIC;
tolerance 1e-05;
relTol 0;
}

View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -67,7 +67,7 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/etc/functions.sh #- include functions
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
@ -94,6 +94,7 @@ rm -r $casePath/DEM/post/*
rm -r $casePath/DEM/log.*
rm -r $casePath/DEM/liggghts.restartCFDEM*
rm -r $casePath/CFD/probes
rm -r $casePath/CFD/postProcessing
rm -r $casePath/CFD/lagrangian
rm -r $casePath/CFD/clockData
echo "done"

View File

@ -24,7 +24,7 @@ read
echo "Make sure $HOME/.OpenFOAM/$WM_PROJECT_VERSION/controlDict is removed after this simulation."
mkdir -p $FOAM_INST_DIR/.OpenFOAM//$WM_PROJECT_VERSION
cp $CFDEM_SRC_DIR/etc/controlDict_cgs_$WM_PROJECT_VERSION $FOAM_INST_DIR/.OpenFOAM/$WM_PROJECT_VERSION/controlDict
cp $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/controlDict_cgs_$WM_PROJECT_VERSION $FOAM_INST_DIR/.OpenFOAM/$WM_PROJECT_VERSION/controlDict
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPiso ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"

View File

@ -40,6 +40,8 @@ regionModel allRegion;
IOModel "basicIO";
probeModel off;
dataExchangeModel twoWayMPI;//twoWayM2M;//twoWayFiles;//oneWayVTK;//
averagingModel dense;//dilute;//

View File

@ -5,8 +5,8 @@ clc;
%====================================%
% simulation data 1
%====================================%
%path = '../probes/0/p';
path = '../probes/0/p';
%path = '../probes/0/p'; % 2.1.x
path = '../postProcessing/probes/0/p'; % 2.2.x
columns=22;
headerlines=4;
data = loaddata(path,columns,headerlines);

View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -67,7 +67,7 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/etc/functions.sh #- include functions
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview

View File

@ -84,7 +84,7 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/etc/functions.sh #- include functions
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
@ -105,6 +105,7 @@ rm -rf $casePath/CFD/processor*
rm -r $casePath/CFD/VTK
rm -rf $casePath/CFD/patchAverage_pressureDrop
rm -rf $casePath/CFD/probes
rm -rf $casePath/CFD/postProcessing
rm -rf $casePath/CFD/particles
rm -r $casePath/CFD/log.*
rm -r $casePath/CFD/lagrangian

View File

@ -40,6 +40,8 @@ regionModel allRegion;
IOModel "basicIO";
probeModel off;
dataExchangeModel twoWayMPI;//twoWayFiles;//oneWayVTK;//
averagingModel dense;//dilute;//

View File

@ -40,6 +40,8 @@ regionModel allRegion;
IOModel "basicIO";
probeModel off;
dataExchangeModel twoWayMPI;//twoWayFiles;//oneWayVTK;//
averagingModel dense;//dilute;//

View File

@ -6,8 +6,8 @@ clc;
% simulation data 1
%====================================%
rhoG = 10 % density in kg/m3
%path = '../probes/0/p';
path = '../probes/0/p';
%path = '../probes/0/p'; % 2.1.x
path = '../postProcessing/probes/0/p'; % 2.2.x
columns=22;
headerlines=4;
data = loaddata(path,columns,headerlines);
@ -20,8 +20,8 @@ t_sim = data(:,1);
%====================================%
% simulation data 2
%====================================%
%path = '../probes/0.05/p';
path = '../probes/0.05/p';
%path = '../probes/0.05/p'; % 2.1.x
path = '../postProcessing/probes/0.05/p'; % 2.2.x
columns=22;
headerlines=4;
data = loaddata(path,columns,headerlines);

View File

@ -44,3 +44,13 @@ dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile
dummyfile

View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables

View File

@ -40,13 +40,17 @@ regionModel allRegion;
IOModel basicIO; //trackIO; //
probeModel off;
dataExchangeModel twoWayMPI;//twoWayFiles;//oneWayVTK;//
averagingModel dense;//dilute;//
clockModel standardClock;//off; //
smoothingModel off;
smoothingModel off; //constDiffSmoothing; //
//useDDTvoidfraction;
forceModels
(
@ -55,6 +59,8 @@ forceModels
//KochHillDrag
//MeiLift
//virtualMassForce
//gradPForce
//viscForce
Archimedes
);
@ -68,6 +74,13 @@ turbulenceModelType RASProperties;//LESProperties;//
//===========================================================================//
// sub-model properties
constDiffSmoothingProps
{
lowerLimit 0.0;
upperLimit 1e99;
smoothingLength 3e-4;
}
implicitCoupleProps
{
velFieldName "U";

View File

@ -30,7 +30,8 @@ vertices
blocks
(
hex (0 1 2 3 4 5 6 7) (20 20 20) simpleGrading (1 1 1)
//hex (0 1 2 3 4 5 6 7) (5 25 5) simpleGrading (1 1 1) // regular grid
hex (0 1 2 3 4 5 6 7) (25 25 25) simpleGrading (1 1 1) // irrregular grid
);
edges

View File

@ -50,7 +50,9 @@ fprintf('final position = %f m\n',X_(length(X_)))
% plot data
%====================================%
figure(1)
plot(t_,U_,t_sim,-U_sim(:,2))
plot(t_,U_, 'k--')
hold on
plot(t_sim,-U_sim(:,2),'rd-')
legend("analytical - Stokes","simulation - DiFelice?")
print('cfdemSolverPiso_settlingTestMPI.eps','-deps2')

View File

@ -72,6 +72,19 @@ solvers
tolerance 1e-05;
relTol 0;
}
voidfraction
{
solver PCG;
preconditioner DIC;
tolerance 1e-09;
relTol 1e-06;
}
Ksl
{
$voidfraction
}
}
PISO

View File

@ -49,7 +49,7 @@ fix zwalls2 all wall/gran/hooke/history primitive type 1 zplane 0.01
#fix bucket_wall all wall/gran/hertz/history 1 0 mesh/gran 1 cad1
#- create single partciles
create_atoms 1 single 0.05 0.04 0.046 units box
create_atoms 1 single 0.05 0.025 0.05 units box
set group all diameter 0.0001 density 3000
#cfd coupling

View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -24,6 +24,7 @@ machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true"
cleanCase="true"
postproc="false"
#--------------------------------------------------------------------------------#
@ -63,7 +64,7 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/etc/functions.sh #- include functions
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
@ -76,21 +77,17 @@ if [ $postproc == "true" ]
fi
#- clean up case
echo "deleting data at: $casePath :\n"
rm -r $casePath/CFD/0.*
rm -r $casePath/CFD/callgrind.*
rm -r $casePath/CFD/*.out
rm -r $casePath/CFD/log.*
rm -r $casePath/CFD/octave/octave-core
rm -r $casePath/CFD/VTK
rm -r $casePath/CFD/processor*
rm -r $casePath/CFD/couplingFiles/*
rm -r $casePath/DEM/post/*
rm -r $casePath/DEM/log.*
rm -r $casePath/CFD/probes
rm -r $casePath/CFD/lagrangian
rm -r $casePath/CFD/clockData
echo "done"
if [ $cleanCase == "true" ]
then
echo "deleting data at: $casePath :\n"
source $WM_PROJECT_DIR/bin/tools/CleanFunctions
cd $casePath/CFD
cleanCase
cd $casePath
rm -r $casePath/CFD/clockData
rm -r $casePath/DEM/post/*
echo "done"
fi
#- preserve post directory
echo "dummyfile" >> $casePath/DEM/post/dummy

View File

@ -40,6 +40,8 @@ regionModel allRegion;
IOModel basicIO;
probeModel off;
dataExchangeModel twoWayMPI;
averagingModel dense;//dilute;//

View File

@ -29,7 +29,8 @@ fprintf('final pressure drop = %f Pa\n',dpErgun)
%====================================%
% simulation data
%====================================%
path = '../probes/0/p';
%path = '../probes/0/p'; % 2.1.x
path = '../postProcessing/probes/0/p'; % 2.2.x
columns=3;
headerlines=5;
data = loaddata(path,columns,headerlines);
@ -70,7 +71,8 @@ Tp = 600;
Np = 1005;
lambda = 0.0256;
path = '../probes/0/T';
%path = '../probes/0/T'; % 2.1.x
path = '../postProcessing/probes/0/T'; % 2.2.x
columns=3;
headerlines=5;
data = loaddata(path,columns,headerlines);

View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/etc/functions.sh
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -70,7 +70,7 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/etc/functions.sh #- include functions
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
@ -97,6 +97,7 @@ rm -r $casePath/DEM/log.*
rm -r $casePath/CFD/log.*
rm -r $casePath/DEM/log.*
rm -r $casePath/CFD/probes
rm -r $casePath/CFD/postProcessing
rm -r $casePath/log_*
echo "done"