avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibMaterial update strategy was fixed

Browse Source
This commit is contained in:
Evgeny Redikultsev
2023-07-22 22:18:17 +05:00
parent 580087b2a6
commit 44ca05d181
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
StructureHelperLogics/Models/Materials/Logics/LibMaterialUpdateStrategy.cs
View File

@@ -13,8 +13,9 @@ namespace StructureHelperLogics.Models.Materials
public void Update(ILibMaterial targetObject, ILibMaterial sourceObject)
{
targetObject.MaterialEntity = sourceObject.MaterialEntity;
var tmpSafetyFactors = new List<IMaterialSafetyFactor>(sourceObject.SafetyFactors);
targetObject.SafetyFactors.Clear();
foreach (var item in sourceObject.SafetyFactors)
foreach (var item in tmpSafetyFactors)
{
targetObject.SafetyFactors.Add(item.Clone() as IMaterialSafetyFactor);
}

5
StructureHelperLogics/NdmCalculations/Cracking/CrackForceCalculator.cs
View File

@@ -94,6 +94,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
result.FactorOfCrackAppearance = factorOfCrackAppearance;
result.TupleOfCrackAppearance = ForceTupleService.InterpolateTuples(EndTuple, StartTuple, factorOfCrackAppearance);
var reducedStrainTuple = GetReducedStrainTuple(factorOfCrackAppearance, psiS);
result.CrackedStrainTuple = GetStrainTuple(EndTuple);
result.ReducedStrainTuple = reducedStrainTuple;
result.SofteningFactors=GetSofteningFactors(reducedStrainTuple);
result.PsiS = psiS;
@@ -128,7 +129,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
result.TupleOfCrackAppearance = (IForceTuple)StartTuple.Clone();
softeningLogic.ForceRatio = result.FactorOfCrackAppearance;
result.PsiS = softeningLogic.GetSofteningFactor();
result.ReducedStrainTuple = GetStrainTuple(EndTuple);
result.CrackedStrainTuple = result.ReducedStrainTuple = GetStrainTuple(EndTuple);
result.SofteningFactors = GetSofteningFactors(result.ReducedStrainTuple);
result.IsSectionCracked = true;
result.Description += "Section cracked in start tuple";
@@ -137,7 +138,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
{
result.IsValid = true;
result.IsSectionCracked = false;
result.ReducedStrainTuple = GetStrainTuple(EndTuple);
result.CrackedStrainTuple = result.ReducedStrainTuple = GetStrainTuple(EndTuple);
result.SofteningFactors = GetSofteningFactors(result.ReducedStrainTuple);
result.Description = "Section is not cracked";
}

1
StructureHelperLogics/NdmCalculations/Cracking/CrackForceResult.cs
View File

@@ -18,6 +18,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
public IForceTuple StartTuple { get; set; }
public IForceTuple EndTuple { get; set; }
public IForceTuple TupleOfCrackAppearance { get; set; }
public StrainTuple CrackedStrainTuple { get; set; }
public StrainTuple ReducedStrainTuple { get; set; }
public StrainTuple SofteningFactors { get; set; }
public IEnumerable<INdm> NdmCollection { get; set; }

4
StructureHelperLogics/NdmCalculations/Cracking/ExpSofteningLogic.cs
View File

@@ -45,8 +45,8 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
public ExpSofteningLogic()
{
FiMin = 0.2d;
PowerFactor = 1d;
BettaFactor = 0.8;
PowerFactor = 2d;
BettaFactor = 0.8d;
}
public double GetSofteningFactor()
{