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

Hopefully fixing merge problems.

Browse Source
This commit is contained in:
Thomas Lichtenegger
2016-05-13 19:01:59 +02:00
parent 001225b5e4 8eb000e27b
commit bdd8244e82
8 changed files with 154 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/0/thDiff
View File

@ -1,8 +1,13 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
<<<<<<< HEAD
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
=======
| \\ / O peration | Version: 2.3.0 |
| \\ / A nd | Web: www.OpenFOAM.org |
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,32 +15,54 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
<<<<<<< HEAD
object thDiff;
=======
location "0";
object T;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
<<<<<<< HEAD
internalField uniform 0.0;
=======
internalField uniform 0;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
boundaryField
{
top
{
type fixedValue;
<<<<<<< HEAD
value uniform 6e-05;
=======
value uniform 2.3e-5;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
bottom
{
type fixedValue;
<<<<<<< HEAD
value uniform 6e-05;
=======
value uniform 2.3e-5;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
walls
{
type fixedValue;
<<<<<<< HEAD
value uniform 6e-05;
=======
value uniform 2.3e-5;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
symmetry
@ -49,6 +76,11 @@ boundaryField
}
}
<<<<<<< HEAD
// ************************************************************************* //
=======
// ************************************************************************* //
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80

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

@ -39,7 +39,7 @@ divSchemes
div(phi,Yi_h) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div((viscousTerm*dev2(grad(U).T()))) Gauss linear;
div((thermo:mu*dev(grad(U).T()))) Gauss linear;
div((thermo:mu*dev(grad(U).T()))) Gauss linear;
}
laplacianSchemes

20
tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/parCFDDEMrun.sh
View File

@ -81,14 +81,14 @@ if [ $postproc == "true" ]
fi
#- clean up case
echo "deleting data at: $casePath :\n"
source $WM_PROJECT_DIR/bin/tools/CleanFunctions
cd $casePath/CFD
cleanCase
rm -r $casePath/CFD/clockData
rm $casePath/DEM/post/*.*
touch $casePath/DEM/post/.gitignore
#echo "deleting data at: $casePath :\n"
#source $WM_PROJECT_DIR/bin/tools/CleanFunctions
#cd $casePath/CFD
#cleanCase
#rm -r $casePath/CFD/clockData
#rm $casePath/DEM/post/*.*
#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"
#rm $casePath/DEM/post/restart/liggghts.restartCFDEM*
#touch $casePath/DEM/post/restart/.gitignore
#echo "done"