From 73e4295a25f469151dd14b861cf17870ecacc5dc Mon Sep 17 00:00:00 2001
From: wanqing0421 <xuwenxuan_ustb@126.com>
Date: Wed, 25 Dec 2024 08:38:09 +0800
Subject: [PATCH] Undo changes in bashrc and change the velocity_ to
 tangentVelocity_

---
 cmake/bashrc                                              | 2 +-
 src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp    | 8 ++++----
 src/MotionModel/entities/conveyorBelt/conveyorBelt.hpp    | 4 ++--
 .../sphereGranFlow/conveyorBelt/settings/geometryDict     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmake/bashrc b/cmake/bashrc
index d9c1191b..277080d3 100644
--- a/cmake/bashrc
+++ b/cmake/bashrc
@@ -1,7 +1,7 @@
 
 export pFlow_PROJECT_VERSION=v-1.0
 
-export pFlow_PROJECT="phasicFlow"
+export pFlow_PROJECT="phasicFlow-$pFlow_PROJECT_VERSION"
 
 
 projectDir="$HOME/PhasicFlow" 
diff --git a/src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp b/src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp
index 839d3b84..2e63a5a1 100644
--- a/src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp
+++ b/src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp
@@ -37,7 +37,7 @@ FUNCTION_H
 bool pFlow::conveyorBelt::read(const dictionary& dict)
 {	
 
-	velocity_ 		= dict.getVal<realx3>("velocity");
+	tangentVelocity_ 		= dict.getVal<realx3>("tangentVelocity");
 	
 	return true;
 }
@@ -45,10 +45,10 @@ bool pFlow::conveyorBelt::read(const dictionary& dict)
 FUNCTION_H
 bool pFlow::conveyorBelt::write(dictionary& dict) const
 {
-	if( !dict.add("velocity", velocity_) )
+	if( !dict.add("tangentVelocity", tangentVelocity_) )
 	{
 		fatalErrorInFunction<<
-		"  error in writing velocity to dictionary "<< dict.globalName()<<endl;
+		"  error in writing tangentVelocity to dictionary "<< dict.globalName()<<endl;
 		return false;
 	}
 	return true;
@@ -65,6 +65,6 @@ bool pFlow::conveyorBelt::read(iIstream& is)
 FUNCTION_H
 bool pFlow::conveyorBelt::write(iOstream& os)const
 {
-  os.writeWordEntry("velocity", velocity_);
+  os.writeWordEntry("tangentVelocity", tangentVelocity_);
   return true;
 }
\ No newline at end of file
diff --git a/src/MotionModel/entities/conveyorBelt/conveyorBelt.hpp b/src/MotionModel/entities/conveyorBelt/conveyorBelt.hpp
index a3d30c0c..3cc46de0 100644
--- a/src/MotionModel/entities/conveyorBelt/conveyorBelt.hpp
+++ b/src/MotionModel/entities/conveyorBelt/conveyorBelt.hpp
@@ -41,7 +41,7 @@ class conveyorBelt
 {
 private:
 
-	realx3  velocity_{0, 0, 0};
+	realx3  tangentVelocity_{0, 0, 0};
 
 public:
 
@@ -66,7 +66,7 @@ public:
 	INLINE_FUNCTION_HD
 	realx3 linVelocityPoint(const realx3 &)const
 	{
-		return velocity_;
+		return tangentVelocity_;
 	}
 
 	INLINE_FUNCTION_HD
diff --git a/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict b/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict
index 96be1ebb..69873d0e 100755
--- a/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict
+++ b/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict
@@ -12,7 +12,7 @@ conveyorBeltInfo
 {
     conveyorBelt1
     {
-        velocity (0.5 0 0);
+        tangentVelocity (0.5 0 0);
     }
 }