Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs =================================================================== diff -u -r3434 -r3447 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3434) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs (.../MacroStabilityInwardsKernelWrapper.cs) (revision 3447) @@ -185,6 +185,9 @@ File.WriteAllText(fileNameForCalculation, inputAsXml); //Todo #Bka : this would be the place to write the stix file based on the input. Separate method as some additional as yet unavailable data needs to be set first. + // var stixWriter = new StixWriter(); #Bka Leave this code here for now as this is the real deal as soon as the tool is finished. Do not remark this in review. + // stixWriter.FillInfo("DAMEngine", Path.GetFullPath(fileNameForCalculation)); + // stixWriter.WriteStixFile(fileNameForCalculation, input); if (inputAsXml.Length > 10) { return PrepareResult.Successful; @@ -278,14 +281,12 @@ MacroStabilityOutput macroStabilityOutput = (MacroStabilityOutput)kernelDataOutput; ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput); ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput); - messages = new List(); PerformStabilityCalculation(macroStabilityOutput, out messages); var fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation); foreach (var logMessage in messages) { logMessage.Message = fileName + ": " + logMessage.Message; } - kernelDataOutput = macroStabilityOutput; } private void PerformStabilityCalculation(MacroStabilityOutput macroStabilityOutput, out List messages) @@ -503,7 +504,7 @@ //MStabModelType model = MStabModelType.UpliftVan; //var subSoilScenario = damKernelInput.SubSoilScenario; //double riverLevel = damKernelInput.RiverLevelHigh; - //EmbankmentDesignParameters embankmentDesignParametersForKernelInput; + if (iterationIndex < 1) { // This is the first (initial) call to prepareDesign. @@ -514,7 +515,6 @@ }; //ToDo MWDAM-? Use FailureMechanismParametersMStab or create new one? FailureMechanismParametersMStab.EmbankmentDesignParameters = embankmentDesignParameters; - //embankmentDesignParametersForKernelInput = null; } else { @@ -530,7 +530,6 @@ } // In the following prepareDesign calls just return the stored embankmentDesignParameters embankmentDesignParameters = FailureMechanismParametersMStab.EmbankmentDesignParameters; - //embankmentDesignParametersForKernelInput = embankmentDesignParameters; } // var xmlInput = CreateXmlInput(macroStabilityKernelDataInput, embankmentDesignParametersForKernelInput); // var prepareResult = PrepareKernel(xmlInput);