Merge pull request #55 from MagmaWorks/main

merge main
MagmaWorks · Nov 27, 2024 · 1f5c62a · 1f5c62a
2 parents f1a9d38 + 990cc96
commit 1f5c62a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Materials/IMaterials/StandardMaterials/EN/IENConcreteMaterial.cs b/Materials/IMaterials/StandardMaterials/EN/IENConcreteMaterial.cs
@@ -9,7 +9,7 @@ public interface IEnConcreteMaterial : IEnMaterial
         IList<EnConcreteExposureClass> ExposureClasses { get; }
         EnCementClass CementClass { get; }
         Length MaximumAggregateSize { get; }
-        Length MaximumCrackWidth { get; }
+        Length CrackWidthLimit { get; }
         Length MinimumCover { get; }
 
         /// <summary>

diff --git a/Materials/MaterialTests/StandardMaterials/EN/ENConcreteMaterialTests.cs b/Materials/MaterialTests/StandardMaterials/EN/ENConcreteMaterialTests.cs
@@ -31,7 +31,7 @@ public void CreateStandardENC40_50UKNAConcreteMaterialTests()
             Assert.Equal(EnConcreteGrade.C40_50, material.Grade);
             Assert.Equal(EnConcreteExposureClass.XC1, material.ExposureClasses[0]);
             Assert.Equal(20, material.MaximumAggregateSize.Millimeters);
-            Assert.Equal(0.3, material.MaximumCrackWidth.Millimeters);
+            Assert.Equal(0.3, material.CrackWidthLimit.Millimeters);
             Assert.Equal(30, material.MinimumCover.Millimeters);
         }
 
@@ -56,7 +56,7 @@ public void CreateStandardENC30_37GermanNAConcreteMaterialWithExposureClassAndMa
             Assert.Equal(EnConcreteExposureClass.XF2, material.ExposureClasses[0]);
             Assert.Equal(EnCementClass.S, material.CementClass);
             Assert.Equal(40, material.MaximumAggregateSize.Millimeters);
-            Assert.Equal(0.2, material.MaximumCrackWidth.Millimeters);
+            Assert.Equal(0.2, material.CrackWidthLimit.Millimeters);
             Assert.Equal(55, material.MinimumCover.Millimeters);
         }
 

diff --git a/Materials/Materials/StandardMaterials/EN/ENConcreteMaterial.cs b/Materials/Materials/StandardMaterials/EN/ENConcreteMaterial.cs
@@ -13,7 +13,7 @@ public class EnConcreteMaterial : IEnConcreteMaterial
         public IEurocode Standard { get; set; } = new EN1992(EN1992Part.Part1_1, NationalAnnex.RecommendedValues);
         public MaterialType Type => MaterialType.Concrete;
         public Length MaximumAggregateSize { get; set; } = new Length(20, LengthUnit.Millimeter);
-        public Length MaximumCrackWidth { get; set; } = new Length(0.3, LengthUnit.Millimeter);
+        public Length CrackWidthLimit { get; set; } = new Length(0.3, LengthUnit.Millimeter);
         public Length MinimumCover { get; set; } = new Length(30, LengthUnit.Millimeter);
         public Ratio PartialFactor { get; set; } = new Ratio(1.5, RatioUnit.DecimalFraction);
         public Ratio AccidentalPartialFactor { get; set; } = new Ratio(1.2, RatioUnit.DecimalFraction);
@@ -42,15 +42,15 @@ public EnConcreteMaterial(EnConcreteGrade grade, NationalAnnex nationalAnnex,
 
         public EnConcreteMaterial(EnConcreteGrade grade, NationalAnnex nationalAnnex,
             EnConcreteExposureClass exposureClass, Length maxAggregateSize,
-            EnCementClass cementClass, Length crackWidth, Length cover)
+            EnCementClass cementClass, Length crackWidthLimit, Length minimumCover)
         {
             Standard = new EN1992(EN1992Part.Part1_1, nationalAnnex);
             Grade = grade;
             CementClass = cementClass;
             ExposureClasses = new List<EnConcreteExposureClass>() { exposureClass };
             MaximumAggregateSize = maxAggregateSize;
-            MaximumCrackWidth = crackWidth;
-            MinimumCover = cover;
+            CrackWidthLimit = crackWidthLimit;
+            MinimumCover = minimumCover;
             SetPartialFactors(nationalAnnex);
         }