diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U index 5fc0e4e2..d809edc4 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U @@ -30,40 +30,16 @@ boundaryField inlet { - /*type flowRateInletVelocity; - flowRate 0.001; - value uniform (0 0 0);*/ - - /*type fixedValue; - value uniform (0 0 0.0001);*/ - - //type zeroGradient; - -/* type groovyBC; - variables "Uend=vector(0,0,0.02);tEnd=0.1;"; - valueExpression "((time() < tEnd) ? Uend/tEnd*time():Uend)"; - value uniform (0 0 0);*/ - - /*// 2.0.x, 1.6,ext - type timeVaryingUniformFixedValue; - fileName "steps_0p1s"; - outOfBounds clamp; - value uniform (0 0 0);*/ - - // 2.1.x type uniformFixedValue; uniformValue table ( (0.000 (0 0 0.002)) - (0.100 (0 0 0.020)) + (0.500 (0 0 0.020)) ); } outlet { - /*type fluxCorrectedVelocity; //inletOutlet; - value uniform (0 0 0); - inletValue uniform (0 0 0);*/ type zeroGradient; } } diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/p b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/p index 3a456746..fce46965 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/p +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/p @@ -16,7 +16,7 @@ FoamFile dimensions [0 2 -2 0 0 0 0]; -internalField uniform 1; +internalField uniform 0e0; boundaryField { @@ -29,13 +29,9 @@ boundaryField inlet { type zeroGradient; - //type fixedValue; - //value uniform 100000; } outlet { - //type zeroGradient; - type fixedValue; value $internalField; } diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties index 8f405355..de31de23 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties @@ -55,12 +55,12 @@ smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; // forceModels ( - //GidaspowDrag + GidaspowDrag //BeetstraDrag //DiFeliceDrag gradPForce viscForce - KochHillDrag + //KochHillDrag //DEMbasedDrag //RongDrag //Archimedes @@ -143,6 +143,7 @@ GidaspowDragProps { verbose true; velFieldName "U"; + granVelFieldName "Us"; voidfractionFieldName "voidfraction"; interpolation true; phi 1; diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m index 5a7d1a37..e0905ca6 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m @@ -9,7 +9,7 @@ rhoG = 10 % density in kg/m3 %path = '../probes/0/p'; % 2.1.x path = '../postProcessing/probes/0/p'; % 2.2.x columns=22; -headerlines=4; +headerlines=23;%4; data = loaddata(path,columns,headerlines); data=transpose(data); [x,y]=size(data) diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict index 05af8ef1..f63efff4 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 0.1; +endTime 0.5; deltaT 0.0005;