Skip to content

Commit 321eb61

Browse files
SteveMaas1978SteveMaas1978
committed
Renamed some log classes for consistent naming.
1 parent 8615f9a commit 321eb61

9 files changed

Lines changed: 98 additions & 98 deletions

File tree

‎FEBioFluid/FEBioFluid.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ REGISTER_FECORE_CLASS(FEPlotFSISolidStress , "solid stress"
259259
REGISTER_FECORE_CLASS(FEPlotFluidShearStressError , "fluid shear stress error");
260260

261261
//-----------------------------------------------------------------------------
262-
REGISTER_FECORE_CLASS(FENodeFluidXVel , "nfvx");
263-
REGISTER_FECORE_CLASS(FENodeFluidYVel , "nfvy");
264-
REGISTER_FECORE_CLASS(FENodeFluidZVel , "nfvz");
262+
REGISTER_FECORE_CLASS(FELogNodeFluidXVel , "nfvx");
263+
REGISTER_FECORE_CLASS(FELogNodeFluidYVel , "nfvy");
264+
REGISTER_FECORE_CLASS(FELogNodeFluidZVel , "nfvz");
265265
REGISTER_FECORE_CLASS(FELogElemFluidPosX , "fx");
266266
REGISTER_FECORE_CLASS(FELogElemFluidPosY , "fy");
267267
REGISTER_FECORE_CLASS(FELogElemFluidPosZ , "fz");

‎FEBioFluid/FEBioFluidData.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ SOFTWARE.*/
3333
#include "FECore/FEModel.h"
3434

3535
//-----------------------------------------------------------------------------
36-
double FENodeFluidXVel::value(const FENode& node)
36+
double FELogNodeFluidXVel::value(const FENode& node)
3737
{
3838
const int dof_VFX = GetFEModel()->GetDOFIndex("wx");
3939
return node.get(dof_VFX);
4040
}
4141

4242
//-----------------------------------------------------------------------------
43-
double FENodeFluidYVel::value(const FENode& node)
43+
double FELogNodeFluidYVel::value(const FENode& node)
4444
{
4545
const int dof_VFY = GetFEModel()->GetDOFIndex("wy");
4646
return node.get(dof_VFY);
4747
}
4848

4949
//-----------------------------------------------------------------------------
50-
double FENodeFluidZVel::value(const FENode& node)
50+
double FELogNodeFluidZVel::value(const FENode& node)
5151
{
5252
const int dof_VFZ = GetFEModel()->GetDOFIndex("wz");
5353
return node.get(dof_VFZ);

‎FEBioFluid/FEBioFluidData.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@ SOFTWARE.*/
3535
//=============================================================================
3636

3737
//-----------------------------------------------------------------------------
38-
class FENodeFluidXVel : public FELogNodeData
38+
class FELogNodeFluidXVel : public FELogNodeData
3939
{
4040
public:
41-
FENodeFluidXVel(FEModel* pfem) : FELogNodeData(pfem){}
41+
FELogNodeFluidXVel(FEModel* pfem) : FELogNodeData(pfem){}
4242
double value(const FENode& node) override;
4343
};
4444

4545
//-----------------------------------------------------------------------------
46-
class FENodeFluidYVel : public FELogNodeData
46+
class FELogNodeFluidYVel : public FELogNodeData
4747
{
4848
public:
49-
FENodeFluidYVel(FEModel* pfem) : FELogNodeData(pfem){}
49+
FELogNodeFluidYVel(FEModel* pfem) : FELogNodeData(pfem){}
5050
double value(const FENode& node) override;
5151
};
5252

5353
//-----------------------------------------------------------------------------
54-
class FENodeFluidZVel : public FELogNodeData
54+
class FELogNodeFluidZVel : public FELogNodeData
5555
{
5656
public:
57-
FENodeFluidZVel(FEModel* pfem) : FELogNodeData(pfem){}
57+
FELogNodeFluidZVel(FEModel* pfem) : FELogNodeData(pfem){}
5858
double value(const FENode& node) override;
5959
};
6060

‎FEBioMech/FEBioMechData.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,85 +52,85 @@ SOFTWARE.*/
5252
#include <FECore/FESolidDomain.h>
5353

5454
//-----------------------------------------------------------------------------
55-
double FENodeXPos::value(const FENode& node)
55+
double FELogNodeXPos::value(const FENode& node)
5656
{
5757
return node.m_rt.x;
5858
}
5959

6060
//-----------------------------------------------------------------------------
61-
double FENodeYPos::value(const FENode& node)
61+
double FELogNodeYPos::value(const FENode& node)
6262
{
6363
return node.m_rt.y;
6464
}
6565

6666
//-----------------------------------------------------------------------------
67-
double FENodeZPos::value(const FENode& node)
67+
double FELogNodeZPos::value(const FENode& node)
6868
{
6969
return node.m_rt.z;
7070
}
7171

7272
//-----------------------------------------------------------------------------
73-
double FENodeXDisp::value(const FENode& node)
73+
double FELogNodeXDisp::value(const FENode& node)
7474
{
7575
const int dof_X = GetFEModel()->GetDOFIndex("x");
7676
return node.get(dof_X);
7777
}
7878

7979
//-----------------------------------------------------------------------------
80-
double FENodeYDisp::value(const FENode& node)
80+
double FELogNodeYDisp::value(const FENode& node)
8181
{
8282
const int dof_Y = GetFEModel()->GetDOFIndex("y");
8383
return node.get(dof_Y);
8484
}
8585

8686
//-----------------------------------------------------------------------------
87-
double FENodeZDisp::value(const FENode& node)
87+
double FELogNodeZDisp::value(const FENode& node)
8888
{
8989
const int dof_Z = GetFEModel()->GetDOFIndex("z");
9090
return node.get(dof_Z);
9191
}
9292

9393
//-----------------------------------------------------------------------------
94-
double FENodeXVel::value(const FENode& node)
94+
double FELogNodeXVel::value(const FENode& node)
9595
{
9696
const int dof_VX = GetFEModel()->GetDOFIndex("vx");
9797
return node.get(dof_VX);
9898
}
9999

100100
//-----------------------------------------------------------------------------
101-
double FENodeYVel::value(const FENode& node)
101+
double FELogNodeYVel::value(const FENode& node)
102102
{
103103
const int dof_VY = GetFEModel()->GetDOFIndex("vy");
104104
return node.get(dof_VY);
105105
}
106106

107107
//-----------------------------------------------------------------------------
108-
double FENodeZVel::value(const FENode& node)
108+
double FELogNodeZVel::value(const FENode& node)
109109
{
110110
const int dof_VZ = GetFEModel()->GetDOFIndex("vz");
111111
return node.get(dof_VZ);
112112
}
113113

114114
//-----------------------------------------------------------------------------
115-
double FENodeXAcc::value(const FENode& node)
115+
double FELogNodeXAcc::value(const FENode& node)
116116
{
117117
return node.m_at.x;
118118
}
119119

120120
//-----------------------------------------------------------------------------
121-
double FENodeYAcc::value(const FENode& node)
121+
double FELogNodeYAcc::value(const FENode& node)
122122
{
123123
return node.m_at.y;
124124
}
125125

126126
//-----------------------------------------------------------------------------
127-
double FENodeZAcc::value(const FENode& node)
127+
double FELogNodeZAcc::value(const FENode& node)
128128
{
129129
return node.m_at.z;
130130
}
131131

132132
//-----------------------------------------------------------------------------
133-
double FENodeForceX::value(const FENode& node)
133+
double FELogNodeForceX::value(const FENode& node)
134134
{
135135
FEModel& fem = *GetFEModel();
136136
int dofX = fem.GetDOFIndex("x");
@@ -144,7 +144,7 @@ double FENodeForceX::value(const FENode& node)
144144
}
145145

146146
//-----------------------------------------------------------------------------
147-
double FENodeForceY::value(const FENode& node)
147+
double FELogNodeForceY::value(const FENode& node)
148148
{
149149
FEModel& fem = *GetFEModel();
150150
int dofY = fem.GetDOFIndex("y");
@@ -158,7 +158,7 @@ double FENodeForceY::value(const FENode& node)
158158
}
159159

160160
//-----------------------------------------------------------------------------
161-
double FENodeForceZ::value(const FENode& node)
161+
double FELogNodeForceZ::value(const FENode& node)
162162
{
163163
FEModel& fem = *GetFEModel();
164164
int dofZ = fem.GetDOFIndex("z");
@@ -2845,7 +2845,7 @@ double FELogMaxContactGap::value(FESurface& surface)
28452845
return 0.0;
28462846
}
28472847

2848-
double FENormalizedInternalEnergy::value(FEDomain& dom)
2848+
double FELogNormalizedInternalEnergy::value(FEDomain& dom)
28492849
{
28502850
double sum = 0.0;
28512851
double vol = 0.0;

‎FEBioMech/FEBioMechData.h‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,122 +41,122 @@ SOFTWARE.*/
4141
//=============================================================================
4242

4343
//-----------------------------------------------------------------------------
44-
class FENodeXPos : public FELogNodeData
44+
class FELogNodeXPos : public FELogNodeData
4545
{
4646
public:
47-
FENodeXPos(FEModel* pfem) : FELogNodeData(pfem){}
47+
FELogNodeXPos(FEModel* pfem) : FELogNodeData(pfem){}
4848
double value(const FENode& node) override;
4949
};
5050

5151
//-----------------------------------------------------------------------------
52-
class FENodeYPos : public FELogNodeData
52+
class FELogNodeYPos : public FELogNodeData
5353
{
5454
public:
55-
FENodeYPos(FEModel* pfem) : FELogNodeData(pfem){}
55+
FELogNodeYPos(FEModel* pfem) : FELogNodeData(pfem){}
5656
double value(const FENode& node) override;
5757
};
5858

5959
//-----------------------------------------------------------------------------
60-
class FENodeZPos : public FELogNodeData
60+
class FELogNodeZPos : public FELogNodeData
6161
{
6262
public:
63-
FENodeZPos(FEModel* pfem) : FELogNodeData(pfem){}
63+
FELogNodeZPos(FEModel* pfem) : FELogNodeData(pfem){}
6464
double value(const FENode& node) override;
6565
};
6666

6767
//-----------------------------------------------------------------------------
68-
class FENodeXDisp : public FELogNodeData
68+
class FELogNodeXDisp : public FELogNodeData
6969
{
7070
public:
71-
FENodeXDisp(FEModel* pfem) : FELogNodeData(pfem){}
71+
FELogNodeXDisp(FEModel* pfem) : FELogNodeData(pfem){}
7272
double value(const FENode& node) override;
7373
};
7474

7575
//-----------------------------------------------------------------------------
76-
class FENodeYDisp : public FELogNodeData
76+
class FELogNodeYDisp : public FELogNodeData
7777
{
7878
public:
79-
FENodeYDisp(FEModel* pfem) : FELogNodeData(pfem){}
79+
FELogNodeYDisp(FEModel* pfem) : FELogNodeData(pfem){}
8080
double value(const FENode& node) override;
8181
};
8282

8383
//-----------------------------------------------------------------------------
84-
class FENodeZDisp : public FELogNodeData
84+
class FELogNodeZDisp : public FELogNodeData
8585
{
8686
public:
87-
FENodeZDisp(FEModel* pfem) : FELogNodeData(pfem){}
87+
FELogNodeZDisp(FEModel* pfem) : FELogNodeData(pfem){}
8888
double value(const FENode& node) override;
8989
};
9090

9191
//-----------------------------------------------------------------------------
92-
class FENodeXVel : public FELogNodeData
92+
class FELogNodeXVel : public FELogNodeData
9393
{
9494
public:
95-
FENodeXVel(FEModel* pfem) : FELogNodeData(pfem){}
95+
FELogNodeXVel(FEModel* pfem) : FELogNodeData(pfem){}
9696
double value(const FENode& node) override;
9797
};
9898

9999
//-----------------------------------------------------------------------------
100-
class FENodeYVel : public FELogNodeData
100+
class FELogNodeYVel : public FELogNodeData
101101
{
102102
public:
103-
FENodeYVel(FEModel* pfem) : FELogNodeData(pfem){}
103+
FELogNodeYVel(FEModel* pfem) : FELogNodeData(pfem){}
104104
double value(const FENode& node) override;
105105
};
106106

107107
//-----------------------------------------------------------------------------
108-
class FENodeZVel : public FELogNodeData
108+
class FELogNodeZVel : public FELogNodeData
109109
{
110110
public:
111-
FENodeZVel(FEModel* pfem) : FELogNodeData(pfem){}
111+
FELogNodeZVel(FEModel* pfem) : FELogNodeData(pfem){}
112112
double value(const FENode& node) override;
113113
};
114114

115115
//-----------------------------------------------------------------------------
116-
class FENodeXAcc : public FELogNodeData
116+
class FELogNodeXAcc : public FELogNodeData
117117
{
118118
public:
119-
FENodeXAcc(FEModel* pfem) : FELogNodeData(pfem){}
119+
FELogNodeXAcc(FEModel* pfem) : FELogNodeData(pfem){}
120120
double value(const FENode& node) override;
121121
};
122122

123123
//-----------------------------------------------------------------------------
124-
class FENodeYAcc : public FELogNodeData
124+
class FELogNodeYAcc : public FELogNodeData
125125
{
126126
public:
127-
FENodeYAcc(FEModel* pfem) : FELogNodeData(pfem){}
127+
FELogNodeYAcc(FEModel* pfem) : FELogNodeData(pfem){}
128128
double value(const FENode& node) override;
129129
};
130130

131131
//-----------------------------------------------------------------------------
132-
class FENodeZAcc : public FELogNodeData
132+
class FELogNodeZAcc : public FELogNodeData
133133
{
134134
public:
135-
FENodeZAcc(FEModel* pfem) : FELogNodeData(pfem){}
135+
FELogNodeZAcc(FEModel* pfem) : FELogNodeData(pfem){}
136136
double value(const FENode& node) override;
137137
};
138138

139139
//-----------------------------------------------------------------------------
140-
class FENodeForceX: public FELogNodeData
140+
class FELogNodeForceX: public FELogNodeData
141141
{
142142
public:
143-
FENodeForceX(FEModel* pfem) : FELogNodeData(pfem){}
143+
FELogNodeForceX(FEModel* pfem) : FELogNodeData(pfem){}
144144
double value(const FENode& node) override;
145145
};
146146

147147
//-----------------------------------------------------------------------------
148-
class FENodeForceY: public FELogNodeData
148+
class FELogNodeForceY: public FELogNodeData
149149
{
150150
public:
151-
FENodeForceY(FEModel* pfem) : FELogNodeData(pfem){}
151+
FELogNodeForceY(FEModel* pfem) : FELogNodeData(pfem){}
152152
double value(const FENode& node) override;
153153
};
154154

155155
//-----------------------------------------------------------------------------
156-
class FENodeForceZ: public FELogNodeData
156+
class FELogNodeForceZ: public FELogNodeData
157157
{
158158
public:
159-
FENodeForceZ(FEModel* pfem) : FELogNodeData(pfem){}
159+
FELogNodeForceZ(FEModel* pfem) : FELogNodeData(pfem){}
160160
double value(const FENode& node) override;
161161
};
162162

@@ -1894,10 +1894,10 @@ class FELogMaxContactGap : public FELogSurfaceData
18941894
//=============================================================================
18951895
// from Gibbons, "Finite Element Modeling of Blast Lung Injury in Sheep", JBME 2015
18961896
// this calculates the normalized time-summed internal energy
1897-
class FENormalizedInternalEnergy : public FELogDomainData
1897+
class FELogNormalizedInternalEnergy : public FELogDomainData
18981898
{
18991899
public:
1900-
FENormalizedInternalEnergy(FEModel* fem) : FELogDomainData(fem), m_sum(0) {}
1900+
FELogNormalizedInternalEnergy(FEModel* fem) : FELogDomainData(fem), m_sum(0) {}
19011901
double value(FEDomain& dom) override;
19021902

19031903
private:

0 commit comments

Comments
 (0)