clean up whitespaces and fix headers in tutorial files

This commit is contained in:
danielque
2023-08-22 13:05:35 +02:00
parent 62077cba88
commit d464002bc6
13 changed files with 104 additions and 105 deletions

View File

@ -24,27 +24,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | ========= |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
| \\ / O peration | Version: 1.6 | \\ / O peration | Website: https://openfoam.org
| \\ / A nd | Web: http://www.OpenFOAM.org | \\ / A nd | Version: 6
| \\/ M anipulation | | \\/ M anipulation |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
FoamFile FoamFile
{ {
@ -24,27 +24,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -24,27 +24,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -24,27 +24,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -24,27 +24,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -24,27 +24,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | ========= |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
| \\ / O peration | Version: 1.6 | \\ / O peration | Website: https://openfoam.org
| \\ / A nd | Web: www.OpenFOAM.org | \\ / A nd | Version: 6
| \\/ M anipulation | | \\/ M anipulation |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
FoamFile FoamFile
{ {
@ -25,27 +25,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | ========= |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
| \\ / O peration | Version: 1.6 | \\ / O peration | Website: https://openfoam.org
| \\ / A nd | Web: www.OpenFOAM.org | \\ / A nd | Version: 6
| \\/ M anipulation | | \\/ M anipulation |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
FoamFile FoamFile
{ {
@ -25,27 +25,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -24,27 +24,27 @@ boundaryField
{ {
type cyclic; type cyclic;
} }
top top
{ {
type cyclic; type cyclic;
} }
lr1 lr1
{ {
type cyclic; type cyclic;
} }
lr2 lr2
{ {
type cyclic; type cyclic;
} }
vh1 vh1
{ {
type cyclic; type cyclic;
} }
vh2 vh2
{ {
type cyclic; type cyclic;

View File

@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | ========= |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
| \\ / O peration | Version: dev | \\ / O peration | Website: https://openfoam.org
| \\ / A nd | Web: www.OpenFOAM.org | \\ / A nd | Version: 6
| \\/ M anipulation | | \\/ M anipulation |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
FoamFile FoamFile
{ {
@ -16,7 +16,7 @@ FoamFile
convertToMeters 1.0; convertToMeters 1.0;
vertices vertices
( (
(-0.004 -0.004 -0.016) (-0.004 -0.004 -0.016)
( 0.004 -0.004 -0.016) ( 0.004 -0.004 -0.016)
@ -30,7 +30,7 @@ vertices
blocks blocks
( (
hex (0 1 2 3 4 5 6 7) (32 32 128) hex (0 1 2 3 4 5 6 7) (32 32 128)
simpleGrading (1 1 1) simpleGrading (1 1 1)
); );
@ -42,38 +42,38 @@ boundary
( (
bottom bottom
{ {
type cyclic; type cyclic;
neighbourPatch top; neighbourPatch top;
faces ((0 3 2 1)); faces ((0 3 2 1));
} }
top top
{ {
type cyclic; type cyclic;
neighbourPatch bottom; neighbourPatch bottom;
faces ((4 5 6 7)); faces ((4 5 6 7));
} }
lr1 lr1
{ {
type cyclic; type cyclic;
neighbourPatch lr2; neighbourPatch lr2;
faces ((0 3 7 4)); faces ((0 3 7 4));
} }
lr2 lr2
{ {
type cyclic; type cyclic;
neighbourPatch lr1; neighbourPatch lr1;
faces ((1 5 6 2)); faces ((1 5 6 2));
} }
vh1 vh1
{ {
type cyclic; type cyclic;
neighbourPatch vh2; neighbourPatch vh2;
faces ((0 1 4 5)); faces ((0 1 4 5));
} }
vh2 vh2
{ {
type cyclic; type cyclic;
neighbourPatch vh1; neighbourPatch vh1;
faces ((2 6 7 3)); faces ((2 6 7 3));
} }
); );

View File

@ -1,10 +1,10 @@
################################################################################ ################################################################################
# brief: Periodic box - creating particle bed # # brief: Periodic box - creating particle bed #
# # # #
# Periodic box simulations of Geldart A particles (d=0.075mm, rho=1500kg/m3) # # Periodic box simulations of Geldart A particles (d=0.075mm, rho=1500kg/m3) #
# Cf. Radl, S. and Sundaresan, S., A drag model for filtered EulerLagrange # # Cf. Radl, S. and Sundaresan, S., A drag model for filtered EulerLagrange #
# simulations of clustered gasparticle suspensions. # # simulations of clustered gasparticle suspensions. #
# Chemical engineering science, (2014). # # Chem. Eng. Sci., (2014) #
# mass loading = 0.05 # # mass loading = 0.05 #
# authors: Behrad Esgandari # # authors: Behrad Esgandari #
# date: Aug 2023 # # date: Aug 2023 #
@ -50,10 +50,10 @@ neigh_modify delay 0
# define the material properties required for granular pair styles # define the material properties required for granular pair styles
# type 1 = particles with friction # type 1 = particles with friction
fix m1 all property/global youngsModulus peratomtype 1e6 fix m1 all property/global youngsModulus peratomtype 1e6
fix m2 all property/global poissonsRatio peratomtype 0.42 fix m2 all property/global poissonsRatio peratomtype 0.42
fix m3 all property/global coefficientRestitution peratomtypepair 1 0.9 fix m3 all property/global coefficientRestitution peratomtypepair 1 0.9
fix m4 all property/global coefficientFriction peratomtypepair 1 0.1 fix m4 all property/global coefficientFriction peratomtypepair 1 0.1
# specify contact model to use # specify contact model to use
pair_style gran model hertz tangential incremental_history limitForce on pair_style gran model hertz tangential incremental_history limitForce on

View File

@ -1,10 +1,10 @@
################################################################################ ################################################################################
# brief: Periodic box - run # # brief: Periodic box - run #
# # # #
# Periodic box simulations of Geldart A particles (d=0.075mm, rho=1500kg/m3) # # Periodic box simulations of Geldart A particles (d=0.075mm, rho=1500kg/m3) #
# Cf. Radl, S. and Sundaresan, S., A drag model for filtered EulerLagrange # # Cf. Radl, S. and Sundaresan, S., A drag model for filtered EulerLagrange #
# simulations of clustered gasparticle suspensions. # # simulations of clustered gasparticle suspensions. #
# Chemical engineering science, (2014). # # Chem. Eng. Sci., (2014) #
# mass loading = 0.05 # # mass loading = 0.05 #
# authors: Behrad Esgandari # # authors: Behrad Esgandari #
# date: Aug 2023 # # date: Aug 2023 #
@ -48,10 +48,10 @@ neigh_modify every 5 delay 0 check no
# define the material properties required for granular pair styles # define the material properties required for granular pair styles
# type 1 = particles with friction # type 1 = particles with friction
fix m1 all property/global youngsModulus peratomtype 1e6 fix m1 all property/global youngsModulus peratomtype 1e6
fix m2 all property/global poissonsRatio peratomtype 0.42 fix m2 all property/global poissonsRatio peratomtype 0.42
fix m3 all property/global coefficientRestitution peratomtypepair 1 0.9 fix m3 all property/global coefficientRestitution peratomtypepair 1 0.9
fix m4 all property/global coefficientFriction peratomtypepair 1 0.1 fix m4 all property/global coefficientFriction peratomtypepair 1 0.1
# specify contact model to use # specify contact model to use
pair_style gran model hertz tangential incremental_history limitForce on pair_style gran model hertz tangential incremental_history limitForce on
@ -84,7 +84,7 @@ compute_modify thermo_temp dynamic yes
# output particle properties (same frequency as CFD output) # output particle properties (same frequency as CFD output)
dump dmp all custom/vtk 10000 ../DEM/post/liggghts_run_*.vtk id type x y z vx vy vz & dump dmp all custom/vtk 10000 ../DEM/post/liggghts_run_*.vtk id type x y z vx vy vz &
fx fy fz omegax omegay omegaz radius fx fy fz omegax omegay omegaz radius
dump dmp2 all custom 10000 ../DEM/post/liggghts_run_*.run id type x y z vx vy vz & dump dmp2 all custom 10000 ../DEM/post/liggghts_run_*.run id type x y z vx vy vz &
fx fy fz omegax omegay omegaz radius fx fy fz omegax omegay omegaz radius

View File

@ -1,10 +1,9 @@
#!/bin/bash #!/bin/bash
#------------------------------------------------------------------------------
#===================================================================#
# DEM run script for periodic box testcase # DEM run script for periodic box testcase
# init periodic box # init periodic box
# Behrad Esgandari - August 2023 # Behrad Esgandari - August 2023
#===================================================================# #------------------------------------------------------------------------------
#- source CFDEM env vars #- source CFDEM env vars
. ~/.bashrc . ~/.bashrc
@ -13,7 +12,7 @@
source $CFDEM_PROJECT_DIR/etc/functions.sh source $CFDEM_PROJECT_DIR/etc/functions.sh
echo "starting DEM run in parallel..." echo "starting DEM run in parallel..."
#--------------------------------------------------------------------------------# #------------------------------------------------------------------------------
#- define variables #- define variables
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
logpath="$casePath" logpath="$casePath"
@ -23,7 +22,7 @@ solverName="in.liggghts_init"
nrProcs=32 nrProcs=32
machineFileName="none" machineFileName="none"
debugMode="off" debugMode="off"
#--------------------------------------------------------------------------------# #------------------------------------------------------------------------------
#- call function to run DEM case #- call function to run DEM case
parDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode parDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode