Undo changes in bashrc and change the velocity_ to tangentVelocity_
This commit is contained in:
parent
a99278447e
commit
73e4295a25
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -12,7 +12,7 @@ conveyorBeltInfo
|
|||
{
|
||||
conveyorBelt1
|
||||
{
|
||||
velocity (0.5 0 0);
|
||||
tangentVelocity (0.5 0 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue