Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCorePipingCalculationTests.cs =================================================================== diff -u -r1473 -r1476 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCorePipingCalculationTests.cs (.../MultiCorePipingCalculationTests.cs) (revision 1473) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MultiCorePipingCalculationTests.cs (.../MultiCorePipingCalculationTests.cs) (revision 1476) @@ -81,39 +81,35 @@ DesignResult multiCoreResult = outputMultiCore.Results.CalculationResults.DesignResults.Where(x => x.LocationName.Equals(oneCoreResult.LocationName) && x.ProfileName.Equals(oneCoreResult.ProfileName)).FirstOrDefault(); if (multiCoreResult == null) { - var diffString = String.Format("No mutlicore result in {0}, {1}", oneCoreResult.LocationName, oneCoreResult.ProfileName); + var diffString = String.Format("No mutlicore result in location '{0}', soilprofile '{1}'", oneCoreResult.LocationName, oneCoreResult.ProfileName); differencesStringBuilder.AppendLine(diffString); differences.Add(diffString); } else { + double safetyFactorSingleCore = 0.0; + double safetyFactorMultiCore = 0.0; switch (pipingModelType) { case PipingModelType.Bligh: - if (Math.Abs(oneCoreResult.PipingDesignResults.BlighFactor - multiCoreResult.PipingDesignResults.BlighFactor) > tolerance) - { - var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor); - differencesStringBuilder.AppendLine(diffString); - differences.Add(diffString); - } + safetyFactorSingleCore = oneCoreResult.PipingDesignResults.BlighFactor; + safetyFactorMultiCore = multiCoreResult.PipingDesignResults.BlighFactor; break; case PipingModelType.Sellmeijer4Forces: - if (Math.Abs(oneCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor - multiCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor) > tolerance) - { - var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor); - differencesStringBuilder.AppendLine(diffString); - differences.Add(diffString); - } + safetyFactorSingleCore = oneCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor; + safetyFactorMultiCore = multiCoreResult.PipingDesignResults.Sellmeijer4ForcesFactor; break; case PipingModelType.SellmeijerVnk: - if (Math.Abs(oneCoreResult.PipingDesignResults.SellmeijerVnkFactor - multiCoreResult.PipingDesignResults.SellmeijerVnkFactor) > tolerance) - { - var diffString = String.Format("Different result in {0}, {1}: 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor); - differencesStringBuilder.AppendLine(diffString); - differences.Add(diffString); - } + safetyFactorSingleCore = oneCoreResult.PipingDesignResults.SellmeijerVnkFactor; + safetyFactorMultiCore = multiCoreResult.PipingDesignResults.SellmeijerVnkFactor; break; } + if (Math.Abs(safetyFactorSingleCore - safetyFactorMultiCore) > tolerance) + { + var diffString = String.Format("Different result in location '{0}', soilprofile '{1}': 1 core = {2}, multicore = {3}", oneCoreResult.LocationName, oneCoreResult.ProfileName, oneCoreResult.PipingDesignResults.BlighFactor, multiCoreResult.PipingDesignResults.BlighFactor); + differencesStringBuilder.AppendLine(diffString); + differences.Add(diffString); + } } }