diff --git a/StructureHelper/Infrastructure/UI/Resources/Materials.xaml b/StructureHelper/Infrastructure/UI/Resources/Materials.xaml
index f0cde06..5d0072d 100644
--- a/StructureHelper/Infrastructure/UI/Resources/Materials.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/Materials.xaml
@@ -25,6 +25,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml b/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml
index 0892d01..39cc35e 100644
--- a/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml
+++ b/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml
@@ -7,40 +7,43 @@
xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Materials"
d:DataContext="{d:DesignInstance vm:HeadMaterialViewModel}"
mc:Ignorable="d"
- Title="Material properties" Height="350" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
+ Title="Material properties"
+ Height="350" Width="300"
+ MinWidth="300" MaxWidth="400" MinHeight="350" MaxHeight="500"
+ WindowStartupLocation="CenterScreen">
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
diff --git a/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml.cs b/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml.cs
index 609a540..e6bf8c8 100644
--- a/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml.cs
+++ b/StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml.cs
@@ -62,6 +62,13 @@ namespace StructureHelper.Windows.MainWindow.Materials
var binding = new Binding();
binding.Source = vm.HelperMaterialViewModel;
bindings.Add(templateName, binding);
+ if (helperMaterial is IFRMaterial)
+ {
+ templateName = "CarbonProperties";
+ var carbonBinding = new Binding();
+ carbonBinding.Source = vm.HelperMaterialViewModel as FRViewModel;
+ bindings.Add(templateName, carbonBinding);
+ }
templateName = "DirectSafetyFactors";
var frBinding = new Binding();
frBinding.Source = (vm.HelperMaterialViewModel as ElasticViewModel).SafetyFactors;
diff --git a/StructureHelper/Windows/ViewModels/Materials/FRViewModel.cs b/StructureHelper/Windows/ViewModels/Materials/FRViewModel.cs
index 2cd3d7f..738395f 100644
--- a/StructureHelper/Windows/ViewModels/Materials/FRViewModel.cs
+++ b/StructureHelper/Windows/ViewModels/Materials/FRViewModel.cs
@@ -10,9 +10,41 @@ namespace StructureHelper.Windows.ViewModels.Materials
{
internal class FRViewModel : ElasticViewModel
{
+ IFRMaterial material;
+ public double ULSConcreteStrength
+ {
+ get
+ {
+ return material.ULSConcreteStrength;
+ }
+
+ set
+ {
+ material.ULSConcreteStrength = value;
+ OnPropertyChanged(nameof(ULSConcreteStrength));
+ }
+ }
+ public double SumThickness
+ {
+ get
+ {
+ return material.SumThickness;
+ }
+
+ set
+ {
+ material.SumThickness = value;
+ OnPropertyChanged(nameof(SumThickness));
+ }
+ }
+ public double GammaF2
+ {
+ get => material.GammaF2;
+ set {}
+ }
public FRViewModel(IFRMaterial material) : base(material)
{
-
+ this.material = material;
}
}
}
diff --git a/StructureHelper/Windows/ViewModels/Materials/MaterialsViewModel.cs b/StructureHelper/Windows/ViewModels/Materials/MaterialsViewModel.cs
index ed5a6df..c53cadf 100644
--- a/StructureHelper/Windows/ViewModels/Materials/MaterialsViewModel.cs
+++ b/StructureHelper/Windows/ViewModels/Materials/MaterialsViewModel.cs
@@ -82,7 +82,7 @@ namespace StructureHelper.Windows.ViewModels.Materials
}
private void AddCarbonFiber()
{
- var material = HeadMaterialFactory.GetHeadMaterial(HeadmaterialType.Carbon4000, ProgramSetting.CodeType);
+ var material = HeadMaterialFactory.GetHeadMaterial(HeadmaterialType.Carbon1400, ProgramSetting.CodeType);
material.Name = "New CFR Material";
NewItem = material;
}
diff --git a/StructureHelperCommon/Models/Materials/Libraries/Factories/FRFactorsFactory.cs b/StructureHelperCommon/Models/Materials/Libraries/Factories/FRFactorsFactory.cs
index e956d19..e76eea6 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/Factories/FRFactorsFactory.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/Factories/FRFactorsFactory.cs
@@ -12,29 +12,24 @@ namespace StructureHelperCommon.Models.Materials.Libraries
public enum FRFactorType
{
ConditionFactor,
- CohesionFactor,
LongTermFactor,
}
public static class FRFactorsFactory
{
const string gammaf1Name = "Gamma_f1";
const string gammaf1Description = "Coefficient for considering environment";
- const string gammaf2Name = "Gamma_f2";
- const string gammaf2Description = "Coefficient for considering cohesion";
const string gammaf3Name = "Gamma_f3";
const string gammaf3Description = "Coefficient for considering long term calculations";
public static IMaterialSafetyFactor GetCarbonFactor(FRFactorType factorType)
{
if (factorType == FRFactorType.LongTermFactor) { return LongTerm(1d / 1.2d,0.8d); }
else if (factorType == FRFactorType.ConditionFactor) { return Condition(gammaf1Name, gammaf1Description , 0.9d); }
- else if (factorType == FRFactorType.CohesionFactor) { return Condition(gammaf2Name, gammaf2Description, 0.9d); }
else throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown);
}
public static IMaterialSafetyFactor GetGlassFactor(FRFactorType factorType)
{
if (factorType == FRFactorType.LongTermFactor) { return LongTerm(1d / 1.8d, 0.3d); }
else if (factorType == FRFactorType.ConditionFactor) { return Condition(gammaf1Name, gammaf1Description, 0.7d); }
- else if (factorType == FRFactorType.CohesionFactor) { return Condition(gammaf2Name, gammaf2Description, 0.9d); }
else throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown);
}
diff --git a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs b/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
index a20ab3f..6a239a5 100644
--- a/StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
+++ b/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 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();
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;
}
}
diff --git a/StructureHelperLogics/Models/Materials/FRMaterials/IFRMaterial.cs b/StructureHelperLogics/Models/Materials/FRMaterials/IFRMaterial.cs
index afa53a2..1300b2d 100644
--- a/StructureHelperLogics/Models/Materials/FRMaterials/IFRMaterial.cs
+++ b/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; }
+
}
}
diff --git a/StructureHelperLogics/Models/Materials/Factories/HeadMaterialFactory.cs b/StructureHelperLogics/Models/Materials/Factories/HeadMaterialFactory.cs
index 9d91f54..68eca3c 100644
--- a/StructureHelperLogics/Models/Materials/Factories/HeadMaterialFactory.cs
+++ b/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;
}
diff --git a/StructureHelperLogics/Models/Materials/Factories/PartialCoefficientFactory.cs b/StructureHelperLogics/Models/Materials/Factories/PartialCoefficientFactory.cs
index 7a9311c..966e295 100644
--- a/StructureHelperLogics/Models/Materials/Factories/PartialCoefficientFactory.cs
+++ b/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);
diff --git a/StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs b/StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs
index ac09562..77733d5 100644
--- a/StructureHelperLogics/Models/Materials/Logics/ElasticMaterialLogic.cs
+++ b/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 parameters = new List()
{
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 parameters, double strain)
+ private double GetStressByStrain(IEnumerable parameters, double strain)
{
double modulus = parameters.First();
double stress = modulus * strain;
diff --git a/StructureHelperLogics/Models/Materials/Logics/IElasticMaterialLogic.cs b/StructureHelperLogics/Models/Materials/Logics/IElasticMaterialLogic.cs
index abbc0d6..3fcd215 100644
--- a/StructureHelperLogics/Models/Materials/Logics/IElasticMaterialLogic.cs
+++ b/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);
}
}