Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/CsvExportData.cs =================================================================== diff -u -r337 -r395 --- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/CsvExportData.cs (.../CsvExportData.cs) (revision 337) +++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/CsvExportData.cs (.../CsvExportData.cs) (revision 395) @@ -263,8 +263,8 @@ this.wti2017PipingFactor = pipingResults.Value.Wti2017PipingFactor; this.wti2017HCritical = pipingResults.Value.Wti2017HCritical; this.localPipingExitPointX = pipingResults.Value.PipingExitPointX; - this.HeaveFactor = pipingResults.Value.HeaveFactor; - this.UpliftFactor = pipingResults.Value.UpliftFactor; + this.heaveFactor = pipingResults.Value.HeaveFactor; + this.upliftFactor = pipingResults.Value.UpliftFactor; } this.calculationResult = (this.PipingFactor == null && this.PipingFailureProbability == null) ? CalculationResult.RunFailed : CalculationResult.Succeeded; break; @@ -299,7 +299,7 @@ private CalculationResult DetermineStabilityCalculationResult(string message, MStabResults? mstabResults) { CalculationResult result; - if ((message != null) && this.resultMessage.Contains("FAIL")) + if ((message != null) && message.Contains("FAIL")) { result = CalculationResult.UnexpectedError; } @@ -350,13 +350,13 @@ set { selectedStabilityKernelType = value; } } - public int NumberOfIterations + public int NumberOfIterations // real results for NWo { get { return numberOfIterations; } set { numberOfIterations = value; } } - public string ResultFile + public string ResultFile //derived result { get { @@ -384,7 +384,7 @@ } } - public string InputFile + public string InputFile // derived result { get { @@ -408,7 +408,7 @@ } } - public string PipingResultFile + public string PipingResultFile //derived result { // Path of piping is not based on the working dir but on assembly (Assembly.GetExecutingAssembly().Location) get @@ -429,20 +429,20 @@ } } - public AnalysisType AnalysisType + public AnalysisType AnalysisType // input, not result { get { return analysisType; } set { analysisType = value; } } - public ProbabilisticType ProbabilisticType + public ProbabilisticType ProbabilisticType // input, not result { get { return probabilisticType; } set { probabilisticType = value; } } [Browsable(false)] - public DamFailureMechanismeCalculationSpecification DamFailureMechanismeCalculation + public DamFailureMechanismeCalculationSpecification DamFailureMechanismeCalculation // input, not result { get { return damFailureMechanismeCalculationSpecification; } set { damFailureMechanismeCalculationSpecification = value; } @@ -453,37 +453,37 @@ get { return this.id; } } - public string DikeName + public string DikeName // input, not result { get { return dike.Name; } } - public string Calculation + public string Calculation // input, not result { get { return this.damFailureMechanismeCalculationSpecification != null ? this.damFailureMechanismeCalculationSpecification.ToString() : ""; } } - public string ScenarioName + public string ScenarioName // input, not result { get { return this.Scenario.LocationScenarioID; } } - public string LocationName + public string LocationName // input, not result { get { return this.Scenario.Location.Name; } } - public int LocationScenarioCount + public int LocationScenarioCount // input, not result { get { return this.Scenario.Location.Scenarios.Count; } } - public string ScenarioDefinitionName + public string ScenarioDefinitionName // input, not result { get { return this.Scenario.LocationScenarioID + " of " + this.LocationScenarioCount.ToString(); } } - public CalculationResult CalculationResult + public CalculationResult CalculationResult // derived result, involves ResultMessage, mstabResults (stab) or PipingFactor == null && this.PipingFailureProbability { get { @@ -495,14 +495,14 @@ } } - public string ResultMessage + public string ResultMessage // real result { get { return resultMessage; } set { resultMessage = value; } } [XmlIgnore] - public double X + public double X //Xrd iput but very usefull as output as well { get { @@ -518,7 +518,7 @@ } [XmlIgnore] - public double Y + public double Y //Yrd iput but very usefull as output as well { get { @@ -533,37 +533,37 @@ } } - public string LocationScenarioId + public string LocationScenarioId // input, not output ##Bka: this is the same as ScenarioName so why both?????? { get { return this.Scenario.LocationScenarioID; } } - public double? RiverLevel + public double? RiverLevel // input, not output { get { return this.Scenario.RiverLevel; } } - public double? RiverLevelLow + public double? RiverLevelLow // input, not output { get { return this.Scenario.RiverLevelLow; } } - public double? DikeTableHeight + public double? DikeTableHeight // input, not output { get { return this.Scenario.DikeTableHeight; } } - public double? SlopeDampingPiezometricHeightPolderSide + public double? SlopeDampingPiezometricHeightPolderSide // input, not output { get { return this.Scenario.Location.SlopeDampingPiezometricHeightPolderSide; } } - public double? CurrentDikeHeight + public double? CurrentDikeHeight // input, not output { get { return this.Scenario.Location.SurfaceLine2.GetDikeHeight(); } } - public double? CurrentDikeToeAtPolderX + public double? CurrentDikeToeAtPolderX // input, not output { get { @@ -575,7 +575,7 @@ } } - public double? CurrentDikeToeAtPolderZ + public double? CurrentDikeToeAtPolderZ // input, not output { get { @@ -609,32 +609,32 @@ return this.Scenario.Location.GetSoilProfileProbability(this.SoilProfile, failureMechanismType); } - public string StabilityProfileName + public string StabilityProfileName // derived input, not output { get { return GetSoilProfileName(FailureMechanismSystemType.StabilityInside); } } - public double? StabilityProfileProbability + public double? StabilityProfileProbability // derived input, not output { get { return GetSoilProfileProbability(FailureMechanismSystemType.StabilityInside); } } - public string PipingProfileName + public string PipingProfileName // derived input, not output { get { return GetSoilProfileName(FailureMechanismSystemType.Piping); } } - public double? PipingProfileProbability + public double? PipingProfileProbability //derived input, not output { get { return GetSoilProfileProbability(FailureMechanismSystemType.Piping); } } - public double? CurrentDikeLength + public double? CurrentDikeLength // input, not output { get { return this.Scenario.Location.SurfaceLine2.GetDikeLength(); } } - public double? StabilityToeAtPolderX + public double? StabilityToeAtPolderX // derived result stab { get { @@ -649,7 +649,7 @@ } } - public double? StabilityToeAtPolderZ + public double? StabilityToeAtPolderZ // derived result stab { get { @@ -664,7 +664,7 @@ } } - public double? StabilityShoulderHeight + public double? StabilityShoulderHeight // derived result stab { get { @@ -679,34 +679,34 @@ } } - public double? StabilitySafetyFactor + public double? StabilitySafetyFactor // real result stab and nwostab { get { return this.safetyFactorStability; } set { this.safetyFactorStability = value; } } - public double? StabilityFailureProbability + public double? StabilityFailureProbability // real result stab { get { return this.failureProbabilityStability; } set { this.failureProbabilityStability = value; } } - public double? RequiredSafetyFactorStabilityInnerSlope + public double? RequiredSafetyFactorStabilityInnerSlope // input { get { return this.Scenario.RequiredSafetyFactorStabilityInnerSlope;} } - public double? RequiredSafetyFactorStabilityOuterSlope + public double? RequiredSafetyFactorStabilityOuterSlope //input { get { return this.Scenario.RequiredSafetyFactorStabilityOuterSlope; } } - public double? RequiredSafetyFactorPiping + public double? RequiredSafetyFactorPiping // input { get { return this.Scenario.RequiredSafetyFactorPiping; } } - public double? PipingToeAtPolderX + public double? PipingToeAtPolderX // derived result piping { get { @@ -721,7 +721,7 @@ } } - public double? PipingToeAtPolderZ + public double? PipingToeAtPolderZ // derived result piping { get { @@ -736,7 +736,7 @@ } } - public double? PipingShoulderHeight + public double? PipingShoulderHeight // derived result piping { get { @@ -751,18 +751,18 @@ } } - public double? PipingFailureProbability + public double? PipingFailureProbability // real result piping { get { return this.failureProbabilityPiping; } set { this.failureProbabilityPiping = value; } } - public double? RequiredFailureProbabilityPiping + public double? RequiredFailureProbabilityPiping // input { get { return this.Scenario.RequiredProbabilityOfFailurePiping; } } - public double? DikeLength + public double? DikeLength // derived value { get { @@ -792,20 +792,20 @@ } } - public double? Zone1SafetyFactorStability + public double? Zone1SafetyFactorStability // real result for stab and nwostab { get { return this.zone1SafetyFactorStability; } set { this.zone1SafetyFactorStability = value; } } - public double? LocalZone1EntryPointX + public double? LocalZone1EntryPointX // real result for stab and nwostab { get { return localZone1EntryPointX; } set { localZone1EntryPointX = value; } } [XmlIgnore] - public double? Zone1EntryPointX + public double? Zone1EntryPointX // derived result { get { @@ -820,7 +820,7 @@ } [XmlIgnore] - public double? Zone1EntryPointY + public double? Zone1EntryPointY // derived result { get { @@ -835,7 +835,7 @@ } [XmlIgnore] - public double? Zone1EntryPointZ + public double? Zone1EntryPointZ // derived result { get { @@ -847,13 +847,13 @@ } } - public double? LocalZone1ExitPointX + public double? LocalZone1ExitPointX // real result stab and nwostab { get { return localZone1ExitPointX; } set { localZone1ExitPointX = value; } } - public double? Zone1ExitPointX + public double? Zone1ExitPointX // derived result { get { @@ -867,7 +867,7 @@ } } - public double? Zone1ExitPointY + public double? Zone1ExitPointY // derived result { get { @@ -881,7 +881,7 @@ } } - public double? Zone1ExitPointZ + public double? Zone1ExitPointZ // derived result { get { @@ -893,19 +893,19 @@ } } - public double? Zone2SafetyFactorStability + public double? Zone2SafetyFactorStability // real result stab and nwostab { get { return this.zone2SafetyFactorStability; } set { this.zone2SafetyFactorStability = value; } } - public double? LocalZone2EntryPointX + public double? LocalZone2EntryPointX // real result stab and nwostab { get { return localZone2EntryPointX; } set { localZone2EntryPointX = value; } } - public double? Zone2EntryPointX + public double? Zone2EntryPointX // derived result { get { @@ -920,7 +920,7 @@ } } - public double? Zone2EntryPointY + public double? Zone2EntryPointY // derived result { get { @@ -935,7 +935,7 @@ } } - public double? Zone2EntryPointZ + public double? Zone2EntryPointZ // derived result { get { @@ -947,13 +947,13 @@ } } - public double? LocalZone2ExitPointX + public double? LocalZone2ExitPointX // real result stab and nwostab { get { return localZone2ExitPointX; } set { localZone2ExitPointX = value; } } - public double? Zone2ExitPointX + public double? Zone2ExitPointX // derived result { get { @@ -967,7 +967,7 @@ } } - public double? Zone2ExitPointY + public double? Zone2ExitPointY // derived result { get { @@ -981,7 +981,7 @@ } } - public double? Zone2ExitPointZ + public double? Zone2ExitPointZ // derived result { get { @@ -993,32 +993,32 @@ } } - public bool? IsUplift + public bool? IsUplift // real result stab and piping { get { return this.isUplift; } set { this.isUplift = value; } } - public double? Pl3MinUplift + public double? Pl3MinUplift // real result stab and piping { get { return this.pl3MinUplift; } set { this.pl3MinUplift = value; } } - public double? Pl3HeadAdjusted + public double? Pl3HeadAdjusted // real result stab and piping { get { return this.pl3HeadAdjusted; } set { this.pl3HeadAdjusted = value; } } - public double? Pl3LocalLocationXMinUplift + public double? Pl3LocalLocationXMinUplift // real result stab and piping { get { return this.pl3LocalLocationXMinUplift; } set { this.pl3LocalLocationXMinUplift = value; } } [XmlIgnore] - public double? Pl3LocationXMinUplift + public double? Pl3LocationXMinUplift // derived result { get { @@ -1033,7 +1033,7 @@ } [XmlIgnore] - public double? Pl3LocationYMinUplift + public double? Pl3LocationYMinUplift // derived result { get { @@ -1047,26 +1047,26 @@ } } - public double? Pl4MinUplift + public double? Pl4MinUplift // real result stab and piping { get { return this.pl4MinUplift; } set { this.pl4MinUplift = value; } } - public double? Pl4HeadAdjusted + public double? Pl4HeadAdjusted // real result stab and piping { get { return this.pl4HeadAdjusted; } set { this.pl4HeadAdjusted = value; } } - public double? Pl4LocalLocationXMinUplift + public double? Pl4LocalLocationXMinUplift // real result stab and piping { get { return this.pl4LocalLocationXMinUplift; } set { this.pl4LocalLocationXMinUplift = value; } } [XmlIgnore] - public double? Pl4LocationXMinUplift + public double? Pl4LocationXMinUplift // derived result { get { @@ -1081,7 +1081,7 @@ } [XmlIgnore] - public double? Pl4LocationYMinUplift + public double? Pl4LocationYMinUplift // derived result { get { @@ -1095,61 +1095,61 @@ } } - public double? UpliftFactor + public double? UpliftFactor // real result piping { get { return this.upliftFactor; } set { this.upliftFactor = value; } } - public double? HeaveFactor + public double? HeaveFactor // real result piping { get { return this.heaveFactor; } set { this.heaveFactor = value; } } - public double? BlighPipingFactor + public double? BlighPipingFactor // real result piping { get { return this.blighPipingFactor; } set { this.blighPipingFactor = value; } } - public double? BlighHCritical + public double? BlighHCritical // real result piping { get { return this.blighHCritical; } set { this.blighHCritical = value; } } - public double? Sellmeijer2ForcesPipingFactor + public double? Sellmeijer2ForcesPipingFactor // real result piping { get { return this.sellmeijer2ForcesPipingFactor; } set { this.sellmeijer2ForcesPipingFactor = value; } } - public double? Sellmeijer2ForcesHCritical + public double? Sellmeijer2ForcesHCritical // real result piping { get { return this.sellmeijer2ForcesHCritical; } set { this.sellmeijer2ForcesHCritical = value; } } - public double? Sellmeijer4ForcesPipingFactor + public double? Sellmeijer4ForcesPipingFactor // real result piping { get { return this.sellmeijer4ForcesPipingFactor; } set { this.sellmeijer4ForcesPipingFactor = value; } } - public double? Sellmeijer4ForcesHCritical + public double? Sellmeijer4ForcesHCritical // real result piping { get { return this.sellmeijer4ForcesHCritical; } set { this.sellmeijer4ForcesHCritical = value; } } - public double? SellmeijerPipingFactor + public double? SellmeijerPipingFactor // real result piping { get { return this.sellmeijerPipingFactor; } set { this.sellmeijerPipingFactor = value; } } - public double? SellmeijerHCritical + public double? SellmeijerHCritical // real result piping { get { return this.sellmeijerHCritical; } set { this.sellmeijerHCritical = value; } @@ -1161,7 +1161,7 @@ /// /// The wti2017 piping factor. /// - public double? Wti2017PipingFactor + public double? Wti2017PipingFactor // real result piping { get { return wti2017PipingFactor; } set { wti2017PipingFactor = value; } @@ -1173,15 +1173,15 @@ /// /// The wti2017 h critical. /// - public double? Wti2017HCritical + public double? Wti2017HCritical // real result piping { get { return wti2017HCritical; } set { wti2017HCritical = value; } } - public string NwoId { get { return this.nwoId; } } + public string NwoId { get { return this.nwoId; } } // real result nwostab - public int NwoResultIndex + public int NwoResultIndex // real result nwostab { get { return this.nwoResultIndex; } } @@ -1214,85 +1214,85 @@ public double? NWOLocationZrdEnd { get { return this.locationZrdEnd; } } //Note: using SurfaceLine instead of LocalXzSurfaceLine must give the proper RD coors. If this is not the case, error is somewhere else. Do not convert here! - public double? DikeToeAtRiverXrd + public double? DikeToeAtRiverXrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X; } } - public double? DikeToeAtRiverYrd + public double? DikeToeAtRiverYrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Y; } } - public double? DikeToeAtRiverZrd + public double? DikeToeAtRiverZrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z; } } - public double? DikeTopAtRiverXrd + public double? DikeTopAtRiverXrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X; } } - public double? DikeTopAtRiverYrd + public double? DikeTopAtRiverYrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Y; } } - public double? DikeTopAtRiverZrd + public double? DikeTopAtRiverZrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z; } } - public double? DikeTopAtPolderXrd + public double? DikeTopAtPolderXrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X; } } - public double? DikeTopAtPolderYrd + public double? DikeTopAtPolderYrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Y; } } - public double? DikeTopAtPolderZrd + public double? DikeTopAtPolderZrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z; } } - public double? DikeToeAtPolderXrd + public double? DikeToeAtPolderXrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X; } } - public double? DikeToeAtPolderYrd + public double? DikeToeAtPolderYrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Y; } } - public double? DikeToeAtPolderZrd + public double? DikeToeAtPolderZrd // input { get { return this.Scenario.Location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z; } } - public double? FlowSlideSafetyFactor + public double? FlowSlideSafetyFactor // real result flowslide { get { return this.safetyFactorFlowSlide; } set { this.safetyFactorFlowSlide = value; } } - public DesignScenario Scenario + public DesignScenario Scenario // holds input as well as results. must not be part of result xml in itself { get { return scenario; } set { scenario = value; } } - public SoilProfile1D SoilProfile + public SoilProfile1D SoilProfile //##Bka : only used internally, no need to return as real result { get { return soilProfile; } set { soilProfile = value; } } - public string SoilGeometry2DName + public string SoilGeometry2DName //##Bka : only used internally, no need to return as real result { get { return soilGeometry2DName; } set { soilGeometry2DName = value; } @@ -1322,7 +1322,7 @@ return redesignedSurfaceLineStabilityGlobal; } - public SurfaceLine2 RedesignedSurfaceLine2Stability + public SurfaceLine2 RedesignedSurfaceLine2Stability // real result stab { get { return redesignedSurfaceLineStability; } set { redesignedSurfaceLineStability = value; } @@ -1352,14 +1352,14 @@ return redesignedSurfaceLinePipingGlobal; } - public SurfaceLine2 RedesignedSurfaceLine2Piping + public SurfaceLine2 RedesignedSurfaceLine2Piping // real result piping { get { return redesignedSurfaceLinePiping; } set { redesignedSurfaceLinePiping = value; } } [XmlIgnore] - public string ProfileName + public string ProfileName // derived input { get { @@ -1380,7 +1380,7 @@ } [XmlIgnore] - public double? ProfileProbability + public double? ProfileProbability // derived input { get { @@ -1401,7 +1401,7 @@ } [XmlIgnore] - public MStabModelType? StabilityModel + public MStabModelType? StabilityModel // derived input { get { @@ -1417,7 +1417,7 @@ } [XmlIgnore] - public double? SafetyFactor + public double? SafetyFactor // derived result { get { @@ -1441,7 +1441,7 @@ } [XmlIgnore] - public double? FailureProbability + public double? FailureProbability // derived result { get { @@ -1462,7 +1462,7 @@ } [XmlIgnore] - public double? RequiredFailureProbability + public double? RequiredFailureProbability // derived input { get { @@ -1478,7 +1478,7 @@ } [XmlIgnore] - public double? RequiredSafetyFactor + public double? RequiredSafetyFactor // derived input { get { @@ -1500,7 +1500,7 @@ } [XmlIgnore] - public double? ShoulderHeight + public double? ShoulderHeight // derived result { get { @@ -1519,7 +1519,7 @@ } [XmlIgnore] - public double? ToeAtPolderX + public double? ToeAtPolderX // derived result { get { @@ -1538,7 +1538,7 @@ } [XmlIgnore] - public double? ToeAtPolderZ + public double? ToeAtPolderZ // derived result { get { @@ -1557,7 +1557,7 @@ } [XmlIgnore] - public PipingModelType? PipingModel + public PipingModelType? PipingModel // input { get { @@ -1570,7 +1570,7 @@ } [XmlIgnore] - public double? PipingFactor + public double? PipingFactor // derived result { get { @@ -1601,7 +1601,7 @@ } [XmlIgnore] - public double? LocalPipingEntryPointX + public double? LocalPipingEntryPointX // derived result or input { get { @@ -1622,7 +1622,7 @@ } [XmlIgnore] - public double? PipingEntryPointX + public double? PipingEntryPointX // derived result { get { @@ -1637,7 +1637,7 @@ } [XmlIgnore] - public double? PipingEntryPointY + public double? PipingEntryPointY // derived result { get { @@ -1651,14 +1651,14 @@ } } - public double? LocalPipingExitPointX + public double? LocalPipingExitPointX // real result piping { get { return localPipingExitPointX; } set { localPipingExitPointX = value; } } [XmlIgnore] - public double? PipingExitPointX + public double? PipingExitPointX // derived result { get { @@ -1673,7 +1673,7 @@ } [XmlIgnore] - public double? PipingExitPointY + public double? PipingExitPointY // derived result { get { @@ -1687,13 +1687,13 @@ } } - public double? SeepageLength + public double? SeepageLength // derived result { get { return LocalPipingExitPointX - LocalPipingEntryPointX; } } [XmlIgnore] - public double? HCritical + public double? HCritical // derived { get { @@ -1723,19 +1723,19 @@ } } - public string BaseFileName + public string BaseFileName // real result for all except flowslide. Is base for derived props. { get { return baseFileName; } set { baseFileName = value; } } - public string CalculationSubDir + public string CalculationSubDir // input { get { return calculationSubDir; } set { calculationSubDir = value; } } - public ResultEvaluation ResultEvaluation + public ResultEvaluation ResultEvaluation // input { get { return resultEvaluation; } set @@ -1744,7 +1744,7 @@ } } - public string Notes + public string Notes // input { get { return notes; } set @@ -1757,7 +1757,7 @@ /// Returns the begin point and end point as a list /// [XmlIgnore] - public List Points + public List Points // derived nwo results { get {