Carbon material was changed

StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs

@@ -14,14 +14,33 @@ namespace StructureHelperLogics.Models.Materials
     {
         private IElasticMaterialLogic elasticMaterialLogic => new ElasticMaterialLogic();
         private MaterialTypes materialType;
-        public double Modulus { get; set; }
+        public double Modulus{ get; set; }
         public double CompressiveStrength { get; set; }
         public double TensileStrength { get; set; }
 
         public List<IMaterialSafetyFactor> SafetyFactors { get; }
+        public double ULSConcreteStrength { get; set; }
+        public double SumThickness { get; set; }
+        public double GammaF2 => GetGammaF2();
+
+        private double GetGammaF2()
+        {
+            const double gammaF2Max = 0.9d;
+            double gammaF2;
+            IFactorLogic factorLogic = new FactorLogic(SafetyFactors);
+            var factors = factorLogic.GetTotalFactor(LimitStates.ULS, CalcTerms.ShortTerm);
+            var rf = TensileStrength * factors.Tensile;
+            var epsUlt = rf / Modulus;
+            gammaF2 = 0.4d / epsUlt * Math.Sqrt(ULSConcreteStrength / (Modulus * SumThickness * 1e3d));
+            gammaF2 = Math.Min(gammaF2, gammaF2Max);
+            return gammaF2;
+        }
 
         public FRMaterial(MaterialTypes materialType)
         {
+
+            ULSConcreteStrength = 14e6d;
+            SumThickness = 0.175e-3d;
             SafetyFactors = new List<IMaterialSafetyFactor>();
             this.materialType = materialType;
             SafetyFactors.AddRange(PartialCoefficientFactory.GetDefaultFRSafetyFactors(ProgramSetting.FRCodeType, this.materialType));
@@ -30,17 +49,24 @@ namespace StructureHelperLogics.Models.Materials
         public object Clone()
         {
             var newItem = new FRMaterial(materialType)
-            { 
+            {
                 Modulus = Modulus,
                 CompressiveStrength = CompressiveStrength,
-                TensileStrength = TensileStrength
+                TensileStrength = TensileStrength,
+                ULSConcreteStrength = ULSConcreteStrength,
+                SumThickness = SumThickness,
             };
             return newItem;
         }
 
         public IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
         {
-            var material = elasticMaterialLogic.GetLoaderMaterial(this, limitState, calcTerm);
+            double factor = 1d;
+            if (limitState == LimitStates.ULS)
+                {
+                    factor = GetGammaF2();
+                }
+            var material = elasticMaterialLogic.GetLoaderMaterial(this, limitState, calcTerm, factor);
             return material;
         }
     }

StructureHelperLogics/Models/Materials/FRMaterials/IFRMaterial.cs

@@ -9,6 +9,9 @@ namespace StructureHelperLogics.Models.Materials
 {
     public interface IFRMaterial : IElasticMaterial
     {
-        
+        double ULSConcreteStrength { get; set; }
+        double SumThickness { get; set; }
+        double GammaF2 { get; }
+
     }
 }

StructureHelperLogics/Models/Materials/Factories/HeadMaterialFactory.cs

@@ -18,7 +18,7 @@ namespace StructureHelperLogics.Models.Materials
         Reinforecement400,
         Reinforecement500,
         Elastic200,
-        Carbon4000,
+        Carbon1400,
         Glass1200
     }     
 
@@ -35,7 +35,7 @@ namespace StructureHelperLogics.Models.Materials
             if (type == HeadmaterialType.Reinforecement400) { return GetReinforcement400(); }
             if (type == HeadmaterialType.Reinforecement500) { return GetReinforcement500(); }
             if (type == HeadmaterialType.Elastic200) { return GetElastic200(); }
-            if (type == HeadmaterialType.Carbon4000) { return GetCarbon4000(); }
+            if (type == HeadmaterialType.Carbon1400) { return GetCarbon1400(); }
             if (type == HeadmaterialType.Glass1200) { return GetGlass1200(); }
             else throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown + nameof(type));
         }
@@ -57,17 +57,27 @@ namespace StructureHelperLogics.Models.Materials
             return material;
         }
 
-        private static IHeadMaterial GetCarbon4000()
+        private static IHeadMaterial GetCarbon1400()
         {
             var material = new HeadMaterial();
-            material.HelperMaterial = new FRMaterial(MaterialTypes.CarbonFiber) { Modulus = 2e11d, CompressiveStrength = 4e9d, TensileStrength = 4e9d };
+            material.HelperMaterial = new FRMaterial(MaterialTypes.CarbonFiber)
+            {
+                Modulus = 1.2e11d,
+                CompressiveStrength = 0d,
+                TensileStrength = 1.4e9d
+            };
             return material;
         }
 
         private static IHeadMaterial GetGlass1200()
         {
             var material = new HeadMaterial();
-            material.HelperMaterial = new FRMaterial(MaterialTypes.GlassFiber) { Modulus = 8e10d, CompressiveStrength = 1.2e9d, TensileStrength = 1.2e9d };
+            material.HelperMaterial = new FRMaterial(MaterialTypes.GlassFiber)
+            {
+                Modulus = 8e10d,
+                CompressiveStrength = 1.2e9d,
+                TensileStrength = 1.2e9d
+            };
             return material;
         }
 

StructureHelperLogics/Models/Materials/Factories/PartialCoefficientFactory.cs

@@ -66,9 +66,6 @@ namespace StructureHelperLogics.Models.Materials
             coefficient = FRFactorsFactory.GetCarbonFactor(FRFactorType.ConditionFactor);
             coefficient.Take = true;
             factors.Add(coefficient);
-            coefficient = FRFactorsFactory.GetCarbonFactor(FRFactorType.CohesionFactor);
-            coefficient.Take = true;
-            factors.Add(coefficient);
             coefficient = FRFactorsFactory.GetCarbonFactor(FRFactorType.LongTermFactor);
             coefficient.Take = true;
             factors.Add(coefficient);
@@ -79,9 +76,6 @@ namespace StructureHelperLogics.Models.Materials
             coefficient = FRFactorsFactory.GetGlassFactor(FRFactorType.ConditionFactor);
             coefficient.Take = true;
             factors.Add(coefficient);
-            coefficient = FRFactorsFactory.GetGlassFactor(FRFactorType.CohesionFactor);
-            coefficient.Take = true;
-            factors.Add(coefficient);
             coefficient = FRFactorsFactory.GetGlassFactor(FRFactorType.LongTermFactor);
             coefficient.Take = true;
             factors.Add(coefficient);

StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs

@@ -12,7 +12,7 @@ namespace StructureHelperLogics.Models.Materials
 {
     internal class ElasticMaterialLogic : IElasticMaterialLogic
     {
-        public IMaterial GetLoaderMaterial(IElasticMaterial elasticMaterial, LimitStates limitState, CalcTerms calcTerm)
+        public IMaterial GetLoaderMaterial(IElasticMaterial elasticMaterial, LimitStates limitState, CalcTerms calcTerm, double factor = 1d)
         { 
             IMaterial material = new Material();
             material.InitModulus = elasticMaterial.Modulus;
@@ -21,15 +21,15 @@ namespace StructureHelperLogics.Models.Materials
             IEnumerable<double> parameters = new List<double>()
             {
                 elasticMaterial.Modulus,
-                elasticMaterial.CompressiveStrength * factors.Compressive,
-                elasticMaterial.TensileStrength * factors.Tensile
+                elasticMaterial.CompressiveStrength * factors.Compressive * factor,
+                elasticMaterial.TensileStrength * factors.Tensile * factor
             };
         material.DiagramParameters = parameters;
-        material.Diagram = GetStress;
+        material.Diagram = GetStressByStrain;
         return material;
         }
 
-    private double GetStress(IEnumerable<double> parameters, double strain)
+    private double GetStressByStrain(IEnumerable<double> parameters, double strain)
     {
         double modulus = parameters.First();
         double stress = modulus * strain;

StructureHelperLogics/Models/Materials/Logics/IElasticMaterialLogic.cs

@@ -10,6 +10,6 @@ namespace StructureHelperLogics.Models.Materials
 {
     internal interface IElasticMaterialLogic
     {
-        IMaterial GetLoaderMaterial(IElasticMaterial material, LimitStates limitState, CalcTerms calcTerm);
+        IMaterial GetLoaderMaterial(IElasticMaterial material, LimitStates limitState, CalcTerms calcTerm, double factor = 1d);
     }
 }