Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs (.../DesignCalculatorSingle.cs) (revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorSingle.cs (.../DesignCalculatorSingle.cs) (revision 4000)
@@ -48,12 +48,12 @@
/// The calculation messages.
/// The design calculations.
public static void PerformSingleCalculation(IKernelWrapper kernelWrapper, IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput,
- DamKernelInput damKernelInput, DesignScenario designScenario,
- List calculationMessages, List designCalculations)
+ DamKernelInput damKernelInput, DesignScenario designScenario,
+ List calculationMessages, List designCalculations)
{
// Perform validation
var designResults = new List();
- List locationCalculationMessages = new List();
+ var locationCalculationMessages = new List();
List validationMessages;
designScenario.CalculationResult = CalculationResult.NoRun;
try
@@ -64,7 +64,7 @@
locationCalculationMessages.Add(new LogMessage(LogMessageType.Error, null,
string.Format(Resources.DesignCalculatorValidationFailed,
damKernelInput.Location.Name,
- damKernelInput.SubSoilScenario.ToString(),
+ damKernelInput.SubSoilScenario,
designScenario.LocationScenarioID)));
locationCalculationMessages.AddRange(validationMessages);
}
@@ -73,15 +73,17 @@
// Perform calculation
kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out locationCalculationMessages);
}
+
// Process output
calculationMessages.AddRange(locationCalculationMessages);
- StringBuilder sb = new StringBuilder();
- foreach (var message in locationCalculationMessages)
+ var sb = new StringBuilder();
+ foreach (LogMessage message in locationCalculationMessages)
{
sb.Append(message.Message + Environment.NewLine);
}
- string resultMessage = sb.ToString();
+ var resultMessage = sb.ToString();
+
designScenario.CalculationResult = CalculationResult.Succeeded;
kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults);
}
@@ -94,12 +96,11 @@
}
finally
{
- foreach (var designResult in designResults)
+ foreach (DesignResult designResult in designResults)
{
designCalculations.Add(designResult);
}
}
}
-
}
-}
+}
\ No newline at end of file