Date: Thu, 30 Mar 2023 15:07:45 -0700
Subject: [PATCH 25/27] CLI::Timer renamed to remove compiler errors
---
doc/Doxyfile | 5 +++--
doc/mdDocs/howToBuild.md | 8 +++++---
doc/mdDocs/howToUsePhasicFlow.md | 5 +++++
.../commandLine/CLI/{Timer.hpp => cliTimer.hpp} | 12 ++++++------
tutorials/sphereGranFlow/rotatingDrumSmall/README.md | 1 +
5 files changed, 20 insertions(+), 11 deletions(-)
create mode 100644 doc/mdDocs/howToUsePhasicFlow.md
rename src/phasicFlow/commandLine/CLI/{Timer.hpp => cliTimer.hpp} (91%)
diff --git a/doc/Doxyfile b/doc/Doxyfile
index e9ba8098..92592451 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -822,7 +822,8 @@ WARN_LOGFILE =
INPUT = $(pFlow_PROJECT_DIR)/src \
$(pFlow_PROJECT_DIR)/utilities \
$(pFlow_PROJECT_DIR)/solvers \
- mdDocs
+ mdDocs \
+ $(pFlow_PROJECT_DIR)/tutorials
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -866,7 +867,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.
-EXCLUDE = $(pFlow_PROJECT_DIR)/src/phasicFlow/commandLine
+EXCLUDE = $(pFlow_PROJECT_DIR)/src/phasicFlow/commandLine/CLI
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/doc/mdDocs/howToBuild.md b/doc/mdDocs/howToBuild.md
index 7fbd8162..ce979692 100644
--- a/doc/mdDocs/howToBuild.md
+++ b/doc/mdDocs/howToBuild.md
@@ -123,17 +123,19 @@ After building, `bin`, `include`, and `lib` folders will be created in `~/Phasic
**note 1**: When compiling the code in parallel, you need to have enough RAM on your computer. As a rule, you need 1 GB free RAM per each processor in your computer for compiling in parallel.
You may want to use fewer number of cores on your computer by using the following command:
+
`$ make install -j 3`
-the above command uses only 3 cores for compiling.
+
+the above command only uses 3 cores for compiling.
**note 2**: By default PhasicFlow is compiled with **double** as floating point variable. You can compile it with **float**. Just in the command line of camke added `-DpFlow_Build_Double=Off` flag to compile it with float. For example if you are building for cuda, you can enter the following command:
-`$ cmake ../ -DpFlow_Build_Cuda=On --DpFlow_Build_Double=Off`
+`$ cmake ../ -DpFlow_Build_Cuda=On -DpFlow_Build_Double=Off`
### Step 6: Testing
In the current terminal or a new terminal enter the following command:
-`$ ~checkPhasicFlow`
+`$ checkPhasicFlow`
This command shows the host and device environments and software version. If PhasicFlow was build correctly, you would get the following output:
```
diff --git a/doc/mdDocs/howToUsePhasicFlow.md b/doc/mdDocs/howToUsePhasicFlow.md
new file mode 100644
index 00000000..ca8e69db
--- /dev/null
+++ b/doc/mdDocs/howToUsePhasicFlow.md
@@ -0,0 +1,5 @@
+# How to use PhasicFlow {#howToUsePhasicFlow}
+Here you will learn how to use PhasicFlow to setup a granular flow simulation. The inputs for simulation are supplied through some text-based files, called file dictionary, located in two folders: `settings` and `caseSetup`. These folders are located under the root case directory.
+All the commands are performed through terminal in which the current working directory is root case directory (you see `settings` and `caseSetup` folders when `ls` command is entered). The states of geometry and particles are stored in time folders with names that represent the time. When simulation is finished, one case use post-processing tool pFlowToVTK to convert the stored results in the time folder into VTK file format. The VTK file format can be read by Paraview.
+A set of tutorials with detailed descriptions are provided to show you how to use PhasicFlow for various granular flow problems. Here is a list of them.
+* [Small rotating drum] (@ref rotatingDrumSmall)
diff --git a/src/phasicFlow/commandLine/CLI/Timer.hpp b/src/phasicFlow/commandLine/CLI/cliTimer.hpp
similarity index 91%
rename from src/phasicFlow/commandLine/CLI/Timer.hpp
rename to src/phasicFlow/commandLine/CLI/cliTimer.hpp
index 429ca026..d345b4bf 100644
--- a/src/phasicFlow/commandLine/CLI/Timer.hpp
+++ b/src/phasicFlow/commandLine/CLI/cliTimer.hpp
@@ -22,7 +22,7 @@
namespace CLI {
/// This is a simple timer with pretty printing. Creating the timer starts counting.
-class Timer {
+class cliTimer {
protected:
/// This is a typedef to make clocks easier to use
using clock = std::chrono::steady_clock;
@@ -57,7 +57,7 @@ class Timer {
public:
/// Standard constructor, can set title and print function
- explicit Timer(std::string title = "Timer", time_print_t time_print = Simple)
+ explicit cliTimer(std::string title = "cliTimer", time_print_t time_print = Simple)
: title_(std::move(title)), time_print_(std::move(time_print)), start_(clock::now()) {}
/// Time a function by running it multiple times. Target time is the len to target.
@@ -111,17 +111,17 @@ class Timer {
std::string to_string() const { return time_print_(title_, make_time_str()); }
/// Division sets the number of cycles to divide by (no graphical change)
- Timer &operator/(std::size_t val) {
+ cliTimer &operator/(std::size_t val) {
cycles = val;
return *this;
}
};
/// This class prints out the time upon destruction
-class AutoTimer : public Timer {
+class AutoTimer : public cliTimer {
public:
/// Reimplementing the constructor is required in GCC 4.7
- explicit AutoTimer(std::string title = "Timer", time_print_t time_print = Simple) : Timer(title, time_print) {}
+ explicit AutoTimer(std::string title = "cliTimer", time_print_t time_print = Simple) : cliTimer(title, time_print) {}
// GCC 4.7 does not support using inheriting constructors.
/// This destructor prints the string
@@ -131,4 +131,4 @@ class AutoTimer : public Timer {
} // namespace CLI
/// This prints out the time if shifted into a std::cout like stream.
-inline std::ostream &operator<<(std::ostream &in, const CLI::Timer &timer) { return in << timer.to_string(); }
+inline std::ostream &operator<<(std::ostream &in, const CLI::cliTimer &timer) { return in << timer.to_string(); }
diff --git a/tutorials/sphereGranFlow/rotatingDrumSmall/README.md b/tutorials/sphereGranFlow/rotatingDrumSmall/README.md
index 300b61d8..60d0ad55 100644
--- a/tutorials/sphereGranFlow/rotatingDrumSmall/README.md
+++ b/tutorials/sphereGranFlow/rotatingDrumSmall/README.md
@@ -1,3 +1,4 @@
+# Simulating a small rotating drum {#rotatingDrumSmall}
## Problem definition
The problem is to simulate a rotating drum with the diameter 0.24 m and the length 0.1 m rotating at 11.6 rpm. It is filled with 30,000 4-mm spherical particles. The timestep for integration is 0.00001 s.
From c3a729e2d35c0e8a0e4b3400303868d1a21efd57 Mon Sep 17 00:00:00 2001
From: Hamidreza Norouzi
Date: Fri, 31 Mar 2023 08:21:24 -0700
Subject: [PATCH 26/27] tote blender corrected
---
.../toteblender/caseSetup/interaction | 49 +++--
.../toteblender/caseSetup/particleInsertion | 4 +-
.../toteblender/caseSetup/sphereShape | 9 +-
.../toteblender/settings/geometryDict | 195 ++++++++++++------
.../toteblender/settings/particlesDict | 57 ++---
.../toteblender/settings/settingsDict | 19 +-
6 files changed, 217 insertions(+), 116 deletions(-)
diff --git a/tutorials/sphereGranFlow/toteblender/caseSetup/interaction b/tutorials/sphereGranFlow/toteblender/caseSetup/interaction
index 6dfdc46d..6b4847dc 100644
--- a/tutorials/sphereGranFlow/toteblender/caseSetup/interaction
+++ b/tutorials/sphereGranFlow/toteblender/caseSetup/interaction
@@ -5,8 +5,10 @@
objectName interaction;
objectType dicrionary;
/* ------------------------------------------------------------------------- */
+
// a list of materials names
materials (solidProperty);
+
// density of materials [kg/m3]
densities (1000.0);
@@ -14,47 +16,60 @@ contactListType sortedContactList;
model
{
- contactForceModel nonLinearNonLimited;
- rollingFrictionModel normal;
+ contactForceModel nonLinearNonLimited;
+
+ rollingFrictionModel normal;
+
/*
Property (solidProperty-solidProperty);
*/
-// Young modulus [Pa]
+
+ // Young modulus [Pa]
Yeff (1.0e6);
-// Shear modulus [Pa]
+
+ // Shear modulus [Pa]
Geff (0.8e6);
-// Poisson's ratio [-]
+
+ // Poisson's ratio [-]
nu (0.25);
-// coefficient of normal restitution
+
+ // coefficient of normal restitution
en (0.7);
-// coefficient of tangential restitution
+
+ // coefficient of tangential restitution
et (1.0);
-// dynamic friction
+
+ // dynamic friction
mu (0.3);
-// rolling friction
- mur (0.1);
-
+
+ // rolling friction
+ mur (0.1);
}
+
contactSearch
{
-// method for broad search particle-particle
+
+ // method for broad search particle-particle
method NBS;
-// method for broad search particle-wall
+
+ // method for broad search particle-wall
wallMapping cellMapping;
NBSInfo
{
- // each 20 timesteps, update neighbor list
+ // each 20 timesteps, update neighbor list
updateFrequency 20;
- // bounding box size to particle diameter (max)
+
+ // bounding box size to particle diameter (max)
sizeRatio 1.1;
}
cellMappingInfo
{
- // each 20 timesteps, update neighbor list
+ // each 20 timesteps, update neighbor list
updateFrequency 20;
- // bounding box for particle-wall search (> 0.5)
+
+ // bounding box for particle-wall search (> 0.5)
cellExtent 0.7;
}
diff --git a/tutorials/sphereGranFlow/toteblender/caseSetup/particleInsertion b/tutorials/sphereGranFlow/toteblender/caseSetup/particleInsertion
index d8f022c6..45ca817c 100644
--- a/tutorials/sphereGranFlow/toteblender/caseSetup/particleInsertion
+++ b/tutorials/sphereGranFlow/toteblender/caseSetup/particleInsertion
@@ -5,8 +5,10 @@
objectName particleInsertion;
objectType dicrionary;
/* ------------------------------------------------------------------------- */
+
// is insertion active?
-active no;
+active no;
+
// not implemented for yes
collisionCheck No;
diff --git a/tutorials/sphereGranFlow/toteblender/caseSetup/sphereShape b/tutorials/sphereGranFlow/toteblender/caseSetup/sphereShape
index 566fb339..b579d7c6 100644
--- a/tutorials/sphereGranFlow/toteblender/caseSetup/sphereShape
+++ b/tutorials/sphereGranFlow/toteblender/caseSetup/sphereShape
@@ -5,9 +5,12 @@
objectName sphereDict;
objectType sphereShape;
/* ------------------------------------------------------------------------- */
-// names of shapes
+
+// name of shapes
names (sphere1);
+
// diameter of shapes (m)
-diameters (0.004);
-// material names for shapes
+diameters (0.005);
+
+// material name for shapes
materials (solidProperty);
\ No newline at end of file
diff --git a/tutorials/sphereGranFlow/toteblender/settings/geometryDict b/tutorials/sphereGranFlow/toteblender/settings/geometryDict
index da9b22e8..b65854eb 100644
--- a/tutorials/sphereGranFlow/toteblender/settings/geometryDict
+++ b/tutorials/sphereGranFlow/toteblender/settings/geometryDict
@@ -5,154 +5,217 @@
objectName geometryDict;
objectType dictionary;
/* ------------------------------------------------------------------------- */
+
// motion model: rotating object around an axis
motionModel rotatingAxisMotion;
+
// information for rotatingAxisMotion motion model
rotatingAxisMotionInfo
{
axisOfRotation
{
p1 (-0.1 0.0 0.15); // first point for the axis of rotation
- p2 (0.1 0.0 0.15); // second point for the axis of rotation
+ p2 ( 0.1 0.0 0.15); // second point for the axis of rotation
+
omega 1.5708; // rotation speed ==> 15 rad/s
- // Start time of Geometry Rotating (s)
- startTime 1;
- // End time of Geometry Rotating (s)
+
+ // Start time of Geometry Rotating (s)
+ startTime 0.5;
+
+ // End time of Geometry Rotating (s)
endTime 9.5;
}
}
+
surfaces
{
- topGate
+
topGate
{
- // type of wall
+ // type of wall
type cylinderWall;
- // begin point of cylinder axis
- p1 (0.0 0.0 0.299);
- // end point of cylinder axis
- p2 (0.0 0.0 0.3);
- // radius at p1
+
+ // begin point of cylinder axis
+ p1 (0.0 0.0 0.3);
+
+ // end point of cylinder axis
+ p2 (0.0 0.0 0.301);
+
+ // radius at p1
radius1 0.03;
- // radius at p2
+
+ // radius at p2
radius2 0.0001;
- // material of wall
+
+ // material of wall
material solidProperty;
- // motion component name
+
+ // motion component name
motion axisOfRotation;
}
topCylinder
{
- // type of the wall
+ // type of the wall
type cylinderWall;
- // begin point of cylinder axis
+
+ // begin point of cylinder axis
p1 (0.0 0.0 0.28);
- // end point of cylinder axis
+
+ // end point of cylinder axis
p2 (0.0 0.0 0.3);
- // radius at p1
+
+ // radius at p1
radius1 0.03;
- // radius at p2
+
+ // radius at p2
radius2 0.03;
- // number of divisions
+
+ // number of divisions
resolution 36;
- // material name of this wall
+
+ // material name of this wall
material solidProperty;
- // motion component name
+
+ // motion component name
motion axisOfRotation;
}
coneShelltop
- {
- // type of the wall
+ {
+ // type of the wall
type cylinderWall;
- // begin point of cylinder axis
+
+ // begin point of cylinder axis
p1 (0.0 0.0 0.2);
- // end point of cylinder axis
+
+ // end point of cylinder axis
p2 (0.0 0.0 0.28);
- // radius at p1
+
+ // radius at p1
radius1 0.1;
- // radius at p2
+
+ // radius at p2
radius2 0.03;
- // number of divisions
+
+ // number of divisions
resolution 36;
- // material name of this wall
+
+ // material name of this wall
material solidProperty;
- // motion component name
+
+ // motion component name
motion axisOfRotation;
}
cylinderShell
{
- // type of the wall
+ // type of the wall
type cylinderWall;
- // begin point of cylinder axis
+
+ // begin point of cylinder axis
p1 (0.0 0.0 0.1);
- // end point of cylinder axis
+
+ // end point of cylinder axis
p2 (0.0 0.0 0.2);
- // radius at p1
+
+ // radius at p1
radius1 0.1;
- // radius at p2
+
+ // radius at p2
radius2 0.1;
- // number of divisions
+
+ // number of divisions
resolution 36;
- // material name of this wall
+
+ // material name of this wall
material solidProperty;
- // motion component name
+
+ // motion component name
motion axisOfRotation;
}
coneShelldown
{
- // type of the wall
+
+ // type of the wall
type cylinderWall;
- // begin point of cylinder axis
+
+ // begin point of cylinder axis
p1 (0.0 0.0 0.02);
- // end point of cylinder axis
+
+ // end point of cylinder axis
p2 (0.0 0.0 0.1);
- // radius at p1
+
+ // radius at p1
radius1 0.03;
- // radius at p2
+
+ // radius at p2
radius2 0.1;
- // number of divisions
+
+ // number of divisions
resolution 36;
- // material name of this wall
+
+ // material name of this wall
material solidProperty;
- // motion component name
+
+ // motion component name
motion axisOfRotation;
}
- /*
- This is a plane wall at the exit of silo
- */
- bottomCylinder
+ bottomCylinder
{
- // type of the wall
+ // type of the wall
type cylinderWall;
- // begin point of cylinder axis
+
+ // begin point of cylinder axis
p1 (0.0 0.0 0.0);
- // end point of cylinder axis
+
+ // end point of cylinder axis
p2 (0.0 0.0 0.02);
- // radius at p1
+
+ // radius at p1
radius1 0.03;
- // radius at p2
+
+ // radius at p2
radius2 0.03;
- // number of divisions
+
+ // number of divisions
resolution 36;
- // material name of this wall
+
+ // material name of this wall
material solidProperty;
- // motion component name
+
+ // motion component name
motion axisOfRotation;
}
+
exitGate
{
- type planeWall;
- p1 (-0.05 -0.05 0);
- p2 (-0.05 0.05 0);
- p3 ( 0.05 0.05 0);
- p4 (0.05 -0.05 0);
- material solidProperty;
- motion axisOfRotation;
+
+ // type of the wall
+ type cylinderWall;
+
+ // begin point of cylinder axis
+ p1 (0.0 0.0 -0.001);
+
+ // end point of cylinder axis
+ p2 (0.0 0.0 0.0);
+
+ // radius at p1
+ radius1 0.03;
+
+ // radius at p2
+ radius2 0.0001;
+
+ // number of divisions
+ resolution 36;
+
+ // material name of this wall
+ material solidProperty;
+
+ // motion component name
+ motion axisOfRotation;
}
}
diff --git a/tutorials/sphereGranFlow/toteblender/settings/particlesDict b/tutorials/sphereGranFlow/toteblender/settings/particlesDict
index f7e291c4..20f56227 100644
--- a/tutorials/sphereGranFlow/toteblender/settings/particlesDict
+++ b/tutorials/sphereGranFlow/toteblender/settings/particlesDict
@@ -12,16 +12,18 @@ setFields
These fields should always be defined for simulations with
spherical particles.
*/
-
defaultValue
{
-// linear velocity (m/s)
+ // linear velocity (m/s)
velocity realx3 (0 0 0);
-// linear acceleration (m/s2)
+
+ // linear acceleration (m/s2)
acceleration realx3 (0 0 0);
-// rotational velocity (rad/s)
- rVelocity realx3 (0 0 0);
-// name of the particle shape
+
+ // rotational velocity (rad/s)
+ rVelocity realx3 (0 0 0);
+
+ // name of the particle shape
shapeName word sphere1;
}
@@ -32,29 +34,36 @@ setFields
// positions particles
positionParticles
{
-// ordered positioning
- method positionOrdered;
-// maximum number of particles in the simulation
- maxNumberOfParticles 40000;
-// perform initial sorting based on morton code?
- mortonSorting Yes;
-// cylinder for positioning particles
+ // ordered positioning
+ method positionOrdered;
+
+ // maximum number of particles in the simulation
+ maxNumberOfParticles 25001;
+
+ // perform initial sorting based on morton code?
+ mortonSorting Yes;
+
+ // cylinder for positioning particles
cylinder
{
-// Coordinates of top cylinderRegion (m,m,m)
- p1 (0.05 0.0 0.12);
- p2 (0.05 0.0 0.22);
-// radius of cylinder
- radius 0.066;
+ // Coordinates of top cylinderRegion (m,m,m)
+ p1 (0.0 0.0 0.09);
+
+ p2 (0.0 0.0 0.21);
+
+ // radius of cylinder
+ radius 0.09;
}
positionOrderedInfo
{
-// minimum space between centers of particles
- diameter 0.003;
-// number of particles in the simulation
- numPoints 20000;
-// axis order for filling the space with particles
- axisOrder (z y x);
+ // minimum space between centers of particles
+ diameter 0.005;
+
+ // number of particles in the simulation
+ numPoints 24000;
+
+ // axis order for filling the space with particles
+ axisOrder (x y z);
}
}
diff --git a/tutorials/sphereGranFlow/toteblender/settings/settingsDict b/tutorials/sphereGranFlow/toteblender/settings/settingsDict
index d5a05a48..34c287bb 100644
--- a/tutorials/sphereGranFlow/toteblender/settings/settingsDict
+++ b/tutorials/sphereGranFlow/toteblender/settings/settingsDict
@@ -6,16 +6,22 @@ objectName settingsDict;
objectType dictionary;;
/*---------------------------------------------------------------------------*/
run toteBlender;
+
// time step for integration (s)
-dt 0.00001;
+dt 0.00004;
+
// start time for simulation
startTime 0;
+
// end time for simulation
endTime 10;
+
// time interval for saving the simulation
-saveInterval 0.1;
+saveInterval 0.05;
+
// maximum number of digits for time folder
-timePrecision 6;
+timePrecision 3;
+
// gravity vector (m/s2)
g (0 0 -9.8);
@@ -26,9 +32,12 @@ domain
min (-0.3 -0.3 -0.3);
max (0.5 0.5 0.5);
}
+
// integration method
-integrationMethod AdamsBashforth2;
+integrationMethod AdamsMoulton4;
+
// report timers?
timersReport Yes;
+
// time interval for reporting timers
-timersReportInterval 0.01;
+timersReportInterval 0.02;
\ No newline at end of file
From 8faa1a5e531257240e6b98e11726d03c3ec9758d Mon Sep 17 00:00:00 2001
From: Hamidreza Norouzi
Date: Fri, 31 Mar 2023 10:48:23 -0700
Subject: [PATCH 27/27] documentation for rotatingAxis
---
.../entities/rotatingAxis/rotatingAxis.hpp | 47 ++++++++++++++++++-
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp b/src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp
index 07e8de5d..0fa38bc7 100644
--- a/src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp
+++ b/src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp
@@ -32,6 +32,33 @@ class rotatingAxis;
#include "rotatingAxisFwd.hpp"
+/**
+ * An axis which rotates around itself at specified speed
+ *
+ * This defines an axis with two end points that rotates around
+ * itself at specified speed (rad/s).
+ *
+ *
+ \verbatim
+ // This creates an axis of rotation around x-axis, rotation starts at t = 1 s
+ // and ends at t = 5 s.
+ {
+ p1 (0 0 0);
+ p2 (1 0 0);
+ omega 1.57;
+ startTime 1;
+ endTime 5;
+ } \endverbatim
+ *
+ * | parameter | value type | discription | optional (default) |
+ * |----| ---- | ---- | ---- |
+ * | p1 | realx3 | begin point of axis | No |
+ * | p2 | realx3 | end point of axis | No |
+ * | omega | real | rotation speed (rad/s) | No |
+ * | startTime | real | start time of rotation (s) | Yes (0) |
+ * | endTime | real | end time of rotation (s) | Yes (infinity) |
+ *
+ */
class rotatingAxis
:
public timeInterval,
@@ -39,56 +66,72 @@ class rotatingAxis
{
protected:
- // rotation speed
+ /// rotation speed
real omega_ = 0;
+ /// is rotating
bool rotating_ = false;
public:
+ // - Constructor
+
+ /// Empty constructor
FUNCTION_HD
rotatingAxis(){}
+ /// Construct from dictionary
FUNCTION_H
rotatingAxis(const dictionary& dict);
+ /// Construct from components
FUNCTION_HD
rotatingAxis(const realx3& p1, const realx3& p2, real omega = 0.0);
+ /// Copy constructor
FUNCTION_HD
rotatingAxis(const rotatingAxis&) = default;
+ /// Copy asssignment
rotatingAxis& operator=(const rotatingAxis&) = default;
+ /// Set omega
FUNCTION_HD
real setOmega(real omega);
-
+ /// Return omega
INLINE_FUNCTION_HD
real omega()const
{
return omega_;
}
+ /// Is rotating
INLINE_FUNCTION_HD
bool isRotating()const
{
return rotating_;
}
+ /// Linear tangential velocity at point p
INLINE_FUNCTION_HD
realx3 linTangentialVelocityPoint(const realx3 &p)const;
// - IO operation
+
+ /// Read from dictionary
FUNCTION_H
bool read(const dictionary& dict);
+ /// Write to dictionary
FUNCTION_H
bool write(dictionary& dict) const;
+ /// Read from input stream is
FUNCTION_H
bool read(iIstream& is);
+ /// Write to output stream os
FUNCTION_H
bool write(iOstream& os)const;