From cd614bf29968cae16b2cc49ad043ab0b48b14aa9 Mon Sep 17 00:00:00 2001 From: Thomas Lichtenegger Date: Mon, 1 Aug 2016 15:55:45 +0200 Subject: [PATCH] Updated tutorials. --- .../cfdemSolverPisoMS/ErgunTestMPI/CFD/0/U | 27 ------ .../ErgunTestMPI/CFD/constant/RASProperties | 25 ------ .../CFD/constant/couplingProperties | 2 +- .../CFD/constant/turbulenceProperties | 2 +- .../ErgunTestMPI/CFD/system/controlDict | 25 +----- .../CFD/constant/couplingProperties | 2 +- .../packedBedTemp/CFD/system/controlDict | 84 +------------------ 7 files changed, 7 insertions(+), 160 deletions(-) delete mode 100644 tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/RASProperties diff --git a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/0/U b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/0/U index 959b298e..275c16f4 100644 --- a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/0/U +++ b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/0/U @@ -23,35 +23,11 @@ boundaryField wall { - //type fixedValue; - //value uniform (0 0 0); type slip; } inlet { - /*type flowRateInletVelocity; - flowRate 0.001; - value uniform (0 0 0);*/ - -/* type fixedValue; - value uniform (0 0 0.1);*/ - - //type zeroGradient; - - /*// superficial velocity BC - type groovyBC; - variables "Usup=vector(0,0,2);alpha=voidfraction;tEnd=0.1;"; // should be used with zeroGradient voidfraction - valueExpression "((time() < tEnd) ? Usup/alpha*(time()/tEnd) : Usup/alpha)"; - value uniform (0 0 0);*/ - - /*// 2.0.x, ext - type timeVaryingUniformFixedValue; - fileName "steps_0p1s"; - outOfBounds clamp; - value uniform (0 0 0);*/ - - // 2.1.x type uniformFixedValue; uniformValue table ( @@ -62,9 +38,6 @@ boundaryField } outlet { - /*type fluxCorrectedVelocity; //inletOutlet; - value uniform (0 0 0); - inletValue uniform (0 0 0);*/ type zeroGradient; } } diff --git a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/RASProperties b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/RASProperties deleted file mode 100644 index daec1829..00000000 --- a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/RASProperties +++ /dev/null @@ -1,25 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object RASProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -RASModel laminar; - -turbulence off; - -printCoeffs on; - - -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/couplingProperties index 98d1e091..cc931b75 100644 --- a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/couplingProperties @@ -70,7 +70,7 @@ momCoupleModels implicitCouple ); -turbulenceModelType RASProperties;//LESProperties;// +turbulenceModelType "turbulenceProperties"; //===========================================================================// // sub-model properties diff --git a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/turbulenceProperties b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/turbulenceProperties index f6753662..9cfc50a3 100644 --- a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/turbulenceProperties +++ b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/constant/turbulenceProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RASModel; +simulationType laminar; // ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/system/controlDict b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/system/controlDict index 0831dcb2..5c6c2725 100644 --- a/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/system/controlDict +++ b/tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/system/controlDict @@ -52,8 +52,7 @@ maxCo 0.1; //libs ("libOpenFOAM.so" "libgroovyBC.so"); functions -( - +{ probes { type probes; @@ -93,25 +92,5 @@ functions outputControl timeStep;//outputTime; outputInterval 1; } - - /*pressureDrop - { - type patchAverage; - functionObjectLibs - ( - "libsimpleFunctionObjects.so" - ); - verbose true; - patches - ( - inlet - outlet - ); - fields - ( - p - ); - factor 1; - }*/ -); +}; // ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/couplingProperties b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/couplingProperties index 8bb90025..e935ef42 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/couplingProperties @@ -62,7 +62,7 @@ momCoupleModels implicitCouple ); -turbulenceModelType RASProperties;//LESProperties;// +turbulenceModelType "turbulenceProperties"; //===========================================================================// // sub-model properties diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict index c21bc0ac..77da5f4e 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict @@ -54,8 +54,7 @@ maxDeltaT 1; //libs ( "libgroovyBC.so" ); functions -( - +{ probes { type probes; @@ -76,84 +75,5 @@ functions outputControl timeStep;//outputTime; outputInterval 1; } - -/* -// simpleFunctionObjects - heatFlux - { - type patchHeatFlux; - functionObjectLibs - ( - "libsimpleFunctionObjects.so" - ); - verbose true; - patches - ( - inlet - outlet - ); - fields // name of temp field - ( - T - ); - cp 1007; // cp in [J/(kg*K)] - factor 1.188; // density for incomp solvers! - } - - massFlux - { - type patchMassFlow; - functionObjectLibs - ( - "libsimpleFunctionObjects.so" - ); - verbose true; - patches - ( - inlet - outlet - ); - factor 1.188; // density for incomp solvers! - } - - pressureDrop - { - type patchAverage; - functionObjectLibs - ( - "libsimpleFunctionObjects.so" - ); - verbose true; - patches - ( - inlet - outlet - ); - fields - ( - p - ); - factor 1; - } - - T - { - type patchAverage; - functionObjectLibs - ( - "libsimpleFunctionObjects.so" - ); - verbose true; - patches - ( - inlet - outlet - ); - fields // name of temp field - ( - T - ); - factor 1; - }*/ -); +}; // ************************************************************************* //