Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs
===================================================================
diff -u -r4000 -r4052
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs	(.../EngineInterface.cs)	(revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs	(.../EngineInterface.cs)	(revision 4052)
@@ -31,177 +31,176 @@
 using Deltares.DamEngine.Io.XmlInput;
 using Deltares.DamEngine.Io.XmlOutput;
 
-namespace Deltares.DamEngine.Interface
+namespace Deltares.DamEngine.Interface;
+
+/// <summary>
+/// The main interface class for accessing the Dam Engine
+/// </summary>
+public class EngineInterface
 {
     /// <summary>
-    /// The main interface class for accessing the Dam Engine
+    /// Initializes a new instance of the <see cref="EngineInterface"/> class.
     /// </summary>
-    public class EngineInterface
+    /// <param name="modelInput">Xml string containing the model input.</param>
+    public EngineInterface(string modelInput)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EngineInterface"/> class.
-        /// </summary>
-        /// <param name="modelInput">Xml string containing the model input.</param>
-        public EngineInterface(string modelInput)
+        if (String.IsNullOrEmpty(modelInput))
         {
-            if (String.IsNullOrEmpty(modelInput))
-            {
-                throw new EngineInterfaceException(Resources.Error_EmptyInputString);
-            }
-
-            Input input = DamXmlSerialization.LoadInputFromXmlString(modelInput);
-            DamProjectData = FillDamFromXmlInput.CreateDamProjectData(input);
-            SendMessage(new LogMessage
-            {
-                MessageType = LogMessageType.Info,
-                Message = Resources.ModelAccepted
-            });
+            throw new EngineInterfaceException(Resources.Error_EmptyInputString);
         }
 
-        /// <summary>
-        /// Gets or sets the progress delegate.
-        /// </summary>
-        /// <value>
-        /// The progress delegate.
-        /// </value>
-        public ProgressDelegate ProgressDelegate { get; set; }
+        Input input = DamXmlSerialization.LoadInputFromXmlString(modelInput);
+        DamProjectData = FillDamFromXmlInput.CreateDamProjectData(input);
+        SendMessage(new LogMessage
+        {
+            MessageType = LogMessageType.Info,
+            Message = Resources.ModelAccepted
+        });
+    }
 
-        /// <summary>
-        /// Gets or sets the send message delegate.
-        /// </summary>
-        /// <value>
-        /// The send message delegate.
-        /// </value>
-        public SendMessageDelegate SendMessageDelegate { get; set; }
+    /// <summary>
+    /// Gets or sets the progress delegate.
+    /// </summary>
+    /// <value>
+    /// The progress delegate.
+    /// </value>
+    public ProgressDelegate ProgressDelegate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the user abort delegate.
-        /// </summary>
-        /// <value>
-        /// The user abort delegate.
-        /// </value>
-        public UserAbortDelegate UserAbortDelegate { get; set; }
+    /// <summary>
+    /// Gets or sets the send message delegate.
+    /// </summary>
+    /// <value>
+    /// The send message delegate.
+    /// </value>
+    public SendMessageDelegate SendMessageDelegate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the dam project data.
-        /// </summary>
-        /// <value>
-        /// The dam project data.
-        /// </value>
-        public DamProjectData DamProjectData { get; set; }
+    /// <summary>
+    /// Gets or sets the user abort delegate.
+    /// </summary>
+    /// <value>
+    /// The user abort delegate.
+    /// </value>
+    public UserAbortDelegate UserAbortDelegate { get; set; }
 
-        /// <summary>
-        /// Validates the model.
-        /// </summary>
-        /// <returns>Validation messages in an XML string</returns>
-        public string Validate()
+    /// <summary>
+    /// Gets or sets the dam project data.
+    /// </summary>
+    /// <value>
+    /// The dam project data.
+    /// </value>
+    public DamProjectData DamProjectData { get; set; }
+
+    /// <summary>
+    /// Validates the model.
+    /// </summary>
+    /// <returns>Validation messages in an XML string</returns>
+    public string Validate()
+    {
+        SendMessage(new LogMessage
         {
-            SendMessage(new LogMessage
-            {
-                MessageType = LogMessageType.Info,
-                Message = Resources.StartValidation
-            });
-            List<LogMessage> validationMessages = null;
+            MessageType = LogMessageType.Info,
+            Message = Resources.StartValidation
+        });
+        List<LogMessage> validationMessages = null;
 
-            try
+        try
+        {
+            DamProjectData.Dike.Validate(DamProjectData.DamProjectType == DamProjectType.Operational);
+        }
+        catch (Exception e)
+        {
+            var validationMessage = new LogMessage(LogMessageType.Error, null, e.Message);
+            validationMessages = new List<LogMessage>
             {
-                DamProjectData.Dike.Validate(DamProjectData.DamProjectType == DamProjectType.Operational);
-            }
-            catch (Exception e)
-            {
-                var validationMessage = new LogMessage(LogMessageType.Error, null, e.Message);
-                validationMessages = new List<LogMessage>
-                {
-                    validationMessage
-                };
-                DamProjectData.CalculationMessages = new List<LogMessage>();
-            }
-
-            // Local validation can give messages and these have to be added to the results but note that there
-            // already can be messages added by instantiation of the interface too. So add the local to the global
-            if (validationMessages != null && validationMessages.Count > 0)
-            {
-                if (DamProjectData != null && DamProjectData.CalculationMessages != null)
-                {
-                    DamProjectData.CalculationMessages.AddRange(validationMessages);
-                }
-            }
-
-            // Now check if there are any messages at all, if so return them.
-            if (DamProjectData != null && DamProjectData.CalculationMessages != null && DamProjectData.CalculationMessages.Count > 0)
-            {
-                Output output = FillXmlOutputFromDam.CreateOutput(DamProjectData);
-                string outputXml = DamXmlSerialization.SaveOutputAsXmlString(output);
-                SendMessage(new LogMessage
-                {
-                    MessageType = LogMessageType.Info,
-                    Message = Resources.EndValidation
-                });
-                return outputXml;
-            }
-
-            SendMessage(new LogMessage
-            {
-                MessageType = LogMessageType.Info,
-                Message = Resources.EndValidation
-            });
-            return null;
+                validationMessage
+            };
+            DamProjectData.CalculationMessages = new List<LogMessage>();
         }
 
-        /// <summary>
-        /// Runs this instance.
-        /// </summary>
-        /// <returns>Returns the output in an XML string</returns>
-        public string Run()
+        // Local validation can give messages and these have to be added to the results but note that there
+        // already can be messages added by instantiation of the interface too. So add the local to the global
+        if (validationMessages != null && validationMessages.Count > 0)
         {
-            string outputXml;
-            SendMessage(new LogMessage
+            if (DamProjectData != null && DamProjectData.CalculationMessages != null)
             {
-                MessageType = LogMessageType.Info,
-                Message = Resources.StartCalculation
-            });
-
-            switch (DamProjectData.DamProjectType)
-            {
-                case DamProjectType.Operational:
-                    var operationalCalculator = new OperationalCalculator();
-                    operationalCalculator.Execute(DamProjectData);
-                    break;
-                case DamProjectType.Design:
-                    var designCalculator = new DesignCalculator();
-                    designCalculator.RegisterProgress(ProgressDelegate);
-                    designCalculator.Execute(DamProjectData);
-                    break;
+                DamProjectData.CalculationMessages.AddRange(validationMessages);
             }
+        }
 
+        // Now check if there are any messages at all, if so return them.
+        if (DamProjectData != null && DamProjectData.CalculationMessages != null && DamProjectData.CalculationMessages.Count > 0)
+        {
             Output output = FillXmlOutputFromDam.CreateOutput(DamProjectData);
-            outputXml = DamXmlSerialization.SaveOutputAsXmlString(output);
+            string outputXml = DamXmlSerialization.SaveOutputAsXmlString(output);
             SendMessage(new LogMessage
             {
                 MessageType = LogMessageType.Info,
-                Message = Resources.EndCalculation
+                Message = Resources.EndValidation
             });
             return outputXml;
         }
 
-        private void SendMessage(LogMessage logMessage)
+        SendMessage(new LogMessage
         {
-            SendMessageDelegate?.Invoke(logMessage);
-        }
+            MessageType = LogMessageType.Info,
+            Message = Resources.EndValidation
+        });
+        return null;
+    }
 
-        private void Progress(double progress)
+    /// <summary>
+    /// Runs this instance.
+    /// </summary>
+    /// <returns>Returns the output in an XML string</returns>
+    public string Run()
+    {
+        string outputXml;
+        SendMessage(new LogMessage
         {
-            ProgressDelegate?.Invoke(progress);
+            MessageType = LogMessageType.Info,
+            Message = Resources.StartCalculation
+        });
+
+        switch (DamProjectData.DamProjectType)
+        {
+            case DamProjectType.Operational:
+                var operationalCalculator = new OperationalCalculator();
+                operationalCalculator.Execute(DamProjectData);
+                break;
+            case DamProjectType.Design:
+                var designCalculator = new DesignCalculator();
+                designCalculator.RegisterProgress(ProgressDelegate);
+                designCalculator.Execute(DamProjectData);
+                break;
         }
 
-        private bool UserAbort()
+        Output output = FillXmlOutputFromDam.CreateOutput(DamProjectData);
+        outputXml = DamXmlSerialization.SaveOutputAsXmlString(output);
+        SendMessage(new LogMessage
         {
-            if (UserAbortDelegate != null)
-            {
-                return UserAbortDelegate();
-            }
+            MessageType = LogMessageType.Info,
+            Message = Resources.EndCalculation
+        });
+        return outputXml;
+    }
 
-            return false;
+    private void SendMessage(LogMessage logMessage)
+    {
+        SendMessageDelegate?.Invoke(logMessage);
+    }
+
+    private void Progress(double progress)
+    {
+        ProgressDelegate?.Invoke(progress);
+    }
+
+    private bool UserAbort()
+    {
+        if (UserAbortDelegate != null)
+        {
+            return UserAbortDelegate();
         }
+
+        return false;
     }
 }
\ No newline at end of file