Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/XmlSoilProfile2DConverterTest.cs =================================================================== diff -u -r3058 -r3288 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/XmlSoilProfile2DConverterTest.cs (.../XmlSoilProfile2DConverterTest.cs) (revision 3058) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/XmlSoilProfile2DConverterTest.cs (.../XmlSoilProfile2DConverterTest.cs) (revision 3288) @@ -75,7 +75,8 @@ { Name = "LayerOne", IsAquifer = true, - GeometrySurface = new GeometrySurface() + GeometrySurface = new GeometrySurface(), + WaterpressureInterpolationModel = WaterpressureInterpolationModel.Automatic }; layerOne.GeometrySurface.OuterLoop = CreateLoop(new GeometryPoint(0, 0, -15), new GeometryPoint(10, 0, -15), @@ -86,7 +87,8 @@ { Name = "LayerTwo", IsAquifer = false, - GeometrySurface = new GeometrySurface() + GeometrySurface = new GeometrySurface(), + WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic }; layerTwo.GeometrySurface.InnerLoops.AddRange(new[] { @@ -168,8 +170,8 @@ Assert.That(convertedSoilLayer.SoilName, Is.EqualTo(soilLayer.Name)); Assert.That(convertedSoilLayer.IsAquifer, Is.EqualTo(soilLayer.IsAquifer)); - // Water pressure interpolation model should be set to Hydrostatic as default (which is value = 1 in DamEngine) - Assert.That(convertedSoilLayer.WaterpressureInterpolationModel, Is.EqualTo(1)); + int expectedModel = ConversionHelper.ConvertToInputWaterpressureInterpolationModel(soilLayer.WaterpressureInterpolationModel); + Assert.That(convertedSoilLayer.WaterpressureInterpolationModel, Is.EqualTo(expectedModel)); AssertSurface(soilLayer.GeometrySurface, convertedSoilLayer.Surface); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/XmlSoilProfile2DConverter.cs =================================================================== diff -u -r3058 -r3288 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/XmlSoilProfile2DConverter.cs (.../XmlSoilProfile2DConverter.cs) (revision 3058) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/XmlSoilProfile2DConverter.cs (.../XmlSoilProfile2DConverter.cs) (revision 3288) @@ -87,7 +87,7 @@ { SoilName = soilLayerName, IsAquifer = soilLayer.IsAquifer, - WaterpressureInterpolationModel = 1 // Corresponds with the 'hydrostatic' value in DamEngine + WaterpressureInterpolationModel = ConversionHelper.ConvertToInputWaterpressureInterpolationModel(soilLayer.WaterpressureInterpolationModel) }; GeometrySurface surface = soilLayer.GeometrySurface;