Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs (.../ClosingStructuresCalculationActivity.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs (.../ClosingStructuresCalculationActivity.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -93,9 +93,6 @@ calculationService.Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, hydraulicBoundaryDatabaseFilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -rf59a022b5a9865fb288c02861489d744e019487d -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision f59a022b5a9865fb288c02861489d744e019487d) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -309,15 +309,11 @@ public void Calculate_InvalidInFlowModelType_ThrowsInvalidEnumArgumentException() { // Setup - var failureMechanism = new ClosingStructuresFailureMechanism(); - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, - mockRepository); - var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); + var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new TestClosingStructuresCalculation { InputParameters = @@ -333,9 +329,6 @@ // Call TestDelegate call = () => service.Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -384,9 +377,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -468,9 +458,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -550,9 +537,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -634,9 +618,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -714,9 +695,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -795,9 +773,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -870,9 +845,6 @@ // Call new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, preprocessorDirectory); @@ -935,9 +907,6 @@ { Action call = () => new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -994,9 +963,6 @@ { new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -1059,9 +1025,6 @@ { new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -1126,9 +1089,6 @@ { new ClosingStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } Index: Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs =================================================================== diff -u -r64ff455bdc7d729c3b52ea59c2d347a5d3b1805d -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision 64ff455bdc7d729c3b52ea59c2d347a5d3b1805d) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -31,7 +31,6 @@ using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.IllustrationPoints; -using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.IO.HydraRing; using Ringtoets.Common.Service.IllustrationPoints; @@ -103,6 +102,7 @@ { throw new ArgumentNullException(nameof(calculation)); } + if (assessmentSection == null) { throw new ArgumentNullException(nameof(assessmentSection)); @@ -122,9 +122,6 @@ /// /// The that holds all the information required to perform the calculation. /// The general inputs used in the calculations. - /// The 'N' parameter used to factor in the 'length effect'. - /// The norm used in the calculation. - /// The contribution used in the calculation. /// The path which points to the hydraulic boundary database file. /// The preprocessor directory. /// Preprocessing is disabled when equals . @@ -144,16 +141,14 @@ /// Thrown when an error occurs while performing the calculation. public void Calculate(StructuresCalculation calculation, TGeneralInput generalInput, - double lengthEffectN, - double norm, - double contribution, string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory) { if (calculation == null) { throw new ArgumentNullException(nameof(calculation)); } + if (generalInput == null) { throw new ArgumentNullException(nameof(generalInput)); @@ -170,7 +165,7 @@ var exceptionThrown = false; try { - PerformCalculation(calculation, lengthEffectN, norm, contribution, input); + PerformCalculation(calculation, input); } catch (HydraRingCalculationException) { @@ -246,15 +241,9 @@ /// Performs a structures calculation. /// /// The structures calculation to use. - /// The 'N' parameter used to factor in the 'length effect'. - /// The norm used in the calculation. - /// The contribution used in the calculation. /// The HydraRing calculation input used for the calculation. /// Thrown when an error occurs while performing the calculation. private void PerformCalculation(StructuresCalculation calculation, - double lengthEffectN, - double norm, - double contribution, TCalculationInput calculationInput) { calculator.Calculate(calculationInput); @@ -336,7 +325,7 @@ string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath, - preprocessorDirectory); + preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { validationResults.Add(databaseFilePathValidationProblem); @@ -371,6 +360,7 @@ validationResults.AddRange(validationRule.Validate()); } } + return validationResults.ToArray(); } } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs =================================================================== diff -u -rc8b539cf2c3d5d46b91c5c0c7c0a9a69b713c13f -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs (.../StructuresCalculationServiceBaseTest.cs) (revision c8b539cf2c3d5d46b91c5c0c7c0a9a69b713c13f) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs (.../StructuresCalculationServiceBaseTest.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -28,7 +28,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Exceptions; -using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.MessageProviders; using Ringtoets.Common.Service.Structures; @@ -440,7 +439,7 @@ // Call TestDelegate test = () => new TestStructuresCalculationService(messageProvider) - .Calculate(null, new GeneralTestInput(), 0, 1, 1, string.Empty, string.Empty); + .Calculate(null, new GeneralTestInput(), string.Empty, string.Empty); // Assert var exception = Assert.Throws(test); @@ -460,7 +459,7 @@ // Call TestDelegate test = () => new TestStructuresCalculationService(messageProvider) - .Calculate(calculation, null, 0, 1, 1, string.Empty, string.Empty); + .Calculate(calculation, null, string.Empty, string.Empty); // Assert var exception = Assert.Throws(test); @@ -504,7 +503,7 @@ var service = new TestStructuresCalculationService(messageProvider); // Call - Action call = () => service.Calculate(calculation, new GeneralTestInput(), 1, 1, 1, validFilePath, validPreprocessorDirectory); + Action call = () => service.Calculate(calculation, new GeneralTestInput(), validFilePath, validPreprocessorDirectory); // Assert TestHelper.AssertLogMessages(call, messages => @@ -564,7 +563,7 @@ var service = new TestStructuresCalculationService(messageProvider); // Call - Action call = () => service.Calculate(calculation, new GeneralTestInput(), 1, 1, 1, validFilePath, validPreprocessorDirectory); + Action call = () => service.Calculate(calculation, new GeneralTestInput(), validFilePath, validPreprocessorDirectory); // Assert TestHelper.AssertLogMessages(call, messages => @@ -617,7 +616,7 @@ var service = new TestStructuresCalculationService(messageProvider); // Call - Action call = () => service.Calculate(calculation, new GeneralTestInput(), 1, 1, 1, validFilePath, validPreprocessorDirectory); + Action call = () => service.Calculate(calculation, new GeneralTestInput(), validFilePath, validPreprocessorDirectory); // Assert TestHelper.AssertLogMessages(call, messages => @@ -669,7 +668,7 @@ var service = new TestStructuresCalculationService(messageProvider); // Call - Action call = () => service.Calculate(calculation, new GeneralTestInput(), 1, 1, 1, validFilePath, validPreprocessorDirectory); + Action call = () => service.Calculate(calculation, new GeneralTestInput(), validFilePath, validPreprocessorDirectory); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -726,7 +725,7 @@ var service = new TestStructuresCalculationService(messageProvider); // Call - Action call = () => service.Calculate(calculation, new GeneralTestInput(), 1, 1, 1, validFilePath, validPreprocessorDirectory); + Action call = () => service.Calculate(calculation, new GeneralTestInput(), validFilePath, validPreprocessorDirectory); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -776,7 +775,7 @@ calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call - service.Calculate(calculation, new GeneralTestInput(), 0, 0.5, 1, validFilePath, validPreprocessorDirectory); + service.Calculate(calculation, new GeneralTestInput(), validFilePath, validPreprocessorDirectory); // Assert Assert.IsNull(calculation.Output); @@ -843,7 +842,7 @@ { try { - structuresCalculationService.Calculate(calculation, new GeneralTestInput(), 0, 0.5, 1, validFilePath, validPreprocessorDirectory); + structuresCalculationService.Calculate(calculation, new GeneralTestInput(), validFilePath, validPreprocessorDirectory); } catch (HydraRingCalculationException) { Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs (.../HeightStructuresCalculationActivity.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs (.../HeightStructuresCalculationActivity.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -90,9 +90,6 @@ calculationService.Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, hydraulicBoundaryDatabaseFilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -rf59a022b5a9865fb288c02861489d744e019487d -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision f59a022b5a9865fb288c02861489d744e019487d) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -407,9 +407,6 @@ { Action call = () => new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -462,9 +459,6 @@ { Action call = () => new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -517,9 +511,6 @@ // Call new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -595,9 +586,6 @@ // Call new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -674,9 +662,6 @@ { new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -740,9 +725,6 @@ { new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -807,9 +789,6 @@ { new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -870,9 +849,6 @@ // Call new HeightStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, preprocessorDirectory); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs (.../StabilityPointStructuresCalculationActivity.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs (.../StabilityPointStructuresCalculationActivity.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -93,9 +93,6 @@ calculationService.Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, hydraulicBoundaryDatabaseFilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -rf59a022b5a9865fb288c02861489d744e019487d -r9cd1f99915772a8d9990c31e281b70dd663b4e2d --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision f59a022b5a9865fb288c02861489d744e019487d) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) @@ -498,14 +498,11 @@ public void Calculate_InvalidInFlowModelType_ThrowsInvalidEnumArgumentException() { // Setup - var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, - mockRepository); var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new TestStabilityPointStructuresCalculation { InputParameters = @@ -522,9 +519,6 @@ // Call TestDelegate call = () => service.Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -567,9 +561,6 @@ // Call TestDelegate call = () => service.Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -619,9 +610,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -743,9 +731,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -864,9 +849,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -988,9 +970,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -1109,9 +1088,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -1233,9 +1209,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -1354,9 +1327,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -1478,9 +1448,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -1595,9 +1562,6 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, preprocessorDirectory); @@ -1662,9 +1626,6 @@ { Action call = () => new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); @@ -1722,9 +1683,6 @@ { new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -1787,9 +1745,6 @@ { new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); } @@ -1853,9 +1808,6 @@ { new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - failureMechanism.GeneralInput.N, - assessmentSection.FailureMechanismContribution.Norm, - failureMechanism.Contribution, validFilePath, validPreprocessorDirectory); }