Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r5806 -r5826
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 5806)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 5826)
@@ -280,7 +280,7 @@
}
[Test]
- public void ImportWaterBoardCsvFiles1DMissingSuTableCurve()
+ public void ImportWaterBoardCsvFiles1DMissingSuTable()
{
const string definitionFilename = @".\TestData\CSVData\Full1DProjectMissingSuTable\Import.defx";
@@ -307,7 +307,7 @@
}
[Test]
- public void ImportWaterBoardCsvFiles1DMissingSuTableCurveCsvFile()
+ public void ImportWaterBoardCsvFiles1DMissingSuTableCsvFile()
{
const string definitionFilename = @".\TestData\CSVData\Full1DProjectMissingSuTableCsvFile\Import.defx";
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r5803 -r5826
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 5803)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 5826)
@@ -747,8 +747,8 @@
-
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r5803 -r5826
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 5803)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 5826)
@@ -128,7 +128,7 @@
TransferAquifersData(dike);
TransferSegmentData(dike);
TransferSigmaTauCurveData(dike); // Should be done before TransferSoilData(), because the SigmaTauCurveData is used there
- TransferSuTableCurveData(dike); // Should be done before TransferSoilData(), because the SuTableCurveData is used there
+ TransferSuTableData(dike); // Should be done before TransferSoilData(), because the SuTableCurveData is used there
TransferSoilData(dike);
// Use InvokeWithoutPublishingEvents for performance reasons after introducing SurfaceLine2
DataEventPublisher.InvokeWithoutPublishingEvents(() => { TransferSurfaceLines(dike); });
@@ -434,9 +434,9 @@
dike.FillImportedSigmaTauCurvesFromCsvFile(SigmaTauCurveRecords);
}
- private void TransferSuTableCurveData(Dike dike)
+ private void TransferSuTableData(Dike dike)
{
- dike.FillImportedSuTableCurvesFromCsvFile(SuTableRecords);
+ dike.FillImportedSuTablesFromCsvFile(SuTableRecords);
}
private void TransferSoilProfilesData(Dike dike)
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
===================================================================
diff -u -r5825 -r5826
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 5825)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 5826)
@@ -242,12 +242,12 @@
}
soil.StressTable = stressCurve;
// Note: if the stress curve was not found, the soil will be removed from the soil list in TryToMakeSoilDataConsistent()
- SigmaSuCurve suTableCurve = ImportedCsvSuTableCurves.Find(sc => sc.Name == soilRecord.SuTableName);
- if (suTableCurve == null)
+ SigmaSuCurve sigmaSuCurve = ImportedCsvSuTables.Find(sc => sc.Name == soilRecord.SuTableName);
+ if (sigmaSuCurve == null)
{
- suTableCurve = new SigmaSuCurve{ Name = soilRecord.SuTableName};
+ sigmaSuCurve = new SigmaSuCurve{ Name = soilRecord.SuTableName};
}
- soil.SuTable = suTableCurve;
+ soil.SuTable = sigmaSuCurve;
// Note: if the su table was not found, the soil will be removed from the soil list in TryToMakeSoilDataConsistent()
if (soilRecord.StrengthIncreaseExponent.HasValue)
@@ -334,7 +334,7 @@
/// Fill the imported su table curves from the csv file
///
///
- public void FillImportedSuTableCurvesFromCsvFile(IEnumerable suTableRecords)
+ public void FillImportedSuTablesFromCsvFile(IEnumerable suTableRecords)
{
if (suTableRecords == null)
{
@@ -343,15 +343,15 @@
foreach (CsvImporterSuTables.SuTableRecord suTableRecord in suTableRecords)
{
- SigmaSuCurve suTableCurve = ImportedCsvSuTableCurves.Find(sc => sc.Name == suTableRecord.SuTableName);
- if (suTableCurve == null)
+ SigmaSuCurve sigmaSuCurve = ImportedCsvSuTables.Find(sc => sc.Name == suTableRecord.SuTableName);
+ if (sigmaSuCurve == null)
{
- suTableCurve = new SigmaSuCurve();
- suTableCurve.Name = suTableRecord.SuTableName;
- ImportedCsvSuTableCurves.Add(suTableCurve);
+ sigmaSuCurve = new SigmaSuCurve();
+ sigmaSuCurve.Name = suTableRecord.SuTableName;
+ ImportedCsvSuTables.Add(sigmaSuCurve);
}
- suTableCurve.SigmaSus.Add(new SigmaSu()
+ sigmaSuCurve.SigmaSus.Add(new SigmaSu()
{
Sigma = suTableRecord.Sigma,
Su = suTableRecord.Su
@@ -485,7 +485,7 @@
internal List ImportedCsvSoils { get; } = new();
internal List ImportedCsvStressCurves { get; } = new();
- internal List ImportedCsvSuTableCurves { get; } = new();
+ internal List ImportedCsvSuTables { get; } = new();
///
/// Tries to make the soil data as read for 1D profiles consistent with the data in the soil database.
@@ -532,7 +532,7 @@
{
soilList.Soils.Remove(soil);
errorSoils.Add(soil);
- soilErrorMessages.Add(string.Format(LocalizationManager.GetTranslatedText(GetType(), "SuTableCurveNotFoundInCsvFile"),
+ soilErrorMessages.Add(string.Format(LocalizationManager.GetTranslatedText(GetType(), "SuTableNotFoundInCsvFile"),
soil.SuTable.Name, soil.Name));
}
Soil existingSoil = soilList.GetSoilByName(soil.Name);