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

clean up whitespaces and comments

Browse Source
This commit is contained in:
Daniel Queteschiner
2019-09-19 12:28:50 +02:00
parent faba96f750
commit a854a89116
25 changed files with 242 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/Allrun.sh
View File

@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
#===================================================================# #===================================================================#
# allrun script for testcase as part of test routine # allrun script for testcase
# run settlingTest # M. Efe Kinaci - Sep 2018
# Christoph Goniva - Sept. 2010
#===================================================================# #===================================================================#
#- source CFDEM env vars #- source CFDEM env vars

19
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/couplingProperties
View File

@ -42,11 +42,11 @@ IOModel basicIO;
probeModel off; probeModel off;
dataExchangeModel twoWayMPI;//twoWayM2M;//twoWayFiles;//oneWayVTK;// dataExchangeModel twoWayMPI;
averagingModel dilute; //dense;//// averagingModel dilute; //dense;//
clockModel off;//standardClock;//off; clockModel off;//standardClock;//
smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; // smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; //
@ -126,7 +126,6 @@ reactantPerParticleProps
{ {
} }
SyamlalThermCondProps SyamlalThermCondProps
{ {
voidfractionFieldName "voidfraction"; voidfractionFieldName "voidfraction";
@ -213,11 +212,8 @@ GidaspowDragProps
velFieldName "U"; velFieldName "U";
granVelFieldName "Us"; granVelFieldName "Us";
voidfractionFieldName "voidfraction"; voidfractionFieldName "voidfraction";
interpolation true; //interpolation is on interpolation true;
phi 1; phi 1;
//implForceDEM true;
//implForceDEMaccumulated true;
//explicitCorr true;
} }
BeetstraDragProps BeetstraDragProps
@ -247,7 +243,6 @@ DEMbasedDragProps
DiFeliceDragProps DiFeliceDragProps
{ {
//verbose true;
velFieldName "U"; velFieldName "U";
voidfractionFieldName "voidfraction"; voidfractionFieldName "voidfraction";
granVelFieldName "Us"; granVelFieldName "Us";
@ -260,13 +255,7 @@ KochHillDragProps
velFieldName "U"; velFieldName "U";
voidfractionFieldName "voidfraction"; voidfractionFieldName "voidfraction";
interpolation false; interpolation false;
//forceSubModels
//(
// ImExCorr
//);
implForceDEM true; implForceDEM true;
//implForceDEMaccumulated true;
//explicitCorr true;
} }
RongDragProps RongDragProps

1
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/foam.dat
View File

@ -32,6 +32,7 @@ H2
Pr 0.76; Pr 0.76;
} }
} }
H2O H2O
{ {
specie specie

2
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/thermophysicalProperties
View File

@ -22,7 +22,7 @@ thermoType
transport const; //sutherland; //calcualtes viscosity as a function of temperature from Stuherland coefficient As and Ts transport const; //sutherland; //calcualtes viscosity as a function of temperature from Stuherland coefficient As and Ts
thermo hConst; //janaf; thermo hConst; //janaf;
equationOfState perfectGas; equationOfState perfectGas;
energy sensibleInternalEnergy; //sensibleEnthalpy; //uses enthaly in the solution energy sensibleInternalEnergy; //sensibleEnthalpy;
specie specie; specie specie;
} }

5
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict
View File

@ -53,7 +53,8 @@ maxDeltaT 0.1;
// ************************************************************************* // // ************************************************************************* //
libs ( libs
(
"libfieldFunctionObjects.so" "libfieldFunctionObjects.so"
); );
@ -67,7 +68,9 @@ functions
probes1 probes1
{ {
type probes; type probes;
functionObjectLibs ("libsampling.so"); functionObjectLibs ("libsampling.so");
#include "probesDict"; #include "probesDict";
} }

1
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/decomposeParDict
View File

@ -17,7 +17,6 @@ FoamFile
numberOfSubdomains 2; numberOfSubdomains 2;
//method scotch;
method simple; method simple;
simpleCoeffs simpleCoeffs

2
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/fvSchemes
View File

@ -33,7 +33,7 @@ divSchemes
{ {
default Gauss linear; default Gauss linear;
div(phi,U) Gauss limitedLinear 1; //Gauss linear; //Gauss limitedLinear 1; // //Gauss limitedLinearV 1; // div(phi,U) Gauss limitedLinear 1; //Gauss linear; //Gauss limitedLinearV 1;
div(phid,p) Gauss limitedLinear 1; //Gauss upwind; //Gauss limitedLinearV 1; div(phid,p) Gauss limitedLinear 1; //Gauss upwind; //Gauss limitedLinearV 1;
div(phi,K) Gauss limitedLinear 1; div(phi,K) Gauss limitedLinear 1;
div(phi,h) Gauss limitedLinear 1; //Gauss upwind; div(phi,h) Gauss limitedLinear 1; //Gauss upwind;

8
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/probesDict
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: 2.1.x | | \\ / O peration | Version: 2.1.x |
| \ / A nd | Web: www.OpenFOAM.org | | \\ / A nd | Web: www.OpenFOAM.org |
| \/ M anipulation | | | \\/ M anipulation | |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
FoamFile FoamFile
{ {

6
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/DEM/in.liggghts_init
View File

@ -24,7 +24,7 @@ fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3
fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 fix m4 all property/global coefficientFriction peratomtypepair 1 0.5
# pair style # pair style
pair_style gran model hertz tangential history # Hertzian without cohesion pair_style gran model hertz tangential history
pair_coeff * * pair_coeff * *
# timestep, gravity # timestep, gravity
@ -52,7 +52,7 @@ compute_modify thermo_temp dynamic yes
# insert the first particles so that dump is not empty # insert the first particles so that dump is not empty
run 1 run 1
dump dmp all custom 100 post/dump.liggghts_init id type x y z vx vy vz fx fy fz radius mass dump dmp all custom 100 ../DEM/post/dump.liggghts_init id type x y z vx vy vz fx fy fz radius mass
run 10 upto run 10 upto
write_restart post/restart/liggghts.restart write_restart ../DEM/post/restart/liggghts.restart

6
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/DEM/in.liggghts_run
View File

@ -1,4 +1,4 @@
# Pour granular particles into chute container, then induce flow # chemistry test case
log ../DEM/log.liggghts log ../DEM/log.liggghts
thermo_log ../DEM/post/thermo.txt thermo_log ../DEM/post/thermo.txt
@ -26,7 +26,7 @@ fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3
fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 fix m4 all property/global coefficientFriction peratomtypepair 1 0.5
# pair style # pair style
pair_style gran model hertz tangential history # Hertzian without cohesion pair_style gran model hertz tangential history
pair_coeff * * pair_coeff * *
# timestep, gravity # timestep, gravity
@ -88,6 +88,7 @@ variable time equal time
variable m1 equal mass[1] variable m1 equal mass[1]
variable rp equal radius[1] variable rp equal radius[1]
variable rho1 equal mass[1]/((4/3)*PI*radius[1]*radius[1]*radius[1]) variable rho1 equal mass[1]/((4/3)*PI*radius[1]*radius[1]*radius[1])
fix printmass all print ${WI} "${time} ${m1} ${rho1} ${rp}" file mass_rho_rad.txt title "#time mass rho rad_par" fix printmass all print ${WI} "${time} ${m1} ${rho1} ${rp}" file mass_rho_rad.txt title "#time mass rho rad_par"
# compute kinetic energy of particles to see if they are moving changing # compute kinetic energy of particles to see if they are moving changing
@ -198,4 +199,5 @@ thermo_modify lost ignore norm no
compute_modify thermo_temp dynamic yes compute_modify thermo_temp dynamic yes
dump dmp all custom 100 ../DEM/post/dump*.liggghts_run id type x y z vx vy vz fx fy fz radius mass f_fracRed[1] f_fracRed[2] f_fracRed[3] dump dmp all custom 100 ../DEM/post/dump*.liggghts_run id type x y z vx vy vz fx fy fz radius mass f_fracRed[1] f_fracRed[2] f_fracRed[3]
run 1 run 1

5
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/parCFDDEMrun.sh
View File

@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
#===================================================================# #===================================================================#
# allrun script for testcase as part of test routine # allrun script for testcase
# run settlingTest CFD part # M. Efe Kinaci - Sep 2018
# Christoph Goniva - Feb. 2011
#===================================================================# #===================================================================#
#- source CFDEM env vars #- source CFDEM env vars

5
tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/parDEMrun.sh
View File

@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
#===================================================================# #===================================================================#
# DEMrun script for ErgunTestMPI testcase # DEMrun script for testcase
# init ErgunTestMPI # M. Efe Kinaci - Sep 2018
# Christoph Goniva - July 2014
#===================================================================# #===================================================================#
#- source CFDEM env vars #- source CFDEM env vars