Merge pull request #42 from MagmaWorks/feature/en-cement-class

Cement Class
MagmaWorks · Nov 8, 2024 · 2dbb89a · 2dbb89a
2 parents e3cf75d + e876d88
commit 2dbb89a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/Materials/IMaterials/StandardMaterials/EN/ENCementClass.cs b/Materials/IMaterials/StandardMaterials/EN/ENCementClass.cs
@@ -0,0 +1,9 @@
+namespace MagmaWorks.Taxonomy.Materials
+{
+    public enum ENCementClass
+    {
+        S,
+        N,
+        R
+    }
+}
diff --git a/Materials/IMaterials/StandardMaterials/EN/IENConcreteMaterial.cs b/Materials/IMaterials/StandardMaterials/EN/IENConcreteMaterial.cs
@@ -5,6 +5,7 @@ namespace MagmaWorks.Taxonomy.Materials
     public interface IENConcreteMaterial : IENMaterial<ENConcreteGrade>
     {
         ENConcreteExposureClass ExposureClass { get; }
+        ENCementClass CementClass { get; }
         Length MaximumAggregateSize { get; }
 
         /// <summary>

diff --git a/Materials/MaterialTests/StandardMaterials/EN/ENConcreteMaterialTests.cs b/Materials/MaterialTests/StandardMaterials/EN/ENConcreteMaterialTests.cs
@@ -40,15 +40,17 @@ public void CreateStandardENC30_37GermanNAConcreteMaterialWithExposureClassAndMa
             ENConcreteGrade grade = ENConcreteGrade.C30_37;
             NationalAnnex nationalAnnex = NationalAnnex.Germany;
             ENConcreteExposureClass exposureClass = ENConcreteExposureClass.XF2;
+            ENCementClass cementClass = ENCementClass.S;
             Length maxAggregateSize = new Length(40, LengthUnit.Millimeter);
 
             // Act
-            IENConcreteMaterial material = new ENConcreteMaterial(grade, nationalAnnex, exposureClass, maxAggregateSize);
+            IENConcreteMaterial material = new ENConcreteMaterial(grade, nationalAnnex, exposureClass, maxAggregateSize, cementClass);
 
             // Assert
             Assert.Equal(NationalAnnex.Germany, material.Standard.NationalAnnex);
             Assert.Equal(ENConcreteGrade.C30_37, material.Grade);
             Assert.Equal(ENConcreteExposureClass.XF2, material.ExposureClass);
+            Assert.Equal(ENCementClass.S, material.CementClass);
             Assert.Equal(40, material.MaximumAggregateSize.Millimeters);
         }
 

diff --git a/Materials/Materials/StandardMaterials/EN/ENConcreteMaterial.cs b/Materials/Materials/StandardMaterials/EN/ENConcreteMaterial.cs
@@ -7,6 +7,7 @@ namespace MagmaWorks.Taxonomy.Materials.StandardMaterials.EN
 {
     public class ENConcreteMaterial : IENConcreteMaterial
     {
+        public ENCementClass CementClass { get; set; } = ENCementClass.N;
         public ENConcreteExposureClass ExposureClass { get; set; } = ENConcreteExposureClass.XC1;
         public ENConcreteGrade Grade { get; set; } = ENConcreteGrade.C30_37;
         public IEurocode Standard { get; set; } = new EN1992(EN1992Part.Part1_1, NationalAnnex.RecommendedValues);
@@ -27,8 +28,9 @@ public ENConcreteMaterial(ENConcreteGrade grade, NationalAnnex nationalAnnex)
         }
 
         public ENConcreteMaterial(ENConcreteGrade grade, NationalAnnex nationalAnnex,
-            ENConcreteExposureClass exposureClass, Length maxAggregateSize)
+            ENConcreteExposureClass exposureClass, Length maxAggregateSize, ENCementClass cementClass)
         {
+            CementClass = cementClass;
             Standard = new EN1992(EN1992Part.Part1_1, nationalAnnex);
             Grade = grade;
             ExposureClass = exposureClass;