Skip to content

Commit 9836775

Browse files
committed
file and type rename+minor
1 parent 5cf2188 commit 9836775

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

BriefFiniteElementNet.CustomElements/Elements/HexahedralElement.cs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ namespace BriefFiniteElementNet.Elements
1717
/// </summary>
1818
[Serializable]
1919
[Obsolete("not fully implemented yet")]
20-
public class HexahedralElementTest : Element
20+
public class HexahedralElement : Element
2121
{
22-
public HexahedralElementTest() : base(8)
22+
public HexahedralElement() : base(8)
2323
{
2424
}
2525

@@ -66,7 +66,13 @@ public override double[] IsoCoordsToLocalCoords(params double[] isoCoords)
6666
throw new NotImplementedException();
6767
}
6868

69-
69+
/// <summary>
70+
/// Checks the node order, throws exception if order is invalid
71+
/// </summary>
72+
private void CheckNodeOrder()
73+
{
74+
throw new NotImplementedException();
75+
}
7076

7177
public override Matrix GetLambdaMatrix()
7278
{
@@ -121,6 +127,7 @@ public Matrix GetLocalDampMatrix()
121127

122128
public override Matrix GetGlobalDampingMatrix()
123129
{
130+
CheckNodeOrder();
124131
return GetLocalDampMatrix();
125132
}
126133

@@ -155,6 +162,8 @@ public Matrix GetLocalMassMatrix()
155162

156163
public override Matrix GetGlobalMassMatrix()
157164
{
165+
CheckNodeOrder();
166+
158167
return GetLocalMassMatrix();
159168
}
160169

@@ -190,6 +199,7 @@ public Matrix GetLocalStifnessMatrix()
190199

191200
public override Matrix GetGlobalStifnessMatrix()
192201
{
202+
CheckNodeOrder();
193203
return GetLocalStifnessMatrix();//local coords is same as global coords in hexahedral
194204
}
195205

@@ -214,17 +224,15 @@ public override Force[] GetGlobalEquivalentNodalLoads(ElementalLoad load)
214224
}
215225
}
216226

217-
218227
for (var i = 0; i < buf.Length; i++)
219228
buf[i] = t.TransformLocalToGlobal(buf[i]);
220229

221-
222230
return buf;
223231
}
224232

225233
#region Deserialization Constructor
226234

227-
protected HexahedralElementTest(SerializationInfo info, StreamingContext context)
235+
protected HexahedralElement(SerializationInfo info, StreamingContext context)
228236
: base(info, context)
229237
{
230238
_material = (BaseMaterial)info.GetValue("_material", typeof(int));

BriefFiniteElementNet.CustomElements/Elements/HexahedralTest.cs renamed to BriefFiniteElementNet.CustomElements/Elements/HexahedralElement_old.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ namespace BriefFiniteElementNet.Elements
1414
/// </summary>
1515
[Serializable]
1616
[Obsolete("really obsolete")]
17-
public class HexahedralElement : Element
17+
public class HexahedralElement_old : Element
1818
{
19-
public HexahedralElement() : base(8)
19+
public HexahedralElement_old() : base(8)
2020
{
2121
}
2222
#region mechanical props
@@ -591,7 +591,7 @@ public Force[] GetGlobalEquivalentNodalLoads(Element targetElement, ElementalLoa
591591

592592
#region Deserialization Constructor
593593

594-
protected HexahedralElement(SerializationInfo info, StreamingContext context)
594+
protected HexahedralElement_old(SerializationInfo info, StreamingContext context)
595595
: base(info, context)
596596
{
597597
_e = (double)info.GetValue("_e", typeof(double));

BriefFiniteElementNet.Validation/Case_06/Validator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ public ValidationResult Validate()
3232

3333
foreach(var elm in abaqusModel.Elements)
3434
{
35-
if (elm is HexahedralElementTest hx)
35+
if (elm is HexahedralElement hx)
3636
{
3737
hx.Material = Materials.UniformIsotropicMaterial.CreateFromYoungPoisson(210e9, 0.25);
3838
}
3939

40-
if (elm is HexahedralElement hx2)
40+
if (elm is HexahedralElement_old hx2)
4141
{
4242
hx2.Material = Materials.UniformIsotropicMaterial.CreateFromYoungPoisson(210e9, 0.25);
4343
}

BriefFiniteElementNet/Elements/TetrahedronElement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected TetrahedronElement(SerializationInfo info, StreamingContext context) :
4444

4545

4646
/// <summary>
47-
/// Checks the node order, for more info look inside method
47+
/// Checks the node order, throws exception if order is invalid
4848
/// </summary>
4949
private void CheckNodeOrder()
5050
{

0 commit comments

Comments
 (0)