From ef2a13dd7e62a75d944c50ac6aa2bdc156972c38 Mon Sep 17 00:00:00 2001
From: wanqing0421 <xuwenxuan_ustb@126.com>
Date: Tue, 24 Dec 2024 16:39:40 +0800
Subject: [PATCH] add conveyor belt model

---
 cmake/bashrc                                        |  2 +-
 src/Geometry/geometryMotion/geometryMotions.cpp     |  2 ++
 src/Geometry/geometryMotion/geometryMotions.hpp     |  3 +++
 src/MotionModel/CMakeLists.txt                      |  3 +++
 .../conveyorBeltMotion/conveyorBeltMotion.hpp       |  2 +-
 .../entities/conveyorBelt/conveyorBelt.cpp          |  2 --
 .../conveyorBelt/settings/geometryDict              | 13 +++++--------
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cmake/bashrc b/cmake/bashrc
index 277080d3..d9c1191b 100644
--- a/cmake/bashrc
+++ b/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" 
diff --git a/src/Geometry/geometryMotion/geometryMotions.cpp b/src/Geometry/geometryMotion/geometryMotions.cpp
index 8b1d1d55..6cdb4a3b 100644
--- a/src/Geometry/geometryMotion/geometryMotions.cpp
+++ b/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>;
diff --git a/src/Geometry/geometryMotion/geometryMotions.hpp b/src/Geometry/geometryMotion/geometryMotions.hpp
index 1bb078d8..3b0a2867 100644
--- a/src/Geometry/geometryMotion/geometryMotions.hpp
+++ b/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;
 
 
diff --git a/src/MotionModel/CMakeLists.txt b/src/MotionModel/CMakeLists.txt
index b0b084fd..1e92a989 100644
--- a/src/MotionModel/CMakeLists.txt
+++ b/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
 
diff --git a/src/MotionModel/conveyorBeltMotion/conveyorBeltMotion.hpp b/src/MotionModel/conveyorBeltMotion/conveyorBeltMotion.hpp
index 98371d39..33c7a16c 100644
--- a/src/MotionModel/conveyorBeltMotion/conveyorBeltMotion.hpp
+++ b/src/MotionModel/conveyorBeltMotion/conveyorBeltMotion.hpp
@@ -46,7 +46,7 @@ conveyorBeltInfo
 {
   conveyorBelt1
   {
-    // the definition based on class conveyorBelt1
+    // the definition based on class conveyorBelt
   }
 }
 ...
diff --git a/src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp b/src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp
index a92466c9..839d3b84 100644
--- a/src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp
+++ b/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)
 {	
diff --git a/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict b/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict
index 8f9a76b1..b04edea2 100755
--- a/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict
+++ b/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
-stationaryInfo
-{
-	
-}
-/*conveyorBeltInfo
+motionModel            conveyorBelt;               // motion model can be rotatingAxis or stationary or vibrating
+
+conveyorBeltMotionInfo
 {
     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