add conveyor belt model

cmake/bashrc

@@ -1,7 +1,7 @@
 
 export pFlow_PROJECT_VERSION=v-1.0
 
-export pFlow_PROJECT="phasicFlow-$pFlow_PROJECT_VERSION"
+export pFlow_PROJECT="phasicFlow"
 
 
 projectDir="$HOME/PhasicFlow" 

src/Geometry/geometryMotion/geometryMotions.cpp

@@ -26,4 +26,6 @@ template class pFlow::geometryMotion<pFlow::rotatingAxisMotion>;
 
 template class pFlow::geometryMotion<pFlow::stationaryWall>;
 
+template class pFlow::geometryMotion<pFlow::conveyorBeltMotion>;
+
 //template class pFlow::geometryMotion<pFlow::multiRotatingAxisMotion>;

src/Geometry/geometryMotion/geometryMotions.hpp

@@ -24,6 +24,7 @@ Licence:
 #include "geometryMotion.hpp"
 #include "stationaryWall.hpp"
 #include "rotatingAxisMotion.hpp"
+#include "conveyorBeltMotion.hpp"
 //#include "multiRotatingAxisMotion.hpp"
 #include "vibratingMotion.hpp"
 
@@ -37,6 +38,8 @@ using rotationAxisMotionGeometry = geometryMotion<rotatingAxisMotion>;
 
 using stationaryGeometry = geometryMotion<stationaryWall>;
 
+using conveyorBeltMotionGeometry = geometryMotion<conveyorBeltMotion>;
+
 //typedef geometryMotion<multiRotatingAxisMotion> multiRotationAxisMotionGeometry;
 
 

src/MotionModel/CMakeLists.txt

@@ -11,6 +11,9 @@ vibratingMotion/vibratingMotion.cpp
 stationaryWall/stationaryWall.cpp
 entities/stationary/stationary.cpp
 
+conveyorBeltMotion/conveyorBeltMotion.cpp
+entities/conveyorBelt/conveyorBelt.cpp
+
 #entities/multiRotatingAxis/multiRotatingAxis.cpp
 #multiRotatingAxisMotion/multiRotatingAxisMotion.cpp
 

src/MotionModel/conveyorBeltMotion/conveyorBeltMotion.hpp

@@ -46,7 +46,7 @@ conveyorBeltInfo
 {
   conveyorBelt1
   {
-    // the definition based on class conveyorBelt1
+    // the definition based on class conveyorBelt
   }
 }
 ...

src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp

@@ -33,8 +33,6 @@ pFlow::conveyorBelt::conveyorBelt(const dictionary& dict)
 	}
 }
 
-
-
 FUNCTION_H
 bool pFlow::conveyorBelt::read(const dictionary& dict)
 {	

tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict

@@ -6,18 +6,15 @@ objectName 	geometryDict;
 objectType 	dictionary;
 fileFormat  ASCII;
 /*---------------------------------------------------------------------------*/
-motionModel            stationary;               // motion model can be rotatingAxis or stationary or vibrating
+motionModel            conveyorBelt;               // motion model can be rotatingAxis or stationary or vibrating
-stationaryInfo
+
-{
+conveyorBeltMotionInfo
-	
-}
-/*conveyorBeltInfo
 {
     conveyorBelt1
     {
         velocity (1, 0, 0);
     }
-}*/
+}
 
 surfaces
 {
@@ -60,7 +57,7 @@ surfaces
 		type 	 stlWall;  	// type of the wall
 		file 	 belt.stl;	// file name in stl folder		
 		material wallMat;   // material name of this wall
-		//motion 	 conveyorBelt1;		// motion component name 
+		motion 	 conveyorBelt1;		// motion component name 
 	}
 
 	box