Index: dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r458 -r463 --- dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 458) +++ dam clients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 463) @@ -27,13 +27,16 @@ using System.Linq; using System.Windows.Forms; using Deltares.Dam.Data; +using Deltares.Dam.Data.DamEngineIo; using Deltares.Dam.Data.DataPlugins; using Deltares.Dam.Data.DataPlugins.Configuration; using Deltares.Dam.Data.IO; using Deltares.Dam.Data.License; using Deltares.Dam.Data.Sensors; using Deltares.Dam.Data.UISupport; using Deltares.DamEngine.Interface; +using Deltares.DamEngine.Io; +using Deltares.DamEngine.Io.XmlInput; using Deltares.Geotechnics.Mechanisms; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; @@ -51,6 +54,7 @@ using DevExpress.XtraBars; using DevExpress.XtraEditors.Controls; using DevExpress.XtraEditors.Repository; +using Location = Deltares.Dam.Data.Location; namespace Deltares.Dam.Forms { @@ -660,7 +664,15 @@ LogManager.Clear(); try { - var damEnginInterface = new EngineInterface(""); + Input input = FillXmlInputFromDamUi.CreateInput(damProject.DamProjectData); + + // Next 2 lines for debugging + const string inputFilename = "InputFile.xml"; + DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input); + + string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); + + var damEnginInterface = new EngineInterface(inputXml); damEnginInterface.Validate(); damEnginInterface.Run(); } Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r458 -r463 --- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 458) +++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 463) @@ -18,8 +18,8 @@ const string inputFilename = "InputFile.xml"; DamProjectData expectedDamProjectData = CreateExampleDamProjectData(); Input input = FillXmlInputFromDamUi.CreateInput(expectedDamProjectData); - DamXmlSerialization.SaveInputAsXml(inputFilename, input); - input = DamXmlSerialization.LoadInputFromXml(inputFilename); + DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input); + input = DamXmlSerialization.LoadInputFromXmlFile(inputFilename); DamProjectData actualDamProjectData = FillDamUiFromXmlInput.CreateDamProjectData(input); CompareDamProjectData(actualDamProjectData, expectedDamProjectData); } Index: dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj =================================================================== diff -u -r341 -r463 --- dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 341) +++ dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 463) @@ -52,6 +52,10 @@ ..\..\..\lib\DamEngine\Deltares.DamEngine.Interface.dll + + False + ..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll + ..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll