diff --git a/benchmarks/rotatingDrum/images/phasicFlow snapshot.png b/benchmarks/rotatingDrum/images/phasicFlow snapshot.png deleted file mode 100644 index c491146e..00000000 Binary files a/benchmarks/rotatingDrum/images/phasicFlow snapshot.png and /dev/null differ diff --git a/benchmarks/rotatingDrum/images/phasicFlow_snapshot.png b/benchmarks/rotatingDrum/images/phasicFlow_snapshot.png new file mode 100644 index 00000000..032800c1 Binary files /dev/null and b/benchmarks/rotatingDrum/images/phasicFlow_snapshot.png differ diff --git a/benchmarks/rotatingDrum/readme.md b/benchmarks/rotatingDrum/readme.md index ef791d1e..5ae068c3 100644 --- a/benchmarks/rotatingDrum/readme.md +++ b/benchmarks/rotatingDrum/readme.md @@ -15,7 +15,7 @@ This benchmark compares the performance of phasicFlow with a well-stablished com
- +

Figure 2. phasicFlow simulation snapshot

diff --git a/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/geometryDict index 72cc32f6..e2a0c797 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/geometryDict +++ b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/geometryDict @@ -35,7 +35,7 @@ surfaces radius2 0.2; // radius at p2 - resolution 24; // number of divisions + resolution 60; // number of divisions material wallMat; // material name of this wall diff --git a/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/particlesDict index 296dadce..f395b571 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/particlesDict +++ b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/particlesDict @@ -27,7 +27,7 @@ positionParticles orderedInfo { - distance 0.006; // minimum space between centers of particles + distance 0.004; // minimum space between centers of particles numPoints 1000000; // number of particles in the simulation diff --git a/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/geometryDict index 72cc32f6..e2a0c797 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/geometryDict +++ b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/geometryDict @@ -35,7 +35,7 @@ surfaces radius2 0.2; // radius at p2 - resolution 24; // number of divisions + resolution 60; // number of divisions material wallMat; // material name of this wall diff --git a/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/geometryDict index d9c08764..2b92233c 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/geometryDict +++ b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/geometryDict @@ -35,7 +35,7 @@ surfaces radius2 0.2; // radius at p2 - resolution 24; // number of divisions + resolution 60; // number of divisions material wallMat; // material name of this wall diff --git a/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/particlesDict index 60bb08b7..ca61762a 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/particlesDict +++ b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/particlesDict @@ -27,7 +27,7 @@ positionParticles orderedInfo { - distance 0.006; // minimum space between centers of particles + distance 0.003; // minimum space between centers of particles numPoints 2000000; // number of particles in the simulation diff --git a/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/geometryDict index 97c513c8..dae67a91 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/geometryDict +++ b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/geometryDict @@ -35,7 +35,7 @@ surfaces radius2 0.2; // radius at p2 - resolution 24; // number of divisions + resolution 60; // number of divisions material wallMat; // material name of this wall diff --git a/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/particlesDict index ce64e36f..fa4c3396 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/particlesDict +++ b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/particlesDict @@ -27,7 +27,7 @@ positionParticles orderedInfo { - distance 0.006; // minimum space between centers of particles + distance 0.003; // minimum space between centers of particles numPoints 4000000; // number of particles in the simulation diff --git a/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/geometryDict index 72cc32f6..e2a0c797 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/geometryDict +++ b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/geometryDict @@ -35,7 +35,7 @@ surfaces radius2 0.2; // radius at p2 - resolution 24; // number of divisions + resolution 60; // number of divisions material wallMat; // material name of this wall diff --git a/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/particlesDict index d8b37223..e0ef3e91 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/particlesDict +++ b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/particlesDict @@ -27,7 +27,7 @@ positionParticles orderedInfo { - distance 0.006; // minimum space between centers of particles + distance 0.005; // minimum space between centers of particles numPoints 500000; // number of particles in the simulation diff --git a/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/geometryDict index 97c513c8..dae67a91 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/geometryDict +++ b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/geometryDict @@ -35,7 +35,7 @@ surfaces radius2 0.2; // radius at p2 - resolution 24; // number of divisions + resolution 60; // number of divisions material wallMat; // material name of this wall diff --git a/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/particlesDict index 9b8a9fe4..362efa72 100644 --- a/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/particlesDict +++ b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/particlesDict @@ -27,7 +27,7 @@ positionParticles orderedInfo { - distance 0.006; // minimum space between centers of particles + distance 0.003; // minimum space between centers of particles numPoints 6000000; // number of particles in the simulation