Skip to content

Commit

Permalink
Merge pull request #58 from MagmaWorks/feature/steel-quality-class
Browse files Browse the repository at this point in the history
Steel specification
  • Loading branch information
kpne authored Dec 4, 2024
2 parents f5bb05d + 4f8c0b9 commit a8f23d0
Show file tree
Hide file tree
Showing 19 changed files with 844 additions and 168 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public enum EnSteelCorrosionResistance
{
None,
W,
WP
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using System.ComponentModel;

namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public enum EnSteelDeliveryCondition
{
[Description("As-rolled - EN10025-2")]
AR,
[Description("Normalised rolled in accordance with EN 10025-3")]
N,
[Description("Thermomechanical rolling in accordance with EN 10025-4")]
M,
[Description("Quenched and tempered in accordance with EN 10025-6")]
Q
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public enum EnSteelFormingTemperature
{
HotRolled,
ColdFormed
}
}
24 changes: 2 additions & 22 deletions Materials/IMaterials/StandardMaterials/En/EnSteelGrade.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,8 @@ public enum EnSteelGrade
S235,
S275,
S355,
S420,
S450,
S275N,
S355N,
S420N,
S460N,
S275M,
S355M,
S420M,
S460M,
S235W,
S355W,
S460Q,
S235H,
S275H,
S355H,
S275NH,
S355NH,
S420NH,
S460NH,
S275MH,
S355MH,
S420MH,
S460MH,
S460,
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public enum EnSteelImpactTemperatureProperty
{
None,
L,
L1
}
}
11 changes: 11 additions & 0 deletions Materials/IMaterials/StandardMaterials/En/EnSteelQuality.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public enum EnSteelQuality
{
None,
JR,
J0,
J2,
K2
}
}
7 changes: 3 additions & 4 deletions Materials/IMaterials/StandardMaterials/En/IEnSteelMaterial.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
using MagmaWorks.Taxonomy.Materials.StandardMaterials.En;
using OasysUnits;
using OasysUnits;

namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public interface IEnSteelMaterial : IEnMaterial
{
IEnSteelSpecification Specification { get; }
EnSteelGrade Grade { get; }
EnExecutionClass ExecutionClassforStaticOrLowSeismicLoading { get; }
EnExecutionClass ExecutionClassforFatigueOrHighSeismicLoading { get; }

/// <summary>
/// γM0 partial factor for resistance of cross-sections whatever the class is
/// </summary>
Expand Down
16 changes: 16 additions & 0 deletions Materials/IMaterials/StandardMaterials/En/IEnSteelSpecification.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using MagmaWorks.Taxonomy.Serialization;

namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public interface IEnSteelSpecification : ITaxonomySerializable
{
EnExecutionClass ExecutionClassforStaticOrLowSeismicLoading { get; set; }
EnExecutionClass ExecutionClassforFatigueOrHighSeismicLoading { get; set; }
EnSteelCorrosionResistance CorrosionResistance { get; set; }
EnSteelDeliveryCondition DeliveryCondition { get; set; }
EnSteelFormingTemperature FormingTemperature { get; set; }
EnSteelImpactTemperatureProperty ImpactTemperatureProperty { get; set; }
EnSteelQuality Quality { get; set; }
bool HollowSection { get; set; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using System;

namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.En
{
public class InvalidSteelSpecificationException : Exception
{
public InvalidSteelSpecificationException(string t) : base(t) { }
}
}
Loading

0 comments on commit a8f23d0

Please sign in to comment.