Merge branch 'develop' of https://github.com/febiosoftware/FEBio into develop

Author: gateshian

FEBioFluid/FEBioFluid.cpp

@@ -259,9 +259,9 @@ REGISTER_FECORE_CLASS(FEPlotFSISolidStress             , "solid stress"
 REGISTER_FECORE_CLASS(FEPlotFluidShearStressError      , "fluid shear stress error");
 
 //-----------------------------------------------------------------------------
-REGISTER_FECORE_CLASS(FENodeFluidXVel          , "nfvx");
-REGISTER_FECORE_CLASS(FENodeFluidYVel          , "nfvy");
-REGISTER_FECORE_CLASS(FENodeFluidZVel          , "nfvz");
+REGISTER_FECORE_CLASS(FELogNodeFluidXVel          , "nfvx");
+REGISTER_FECORE_CLASS(FELogNodeFluidYVel          , "nfvy");
+REGISTER_FECORE_CLASS(FELogNodeFluidZVel          , "nfvz");
 REGISTER_FECORE_CLASS(FELogElemFluidPosX       , "fx");
 REGISTER_FECORE_CLASS(FELogElemFluidPosY       , "fy");
 REGISTER_FECORE_CLASS(FELogElemFluidPosZ       , "fz");

FEBioFluid/FEBioFluidData.cpp

@@ -33,21 +33,21 @@ SOFTWARE.*/
 #include "FECore/FEModel.h"
 
 //-----------------------------------------------------------------------------
-double FENodeFluidXVel::value(const FENode& node)
+double FELogNodeFluidXVel::value(const FENode& node)
 {
     const int dof_VFX = GetFEModel()->GetDOFIndex("wx");
     return node.get(dof_VFX);
 }
 
 //-----------------------------------------------------------------------------
-double FENodeFluidYVel::value(const FENode& node)
+double FELogNodeFluidYVel::value(const FENode& node)
 {
     const int dof_VFY = GetFEModel()->GetDOFIndex("wy");
     return node.get(dof_VFY);
 }
 
 //-----------------------------------------------------------------------------
-double FENodeFluidZVel::value(const FENode& node)
+double FELogNodeFluidZVel::value(const FENode& node)
 {
     const int dof_VFZ = GetFEModel()->GetDOFIndex("wz");
     return node.get(dof_VFZ);

FEBioFluid/FEBioFluidData.h

@@ -36,26 +36,26 @@ SOFTWARE.*/
 //=============================================================================
 
 //-----------------------------------------------------------------------------
-class FENodeFluidXVel : public FELogNodeData
+class FELogNodeFluidXVel : public FELogNodeData
 {
 public:
-    FENodeFluidXVel(FEModel* pfem) : FELogNodeData(pfem){}
+    FELogNodeFluidXVel(FEModel* pfem) : FELogNodeData(pfem){}
     double value(const FENode& node) override;
 };
 
 //-----------------------------------------------------------------------------
-class FENodeFluidYVel : public FELogNodeData
+class FELogNodeFluidYVel : public FELogNodeData
 {
 public:
-    FENodeFluidYVel(FEModel* pfem) : FELogNodeData(pfem){}
+    FELogNodeFluidYVel(FEModel* pfem) : FELogNodeData(pfem){}
 	double value(const FENode& node) override;
 };
 
 //-----------------------------------------------------------------------------
-class FENodeFluidZVel : public FELogNodeData
+class FELogNodeFluidZVel : public FELogNodeData
 {
 public:
-    FENodeFluidZVel(FEModel* pfem) : FELogNodeData(pfem){}
+    FELogNodeFluidZVel(FEModel* pfem) : FELogNodeData(pfem){}
 	double value(const FENode& node) override;
 };