Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/StixFileWriterConnector.cs
===================================================================
diff -u -r6495 -r6496
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/StixFileWriterConnector.cs (.../StixFileWriterConnector.cs) (revision 6495)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/StixFileWriterConnector.cs (.../StixFileWriterConnector.cs) (revision 6496)
@@ -31,7 +31,6 @@
using Deltares.DamEngine.Data.Standard.Logging;
using Deltares.MacroStability.CSharpWrapper.Input;
using Deltares.MacroStability.CSharpWrapper.Output;
-using Deltares.MacroStability.Io.XmlInput;
using Deltares.StixFileWriter;
using MacroStabilityOutput = Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityInwards.MacroStabilityOutput;
using Waternet = Deltares.DamEngine.Data.Geometry.Waternet;
@@ -49,27 +48,27 @@
///
///
///
- public static void WriteStixFileWithInput(DamKernelInput damKernelInput, MStabParameters mStabParameters, Waternet waterNet,
+ public static void WriteStixFileWithInput(DamKernelInput damKernelInput, MStabParameters mStabParameters, Waternet waterNet,
double xCoordinateLowestUpliftFactorPoint, MacroStabilityOutput macroStabilityOutput,
string fileName, List messages)
{
try
{
var filler = new FillMacroStabilityWrapperInputFromEngine();
- MacroStabilityInput macroStabilityInput = filler.CreateMacroStabilityInput(damKernelInput, mStabParameters, waterNet,
- xCoordinateLowestUpliftFactorPoint);
+ MacroStabilityInput macroStabilityInput = filler.CreateMacroStabilityInput(damKernelInput, mStabParameters, waterNet,
+ xCoordinateLowestUpliftFactorPoint);
MacroStabilityOutputItem stabilityOutputItem = macroStabilityOutput.StabilityOutputItems[^1];
CreateCorrectGridAsInputBasedOnOutputItem(stabilityOutputItem, macroStabilityInput);
WriteStixFileBasedOnInputOnly(fileName, macroStabilityInput);
}
catch (Exception exceptionDuringStixFileWriter)
{
- string message = LocalizationManager.GetTranslatedText(typeof(MacroStabilityCommonHelper),
+ string message = LocalizationManager.GetTranslatedText(typeof(MacroStabilityCommonHelper),
"UnexpectedErrorStixFileCreation") + exceptionDuringStixFileWriter.Message;
messages.Add(new LogMessage(LogMessageType.Warning, null, message));
}
}
-
+
///
/// Writes the stix file based the input and the results.
///
@@ -80,16 +79,16 @@
///
///
///
- public static void WriteStixFileWithInputAndResults(DamKernelInput damKernelInput, MStabParameters mStabParameters,
- Waternet waterNet, double xCoordinateLowestUpliftFactorPoint,
- MacroStabilityOutput macroStabilityOutput, string fileName, List messages)
+ public static void WriteStixFileWithInputAndResults(DamKernelInput damKernelInput, MStabParameters mStabParameters,
+ Waternet waterNet, double xCoordinateLowestUpliftFactorPoint,
+ MacroStabilityOutput macroStabilityOutput, string fileName, List messages)
{
try
{
var filler = new FillMacroStabilityWrapperInputFromEngine();
- MacroStabilityInput macroStabilityInput = filler.CreateMacroStabilityInput(damKernelInput, mStabParameters, waterNet,
- xCoordinateLowestUpliftFactorPoint);
-
+ MacroStabilityInput macroStabilityInput = filler.CreateMacroStabilityInput(damKernelInput, mStabParameters, waterNet,
+ xCoordinateLowestUpliftFactorPoint);
+
MacroStabilityOutputItem stabilityOutputItem = macroStabilityOutput.StabilityOutputItems[^1];
CreateCorrectGridAsInputBasedOnOutputItem(stabilityOutputItem, macroStabilityInput);
@@ -100,7 +99,7 @@
}
catch (Exception exceptionDuringStixFileWriter)
{
- string message = LocalizationManager.GetTranslatedText(typeof(MacroStabilityCommonHelper),
+ string message = LocalizationManager.GetTranslatedText(typeof(MacroStabilityCommonHelper),
"UnexpectedErrorStixFileCreation") + exceptionDuringStixFileWriter.Message;
messages.Add(new LogMessage(LogMessageType.Warning, null, message));
}
@@ -139,7 +138,7 @@
Path.GetFileName(fileName), true);
StixFileWrite(inputStixFile, fileNameForCalculationAsStix, input);
}
-
+
///
/// Writes the stix file based on input and results slip plane.
///
@@ -171,6 +170,7 @@
macroStabilityOutputItem.ActiveCenterPoint = new Point2D();
macroStabilityOutputItem.SafetyFactor = 9999;
}
+
resultStixWrite.FillCalculatedCircle(macroStabilityOutputItem.ActiveCenterPoint.X,
macroStabilityOutputItem.ActiveCenterPoint.Z,
macroStabilityOutputItem.ActiveCenterPointRadius);
@@ -179,13 +179,13 @@
StixFileWrite(resultStixWrite, fileNameForCalculationAsStix, input);
}
-
+
private static string DetermineStixFilename(string fileNameForCalc, string suffix, string extension = ".stix")
{
return Path.Combine(Path.GetDirectoryName(fileNameForCalc) ?? string.Empty,
$"{Path.GetFileNameWithoutExtension(fileNameForCalc)}_{suffix}{extension}");
}
-
+
private static void StixFileWrite(StixWriter stixWriter, string fileName, MacroStabilityInput input)
{
if (File.Exists(fileName))
@@ -195,5 +195,4 @@
stixWriter.WriteStixFile(fileName, input);
}
-
}
\ No newline at end of file