Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2286 -r2319
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2286)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2319)
@@ -2480,6 +2480,13 @@
return Segment.GetMostProbableGeometry2DName(segmentFailureMechanismType);
}
+ ///
+ /// Gets the soil profile probability.
+ ///
+ /// The soil profile.
+ /// Type of the segment failure mechanism.
+ ///
+ ///
public double? GetSoilProfileProbability(SoilProfile1D soilProfile, FailureMechanismSystemType? segmentFailureMechanismType)
{
if (Segment == null)
@@ -2491,6 +2498,23 @@
}
///
+ /// Gets the soil geometry2 d probability.
+ ///
+ /// Name of the soil geometry2 d.
+ /// Type of the segment failure mechanism.
+ ///
+ ///
+ public double? GetSoilGeometry2DProbability(string soilGeometry2DName, FailureMechanismSystemType? segmentFailureMechanismType)
+ {
+ if (Segment == null)
+ {
+ throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+ }
+
+ return Segment.GetSoilGeometry2DProbability(soilGeometry2DName, segmentFailureMechanismType);
+ }
+
+ ///
/// Gets a sorted list of soil geometry probabilities for a certain failure mechanism type
///
/// The failure mechanism type
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r2273 -r2319
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2273)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2319)
@@ -520,7 +520,11 @@
private double? GetSoilProfileProbability(FailureMechanismSystemType? failureMechanismType)
{
- return scenario.Location.GetSoilProfileProbability(soilProfile, failureMechanismType);
+ if (soilProfile != null)
+ {
+ return scenario.Location.GetSoilProfileProbability(soilProfile, failureMechanismType);
+ }
+ return scenario.Location.GetSoilGeometry2DProbability(soilGeometry2DName, failureMechanismType);
}
[CsvExportColumn("StabilityProfileName", 16)]