Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs =================================================================== diff -u -r1536 -r1553 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1536) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs (.../FillDamFromXmlInput.cs) (revision 1553) @@ -27,6 +27,7 @@ using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Interface.Properties; using Deltares.DamEngine.Io.XmlInput; using Location = Deltares.DamEngine.Data.General.Location; @@ -69,7 +70,11 @@ TransferSurfaceLines(input.SurfaceLines, dike.SurfaceLines2); dike.SoilList = new SoilList(); TransferSoils(input.Soils, dike.SoilList.Soils); - TransferAquiferSoils(input.AquiferSoils, dike.SoilList); + var messages = TransferAquiferSoils(input.AquiferSoils, dike.SoilList); + if (messages.Count > 0) + { + damProjectData.CalculationMessages = messages; + } TransferSoilProfiles1D(input.SoilProfiles1D, dike.SoilProfiles, dike.SoilList); TransferSoilProfiles2D(input.SoilProfiles2D, dike.SoilProfiles2D, dike.SoilList); TransferSegments(input.Segments, damProjectData.Segments); @@ -79,8 +84,9 @@ return damProjectData; } - private static void TransferAquiferSoils(InputAquiferSoil[] inputAquiferSoils, SoilList soilList) + private static List TransferAquiferSoils(InputAquiferSoil[] inputAquiferSoils, SoilList soilList) { + List validationMessages = new List(); if (inputAquiferSoils != null) { soilList.AquiferDictionary = new Dictionary(); @@ -93,13 +99,16 @@ } else { + // If a soil is (wrongly) in the list more than once, then prefer aquifer true. if (aquiferSoil.IsAquifer) - { + { + validationMessages.Add(new LogMessage(LogMessageType.Warning, aquiferSoil, string.Format(Resources.DoubleAquiferSoil, aquiferSoil.Soilname))); soilList.AquiferDictionary[soil] = true; } } } } + return validationMessages; } private static void TransferAnalysisSpecification(Input input, DamProjectData damProjectData)