Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs =================================================================== diff -u -r1953 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs (.../WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs) (revision 1953) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs (.../WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedOutput.cs) (revision 1961) @@ -23,13 +23,13 @@ using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Standard.Calculation; -namespace Deltares.DamEngine.Calculators.KernelWrappers.WbiPipingSellmeijerRevised +namespace Deltares.DamEngine.Calculators.KernelWrappers.WtiPipingSellmeijerRevised { /// - /// Output parameters for Wbi Piping SellmeijerRevised - /// Note: the Wbi kernel does provide more output (such as CCreep, Zp etc) but thta just is not used in DAM. + /// Output parameters for Wti Piping SellmeijerRevised + /// Note: the Wti kernel does provide more output (such as CCreep, Zp etc) but thta just is not used in DAM. /// - public class WbiPipingSellmeijerRevisedOutput: IKernelDataOutput + public class WtiPipingSellmeijerRevisedOutput: IKernelDataOutput { /// /// Gets or sets the backward erosion safetyfactor. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx =================================================================== diff -u -r1955 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 1955) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 1961) @@ -273,11 +273,11 @@ De nieuwe berm snijdt het dijkprofiel niet. Ofwel het dijkprofiel verloopt heel vreemd of de nieuwe bermlengte is te groot. - - Geen invoer object gedefinieerd voor WBI Sellmeijer Revised + + Geen invoer object gedefinieerd voor WTI Sellmeijer Revised - - Geen uitvoer object gedefinieerd voor WBI Sellmeijer Revised + + Geen uitvoer object gedefinieerd voor WTI Sellmeijer Revised Geen Dam invoer object gedefinieerd voor WTI Macrostabiliteit Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs =================================================================== diff -u -r1933 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1933) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 1961) @@ -251,7 +251,7 @@ /// public enum TimeSerieParameters { - PipingFactorWbiSellmeijerRevised, + PipingFactorWtiSellmeijerRevised, PipingFactorBligh, PipingFactorSellmeijer, ProbabilityOfFailurePipingSellmeijer, Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedInput.cs =================================================================== diff -u -r1921 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedInput.cs (.../WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedInput.cs) (revision 1921) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedInput.cs (.../WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedInput.cs) (revision 1961) @@ -23,12 +23,12 @@ using Deltares.DamEngine.Data.General; using Deltares.WTIPiping; -namespace Deltares.DamEngine.Calculators.KernelWrappers.WbiPipingSellmeijerRevised +namespace Deltares.DamEngine.Calculators.KernelWrappers.WtiPipingSellmeijerRevised { /// - /// Input parameters for Wbi Piping SellmeijerRevised + /// Input parameters for Wti Piping SellmeijerRevised /// - public class WbiPipingSellmeijerRevisedInput : IKernelDataInput + public class WtiPipingSellmeijerRevisedInput : IKernelDataInput { // For now, Ich is just used with a default value (see MWDAM-1299) private const double cIch = 0.3; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj =================================================================== diff -u -r1959 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1959) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 1961) @@ -81,10 +81,10 @@ - + - - + + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs =================================================================== diff -u -r1902 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 1902) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs (.../KernelWrapperHelper.cs) (revision 1961) @@ -27,7 +27,7 @@ using Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijer4Forces; using Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijerVnk; using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces; -using Deltares.DamEngine.Calculators.KernelWrappers.WbiPipingSellmeijerRevised; +using Deltares.DamEngine.Calculators.KernelWrappers.WtiPipingSellmeijerRevised; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Standard; @@ -76,7 +76,7 @@ kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper(); break; case PipingModelType.Wti2017: - kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); break; } break; Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs =================================================================== diff -u -r1919 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs (.../FactoryForSurfaceLines.cs) (revision 1919) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs (.../FactoryForSurfaceLines.cs) (revision 1961) @@ -696,7 +696,7 @@ return surfaceLine; } - public static SurfaceLine2 CreateSurfaceLineForWbiPiping(bool includingTraffic = false) + public static SurfaceLine2 CreateSurfaceLineForWtiPiping(bool includingTraffic = false) { //Surface line tutorial 1 var surfaceLine = new SurfaceLine2 Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedDesignInputFile.xml =================================================================== diff -u -r1741 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedDesignInputFile.xml (.../PipingVoorbeeld1_SellmeijerRevisedDesignInputFile.xml) (revision 1741) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedDesignInputFile.xml (.../PipingVoorbeeld1_SellmeijerRevisedDesignInputFile.xml) (revision 1961) @@ -1,5 +1,5 @@ - + Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedInputFile.xml =================================================================== diff -u -r1741 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedInputFile.xml (.../PipingVoorbeeld1_SellmeijerRevisedInputFile.xml) (revision 1741) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedInputFile.xml (.../PipingVoorbeeld1_SellmeijerRevisedInputFile.xml) (revision 1961) @@ -1,5 +1,5 @@ - + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs =================================================================== diff -u -r1935 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs (.../WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1935) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs (.../WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapper.cs) (revision 1961) @@ -38,12 +38,12 @@ using Deltares.WTIPiping; using UpliftLocationAndResult = Deltares.DamEngine.Calculators.Uplift.UpliftLocationAndResult; -namespace Deltares.DamEngine.Calculators.KernelWrappers.WbiPipingSellmeijerRevised +namespace Deltares.DamEngine.Calculators.KernelWrappers.WtiPipingSellmeijerRevised { /// - /// Wrapper for Wbi Piping SellmeijerRevised kernel + /// Wrapper for Wti Piping SellmeijerRevised kernel /// - public class WbiPipingSellmeijerRevisedKernelWrapper: IKernelWrapper + public class WtiPipingSellmeijerRevisedKernelWrapper: IKernelWrapper { private const double defaultMaxReturnValue = 90.0; private const double defaultFluidisationGradient = 0.3; @@ -60,7 +60,7 @@ /// public PrepareResult Prepare(DamKernelInput damKernelInput, int iterationIndex, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput) { - var damPipingOutput = new WbiPipingSellmeijerRevisedOutput() + var damPipingOutput = new WtiPipingSellmeijerRevisedOutput() { FoSbe = defaultMaxReturnValue, FoSu = defaultMaxReturnValue, @@ -94,39 +94,39 @@ /// public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages) { - var wbiPipingSellmeijerRevisedOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; + var wtiPipingSellmeijerRevisedOutput = (WtiPipingSellmeijerRevisedOutput)kernelDataOutput; List kernelMessages = new List(); messages = new List(); - // Validate the WBI Heave calculator - var calculatorWbiHeave = CreateWtiHeaveCalculator(kernelDataInput); + // Validate the WTI Heave calculator + var calculatorWtiHeave = CreateWtiHeaveCalculator(kernelDataInput); kernelMessages.Clear(); - kernelMessages = calculatorWbiHeave.Validate(); + kernelMessages = calculatorWtiHeave.Validate(); foreach (string stringMessage in kernelMessages) { messages.Add(new LogMessage() { Message = stringMessage, MessageType = LogMessageType.Error }); } - // Validate the WBI Uplift calculator - var calculatorWbiUplift = CreateWtiUpliftCalculator(kernelDataInput); + // Validate the WTI Uplift calculator + var calculatorWtiUplift = CreateWtiUpliftCalculator(kernelDataInput); kernelMessages.Clear(); - kernelMessages = calculatorWbiUplift.Validate(); + kernelMessages = calculatorWtiUplift.Validate(); foreach (string stringMessage in kernelMessages) { messages.Add(new LogMessage() { Message = stringMessage, MessageType = LogMessageType.Error }); } - // Validate the WBI Piping calculator - var calculatorWbiSellmeijerRevised = CreatePipingCalculatorWbiSellmeijerRevised(kernelDataInput); + // Validate the WTI Piping calculator + var calculatorWtiSellmeijerRevised = CreatePipingCalculatorWtiSellmeijerRevised(kernelDataInput); kernelMessages.Clear(); - kernelMessages = calculatorWbiSellmeijerRevised.Validate(); + kernelMessages = calculatorWtiSellmeijerRevised.Validate(); foreach (string stringMessage in kernelMessages) { messages.Add(new LogMessage() { Message = stringMessage, MessageType = LogMessageType.Error }); } if (messages.Count > 0) { - wbiPipingSellmeijerRevisedOutput.CalculationResult = CalculationResult.InvalidInputData; + wtiPipingSellmeijerRevisedOutput.CalculationResult = CalculationResult.InvalidInputData; } return messages.Count; } @@ -139,24 +139,24 @@ /// The messages. public void Execute(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List messages) { - var wbiPipingSellmeijerRevisedInput = kernelDataInput as WbiPipingSellmeijerRevisedInput; - var wbiPipingSellmeijerRevisedOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; - ThrowWhenKernelInputNull(wbiPipingSellmeijerRevisedInput); - ThrowWhenKernelOutputNull(wbiPipingSellmeijerRevisedOutput); + var wtiPipingSellmeijerRevisedInput = kernelDataInput as WtiPipingSellmeijerRevisedInput; + var wtiPipingSellmeijerRevisedOutput = (WtiPipingSellmeijerRevisedOutput)kernelDataOutput; + ThrowWhenKernelInputNull(wtiPipingSellmeijerRevisedInput); + ThrowWhenKernelOutputNull(wtiPipingSellmeijerRevisedOutput); // Initialize result as no run. - wbiPipingSellmeijerRevisedOutput.CalculationResult = CalculationResult.NoRun; + wtiPipingSellmeijerRevisedOutput.CalculationResult = CalculationResult.NoRun; messages = new List(); List upliftMessages; - PerformSingleCalculationWbiUplift(out upliftMessages, wbiPipingSellmeijerRevisedOutput, wbiPipingSellmeijerRevisedInput); + PerformSingleCalculationWtiUplift(out upliftMessages, wtiPipingSellmeijerRevisedOutput, wtiPipingSellmeijerRevisedInput); messages.AddRange(upliftMessages); List heaveMessages; - PerformSingleCalculationWbiHeave(out heaveMessages, wbiPipingSellmeijerRevisedOutput, wbiPipingSellmeijerRevisedInput); + PerformSingleCalculationWtiHeave(out heaveMessages, wtiPipingSellmeijerRevisedOutput, wtiPipingSellmeijerRevisedInput); messages.AddRange(heaveMessages); List pipingMessages; - PerformSingleCalculationWbiSellmeijerRevised(out pipingMessages, wbiPipingSellmeijerRevisedOutput, wbiPipingSellmeijerRevisedInput); + PerformSingleCalculationWtiSellmeijerRevised(out pipingMessages, wtiPipingSellmeijerRevisedOutput, wtiPipingSellmeijerRevisedInput); messages.AddRange(pipingMessages); } @@ -170,7 +170,7 @@ /// The design results public void PostProcess(DamKernelInput damKernelInput, IKernelDataOutput kernelDataOutput, DesignScenario designScenario, string resultMessage, out List designResults) { - var damPipingOutput = kernelDataOutput as WbiPipingSellmeijerRevisedOutput; + var damPipingOutput = kernelDataOutput as WtiPipingSellmeijerRevisedOutput; ThrowWhenDamKernelInputNull(damKernelInput); ThrowWhenKernelOutputNull(damPipingOutput); @@ -192,16 +192,16 @@ pipingDesignResults.LocalExitPointX = damPipingOutput.ExitPointX; pipingDesignResults.UpliftFactor = damPipingOutput.UpliftFactor; pipingDesignResults.UpliftSituation = damPipingOutput.UpliftSituation; - // Add results of the wbi-uplift calculation + // Add results of the wti-uplift calculation pipingDesignResults.Wti2017UpliftSafetyFactor = Math.Min(damPipingOutput.FoSu, defaultMaxReturnValue); pipingDesignResults.Wti2017UpliftHcritical = damPipingOutput.Hcu; pipingDesignResults.Wti2017UpliftDeltaPhiC = damPipingOutput.DeltaPhiCu; - // Add results of the wbi-heave calculation + // Add results of the wti-heave calculation pipingDesignResults.Wti2017HeaveSafetyFactor = Math.Min(damPipingOutput.FoSh, defaultMaxReturnValue); ; pipingDesignResults.Wti2017HeaveHcritical = damPipingOutput.Hch; pipingDesignResults.Wti2017Gradient = damPipingOutput.Gradient; pipingDesignResults.EffectiveStress = damPipingOutput.EffectiveStress; - // Add the overall results for WBI piping kernel (FoS = highest value of FoSh, FoSu and FoSbe; HcO is Hcbe belonging to FoS), see MWDAM-1370 + // Add the overall results for WTI piping kernel (FoS = highest value of FoSh, FoSu and FoSbe; HcO is Hcbe belonging to FoS), see MWDAM-1370 var maxFoS = damPipingOutput.FoSbe; var overallHc = damPipingOutput.Hcbe; if (damPipingOutput.FoSu > damPipingOutput.FoSbe) @@ -237,8 +237,8 @@ public ShoulderDesign CalculateDesignAtPoint(DamKernelInput damKernelInput, IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, GeometryPoint point, out List messages) { messages = new List(); - var damPipingInput = kernelDataInput as WbiPipingSellmeijerRevisedInput; - var damPipingOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; + var damPipingInput = kernelDataInput as WtiPipingSellmeijerRevisedInput; + var damPipingOutput = (WtiPipingSellmeijerRevisedOutput)kernelDataOutput; ThrowWhenDamKernelInputNull(damKernelInput); ThrowWhenKernelOutputNull(damPipingOutput); Location location = damKernelInput.Location; @@ -270,15 +270,15 @@ // Calculate the piping safety factor using the level of the given point List upliftMessages; - PerformSingleCalculationWbiUplift(out upliftMessages, damPipingOutput, damPipingInput); + PerformSingleCalculationWtiUplift(out upliftMessages, damPipingOutput, damPipingInput); messages.AddRange(upliftMessages); List heaveMessages; - PerformSingleCalculationWbiHeave(out heaveMessages, damPipingOutput, damPipingInput); + PerformSingleCalculationWtiHeave(out heaveMessages, damPipingOutput, damPipingInput); messages.AddRange(heaveMessages); List pipingMessages; - PerformSingleCalculationWbiSellmeijerRevised(out pipingMessages, damPipingOutput, damPipingInput); + PerformSingleCalculationWtiSellmeijerRevised(out pipingMessages, damPipingOutput, damPipingInput); messages.AddRange(pipingMessages); // If too low, then determine required height and length (from uplift) @@ -309,8 +309,8 @@ /// public bool EvaluateDesign(DamKernelInput damKernelInput, IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out DesignAdvise designAdvise, out string evaluationMessage) { - var damPipingInput = kernelDataInput as WbiPipingSellmeijerRevisedInput; - var damPipingOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; + var damPipingInput = kernelDataInput as WtiPipingSellmeijerRevisedInput; + var damPipingOutput = (WtiPipingSellmeijerRevisedOutput)kernelDataOutput; ThrowWhenKernelInputNull(damPipingInput); ThrowWhenDamKernelInputNull(damKernelInput); ThrowWhenKernelOutputNull(damPipingOutput); @@ -346,7 +346,7 @@ } /// - /// Evaluates the uplift situation and prepares the input for the wbi-piping and the wbi-uplift calculation. + /// Evaluates the uplift situation and prepares the input for the wti-piping and the wti-uplift calculation. /// /// The dam kernel input. /// The kernel data input. @@ -355,7 +355,7 @@ /// The dam piping output. private static void EvaluateUpliftSituation(DamKernelInput damKernelInput, out IKernelDataInput kernelDataInput, PlLines plLines, double waterLevel, - WbiPipingSellmeijerRevisedOutput damPipingOutput) + WtiPipingSellmeijerRevisedOutput damPipingOutput) { const double upliftCriterionTolerance = 0.000000001; var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D; @@ -423,8 +423,8 @@ effectiveThicknessCalculator.Calculate(); var effectiveStress = effectiveThicknessCalculator.EffectiveStress; - // Fill the input for the wbi-uplift calculation as well as the wbi-piping SellmeijerRevised calculation. - kernelDataInput = new WbiPipingSellmeijerRevisedInput() + // Fill the input for the wti-uplift calculation as well as the wti-piping SellmeijerRevised calculation. + kernelDataInput = new WtiPipingSellmeijerRevisedInput() { HRiver = waterLevel, HExit = referenceLevel, @@ -454,33 +454,33 @@ } /// - /// Creates the piping calculator wbi sellmeijer revised. + /// Creates the piping calculator wti sellmeijer revised. /// /// The kernel data input. /// the Sellmeijer2011Calculator - private static Sellmeijer2011Calculator CreatePipingCalculatorWbiSellmeijerRevised(IKernelDataInput kernelDataInput) + private static Sellmeijer2011Calculator CreatePipingCalculatorWtiSellmeijerRevised(IKernelDataInput kernelDataInput) { - var wbiPipingSellmeijerRevisedInput = kernelDataInput as WbiPipingSellmeijerRevisedInput; - ThrowWhenKernelInputNull(wbiPipingSellmeijerRevisedInput); + var wtiPipingSellmeijerRevisedInput = kernelDataInput as WtiPipingSellmeijerRevisedInput; + ThrowWhenKernelInputNull(wtiPipingSellmeijerRevisedInput); var calculator = new Sellmeijer2011Calculator { - HRiver = wbiPipingSellmeijerRevisedInput.HRiver, - HExit = wbiPipingSellmeijerRevisedInput.HExit, - Rc = wbiPipingSellmeijerRevisedInput.Rc, - DTotal = wbiPipingSellmeijerRevisedInput.DTotal, - DAquifer = wbiPipingSellmeijerRevisedInput.DAquifer, - SeepageLength = wbiPipingSellmeijerRevisedInput.SeepageLength, - D70 = wbiPipingSellmeijerRevisedInput.D70, - D70Mean = wbiPipingSellmeijerRevisedInput.D70Mean, - WhitesDragCoefficient = wbiPipingSellmeijerRevisedInput.WhitesDragCoefficient, - BeddingAngle = wbiPipingSellmeijerRevisedInput.BeddingAngle, - DarcyPermeability = wbiPipingSellmeijerRevisedInput.DarcyPermeability, - KinematicViscosityWater = wbiPipingSellmeijerRevisedInput.KinematicViscosityWater, - VolumetricWeightOfWater = wbiPipingSellmeijerRevisedInput.VolumetricWeightOfWater, - GammaSubParticles = wbiPipingSellmeijerRevisedInput.GammaSubParticles, - Gravity = wbiPipingSellmeijerRevisedInput.Gravity, - BottomLevelAquitardAboveExitPointZ = wbiPipingSellmeijerRevisedInput.BottomLevelAquitardAboveExitPointZ, - ModelFactorPiping = wbiPipingSellmeijerRevisedInput.ModelFactorPiping + HRiver = wtiPipingSellmeijerRevisedInput.HRiver, + HExit = wtiPipingSellmeijerRevisedInput.HExit, + Rc = wtiPipingSellmeijerRevisedInput.Rc, + DTotal = wtiPipingSellmeijerRevisedInput.DTotal, + DAquifer = wtiPipingSellmeijerRevisedInput.DAquifer, + SeepageLength = wtiPipingSellmeijerRevisedInput.SeepageLength, + D70 = wtiPipingSellmeijerRevisedInput.D70, + D70Mean = wtiPipingSellmeijerRevisedInput.D70Mean, + WhitesDragCoefficient = wtiPipingSellmeijerRevisedInput.WhitesDragCoefficient, + BeddingAngle = wtiPipingSellmeijerRevisedInput.BeddingAngle, + DarcyPermeability = wtiPipingSellmeijerRevisedInput.DarcyPermeability, + KinematicViscosityWater = wtiPipingSellmeijerRevisedInput.KinematicViscosityWater, + VolumetricWeightOfWater = wtiPipingSellmeijerRevisedInput.VolumetricWeightOfWater, + GammaSubParticles = wtiPipingSellmeijerRevisedInput.GammaSubParticles, + Gravity = wtiPipingSellmeijerRevisedInput.Gravity, + BottomLevelAquitardAboveExitPointZ = wtiPipingSellmeijerRevisedInput.BottomLevelAquitardAboveExitPointZ, + ModelFactorPiping = wtiPipingSellmeijerRevisedInput.ModelFactorPiping }; return calculator; } @@ -492,18 +492,18 @@ /// private static WTIUpliftCalculator CreateWtiUpliftCalculator(IKernelDataInput kernelDataInput) { - var wbiPipingSellmeijerRevisedInput = kernelDataInput as WbiPipingSellmeijerRevisedInput; - ThrowWhenKernelInputNull(wbiPipingSellmeijerRevisedInput); + var wtiPipingSellmeijerRevisedInput = kernelDataInput as WtiPipingSellmeijerRevisedInput; + ThrowWhenKernelInputNull(wtiPipingSellmeijerRevisedInput); var calculator = new WTIUpliftCalculator { - VolumetricWeightOfWater = wbiPipingSellmeijerRevisedInput.VolumetricWeightOfWater, - ModelFactorUplift = wbiPipingSellmeijerRevisedInput.ModelFactorUplift, - EffectiveStress = wbiPipingSellmeijerRevisedInput.EffectiveStress, - RExit = wbiPipingSellmeijerRevisedInput.RExit, - HRiver = wbiPipingSellmeijerRevisedInput.HRiver, - HExit = wbiPipingSellmeijerRevisedInput.HExit, - PhiPolder = wbiPipingSellmeijerRevisedInput.PhiPolder, - PhiExit = wbiPipingSellmeijerRevisedInput.PhiExit + VolumetricWeightOfWater = wtiPipingSellmeijerRevisedInput.VolumetricWeightOfWater, + ModelFactorUplift = wtiPipingSellmeijerRevisedInput.ModelFactorUplift, + EffectiveStress = wtiPipingSellmeijerRevisedInput.EffectiveStress, + RExit = wtiPipingSellmeijerRevisedInput.RExit, + HRiver = wtiPipingSellmeijerRevisedInput.HRiver, + HExit = wtiPipingSellmeijerRevisedInput.HExit, + PhiPolder = wtiPipingSellmeijerRevisedInput.PhiPolder, + PhiExit = wtiPipingSellmeijerRevisedInput.PhiExit }; return calculator; } @@ -515,15 +515,15 @@ /// private static HeaveCalculator CreateWtiHeaveCalculator(IKernelDataInput kernelDataInput) { - var wbiPipingSellmeijerRevisedInput = kernelDataInput as WbiPipingSellmeijerRevisedInput; - ThrowWhenKernelInputNull(wbiPipingSellmeijerRevisedInput); + var wtiPipingSellmeijerRevisedInput = kernelDataInput as WtiPipingSellmeijerRevisedInput; + ThrowWhenKernelInputNull(wtiPipingSellmeijerRevisedInput); var calculator = new HeaveCalculator { - Ich = wbiPipingSellmeijerRevisedInput.Ich, - DTotal = wbiPipingSellmeijerRevisedInput.DTotal, - PhiExit = wbiPipingSellmeijerRevisedInput.PhiExit, - RExit = wbiPipingSellmeijerRevisedInput.RExit, - HExit = wbiPipingSellmeijerRevisedInput.HExit + Ich = wtiPipingSellmeijerRevisedInput.Ich, + DTotal = wtiPipingSellmeijerRevisedInput.DTotal, + PhiExit = wtiPipingSellmeijerRevisedInput.PhiExit, + RExit = wtiPipingSellmeijerRevisedInput.RExit, + HExit = wtiPipingSellmeijerRevisedInput.HExit }; return calculator; } @@ -618,101 +618,101 @@ } /// - /// Performs the single calculation wbi sellmeijer revised. + /// Performs the single calculation wti sellmeijer revised. /// /// The messages. - /// The wbi piping output. - /// The wbi piping input. - private static void PerformSingleCalculationWbiSellmeijerRevised(out List messages, WbiPipingSellmeijerRevisedOutput wbiPipingOutput, - WbiPipingSellmeijerRevisedInput wbiPipingInput) + /// The wti piping output. + /// The wti piping input. + private static void PerformSingleCalculationWtiSellmeijerRevised(out List messages, WtiPipingSellmeijerRevisedOutput wtiPipingOutput, + WtiPipingSellmeijerRevisedInput wtiPipingInput) { - wbiPipingOutput.FoSbe = defaultMaxReturnValue; + wtiPipingOutput.FoSbe = defaultMaxReturnValue; messages = new List(); try { - var calculator = CreatePipingCalculatorWbiSellmeijerRevised(wbiPipingInput); + var calculator = CreatePipingCalculatorWtiSellmeijerRevised(wtiPipingInput); calculator.Calculate(); - wbiPipingOutput.FoSbe = calculator.FoSp; - wbiPipingOutput.Hcbe = calculator.Hcp; - wbiPipingOutput.DeltaPhiCbe = calculator.Hc; - wbiPipingOutput.CalculationResult = CalculationResult.Succeeded; + wtiPipingOutput.FoSbe = calculator.FoSp; + wtiPipingOutput.Hcbe = calculator.Hcp; + wtiPipingOutput.DeltaPhiCbe = calculator.Hc; + wtiPipingOutput.CalculationResult = CalculationResult.Succeeded; } catch (Exception e) { - wbiPipingOutput.CalculationResult = CalculationResult.UnexpectedError; + wtiPipingOutput.CalculationResult = CalculationResult.UnexpectedError; messages.Add(new LogMessage(LogMessageType.Error, null, e.Message)); } } /// - /// Performs the single calculation wbi uplift. + /// Performs the single calculation wti uplift. /// /// The messages. - /// The wbi piping output. - /// The wbi piping input. - private static void PerformSingleCalculationWbiUplift(out List messages, WbiPipingSellmeijerRevisedOutput wbiPipingOutput, - WbiPipingSellmeijerRevisedInput wbiPipingInput) + /// The wti piping output. + /// The wti piping input. + private static void PerformSingleCalculationWtiUplift(out List messages, WtiPipingSellmeijerRevisedOutput wtiPipingOutput, + WtiPipingSellmeijerRevisedInput wtiPipingInput) { - wbiPipingOutput.FoSu = defaultMaxReturnValue; + wtiPipingOutput.FoSu = defaultMaxReturnValue; messages = new List(); try { - var calculator = CreateWtiUpliftCalculator(wbiPipingInput); + var calculator = CreateWtiUpliftCalculator(wtiPipingInput); calculator.Calculate(); - wbiPipingOutput.FoSu = calculator.FoSu; - wbiPipingOutput.Hcu = calculator.Hcu; - wbiPipingOutput.DeltaPhiCu = calculator.DeltaPhiCu; - wbiPipingOutput.CalculationResult = CalculationResult.Succeeded; + wtiPipingOutput.FoSu = calculator.FoSu; + wtiPipingOutput.Hcu = calculator.Hcu; + wtiPipingOutput.DeltaPhiCu = calculator.DeltaPhiCu; + wtiPipingOutput.CalculationResult = CalculationResult.Succeeded; } catch (Exception e) { - wbiPipingOutput.CalculationResult = CalculationResult.UnexpectedError; + wtiPipingOutput.CalculationResult = CalculationResult.UnexpectedError; messages.Add(new LogMessage(LogMessageType.Error, null, e.Message)); } } - private static void PerformSingleCalculationWbiHeave(out List messages, WbiPipingSellmeijerRevisedOutput wbiPipingOutput, - WbiPipingSellmeijerRevisedInput wbiPipingInput) + private static void PerformSingleCalculationWtiHeave(out List messages, WtiPipingSellmeijerRevisedOutput wtiPipingOutput, + WtiPipingSellmeijerRevisedInput wtiPipingInput) { - wbiPipingOutput.FoSh = defaultMaxReturnValue; + wtiPipingOutput.FoSh = defaultMaxReturnValue; messages = new List(); try { - var calculator = CreateWtiHeaveCalculator(wbiPipingInput); + var calculator = CreateWtiHeaveCalculator(wtiPipingInput); calculator.Calculate(); - wbiPipingOutput.FoSh = calculator.FoSh; - wbiPipingOutput.Hch = calculator.Hch; - wbiPipingOutput.Gradient = calculator.Gradient; - wbiPipingOutput.CalculationResult = CalculationResult.Succeeded; + wtiPipingOutput.FoSh = calculator.FoSh; + wtiPipingOutput.Hch = calculator.Hch; + wtiPipingOutput.Gradient = calculator.Gradient; + wtiPipingOutput.CalculationResult = CalculationResult.Succeeded; } catch (Exception e) { - wbiPipingOutput.CalculationResult = CalculationResult.UnexpectedError; + wtiPipingOutput.CalculationResult = CalculationResult.UnexpectedError; messages.Add(new LogMessage(LogMessageType.Error, null, e.Message)); } } - private static void ThrowWhenKernelInputNull(WbiPipingSellmeijerRevisedInput wbiPipingInput) + private static void ThrowWhenKernelInputNull(WtiPipingSellmeijerRevisedInput wtiPipingInput) { - if (wbiPipingInput == null) + if (wtiPipingInput == null) { - throw new NoNullAllowedException(Resources.WbiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined); + throw new NoNullAllowedException(Resources.WtiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined); } } - private static void ThrowWhenKernelOutputNull(WbiPipingSellmeijerRevisedOutput wbiPipingOutput) + private static void ThrowWhenKernelOutputNull(WtiPipingSellmeijerRevisedOutput wtiPipingOutput) { - if (wbiPipingOutput == null) + if (wtiPipingOutput == null) { - throw new NoNullAllowedException(Resources.WbiPipingSellmeijerRevisedKernelWrapper_NoOutputObjectDefined); + throw new NoNullAllowedException(Resources.WtiPipingSellmeijerRevisedKernelWrapper_NoOutputObjectDefined); } } private static void ThrowWhenDamKernelInputNull(DamKernelInput damKernelInput) { if (damKernelInput == null) { - throw new NoNullAllowedException(Resources.WbiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined); + throw new NoNullAllowedException(Resources.WtiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined); } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs =================================================================== diff -u -r1935 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 1935) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 1961) @@ -24,7 +24,7 @@ using Deltares.DamEngine.Calculators.KernelWrappers.Common; using Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijer4Forces; using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces; -using Deltares.DamEngine.Calculators.KernelWrappers.WbiPipingSellmeijerRevised; +using Deltares.DamEngine.Calculators.KernelWrappers.WtiPipingSellmeijerRevised; using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Results; @@ -35,10 +35,10 @@ using Deltares.WTIPiping; using NUnit.Framework; -namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.WbiPipingSellmeijerRevised +namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.WtiPipingSellmeijerRevised { [TestFixture] - public class WbiPipingSellmeijerRevisedKernelWrapperTests + public class WtiPipingSellmeijerRevisedKernelWrapperTests { [Test] public void TestFullCalculation() @@ -50,7 +50,7 @@ var location = new Location("Location 1") { - SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWbiPiping(), + SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWtiPiping(), ModelFactors = { UpliftCriterionPiping = 1.0 @@ -86,17 +86,17 @@ DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification }; - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); // Prepare the wrapper. Result is input for the calculation dll IKernelDataInput damPipingInput; IKernelDataOutput kernelDataOutput; kernelWrapper.Prepare(damKernelInput, 0, out damPipingInput, out kernelDataOutput); // The factory used here in the Engine to create the soilprofile uses Physics.FactorMicroMeterToMeter in setting the D70. - // The original test in WBI piping kernel uses the D70 without this factor so in order to get the same results here, + // The original test in WTI piping kernel uses the D70 without this factor so in order to get the same results here, // correct the D70 for this here. - (damPipingInput as WbiPipingSellmeijerRevisedInput).D70 = (damPipingInput as WbiPipingSellmeijerRevisedInput).D70 * (1/Physics.FactorMicroMeterToMeter); + (damPipingInput as WtiPipingSellmeijerRevisedInput).D70 = (damPipingInput as WtiPipingSellmeijerRevisedInput).D70 * (1/Physics.FactorMicroMeterToMeter); // Validate the input List messages; @@ -105,7 +105,7 @@ // Run the dll kernelWrapper.Execute(damPipingInput, kernelDataOutput, out messages); - var damPipingOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; + var damPipingOutput = (WtiPipingSellmeijerRevisedOutput)kernelDataOutput; Assert.AreEqual(0, messages.Count); Assert.AreEqual(1860.9050036726026, damPipingOutput.FoSbe, diff); Assert.AreEqual(1302.9335025708217, damPipingOutput.Hcbe, diff); @@ -158,7 +158,7 @@ var location = new Location { - SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWbiPiping(), + SurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWtiPiping(), ModelFactors = { UpliftCriterionPiping = 1.0 @@ -188,12 +188,12 @@ RiverLevelHigh = 1.0, DamFailureMechanismeCalculationSpecification = damFailureMechanismeCalculationSpecification }; - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); IKernelDataInput kernelDataInput; IKernelDataOutput kernelDataOutput; kernelWrapper.Prepare(damKernelInput, 0, out kernelDataInput, out kernelDataOutput); - var damPipingInput = (WbiPipingSellmeijerRevisedInput)kernelDataInput; - var damPipingOutput = (WbiPipingSellmeijerRevisedOutput)kernelDataOutput; + var damPipingInput = (WtiPipingSellmeijerRevisedInput)kernelDataInput; + var damPipingOutput = (WtiPipingSellmeijerRevisedOutput)kernelDataOutput; Assert.AreEqual(1.0, damPipingInput.HRiver, diff); Assert.AreEqual(0.0, damPipingInput.HExit, diff); Assert.AreEqual(0.3, damPipingInput.Rc, diff); @@ -220,17 +220,17 @@ [Test] public void TestValidate() { - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); // Validate without setting values. Expected error messages. - var damPipingInput = new WbiPipingSellmeijerRevisedInput(); - var damPipingOutput = new WbiPipingSellmeijerRevisedOutput(); + var damPipingInput = new WtiPipingSellmeijerRevisedInput(); + var damPipingOutput = new WtiPipingSellmeijerRevisedOutput(); List messages; kernelWrapper.Validate(damPipingInput, damPipingOutput, out messages); Assert.IsTrue(messages.Count > 0); // Validate the input when valid input is provided. Expected no messages. - damPipingInput = new WbiPipingSellmeijerRevisedInput() + damPipingInput = new WtiPipingSellmeijerRevisedInput() { HRiver = 1.0, HExit = 0.0, @@ -253,7 +253,7 @@ [Test] public void TestPostProcess() { - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); var subSoilScenario = new SoilGeometryProbability { @@ -278,7 +278,7 @@ IsUplift = true }; var calculationResult = CalculationResult.Succeeded; - var output = new WbiPipingSellmeijerRevisedOutput() + var output = new WtiPipingSellmeijerRevisedOutput() { SeepageLength = 30, FoSbe = 1.1, @@ -333,41 +333,41 @@ } [Test] - [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor WBI Sellmeijer Revised")] + [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor WTI Sellmeijer Revised")] [SetUICulture("nl-NL")] public void TestLanguageNLThrowsExceptionInExecuteWhenInputIsNull() { - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); List messages; kernelWrapper.Execute(null, null, out messages); } [Test] - [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for WBI Sellmeijer Revised")] + [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for WTI Sellmeijer Revised")] [SetUICulture("en-US")] public void TestLanguageENThrowsExceptionInExecuteWhenInputIsNull() { - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); List messages; kernelWrapper.Execute(null, null, out messages); } [Test] - [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor WBI Sellmeijer Revised")] + [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor WTI Sellmeijer Revised")] [SetUICulture("nl-NL")] public void TestThrowsExceptionInPostProcessWhenOutputIsNull() { - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); List results; kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results); } [Test] - [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor WBI Sellmeijer Revised")] + [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor WTI Sellmeijer Revised")] [SetUICulture("nl-NL")] public void TestThrowsExceptionInPostProcessWhenInputIsNull() { - var kernelWrapper = new WbiPipingSellmeijerRevisedKernelWrapper(); + var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper(); List results; kernelWrapper.PostProcess(null, new DamPipingSellmeijer4ForcesOutput(), null, "", out results); } @@ -392,15 +392,15 @@ [TestCase(CharacteristicPointType.TrafficLoadOutside, PipingCharacteristicPointType.None)] public void TestConvertToPipingPointType(CharacteristicPointType charPointType, PipingCharacteristicPointType pipingCharacteristicPointType) { - Assert.AreEqual(pipingCharacteristicPointType, WbiPipingSellmeijerRevisedKernelWrapper.ConvertToPipingPointType(charPointType)); + Assert.AreEqual(pipingCharacteristicPointType, WtiPipingSellmeijerRevisedKernelWrapper.ConvertToPipingPointType(charPointType)); } [Test] public void TestConvertToPipingSurfaceLine() { const double diff = 0.0001; - var surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWbiPiping(true); - var surfaceLinePiping = WbiPipingSellmeijerRevisedKernelWrapper.ConvertToPipingSurfaceLine(surfaceLine); + var surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineForWtiPiping(true); + var surfaceLinePiping = WtiPipingSellmeijerRevisedKernelWrapper.ConvertToPipingSurfaceLine(surfaceLine); Assert.AreEqual(12, surfaceLinePiping.Points.Count); // Check some coodinates and types Assert.AreEqual(34.5, surfaceLinePiping.Points[2].X, diff); @@ -429,7 +429,7 @@ { const double diff = 0.0001; var profile = FactoryForSoilProfiles.CreatePipingSellmeijerProfileWithOneSandlayer(); - var profilePiping = WbiPipingSellmeijerRevisedKernelWrapper.ConvertToPipingProfile(profile); + var profilePiping = WtiPipingSellmeijerRevisedKernelWrapper.ConvertToPipingProfile(profile); Assert.AreEqual(2, profilePiping.Layers.Count); Assert.AreEqual(10, profilePiping.Layers[0].TopLevel, diff); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedDesignHeightInputFile.xml =================================================================== diff -u -r1741 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedDesignHeightInputFile.xml (.../PipingVoorbeeld1_SellmeijerRevisedDesignHeightInputFile.xml) (revision 1741) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/PipingVoorbeeld1_SellmeijerRevisedDesignHeightInputFile.xml (.../PipingVoorbeeld1_SellmeijerRevisedDesignHeightInputFile.xml) (revision 1961) @@ -1,5 +1,5 @@ - + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj =================================================================== diff -u -r1955 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 1955) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 1961) @@ -55,7 +55,7 @@ - + Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx =================================================================== diff -u -r1955 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 1955) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 1961) @@ -267,11 +267,11 @@ Location '{0}', subsoil scenario '{1}', design scenario '{2}': The calculation failed with error message '{3}' - - No input object defined for WBI Sellmeijer Revised + + No input object defined for WTI Sellmeijer Revised - - No output object defined for WBI Sellmeijer Revised + + No output object defined for WTI Sellmeijer Revised Location '{0}', subsoil scenario '{1}', timestep '{2}', timestamp '{3}': The calculation failed with error message '{4}'. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs =================================================================== diff -u -r1955 -r1961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1955) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1961) @@ -543,24 +543,6 @@ } /// - /// Looks up a localized string similar to No input object defined for WBI Sellmeijer Revised. - /// - internal static string WbiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined { - get { - return ResourceManager.GetString("WbiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to No output object defined for WBI Sellmeijer Revised. - /// - internal static string WbiPipingSellmeijerRevisedKernelWrapper_NoOutputObjectDefined { - get { - return ResourceManager.GetString("WbiPipingSellmeijerRevisedKernelWrapper_NoOutputObjectDefined", resourceCulture); - } - } - - /// /// Looks up a localized string similar to No Dam input object defined for WTI Macro Stability. /// internal static string WtiMacroStabilityKernelWrapper_NoDamInputObjectDefinedForWtiMacroStability { @@ -604,5 +586,23 @@ return ResourceManager.GetString("WtiMacroStabilityKernelWrapper_PrepareForWtiMacroStabilityDidNotSucceed", resourceCulture); } } + + /// + /// Looks up a localized string similar to No input object defined for WTI Sellmeijer Revised. + /// + internal static string WtiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined { + get { + return ResourceManager.GetString("WtiPipingSellmeijerRevisedKernelWrapper_NoInputObjectDefined", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No output object defined for WTI Sellmeijer Revised. + /// + internal static string WtiPipingSellmeijerRevisedKernelWrapper_NoOutputObjectDefined { + get { + return ResourceManager.GetString("WtiPipingSellmeijerRevisedKernelWrapper_NoOutputObjectDefined", resourceCulture); + } + } } } Fisheye: Tag 1961 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapper.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1961 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1961 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedInput.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1961 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WbiPipingSellmeijerRevised/WbiPipingSellmeijerRevisedKernelWrapperTests.cs'. Fisheye: No comparison available. Pass `N' to diff?