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

Merge branch 'feature/cfdemSolverRhoPimple' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/cfdemSolverRhoPimple

Browse Source
This commit is contained in:
ekinaci
2017-09-04 13:43:28 +02:00
parent 1e7fc386cc 557a9d3fad
commit ace0e60c8c
172 changed files with 2674 additions and 2142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tutorials/cfdemPostproc/fillCylinder/Allrun.sh
View File

@ -9,7 +9,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#- define variables
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
@ -73,7 +73,7 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
#foamToVTK
#- start paraview
echo ""
echo "trying to start paraview..."

4
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/Allrun.sh
View File

@ -1,12 +1,12 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest
# Christoph Goniva - July. 2011, mod by Alice Hager - July 2011
#===================================================================#
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#- define variables
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"

10
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest CFD part
# Christoph Goniva - Feb. 2011
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -32,11 +32,11 @@ parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $m
if [ $runOctave == "true" ]
then
cd $casePath/CFD/octave
octave postproc.m
evince pos_z_two_part_rec_glow.eps
evince vel_z_two_part_rec_glow.eps
evince pos_z_two_part_rec_glow.eps
evince vel_z_two_part_rec_glow.eps
#display pos_y_two_part_rec_glow.png &
#display vel_y_two_part_rec_glow.png &
fi

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

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run ErgunTestCG
# Christoph Goniva - Sept. 2010
#===================================================================#
@ -10,7 +10,7 @@
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
# check if mesh was built
if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then
@ -29,4 +29,4 @@ else
fi
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPiso ErgunTestCG CFD' -e "bash $casePath/parCFDDEMrun.sh"
gnome-terminal --title='cfdemSolverPiso ErgunTestCG CFD' -e "bash $casePath/parCFDDEMrun.sh"

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

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest CFD part
# Christoph Goniva - Feb. 2011
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -45,7 +45,7 @@ if [ $runOctave == "true" ]
#- run octave
octave totalPressureDrop.m
#- show plot
#- show plot
evince cfdemSolverPiso_ErgunTestCG.eps
#- copy log file to test harness
@ -67,8 +67,6 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
paraview

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

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

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

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest CFD part
# Christoph Goniva - Feb. 2011
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -45,7 +45,7 @@ if [ $runOctave == "true" ]
#- run octave
octave totalPressureDrop.m
#- show plot
#- show plot
evince cfdemSolverPiso_ErgunTestMPI.eps
#- copy log file to test harness
@ -67,8 +67,6 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
paraview

2
tutorials/cfdemSolverPiso/ErgunTestMPI/parDEMrun.sh
View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
echo "starting DEM run in parallel..."
#--------------------------------------------------------------------------------#

10
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# run ErgunTestMPI_cgs
# allrun script for testcase as part of test routine
# run ErgunTestMPI_cgs
# Christoph Goniva - March 2013
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -45,7 +45,7 @@ if [ $runOctave == "true" ]
#- run octave
octave totalPressureDrop.m
#- show plot
#- show plot
evince cfdemSolverPiso_ErgunTestMPI.eps
#- copy log file to test harness
@ -67,8 +67,6 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
paraview

2
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parDEMrun.sh
View File

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

10
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/Allrun.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest
# Christoph Goniva - Sept. 2010
#===================================================================#
@ -35,7 +35,7 @@ cp $casePath/CFD/system/controlDict_run $casePath/CFD/system/controlDict
#-------------------------------------------------------#
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPiso ErgunTestMPI_restart CFD' -e "bash $casePath/parCFDDEMrun.sh"
gnome-terminal --title='cfdemSolverPiso ErgunTestMPI_restart CFD' -e "bash $casePath/parCFDDEMrun.sh"
#- wait until sim has finished then run octave
echo "simulation finished? ...press enter to proceed"
@ -49,7 +49,7 @@ cp $casePath/CFD/constant/couplingProperties_restart $casePath/CFD/constant/coup
cp $casePath/CFD/system/controlDict_restart $casePath/CFD/system/controlDict
#- run parallel CFD-DEM in new terminal
#gnome-terminal --title='cfdemSolverPiso ErgunTestMPI_restart CFD' -e "bash $casePath/parCFDDEMrun.sh"
#gnome-terminal --title='cfdemSolverPiso ErgunTestMPI_restart CFD' -e "bash $casePath/parCFDDEMrun.sh"
bash $casePath/parCFDDEMrun.sh
@ -70,7 +70,7 @@ if [ $runOctave == "true" ]
#- run octave
octave totalPressureDrop.m
#- show plot
#- show plot
evince cfdemSolverPiso_ErgunTestMPI.eps
#- copy log file to test harness
@ -92,8 +92,6 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
paraview

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

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest CFD part
# Christoph Goniva - Feb. 2011
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables

2
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/parDEMrun.sh
View File

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

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

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest CFD part
# Christoph Goniva - Feb. 2011
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -42,7 +42,7 @@ if [ $runOctave == "true" ]
#- run octave
octave settlingVelocity.m
#- show plot
#- show plot
evince cfdemSolverPiso_settlingTestMPI.eps
#- copy log file to test harness
@ -64,8 +64,6 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
paraview

6
tutorials/cfdemSolverPisoMS/ErgunTestMPI/Allrun.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest
# Christoph Goniva - Sept. 2010
#===================================================================#
@ -22,7 +22,7 @@ else
fi
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPisoMS ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
gnome-terminal --title='cfdemSolverPisoMS ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
if [ $postproc == "true" ]
then
@ -38,7 +38,7 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
#foamToVTK #- serial run of foamToVTK
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
source $CFDEM_PROJECT_DIR/etc/functions.sh #- include functions
pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview

6
tutorials/cfdemSolverPisoMS/ErgunTestMPI/parCFDDEMrun.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest CFD part
# Christoph Goniva - Feb. 2011
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -42,7 +42,7 @@ rm cfdemSolverPisoMS_ErgunTestMPI.eps
#- run octave
octave totalPressureDrop.m
#- show plot
#- show plot
evince cfdemSolverPisoMS_ErgunTestMPI.eps
#------------------------------#

8
tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#===================================================================#
# allrun script for testcase as part of test routine
# allrun script for testcase as part of test routine
# run settlingTest CFD part
# Christoph Goniva - May. 2011
#===================================================================#
@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
#--------------------------------------------------------------------------------#
#- define variables
@ -43,7 +43,7 @@ if [ $runOctave == "true" ]
#- run octave
octave totalPressureDropAndNusselt.m
#- show plots
#- show plots
evince cfdemSolverPisoScalar_Nusselt.eps &
evince cfdemSolverPisoScalar_pressureDrop.eps
#------------------------------#
@ -70,8 +70,6 @@ if [ $postproc == "true" ]
#- get VTK data from CFD sim
cd $casePath/CFD
foamToVTK #- serial run of foamToVTK
#source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions
#pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK
#- start paraview
paraview

2
tutorials/cfdemSolverPisoScalar/packedBedTemp/parDEMrun.sh
View File

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

2
tutorials/cfdemSolverRhoPimple/ErgunTestMPI/parDEMrun.sh
View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
echo "starting DEM run in parallel..."
#--------------------------------------------------------------------------------#

2
tutorials/cfdemSolverRhoPimple/FinesColumn/parCFDDEMrun.sh
View File

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

2
tutorials/cfdemSolverRhoPimple/FinesColumn/parDEMrun.sh
View File

@ -10,7 +10,7 @@
. ~/.bashrc
#- include functions
source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
source $CFDEM_PROJECT_DIR/etc/functions.sh
echo "starting DEM run in parallel..."
#--------------------------------------------------------------------------------#

3
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/CFD/0/CO2
View File

@ -38,7 +38,8 @@ boundaryField
inlet
{
type zeroGradient;
type fixedValue;
value uniform 0.0;
}
outlet

3
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/CFD/0/O2
View File

@ -38,7 +38,8 @@ boundaryField
inlet
{
type zeroGradient;
type fixedValue;
value uniform 1.0;
}
outlet

3
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/CFD/0/T
View File

@ -38,7 +38,8 @@ boundaryField
inlet
{
type zeroGradient;
type fixedValue;
value uniform 1293.15;
}
outlet

3
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/CFD/0/rho
View File

@ -37,7 +37,8 @@ boundaryField
inlet
{
type zeroGradient;
type fixedValue;
value uniform 0.38;
}
outlet

28
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/CFD/system/fvOptions Normal file
View File

@ -0,0 +1,28 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 2.3.0 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvOptions;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
source1
{
type limitTemperature;
active yes;
limitTemperatureCoeffs
{
active yes;
selectionMode all;
Tmin 500;
Tmax 1500;
}
}

2
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/CFD/system/fvSchemes
View File

@ -29,7 +29,7 @@ divSchemes
{
default none;
div(phi,U) Gauss linear; //Gauss upwind;
div(phi,U) Gauss upwind;
div(phid,p) Gauss linear; //Gauss upwind;
div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;

6
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/CFD/system/fvSolution
View File

@ -50,7 +50,7 @@ solvers
pFinal
{
$p;
tolerance 1e-06;
tolerance 1e-07;
relTol 0;
}
@ -65,7 +65,7 @@ solvers
"(U|h|R|k|epsilon)Final"
{
$U;
tolerance 1e-05;
tolerance 1e-07;
relTol 0;
}
@ -77,7 +77,7 @@ solvers
"(Yi|CO2|O2)Final"
{
$Yi;
tolerance 1e-06;
tolerance 1e-08;
relTol 0;
}
}

2
tutorials/cfdemSolverRhoPimpleChem/Shrinking_particle_model/parCFDDEMrun.sh
View File

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