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

Fix crack width calculation

Browse Source
This commit is contained in:
ear
2024-12-19 17:43:04 +05:00
parent a14433f3cb
commit 2cd350d3e8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
StructureHelperLogics/NdmCalculations/Cracking/CrackWidthCalculationLogic.cs
View File

@@ -17,7 +17,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
private ICrackWidthLogic crackWidthLogic; private ICrackWidthLogic crackWidthLogic;
private RebarCrackResult result; private RebarCrackResult result;
private ICrackSofteningLogic crackSofteningLogic; private ICrackSofteningLogic crackSofteningLogic;
private IRebarStressResult rebarStressResult; private IRebarStressResult longRebarStressResult;
private ICrackWidthLogicInputData acrc2InputData; private ICrackWidthLogicInputData acrc2InputData;
private ICrackWidthLogicInputData acrc1InputData; private ICrackWidthLogicInputData acrc1InputData;
private ICrackWidthLogicInputData acrc3InputData; private ICrackWidthLogicInputData acrc3InputData;
@@ -83,7 +83,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
{ {
TraceLogger?.AddMessage($"Short term softening factor calculation"); TraceLogger?.AddMessage($"Short term softening factor calculation");
crackSofteningLogic = GetSofteningLogic(InputData.ShortRebarData); crackSofteningLogic = GetSofteningLogic(InputData.ShortRebarData);
rebarStressResult = GetRebarStressResult(InputData.ShortRebarData); longRebarStressResult = GetRebarStressResult(InputData.ShortRebarData);
acrc3InputData = GetCrackWidthInputData(crackSofteningLogic, InputData.LongRebarData, CalcTerms.ShortTerm); acrc3InputData = GetCrackWidthInputData(crackSofteningLogic, InputData.LongRebarData, CalcTerms.ShortTerm);
crackWidthLogic.InputData = acrc3InputData; crackWidthLogic.InputData = acrc3InputData;
longTermLoadShortConcreteCrackWidth = crackWidthLogic.GetCrackWidth(); longTermLoadShortConcreteCrackWidth = crackWidthLogic.GetCrackWidth();
@@ -99,7 +99,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
{ {
CrackWidth = acrcShort, CrackWidth = acrcShort,
UltimateCrackWidth = InputData.UserCrackInputData.UltimateShortCrackWidth, UltimateCrackWidth = InputData.UserCrackInputData.UltimateShortCrackWidth,
RebarStressResult = rebarStressResult, RebarStressResult = longRebarStressResult,
SofteningFactor = crackSofteningLogic.GetSofteningFactor() SofteningFactor = crackSofteningLogic.GetSofteningFactor()
}; };
TraceCrackResult(shortRebarResult); TraceCrackResult(shortRebarResult);
@@ -110,7 +110,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
{ {
TraceLogger?.AddMessage($"Long term softening factor calculation"); TraceLogger?.AddMessage($"Long term softening factor calculation");
crackSofteningLogic = GetSofteningLogic(InputData.LongRebarData); crackSofteningLogic = GetSofteningLogic(InputData.LongRebarData);
rebarStressResult = GetRebarStressResult(InputData.LongRebarData); longRebarStressResult = GetRebarStressResult(InputData.LongRebarData);
acrc1InputData = GetCrackWidthInputData(crackSofteningLogic, InputData.LongRebarData, CalcTerms.LongTerm); acrc1InputData = GetCrackWidthInputData(crackSofteningLogic, InputData.LongRebarData, CalcTerms.LongTerm);
crackWidthLogic.InputData = acrc1InputData; crackWidthLogic.InputData = acrc1InputData;
longTermLoadLongTermConcreteCrackWidth = crackWidthLogic.GetCrackWidth(); longTermLoadLongTermConcreteCrackWidth = crackWidthLogic.GetCrackWidth();
@@ -119,7 +119,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
{ {
CrackWidth = longTermLoadLongTermConcreteCrackWidth, CrackWidth = longTermLoadLongTermConcreteCrackWidth,
UltimateCrackWidth = InputData.UserCrackInputData.UltimateLongCrackWidth, UltimateCrackWidth = InputData.UserCrackInputData.UltimateLongCrackWidth,
RebarStressResult = rebarStressResult, RebarStressResult = longRebarStressResult,
SofteningFactor = crackSofteningLogic.GetSofteningFactor() SofteningFactor = crackSofteningLogic.GetSofteningFactor()
}; };
TraceLogger?.AddMessage($"Long crack width acrc = acrc,1 = {longTermLoadLongTermConcreteCrackWidth}(m)"); TraceLogger?.AddMessage($"Long crack width acrc = acrc,1 = {longTermLoadLongTermConcreteCrackWidth}(m)");
@@ -166,6 +166,8 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
private ICrackWidthLogicInputData GetCrackWidthInputData(ICrackSofteningLogic crackSofteningLogic, IRebarCrackInputData inputData, CalcTerms calcTerm) private ICrackWidthLogicInputData GetCrackWidthInputData(ICrackSofteningLogic crackSofteningLogic, IRebarCrackInputData inputData, CalcTerms calcTerm)
{ {
//to do fix multy recall
IRebarStressResult rebarStressResult = GetRebarStressResult(inputData);
var factoryInputData = new CrackWidthLogicInputDataFactory(crackSofteningLogic) var factoryInputData = new CrackWidthLogicInputDataFactory(crackSofteningLogic)
{ {
CalcTerm = calcTerm, CalcTerm = calcTerm,