Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs =================================================================== diff -u -r5724 -r5777 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5724) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5777) @@ -419,41 +419,41 @@ { // Uplift Van case "UpliftVanGridSizeDetermination": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanTangentLinesDefinition": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanTangentLinesDistance": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanLeftGridVerticalPointCount": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanLeftGridVerticalPointDistance": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanLeftGridHorizontalPointCount": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanLeftGridHorizontalPointDistance": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanRightGridVerticalPointCount": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanRightGridVerticalPointDistance": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanRightGridHorizontalPointCount": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); case "UpliftVanRightGridHorizontalPointDistance": - return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan(); + return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan(); // Bishop case "BishopSearchAreaDetermination": - return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); + return IsStabilityBishop() || IsStabilityBishopUpliftVan(); case "BishopTangentLinesDistance": - return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); + return IsStabilityBishop() || IsStabilityBishopUpliftVan(); case "BishopGridVerticalPointCount": - return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); + return IsStabilityBishop() || IsStabilityBishopUpliftVan(); case "BishopGridVerticalPointDistance": - return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); + return IsStabilityBishop() || IsStabilityBishopUpliftVan(); case "BishopGridHorizontalPointCount": - return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); + return IsStabilityBishop() || IsStabilityBishopUpliftVan(); case "BishopGridHorizontalPointDistance": - return IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); + return IsStabilityBishop() || IsStabilityBishopUpliftVan(); default: return true; } } @@ -504,21 +504,21 @@ } } - private bool IsStabiltyBishop() + private bool IsStabilityBishop() { return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) && (MStabModelType) Specification.CalculationModel == MStabModelType.Bishop); } - private bool IsStabiltyUpliftVan() + private bool IsStabilityUpliftVan() { return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) && (MStabModelType) Specification.CalculationModel == MStabModelType.UpliftVan); } - private bool IsStabiltyBishopUpliftVan() + private bool IsStabilityBishopUpliftVan() { return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) && Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config =================================================================== diff -u -r5716 -r5777 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config (.../app.config) (revision 5716) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config (.../app.config) (revision 5777) @@ -1,30 +1,33 @@  - - -
+ +
@@ -47,9 +50,6 @@ csv - - Soilbase\soilbase.mdb - modelparameters @@ -110,9 +110,6 @@ 0.25 - - 0.25 - \ No newline at end of file