Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r4569 -r4618 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4569) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4618) @@ -248,9 +248,7 @@ soil.RatioCuPc = soilRecord.RatioSuPc.Value; } - soil.UsePop = soilRecord.UsePop; - - if (soilRecord.Pop.HasValue && soilRecord.UsePop) + if (soilRecord.Pop.HasValue) { soil.POP = soilRecord.Pop.Value; } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r4569 -r4618 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4569) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4618) @@ -719,7 +719,6 @@ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo((ShearStrengthModel) 0)); Assert.That(soilRecord.StrengthIncreaseExponent, Is.Null); Assert.That(soilRecord.RatioSuPc, Is.Null); - Assert.That(soilRecord.UsePop, Is.False); Assert.That(soilRecord.Pop, Is.Null); soilRecord = soilRecords[1]; @@ -735,7 +734,6 @@ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo((ShearStrengthModel) 0)); Assert.That(soilRecord.StrengthIncreaseExponent, Is.Null); Assert.That(soilRecord.RatioSuPc, Is.Null); - Assert.That(soilRecord.UsePop, Is.False); Assert.That(soilRecord.Pop, Is.Null); } @@ -767,7 +765,6 @@ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CPhi)); Assert.That(soilRecord.StrengthIncreaseExponent, Is.EqualTo(0.700)); Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220)); - Assert.That(soilRecord.UsePop, Is.False); Assert.That(soilRecord.Pop, Is.EqualTo(10.000)); Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("")); @@ -784,7 +781,6 @@ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.StressTable)); Assert.That(soilRecord.StrengthIncreaseExponent, Is.EqualTo(0.700)); Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220)); - Assert.That(soilRecord.UsePop, Is.False); Assert.That(soilRecord.Pop, Is.EqualTo(10.000)); Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("CurveKlei")); @@ -801,7 +797,6 @@ Assert.That(soilRecord.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.CuCalculated)); Assert.That(soilRecord.StrengthIncreaseExponent, Is.EqualTo(0.700)); Assert.That(soilRecord.RatioSuPc, Is.EqualTo(0.220)); - Assert.That(soilRecord.UsePop, Is.False); Assert.That(soilRecord.Pop, Is.EqualTo(10.000)); Assert.That(soilRecord.SigmaTauCurveName, Is.EqualTo("")); } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs =================================================================== diff -u -r4609 -r4618 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 4609) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 4618) @@ -260,7 +260,6 @@ ShearStrengthModel = ShearStrengthModel.CPhi, StrengthIncreaseExponent = random.NextDouble(), RatioSuPc = random.NextDouble(), - UsePop = true, Pop = random.NextDouble() }, new() @@ -277,7 +276,6 @@ ShearStrengthModel = ShearStrengthModel.CuCalculated, StrengthIncreaseExponent = random.NextDouble(), RatioSuPc = random.NextDouble(), - UsePop = false, Pop = random.NextDouble() } }; @@ -301,17 +299,7 @@ Assert.That(soil.ShearStrengthModel, Is.EqualTo(soilRecord.ShearStrengthModel)); Assert.That(soil.StrengthIncreaseExponent, Is.EqualTo(soilRecord.StrengthIncreaseExponent)); Assert.That(soil.RatioCuPc, Is.EqualTo(soilRecord.RatioSuPc)); - switch (i) - { - case 0: - Assert.That(soil.POP, Is.EqualTo(soilRecord.Pop)); - break; - case 1: - Assert.That(soil.POP, Is.NaN); - break; - } - - Assert.That(soil.UsePop, Is.EqualTo(soilRecord.UsePop)); + Assert.That(soil.POP, Is.EqualTo(soilRecord.Pop)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs =================================================================== diff -u -r4539 -r4618 --- DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 4618) @@ -241,7 +241,6 @@ StaticReflection.GetMemberName(s => s.ShearStrengthModel), StaticReflection.GetMemberName(s => s.Cohesion), StaticReflection.GetMemberName(s => s.FrictionAngle), - StaticReflection.GetMemberName(s => s.UsePop), StaticReflection.GetMemberName(s => s.POP), StaticReflection.GetMemberName(s => s.RatioCuPc), StaticReflection.GetMemberName(s => s.StrengthIncreaseExponent) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs =================================================================== diff -u -r4544 -r4618 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 4544) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 4618) @@ -451,11 +451,6 @@ public const string RatioSuPcColumnName = "ratio_su_pc"; /// - /// use_pop - /// - public const string UsePopColumnName = "use_pop"; - - /// /// pop /// public const string PopColumnName = "pop"; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs =================================================================== diff -u -r4544 -r4618 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs (.../CsvImporterSoils.cs) (revision 4544) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoils.cs (.../CsvImporterSoils.cs) (revision 4618) @@ -80,7 +80,6 @@ int colIndexShearStrengthModel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ShearStrengthModelColumnName); int colIndexStrengthIncreaseExponent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StrengthIncreaseExponentColumnName); int colIndexRatioSuPc = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RatioSuPcColumnName); - int colIndexUsePop = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePopColumnName); int colIndexPop = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PopColumnName); int colIndexSigmaTauCurveName = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SigmaTauCurveNameColumnName); @@ -116,12 +115,6 @@ soil.StrengthIncreaseExponent = FetchOptionalColumn(colIndexStrengthIncreaseExponent, csv); soil.RatioSuPc = FetchOptionalColumn(colIndexRatioSuPc, csv); - if (colIndexUsePop > -1) - { - currentColIndex = colIndexUsePop; - soil.UsePop = Convert.ToBoolean(csv[currentColIndex]); - } - if (colIndexSigmaTauCurveName > -1) { currentColIndex = colIndexSigmaTauCurveName; @@ -185,7 +178,6 @@ public string SigmaTauCurveName { get; set; } = ""; public double? StrengthIncreaseExponent { get; set; } public double? RatioSuPc { get; set; } - public bool UsePop { get; set; } public double? Pop { get; set; } } } \ No newline at end of file