Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs =================================================================== diff -u -r448f6dbf9768780659b7e9380edee12483dcdaaa -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision 448f6dbf9768780659b7e9380edee12483dcdaaa) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -44,6 +44,7 @@ /// of the . /// /// The input to get the values from. + /// The general input to get the values from. /// The assessment level to use. /// The validation issues found, if any. /// Thrown when @@ -79,6 +80,7 @@ /// of the . /// /// The input to get the values from. + /// The general input to get the values from. /// The validation issues found, if any. /// Thrown when /// is null. Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationExporter.cs =================================================================== diff -u -r448f6dbf9768780659b7e9380edee12483dcdaaa -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationExporter.cs (.../MacroStabilityInwardsCalculationExporter.cs) (revision 448f6dbf9768780659b7e9380edee12483dcdaaa) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationExporter.cs (.../MacroStabilityInwardsCalculationExporter.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -57,6 +57,7 @@ /// Creates a new instance of . /// /// The calculation to export. + /// The to use. /// The persistence factory to use. /// The file path to export to. /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationGroupExporter.cs =================================================================== diff -u -r448f6dbf9768780659b7e9380edee12483dcdaaa -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationGroupExporter.cs (.../MacroStabilityInwardsCalculationGroupExporter.cs) (revision 448f6dbf9768780659b7e9380edee12483dcdaaa) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Exporters/MacroStabilityInwardsCalculationGroupExporter.cs (.../MacroStabilityInwardsCalculationGroupExporter.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -55,6 +55,7 @@ /// Creates a new instance of . /// /// The calculation group to export. + /// The to use. /// The persistence factory to use. /// The folder path to export to. /// The extension of the files. @@ -69,7 +70,7 @@ /// does not contain an invalid character, /// is not too long. /// - public MacroStabilityInwardsCalculationGroupExporter(CalculationGroup calculationGroup, GeneralMacroStabilityInwardsInput generalInput, IPersistenceFactory persistenceFactory, string folderPath, + public MacroStabilityInwardsCalculationGroupExporter(CalculationGroup calculationGroup, GeneralMacroStabilityInwardsInput generalInput, IPersistenceFactory persistenceFactory, string folderPath, string fileExtension, Func getNormativeAssessmentLevelFunc) { if (calculationGroup == null) @@ -121,7 +122,7 @@ log.WarnFormat(Resources.MacroStabilityInwardsCalculationGroupExporter_Export_Calculation_0_has_no_output_and_is_skipped, calculation.Name); break; case MacroStabilityInwardsCalculation calculation: - continueExport = ExportCalculation(calculation, generalInput, currentFolderPath, exportedCalculations); + continueExport = ExportCalculation(calculation, currentFolderPath, exportedCalculations); break; } @@ -163,11 +164,11 @@ return true; } - private bool ExportCalculation(MacroStabilityInwardsCalculation calculation, GeneralMacroStabilityInwardsInput generalInput, string currentFolderPath, IDictionary exportedCalculations) + private bool ExportCalculation(MacroStabilityInwardsCalculation calculation, string currentFolderPath, IDictionary exportedCalculations) { log.InfoFormat(CoreCommonGuiResources.GuiExportHandler_ExportItemUsingDialog_Start_exporting_DataType_0_, calculation.Name); - string uniqueName = NamingHelper.GetUniqueName(exportedCalculations, ((ICalculationBase)calculation).Name, c => c.Value); + string uniqueName = NamingHelper.GetUniqueName(exportedCalculations, ((ICalculationBase) calculation).Name, c => c.Value); string filePath = GetCalculationFilePath(currentFolderPath, uniqueName); var exporter = new MacroStabilityInwardsCalculationExporter(calculation, generalInput, persistenceFactory, filePath, () => getNormativeAssessmentLevelFunc(calculation)); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableDataModelFactory.cs =================================================================== diff -u -r6c4c5de22b1a8de30244c78943f420f102628157 -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableDataModelFactory.cs (.../PersistableDataModelFactory.cs) (revision 6c4c5de22b1a8de30244c78943f420f102628157) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableDataModelFactory.cs (.../PersistableDataModelFactory.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -36,6 +36,7 @@ /// Creates a new . /// /// The calculation to get the data from. + /// The to use. /// /// for obtaining the normative assessment level. /// The filePath that is used. Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetFactory.cs =================================================================== diff -u -r6c4c5de22b1a8de30244c78943f420f102628157 -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetFactory.cs (.../PersistableWaternetFactory.cs) (revision 6c4c5de22b1a8de30244c78943f420f102628157) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetFactory.cs (.../PersistableWaternetFactory.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -42,6 +42,7 @@ /// The extreme Waternet to use. /// The factory for creating IDs. /// The persistence registry. + /// The to use. /// A collection of . /// Thrown when any parameter is null. public static IEnumerable Create(MacroStabilityInwardsWaternet dailyWaternet, Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs =================================================================== diff -u -r448f6dbf9768780659b7e9380edee12483dcdaaa -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision 448f6dbf9768780659b7e9380edee12483dcdaaa) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -223,8 +223,8 @@ public double PenetrationLength { internal get; set; } /// - /// Gets or sets the penetration length. - /// [m] + /// Gets or sets the volumetric weight of water. + /// [kN/m3] /// public double WaterVolumetricWeight { internal get; set; } Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r448f6dbf9768780659b7e9380edee12483dcdaaa -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 448f6dbf9768780659b7e9380edee12483dcdaaa) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -184,7 +184,8 @@ { Name = Resources.MacroStabilityInwardsCalculationExporter_DisplayName, Extension = Resources.Stix_file_filter_extension, - CreateFileExporter = (context, folderPath) => new MacroStabilityInwardsCalculationGroupExporter(context.WrappedData, context.FailureMechanism.GeneralInput, new PersistenceFactory(), folderPath, Resources.Stix_file_filter_extension, + CreateFileExporter = (context, folderPath) => new MacroStabilityInwardsCalculationGroupExporter(context.WrappedData, context.FailureMechanism.GeneralInput, + new PersistenceFactory(), folderPath, Resources.Stix_file_filter_extension, calculation => GetNormativeAssessmentLevel(context.AssessmentSection, calculation)), IsEnabled = context => context.WrappedData.HasOutput(), GetExportPath = () => ExportHelper.GetFolderPath(GetInquiryHelper()) Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs =================================================================== diff -u -r448f6dbf9768780659b7e9380edee12483dcdaaa -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs (.../MacroStabilityInwardsCalculationActivity.cs) (revision 448f6dbf9768780659b7e9380edee12483dcdaaa) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs (.../MacroStabilityInwardsCalculationActivity.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -40,6 +40,7 @@ /// Creates a new instance of . /// /// The macro stability inwards calculation to perform. + /// The general input to get the values from. /// The normative assessment level to use in case the manual assessment level is not applicable. /// Thrown when is null. public MacroStabilityInwardsCalculationActivity(MacroStabilityInwardsCalculation calculation, Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r448f6dbf9768780659b7e9380edee12483dcdaaa -r397808fb8f82f617d4cc8594a77c3f3b75bd7d7f --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 448f6dbf9768780659b7e9380edee12483dcdaaa) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 397808fb8f82f617d4cc8594a77c3f3b75bd7d7f) @@ -54,6 +54,7 @@ /// the execution of the operation. /// /// The for which to validate the values. + /// The general input to get the values from. /// The normative assessment level to use in case the manual assessment level is not applicable. /// false if contains validation errors; true otherwise. /// Thrown when is null. @@ -127,6 +128,7 @@ /// Error and status information is logged during the execution of the operation. /// /// The to base the input for the calculation upon. + /// The general input to get the values from. /// The normative assessment level to use in case the manual assessment level is not applicable. /// Thrown when is null. /// Thrown when an error (both expected or unexpected) occurred during the calculation.