Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
===================================================================
diff -u -r909 -r935
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 909)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 935)
@@ -154,6 +154,15 @@
}
///
+ /// Looks up a localized string similar to Location {0}, subsoil scenario '{1}', design scenario '{2}': This calculation in not relevant and thus skipped..
+ ///
+ internal static string DesignCalculatorIrrelevant {
+ get {
+ return ResourceManager.GetString("DesignCalculatorIrrelevant", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Requested kernel not implemented yet.
///
internal static string DesignCalculatorKernelNotImplemented {
@@ -163,6 +172,15 @@
}
///
+ /// Looks up a localized string similar to Location {0}, subsoil scenario '{1}', design scenario '{2}': The preparation for this calculation failed..
+ ///
+ internal static string DesignCalculatorPrepareError {
+ get {
+ return ResourceManager.GetString("DesignCalculatorPrepareError", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Validation failed for location '{0}', subsoil scenario '{1}', design scenario '{2}'.
///
internal static string DesignCalculatorValidationFailed {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
===================================================================
diff -u -r929 -r935
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 929)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs (.../DamMacroStabilityOutwardsKernelWrapperTests.cs) (revision 935)
@@ -61,7 +61,7 @@
}
var damKernelInput = CreateDamKernelInput();
-
+ damKernelInput.WorkingDir = workingDir;
var FailureMechanismParametersMStab = new FailureMechanismParametersMStab
{
MStabParameters =
@@ -122,6 +122,7 @@
}
var damKernelInput = CreateDamKernelInput(true);
+ damKernelInput.WorkingDir = workingDir;
damKernelInput.DesignScenario.Location.DikeEmbankmentMaterial = "Del_Ppp";
damKernelInput.DesignScenario.Location.ShoulderEmbankmentMaterial = "Del_Ppp";
damKernelInput.DesignScenario.Location.StabilityOptions.MinimalCircleDepth = 1.0;
@@ -175,11 +176,11 @@
private static DamKernelInput CreateDamKernelInput(bool realOut = false)
{
var soilDbName = Path.Combine(testFolder, "soilmaterials.mdb");
- var soilGeometry2DName = Path.Combine(testFolder, "1D1.sti");
+ var soilGeometry2DName = "1D1.sti";
if (realOut)
{
soilDbName = Path.Combine(testFolder, "soilmaterialsOutwards.mdb");
- soilGeometry2DName = Path.Combine(testFolder, "OutwardsZones.sti");
+ soilGeometry2DName = "OutwardsZones.sti";
}
var line = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
var location = new Location();
@@ -198,7 +199,6 @@
SoilProfileType = SoilProfileType.ProfileTypeStiFile,
SegmentFailureMechanismType = FailureMechanismSystemType.StabilityOutside
};
-
var damKernelInput = new DamKernelInput
{
Location = location,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx
===================================================================
diff -u -r909 -r935
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 909)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 935)
@@ -156,4 +156,10 @@
Required safety factor must be specified
+
+ Location {0}, subsoil scenario '{1}', design scenario '{2}': This calculation in not relevant and thus skipped.
+
+
+ Location {0}, subsoil scenario '{1}', design scenario '{2}': The preparation for this calculation failed.
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r910 -r935
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 910)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs (.../DamMacroStabilityOutwardsKernelWrapper.cs) (revision 935)
@@ -34,6 +34,7 @@
using Deltares.DamEngine.Data.Standard.Calculation;
using Deltares.DamEngine.Data.Standard.Logging;
using Deltares.DamMacroStability.Calculator;
+using System.IO;
namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityOutwards
{
@@ -78,11 +79,28 @@
CalculationResult = CalculationResult.NoRun
};
kernelDataOutput = damMacroStabilityOutput;
- if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityOutside)
+ // Note: as segments and thus SubSoilScenario are generally divided into Piping versus Stability,
+ // the actual SegmentFailureMechanismType would be set to StabilityInside rather than StabilityOutside
+ // So check for both types.
+ if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityOutside ||
+ damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside)
{
// Make sure the gridposition is Left.
FailureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
-
+ if (string.IsNullOrEmpty(damKernelInput.WorkingDir))
+ {
+ FailureMechanismParametersMStab.ProjectWorkingPath = Directory.GetCurrentDirectory();
+ }
+ else
+ {
+ FailureMechanismParametersMStab.ProjectWorkingPath = damKernelInput.WorkingDir;
+ }
+ if (damKernelInput.SubSoilScenario.SoilProfileType == SoilProfileType.ProfileTypeStiFile)
+ {
+ damKernelInput.SubSoilScenario.StiFileName = Path.Combine(
+ damKernelInput.Location.StabilityOptions.MapForSoilGeometries2D,
+ damKernelInput.SubSoilScenario.StiFileName);
+ }
var damMacroStabilityInput = new DamMacroStabilityInput()
{
DGeoStabilityExePath = FailureMechanismParametersMStab.DGeoStabilityExePath,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs
===================================================================
diff -u -r929 -r935
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs (.../DesignCalculator.cs) (revision 929)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs (.../DesignCalculator.cs) (revision 935)
@@ -31,6 +31,7 @@
using Deltares.DamEngine.Calculators.Properties;
using Deltares.DamEngine.Data.General;
using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Standard.Calculation;
using Deltares.DamEngine.Data.Standard.Logging;
namespace Deltares.DamEngine.Calculators.Dikes_Design
@@ -115,11 +116,30 @@
damProjectData.DesignCalculations.Add(designResult);
}
}
+ else
+ {
+ if (prepareResult == PrepareResult.NotRelevant)
+ {
+ calculationMessages.Add(new LogMessage(LogMessageType.Info, null,
+ string.Format(Resources.DesignCalculatorIrrelevant,
+ location.Name,
+ soiProfileProbability.ToString(),
+ damKernelInput.DesignScenario.LocationScenarioID)));
+ }
+ if (prepareResult == PrepareResult.Failed)
+ {
+ calculationMessages.Add(new LogMessage(LogMessageType.Error, null,
+ string.Format(Resources.DesignCalculatorPrepareError,
+ location.Name,
+ soiProfileProbability.ToString(),
+ damKernelInput.DesignScenario.LocationScenarioID)));
+ }
+ }
+
}
}
}
return calculationMessages;
}
-
}
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
===================================================================
diff -u -r909 -r935
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 909)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 935)
@@ -147,9 +147,15 @@
Geen uitvoer object gedefinieerd voor Sellmeijer VNK
+
+ Locatie '{0}', ondergrond scenario '{1}', ontwerp scenario '{2}': Deze berekening is niet relevant en dus overgeslagen.
+
Gekozen rekenkernel is nog niet beschikbaar
+
+ Locatie '{0}', ondergrond scenario '{1}', ontwerp scenario '{2}': Het klaarzetten van deze berekening is mislukt.
+
Validatie faalt voor locatie '{0}', ondergrond scenario '{1}', ontwerp scenario '{2}'