Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs =================================================================== diff -u -r6651 -r6702 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6651) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 6702) @@ -613,7 +613,7 @@ foreach (LocationJob locationJob in LocationJobs) { - if ((locationJob.Result != JobResult.NoRun) && locationJob.Run != null && locationJob.Run.Value) + if (locationJob.HasDesignScenarioResults) { foreach (Dike dike in WaterBoard.Dikes) { @@ -623,7 +623,6 @@ break; } } - numberOfCalculatedJobs++; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs =================================================================== diff -u -r6436 -r6702 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs (.../LocationJob.cs) (revision 6702) @@ -125,7 +125,9 @@ { foreach (CsvExportData calculationResult in scenario.CalculationResults) { - if ((calculationResult.SafetyFactor != null) || (calculationResult.CalculationResult == CalculationResult.UnexpectedError)) + bool isUpLiftVanNoUplift = IsUpliftVanNoUplift(calculationResult); + if (isUpLiftVanNoUplift || (calculationResult.SafetyFactor != null) || + (calculationResult.CalculationResult == CalculationResult.UnexpectedError)) { return true; } @@ -135,6 +137,17 @@ return false; } } + + public static bool IsUpliftVanNoUplift(CsvExportData calculationResult) + { + if (calculationResult != null) + { + return calculationResult.DamFailureMechanismeCalculation.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside && + calculationResult.DamFailureMechanismeCalculation.StabilityModelType == StabilityModelType.UpliftVan && + calculationResult.IsUplift == false; + } + return false; + } [Data] [Label("Safety factor")]