diff --git a/benchmarks/rotatingDrum_1mParticles/caseSetup/interaction b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/caseSetup/interaction similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/caseSetup/interaction rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/caseSetup/interaction diff --git a/benchmarks/rotatingDrum_1mParticles/caseSetup/shapes b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/caseSetup/shapes similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/caseSetup/shapes rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/caseSetup/shapes diff --git a/benchmarks/rotatingDrum_1mParticles/cleanThisCase b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/cleanThisCase similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/cleanThisCase rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/cleanThisCase diff --git a/benchmarks/rotatingDrum_1mParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/runThisCase similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/runThisCase rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/runThisCase diff --git a/benchmarks/rotatingDrum_1mParticles/settings/domainDict b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/domainDict similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/settings/domainDict rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/domainDict diff --git a/benchmarks/rotatingDrum_1mParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/geometryDict similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/settings/geometryDict rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/geometryDict diff --git a/benchmarks/rotatingDrum_1mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/particlesDict similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/settings/particlesDict rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/particlesDict diff --git a/benchmarks/rotatingDrum_1mParticles/settings/settingsDict b/benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/settingsDict similarity index 100% rename from benchmarks/rotatingDrum_1mParticles/settings/settingsDict rename to benchmarks/rotatingDrum/rotatingDrum_1mParticles/settings/settingsDict diff --git a/benchmarks/rotatingDrum_250kParticles/caseSetup/interaction b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/caseSetup/interaction similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/caseSetup/interaction rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/caseSetup/interaction diff --git a/benchmarks/rotatingDrum_250kParticles/caseSetup/shapes b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/caseSetup/shapes similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/caseSetup/shapes rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/caseSetup/shapes diff --git a/benchmarks/rotatingDrum_250kParticles/cleanThisCase b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/cleanThisCase similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/cleanThisCase rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/cleanThisCase diff --git a/benchmarks/rotatingDrum_250kParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/runThisCase similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/runThisCase rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/runThisCase diff --git a/benchmarks/rotatingDrum_250kParticles/settings/domainDict b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/domainDict similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/settings/domainDict rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/domainDict diff --git a/benchmarks/rotatingDrum_250kParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/geometryDict similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/settings/geometryDict rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/geometryDict diff --git a/benchmarks/rotatingDrum_250kParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/particlesDict similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/settings/particlesDict rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/particlesDict diff --git a/benchmarks/rotatingDrum_250kParticles/settings/settingsDict b/benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/settingsDict similarity index 100% rename from benchmarks/rotatingDrum_250kParticles/settings/settingsDict rename to benchmarks/rotatingDrum/rotatingDrum_250kParticles/settings/settingsDict diff --git a/benchmarks/rotatingDrum_2mParticles/caseSetup/interaction b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/caseSetup/interaction similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/caseSetup/interaction rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/caseSetup/interaction diff --git a/benchmarks/rotatingDrum_2mParticles/caseSetup/shapes b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/caseSetup/shapes similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/caseSetup/shapes rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/caseSetup/shapes diff --git a/benchmarks/rotatingDrum_2mParticles/cleanThisCase b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/cleanThisCase similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/cleanThisCase rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/cleanThisCase diff --git a/benchmarks/rotatingDrum_2mParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/runThisCase similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/runThisCase rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/runThisCase diff --git a/benchmarks/rotatingDrum_2mParticles/settings/domainDict b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/domainDict similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/settings/domainDict rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/domainDict diff --git a/benchmarks/rotatingDrum_2mParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/geometryDict similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/settings/geometryDict rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/geometryDict diff --git a/benchmarks/rotatingDrum_2mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/particlesDict similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/settings/particlesDict rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/particlesDict diff --git a/benchmarks/rotatingDrum_2mParticles/settings/settingsDict b/benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/settingsDict similarity index 100% rename from benchmarks/rotatingDrum_2mParticles/settings/settingsDict rename to benchmarks/rotatingDrum/rotatingDrum_2mParticles/settings/settingsDict diff --git a/benchmarks/rotatingDrum_4mParticles/caseSetup/interaction b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/caseSetup/interaction similarity index 100% rename from benchmarks/rotatingDrum_4mParticles/caseSetup/interaction rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/caseSetup/interaction diff --git a/benchmarks/rotatingDrum_4MParticles/caseSetup/shapes b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/caseSetup/shapes old mode 100755 new mode 100644 similarity index 100% rename from benchmarks/rotatingDrum_4MParticles/caseSetup/shapes rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/caseSetup/shapes diff --git a/benchmarks/rotatingDrum_4MParticles/cleanThisCase b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/cleanThisCase similarity index 100% rename from benchmarks/rotatingDrum_4MParticles/cleanThisCase rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/cleanThisCase diff --git a/benchmarks/rotatingDrum_4MParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/runThisCase similarity index 100% rename from benchmarks/rotatingDrum_4MParticles/runThisCase rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/runThisCase diff --git a/benchmarks/rotatingDrum_4mParticles/settings/domainDict b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/domainDict similarity index 100% rename from benchmarks/rotatingDrum_4mParticles/settings/domainDict rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/domainDict diff --git a/benchmarks/rotatingDrum_4MParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/geometryDict similarity index 100% rename from benchmarks/rotatingDrum_4MParticles/settings/geometryDict rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/geometryDict diff --git a/benchmarks/rotatingDrum_4mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/particlesDict similarity index 100% rename from benchmarks/rotatingDrum_4mParticles/settings/particlesDict rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/particlesDict diff --git a/benchmarks/rotatingDrum_4mParticles/settings/settingsDict b/benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/settingsDict similarity index 100% rename from benchmarks/rotatingDrum_4mParticles/settings/settingsDict rename to benchmarks/rotatingDrum/rotatingDrum_4mParticles/settings/settingsDict diff --git a/benchmarks/rotatingDrum_500kParticles/caseSetup/interaction b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/caseSetup/interaction similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/caseSetup/interaction rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/caseSetup/interaction diff --git a/benchmarks/rotatingDrum_500kParticles/caseSetup/shapes b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/caseSetup/shapes similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/caseSetup/shapes rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/caseSetup/shapes diff --git a/benchmarks/rotatingDrum_4mParticles/cleanThisCase b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/cleanThisCase similarity index 100% rename from benchmarks/rotatingDrum_4mParticles/cleanThisCase rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/cleanThisCase diff --git a/benchmarks/rotatingDrum_4mParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/runThisCase similarity index 100% rename from benchmarks/rotatingDrum_4mParticles/runThisCase rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/runThisCase diff --git a/benchmarks/rotatingDrum_500kParticles/settings/domainDict b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/domainDict similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/settings/domainDict rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/domainDict diff --git a/benchmarks/rotatingDrum_500kParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/geometryDict similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/settings/geometryDict rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/geometryDict diff --git a/benchmarks/rotatingDrum_500kParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/particlesDict similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/settings/particlesDict rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/particlesDict diff --git a/benchmarks/rotatingDrum_500kParticles/settings/settingsDict b/benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/settingsDict similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/settings/settingsDict rename to benchmarks/rotatingDrum/rotatingDrum_500kParticles/settings/settingsDict diff --git a/benchmarks/rotatingDrum_6mParticles/caseSetup/interaction b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/caseSetup/interaction similarity index 100% rename from benchmarks/rotatingDrum_6mParticles/caseSetup/interaction rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/caseSetup/interaction diff --git a/benchmarks/rotatingDrum_4mParticles/caseSetup/shapes b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/caseSetup/shapes similarity index 91% rename from benchmarks/rotatingDrum_4mParticles/caseSetup/shapes rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/caseSetup/shapes index d08fdf86..0c0b3443 100644 --- a/benchmarks/rotatingDrum_4mParticles/caseSetup/shapes +++ b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/caseSetup/shapes @@ -10,6 +10,6 @@ fileFormat ASCII; names (glassBead); // names of shapes -diameters (0.003); // diameter of shapes +diameters (0.002); // diameter of shapes materials (glassMat); // material names for shapes diff --git a/benchmarks/rotatingDrum_500kParticles/cleanThisCase b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/cleanThisCase similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/cleanThisCase rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/cleanThisCase diff --git a/benchmarks/rotatingDrum_500kParticles/runThisCase b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/runThisCase similarity index 100% rename from benchmarks/rotatingDrum_500kParticles/runThisCase rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/runThisCase diff --git a/benchmarks/rotatingDrum_6mParticles/settings/domainDict b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/domainDict similarity index 100% rename from benchmarks/rotatingDrum_6mParticles/settings/domainDict rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/domainDict diff --git a/benchmarks/rotatingDrum_4mParticles/settings/geometryDict b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/geometryDict similarity index 100% rename from benchmarks/rotatingDrum_4mParticles/settings/geometryDict rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/geometryDict diff --git a/benchmarks/rotatingDrum_6mParticles/settings/particlesDict b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/particlesDict similarity index 100% rename from benchmarks/rotatingDrum_6mParticles/settings/particlesDict rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/particlesDict diff --git a/benchmarks/rotatingDrum_6mParticles/settings/settingsDict b/benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/settingsDict similarity index 100% rename from benchmarks/rotatingDrum_6mParticles/settings/settingsDict rename to benchmarks/rotatingDrum/rotatingDrum_8mParticles/settings/settingsDict diff --git a/benchmarks/rotatingDrum_4MParticles/caseSetup/interaction b/benchmarks/rotatingDrum_4MParticles/caseSetup/interaction deleted file mode 100755 index e99f1b34..00000000 --- a/benchmarks/rotatingDrum_4MParticles/caseSetup/interaction +++ /dev/null @@ -1,60 +0,0 @@ -/* -------------------------------*- C++ -*--------------------------------- *\ -| phasicFlow File | -| copyright: www.cemf.ir | -\* ------------------------------------------------------------------------- */ - -objectName interaction; -objectType dictionary; -fileFormat ASCII; - -/*---------------------------------------------------------------------------*/ - -materials (glassMat wallMat); // a list of materials names - -densities (2500.0 2500); // density of materials [kg/m3] - -contactListType sortedContactList; - -contactSearch -{ - method NBS; - - updateInterval 10; - - sizeRatio 1.1; - - cellExtent 0.55; - - adjustableBox Yes; -} - -model -{ - contactForceModel nonLinearLimited; - - rollingFrictionModel normal; - - /* - Property (glassMat-glassMat glassMat-wallMat - wallMat-wallMat); - */ - - Yeff (1.0e6 1.0e6 - 1.0e6); // Young modulus [Pa] - - Geff (0.8e6 0.8e6 - 0.8e6); // Shear modulus [Pa] - - nu (0.25 0.25 - 0.25); // Poisson's ratio [-] - - en (0.97 0.85 - 1.00); // coefficient of normal restitution - - mu (0.65 0.65 - 0.65); // dynamic friction - - mur (0.1 0.1 - 0.1); // rolling friction -} - diff --git a/benchmarks/rotatingDrum_4MParticles/caseSetup/particleInsertion b/benchmarks/rotatingDrum_4MParticles/caseSetup/particleInsertion deleted file mode 100755 index d1075bda..00000000 --- a/benchmarks/rotatingDrum_4MParticles/caseSetup/particleInsertion +++ /dev/null @@ -1,12 +0,0 @@ -/* -------------------------------*- C++ -*--------------------------------- *\ -| phasicFlow File | -| copyright: www.cemf.ir | -\* ------------------------------------------------------------------------- */ - -objectName particleInsertion; -objectType dicrionary; -fileFormat ASCII; - -active No; // is insertion active? - - diff --git a/benchmarks/rotatingDrum_4MParticles/settings/domainDict b/benchmarks/rotatingDrum_4MParticles/settings/domainDict deleted file mode 100755 index a54a7831..00000000 --- a/benchmarks/rotatingDrum_4MParticles/settings/domainDict +++ /dev/null @@ -1,46 +0,0 @@ -/* -------------------------------*- C++ -*--------------------------------- *\ -| phasicFlow File | -| copyright: www.cemf.ir | -\* ------------------------------------------------------------------------- */ -objectName domainDict; -objectType dictionary; -fileFormat ASCII; -/*---------------------------------------------------------------------------*/ -globalBox // Simulation domain: every particles that goes outside this domain will be deleted -{ - min (-0.2 -0.2 -0.0); - max ( 0.2 0.2 1.6); -} - -boundaries -{ - left - { - type exit; // other options: periodic, reflective - } - - right - { - type exit; // other options: periodic, reflective - } - - bottom - { - type exit; // other options: periodic, reflective - } - - top - { - type exit; // other options: periodic, reflective - } - - rear - { - type exit; // other options: periodic, reflective - } - - front - { - type exit; // other options: periodic, reflective - } -} diff --git a/benchmarks/rotatingDrum_4MParticles/settings/particlesDict b/benchmarks/rotatingDrum_4MParticles/settings/particlesDict deleted file mode 100644 index d24e6441..00000000 --- a/benchmarks/rotatingDrum_4MParticles/settings/particlesDict +++ /dev/null @@ -1,47 +0,0 @@ -/* -------------------------------*- C++ -*--------------------------------- *\ -| phasicFlow File | -| copyright: www.cemf.ir | -\* ------------------------------------------------------------------------- */ - -objectName particlesDict; -objectType dictionary; -fileFormat ASCII; - -setFields -{ - defaultValue - { - velocity realx3 (0 0 0); // linear velocity (m/s) - acceleration realx3 (0 0 0); // linear acceleration (m/s2) - rotVelocity realx3 (0 0 0); // rotational velocity (rad/s) - shapeName word glassBead; // name of the particle shape - } - - selectors - {} -} - -positionParticles -{ - method ordered; - - orderedInfo - { - diameter 0.003; // minimum space between centers of particles - - numPoints 4000000; // number of particles in the simulation - - axisOrder (z x y); // axis order for filling the space with particles - } - - regionType cylinder; // other options: box and sphere - - cylinderInfo // cylinder for positioning particles - { - p1 (0.0 0.0 0.01); // lower corner point of the box - - p2 (0.0 0.0 1.59); // upper corner point of the box - - radius 0.195; // radius of cylinder - } -} diff --git a/benchmarks/rotatingDrum_4MParticles/settings/settingsDict b/benchmarks/rotatingDrum_4MParticles/settings/settingsDict deleted file mode 100644 index 8a06568f..00000000 --- a/benchmarks/rotatingDrum_4MParticles/settings/settingsDict +++ /dev/null @@ -1,34 +0,0 @@ -/* -------------------------------*- C++ -*--------------------------------- *\ -| phasicFlow File | -| copyright: www.cemf.ir | -\* ------------------------------------------------------------------------- */ -objectName settingsDict; -objectType dictionary; -fileFormat ASCII; -/*---------------------------------------------------------------------------*/ -run rotatingDrum_4MParticles; - -dt 0.00001; // time step for integration (s) - -startTime 0; // start time for simulation - -endTime 10; // end time for simulation - -saveInterval 0.2; // time interval for saving the simulation - -timePrecision 5; // maximum number of digits for time folder - -g (0 -9.8 0); // gravity vector (m/s2) - -includeObjects (diameter); // save necessary (i.e., required) data on disk - -// exclude unnecessary data from saving on disk -excludeObjects (rVelocity.dy1 pStructPosition.dy1 pStructVelocity.dy1); - -integrationMethod AdamsBashforth2; // integration method - -writeFormat binary; // data writting format (ascii or binary) - -timersReport Yes; - -timersReportInterval 0.05; diff --git a/benchmarks/rotatingDrum_6mParticles/caseSetup/shapes b/benchmarks/rotatingDrum_6mParticles/caseSetup/shapes deleted file mode 100644 index d08fdf86..00000000 --- a/benchmarks/rotatingDrum_6mParticles/caseSetup/shapes +++ /dev/null @@ -1,15 +0,0 @@ -/* -------------------------------*- C++ -*--------------------------------- *\ -| phasicFlow File | -| copyright: www.cemf.ir | -\* ------------------------------------------------------------------------- */ - -objectName shapes; -objectType dictionary; -fileFormat ASCII; -/*---------------------------------------------------------------------------*/ - -names (glassBead); // names of shapes - -diameters (0.003); // diameter of shapes - -materials (glassMat); // material names for shapes diff --git a/benchmarks/rotatingDrum_6mParticles/cleanThisCase b/benchmarks/rotatingDrum_6mParticles/cleanThisCase deleted file mode 100755 index 8a0ab919..00000000 --- a/benchmarks/rotatingDrum_6mParticles/cleanThisCase +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -ls | grep -P "^(([0-9]+\.?[0-9]*)|(\.[0-9]+))$" | xargs -d"\n" rm -rf -rm -rf VTK - -#------------------------------------------------------------------------------ diff --git a/benchmarks/rotatingDrum_6mParticles/runThisCase b/benchmarks/rotatingDrum_6mParticles/runThisCase deleted file mode 100755 index c48d71fe..00000000 --- a/benchmarks/rotatingDrum_6mParticles/runThisCase +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -echo "\n<--------------------------------------------------------------------->" -echo "1) Creating particles" -echo "<--------------------------------------------------------------------->\n" -particlesPhasicFlow - -echo "\n<--------------------------------------------------------------------->" -echo "2) Creating geometry" -echo "<--------------------------------------------------------------------->\n" -geometryPhasicFlow - -echo "\n<--------------------------------------------------------------------->" -echo "3) Running the case" -echo "<--------------------------------------------------------------------->\n" -sphereGranFlow - - - - -#------------------------------------------------------------------------------ diff --git a/benchmarks/rotatingDrum_6mParticles/settings/geometryDict b/benchmarks/rotatingDrum_6mParticles/settings/geometryDict deleted file mode 100644 index 97c513c8..00000000 --- a/benchmarks/rotatingDrum_6mParticles/settings/geometryDict +++ /dev/null @@ -1,86 +0,0 @@ -/* -------------------------------*- C++ -*--------------------------------- *\ -| phasicFlow File | -| copyright: www.cemf.ir | -\* ------------------------------------------------------------------------- */ - -objectName geometryDict; -objectType dictionary; -fileFormat ASCII; - -motionModel rotatingAxis; // motion model: rotating object around an axis - -rotatingAxisInfo // information for rotatingAxisMotion motion model -{ - rotAxis - { - p1 (0.0 0.0 0.0); // first point for the axis of rotation - - p2 (0.0 0.0 1.0); // second point for the axis of rotation - - omega 1.256; // rotation speed (rad/s) => 12 rpm - } -} - -surfaces -{ - cylinder - { - type cylinderWall; // type of the wall - - p1 (0.0 0.0 0.0); // begin point of cylinder axis - - p2 (0.0 0.0 1.6); // end point of cylinder axis - - radius1 0.2; // radius at p1 - - radius2 0.2; // radius at p2 - - resolution 24; // number of divisions - - material wallMat; // material name of this wall - - motion rotAxis; // motion component name - } - - /* - This is a plane wall at the rear end of cylinder - */ - - wall1 - { - type planeWall; // type of the wall - - p1 (-0.2 -0.2 0.0); // first point of the wall - - p2 ( 0.2 -0.2 0.0); // second point - - p3 ( 0.2 0.2 0.0); // third point - - p4 (-0.2 0.2 0.0); // fourth point - - material wallMat; // material name of the wall - - motion rotAxis; // motion component name - } - - /* - This is a plane wall at the front end of cylinder - */ - - wall2 - { - type planeWall; // type of the wall - - p1 (-0.2 -0.2 1.6); // first point of the wall - - p2 ( 0.2 -0.2 1.6); // second point - - p3 ( 0.2 0.2 1.6); // third point - - p4 (-0.2 0.2 1.6); // fourth point - - material wallMat; // material name of the wall - - motion rotAxis; // motion component name - } -}