xfygogo
/
phasicFlow
mirror of https://github.com/PhasicFlow/phasicFlow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Undo changes in bashrc and change the velocity_ to tangentVelocity_

This commit is contained in:
wanqing0421 2024-12-25 08:38:09 +08:00
parent a99278447e
commit 73e4295a25
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/bashrc
View File

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

8
src/MotionModel/entities/conveyorBelt/conveyorBelt.cpp
View File

@ -37,7 +37,7 @@ FUNCTION_H
bool pFlow::conveyorBelt::read(const dictionary& dict) bool pFlow::conveyorBelt::read(const dictionary& dict)
{ {
velocity_ = dict.getVal<realx3>("velocity"); tangentVelocity_ = dict.getVal<realx3>("tangentVelocity");
return true; return true;
} }
@ -45,10 +45,10 @@ bool pFlow::conveyorBelt::read(const dictionary& dict)
FUNCTION_H FUNCTION_H
bool pFlow::conveyorBelt::write(dictionary& dict) const bool pFlow::conveyorBelt::write(dictionary& dict) const
{ {
if( !dict.add("velocity", velocity_) ) if( !dict.add("tangentVelocity", tangentVelocity_) )
{ {
fatalErrorInFunction<< fatalErrorInFunction<<
" error in writing velocity to dictionary "<< dict.globalName()<<endl; " error in writing tangentVelocity to dictionary "<< dict.globalName()<<endl;
return false; return false;
} }
return true; return true;
@ -65,6 +65,6 @@ bool pFlow::conveyorBelt::read(iIstream& is)
FUNCTION_H FUNCTION_H
bool pFlow::conveyorBelt::write(iOstream& os)const bool pFlow::conveyorBelt::write(iOstream& os)const
{ {
os.writeWordEntry("velocity", velocity_); os.writeWordEntry("tangentVelocity", tangentVelocity_);
return true; return true;
} }

4
src/MotionModel/entities/conveyorBelt/conveyorBelt.hpp
View File

@ -41,7 +41,7 @@ class conveyorBelt
{ {
private: private:
realx3 velocity_{0, 0, 0}; realx3 tangentVelocity_{0, 0, 0};
public: public:
@ -66,7 +66,7 @@ public:
INLINE_FUNCTION_HD INLINE_FUNCTION_HD
realx3 linVelocityPoint(const realx3 &)const realx3 linVelocityPoint(const realx3 &)const
{ {
return velocity_; return tangentVelocity_;
} }
INLINE_FUNCTION_HD INLINE_FUNCTION_HD

2
tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict
View File

@ -12,7 +12,7 @@ conveyorBeltInfo
{ {
conveyorBelt1 conveyorBelt1
{ {
velocity (0.5 0 0); tangentVelocity (0.5 0 0);
} }
} }