diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/ReadMe.md b/tutorials/sphereGranFlow/RotaryAirLockValve/ReadMe.md
index b314b6ba..f68d5e89 100644
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/ReadMe.md
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/ReadMe.md
@@ -88,10 +88,10 @@ surfaces
```
## Defining particles
### Diameter and material of spheres
-In the `caseSetup/sphereShape` the diameter and the material name of the particles are defined.
+In the `caseSetup/shapes` the diameter and the material name of the particles are defined.
-in caseSetup/sphereShape file
+in caseSetup/shapes file
```C++
diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/interaction b/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/interaction
index 3defdb75..f25783ff 100644
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/interaction
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/interaction
@@ -6,30 +6,30 @@ objectName interaction;
objectType dicrionary;
fileFormat ASCII;
/*---------------------------------------------------------------------------*/
-materials (sphereMat wallMat); // a list of materials names
+materials (sphereMat wallMat); // a list of materials names
-densities (1000 2500); // density of materials [kg/m3]
+densities (1000 2500); // density of materials [kg/m3]
-contactListType sortedContactList;
+contactListType sortedContactList;
contactSearch
{
- method NBS; // method for broad search
+ method NBS; // method for broad search
- updateInterval 10;
+ updateInterval 10;
- sizeRatio 1.1;
+ sizeRatio 1.1;
- cellExtent 0.55;
+ cellExtent 0.55;
- adjustableBox Yes;
+ adjustableBox Yes;
}
model
{
- contactForceModel nonLinearNonLimited;
+ contactForceModel nonLinearNonLimited;
- rollingFrictionModel normal;
+ rollingFrictionModel normal;
/*
Property (sphereMat-sphereMat sphereMat-wallMat
@@ -43,19 +43,19 @@ model
Geff (0.8e6 0.8e6 // Shear modulus [Pa]
0.8e6);
- nu (0.25 0.25 // Poisson's ratio [-]
- 0.25);
+ nu (0.25 0.25 // Poisson's ratio [-]
+ 0.25);
- en (0.70 0.80 // coefficient of normal restitution
- 1.0);
+ en (0.70 0.80 // coefficient of normal restitution
+ 1.0);
- et (1.0 1.0 // coefficient of tangential restitution
- 1.0);
+ et (1.0 1.0 // coefficient of tangential restitution
+ 1.0);
- mu (0.3 0.35 // dynamic friction
- 0.35);
+ mu (0.3 0.35 // dynamic friction
+ 0.35);
- mur (0.1 0.1 // rolling friction
- 0.1);
+ mur (0.1 0.1 // rolling friction
+ 0.1);
}
diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/particleInsertion b/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/particleInsertion
index 06342b39..b12d8665 100644
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/particleInsertion
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/particleInsertion
@@ -6,9 +6,7 @@ objectName particleInsertion;
objectType dicrionary;
fileFormat ASCII;
/*---------------------------------------------------------------------------*/
-active yes; // is insertion active -> yes or no
-
-checkForCollision No; // is checked -> yes or no
+active yes; // is insertion active -> yes or no
/*
one region is considered for inserting particles.
@@ -16,32 +14,32 @@ checkForCollision No; // is checked
topRegion
{
- regionType box; // type of insertion region
+ regionType box; // type of insertion region
- timeControl simulationTime;
+ timeControl simulationTime;
- rate 4000; // insertion rate (particles/s)
+ rate 4000; // insertion rate (particles/s)
- startTime 0; // Start time of Particles insertion (s)
+ startTime 0; // Start time of Particles insertion (s)
- endTime 7; // End time of Particles insertion (s)
+ endTime 7; // End time of Particles insertion (s)
- insertionInterval 0.025; // Time Interval between each insertion (s)
+ insertionInterval 0.025; // Time Interval between each insertion (s)
- boxInfo // Coordinates of BoxRegion (m,m,m)
+ boxInfo // Coordinates of BoxRegion (m,m,m)
{
- min ( 0.48 0.58 0.01 ); // (m,m,m)
+ min ( 0.48 0.58 0.01 ); // (m,m,m)
- max ( 0.64 0.59 0.05 ); // (m,m,m)
+ max ( 0.64 0.59 0.05 ); // (m,m,m)
}
setFields
{
- velocity realx3 (0.0 -0.6 0.0); // initial velocity of inserted particles
+ velocity realx3 (0.0 -0.6 0.0); // initial velocity of inserted particles
}
mixture
{
- sphere 1;
+ sphere 1;
}
}
diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/shapes b/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/shapes
index a5e990d0..fa676375 100644
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/shapes
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/caseSetup/shapes
@@ -6,8 +6,8 @@ objectName particleInsertion;
objectType dicrionary;
fileFormat ASCII;
/*---------------------------------------------------------------------------*/
-names (sphere); // names of shapes
+names (sphere); // names of shapes
-diameters (0.005); // diameter of shapes
+diameters (0.005); // diameter of shapes
-materials (sphereMat); // material names for shapes
+materials (sphereMat); // material names for shapes
diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/domainDict b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/domainDict
index f494d822..818757f4 100755
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/domainDict
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/domainDict
@@ -8,30 +8,13 @@ fileFormat ASCII;
/*---------------------------------------------------------------------------*/
globalBox // Simulation domain: every particles that goes outside this domain will be deleted
{
- min (0.397538 0.178212 0.00);
+ min (0.397538 0.178212 0.00);
- max (0.725537 0.600214 0.06);
-}
-
-decomposition
-{
- direction z;
+ max (0.725537 0.600214 0.06);
}
boundaries
{
-
-
- neighborListUpdateInterval 50; /* Determines how often (how many iterations) do you want to
-
- rebuild the list of particles in the neighbor list
-
- of all boundaries in the simulation domain */
-
- updateInterval 10; // Determines how often do you want to update the new changes in the boundary
-
- neighborLength 0.004; // The distance from the boundary plane within which particles are marked to be in the boundary list
-
left
{
type exit; // other options: periodict, reflective
diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/geometryDict b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/geometryDict
index 8d1a515e..f4b737c3 100644
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/geometryDict
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/geometryDict
@@ -6,21 +6,21 @@ objectName geometryDict;
objectType dictionary;
fileFormat ASCII;
/*---------------------------------------------------------------------------*/
-motionModel rotatingAxis; // motion model: rotating object around an axis
+motionModel rotatingAxis; // motion model: rotating object around an axis
-rotatingAxisInfo // information for rotatingAxisMotion motion model
+rotatingAxisInfo // information for rotatingAxisMotion motion model
{
rotAxis
{
- p1 (0.561547 0.372714 0.000); // first point for the axis of rotation
+ p1 (0.561547 0.372714 0.000); // first point for the axis of rotation
- p2 (0.561547 0.372714 0.010); // second point for the axis of rotation
+ p2 (0.561547 0.372714 0.010); // second point for the axis of rotation
- omega 2.1; // rotation speed (rad/s)
+ omega 2.1; // rotation speed (rad/s)
- startTime 1.25; // Start time of Geometry Rotating (s)
+ startTime 1.25; // Start time of Geometry Rotating (s)
- endTime 7; // End time of Geometry Rotating (s)
+ endTime 7; // End time of Geometry Rotating (s)
}
}
@@ -28,24 +28,24 @@ surfaces
{
gear
{
- type stlWall; // type of the wall
+ type stlWall; // type of the wall
- file gear.stl; // file name in stl folder
+ file gear.stl; // file name in stl folder
- material wallMat; // material name of this wall
+ material wallMat; // material name of this wall
- motion rotAxis; // motion component name
+ motion rotAxis; // motion component name
}
surfaces
{
- type stlWall; // type of the wall
+ type stlWall; // type of the wall
- file surfaces.stl; // file name in stl folder
+ file surfaces.stl; // file name in stl folder
- material wallMat; // material name of this wall
+ material wallMat; // material name of this wall
- motion none; // motion component name
+ motion none; // motion component name
}
}
diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/particlesDict b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/particlesDict
index 9d35b6f7..29bf3bcb 100644
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/particlesDict
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/particlesDict
@@ -16,28 +16,28 @@ setFields
defaultValue
{
- velocity realx3 (0 0 0); // linear velocity (m/s)
+ velocity realx3 (0 0 0); // linear velocity (m/s)
- acceleration realx3 (0 0 0); // linear acceleration (m/s2)
+ acceleration realx3 (0 0 0); // linear acceleration (m/s2)
- rVelocity realx3 (0 0 0); // rotational velocity (rad/s)
+ rVelocity realx3 (0 0 0); // rotational velocity (rad/s)
- shapeName word sphere; // name of the particle shape
+ shapeName word sphere; // name of the particle shape
}
selectors
{
shapeAssigne
{
- selector stridedRange; // other options: box, cylinder, sphere, randomPoints
+ selector stridedRange; // other options: box, cylinder, sphere, randomPoints
stridedRangeInfo
{
- begin 0; // begin index of points
+ begin 0; // begin index of points
- end 50000; // end index of points
+ end 50000; // end index of points
- stride 3; // stride for selector
+ stride 3; // stride for selector
}
fieldValue // fields that the selector is applied to
@@ -50,25 +50,5 @@ setFields
positionParticles // positions particles
{
- method ordered; // other options: random and empty
-
- orderedInfo
- {
- diameter 0.005; // diameter of particles
-
- numPoints 50000; // 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 information for positioning particles
- {
- p1 (0.0 0.0 0.003); // begin point of cylinder axis
-
- p2 (0.0 0.0 0.22); // end point of cylinder axis
-
- radius 0.117; // radius of cylinder
- }
+ method empty; // other options: random and ordered
}
diff --git a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/settingsDict b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/settingsDict
index 4ec1e0fb..d7a771cd 100644
--- a/tutorials/sphereGranFlow/RotaryAirLockValve/settings/settingsDict
+++ b/tutorials/sphereGranFlow/RotaryAirLockValve/settings/settingsDict
@@ -6,19 +6,19 @@ objectName geometryDict;
objectType dictionary;
fileFormat ASCII;
/*---------------------------------------------------------------------------*/
-run rotatingAirLockValve;
+run RotaryAirLockValve;
-dt 0.00001; // time step for integration (s)
+dt 0.00001; // time step for integration (s)
-startTime 0; // start time for simulation
+startTime 0; // start time for simulation
-endTime 7; // end time for simulation
+endTime 7; // end time for simulation
-saveInterval 0.05; // time interval for saving the simulation
+saveInterval 0.05; // time interval for saving the simulation
-timePrecision 5; // maximum number of digits for time folder
+timePrecision 5; // maximum number of digits for time folder
-g (0 -9.8 0); // gravity vector (m/s2)
+g (0 -9.8 0); // gravity vector (m/s2)
// save necessary (i.e., required) data on disk
includeObjects (diameter mass);
@@ -26,11 +26,11 @@ includeObjects (diameter mass);
// exclude unnecessary data from saving on disk
excludeObjects (rVelocity.dy1 pStructPosition.dy1 pStructVelocity.dy1);
-integrationMethod AdamsBashforth2;
+integrationMethod AdamsBashforth2;
-writeFormat ascii; // data writting format (ascii or binary)
+writeFormat ascii; // data writting format (ascii or binary)
-timersReport Yes; // report timers: Yes or No
+timersReport Yes; // report timers: Yes or No
-timersReportInterval 0.1; // time interval for reporting timers
+timersReportInterval 0.1; // time interval for reporting timers