Index: dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamCalculation.cs =================================================================== diff -u -r303 -r330 --- dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamCalculation.cs (.../DamCalculation.cs) (revision 303) +++ dam engine/branches/Initial Source/Deltares.DamEngine.Calculators/General/DamCalculation.cs (.../DamCalculation.cs) (revision 330) @@ -218,72 +218,72 @@ /// /// /// - private void CalculateFailureMechanismStabilityInsideMStab( - DamFailureMechanismeCalculationSpecification failureMechanismeCalculationSpecification, - string failureMechanismWorkingDirectory) - { - if (string.IsNullOrWhiteSpace(failureMechanismWorkingDirectory)) - throw new ArgumentException("Invalid working directory. The supplied string is empty or null.", "failureMechanismWorkingDirectory"); +// private void CalculateFailureMechanismStabilityInsideMStab( +// DamFailureMechanismeCalculationSpecification failureMechanismeCalculationSpecification, +// string failureMechanismWorkingDirectory) +// { +// if (string.IsNullOrWhiteSpace(failureMechanismWorkingDirectory)) +// throw new ArgumentException("Invalid working directory. The supplied string is empty or null.", "failureMechanismWorkingDirectory"); +// +// string stabilityWorkingPath = Path.GetFullPath(failureMechanismWorkingDirectory); +// +// var timeSerieStabilityCalculator = new TimeSerieStabilityCalculator +// { +// StabilityWorkingPath = stabilityWorkingPath, +// IsMStabCalculationOff = false, +// MStabExePath = this.mstabExePath, +// SendMessageDelegate = sendMessageDelegate +// }; +// +// if (!Directory.Exists(timeSerieStabilityCalculator.StabilityWorkingPath)) +// { +// Directory.CreateDirectory(timeSerieStabilityCalculator.StabilityWorkingPath); +// } +// int locationCounter = 0; +// var safetyFactorsTimeSerieCollection = new TimeSerieCollection(); +// foreach (DamJob damJob in (damProjectData.WaterBoardJob as WaterBoardJob).Jobs) +// { +// DikeJob dikeJob = damJob as DikeJob; +// foreach (LocationJob locationJob in dikeJob.Jobs) +// { +// if (locationJob.Run.Value && locationJob.WaterLevelTimeSerie != null) +// { +// TimeSerie safefactorsTimeSerie = timeSerieStabilityCalculator.CreateStabilityInsideSafetyFactorTimeSerie( +// locationJob.WaterLevelTimeSerie, +// dikeJob.Dike, +// locationJob.Location, +// locationCounter, +// ProjectDataDirectory, +// failureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters, +// null); +// locationJob.LocationResult.StabilityTimeSerie = safefactorsTimeSerie; +// safefactorsTimeSerie.LocationId = locationJob.Location.Name; +// safetyFactorsTimeSerieCollection.Series.Add(safefactorsTimeSerie); +// locationCounter++; +// } +// } +// timeSerieStabilityCalculator.IsCalculateAllStabilityProjectsAtOnce = true; +// timeSerieStabilityCalculator.CalculateSafetyFactorFromTimeSeries(TimeSerieParameters.StabilityInsideFactor.ToString(), +// dikeJob.Dike, safetyFactorsTimeSerieCollection); +// } +// ThrowHelper.ThrowWhenConditionIsTrue("No locations specified.",() => locationCounter == 0); +// } - string stabilityWorkingPath = Path.GetFullPath(failureMechanismWorkingDirectory); - - var timeSerieStabilityCalculator = new TimeSerieStabilityCalculator - { - StabilityWorkingPath = stabilityWorkingPath, - IsMStabCalculationOff = false, - MStabExePath = this.mstabExePath, - SendMessageDelegate = sendMessageDelegate - }; - - if (!Directory.Exists(timeSerieStabilityCalculator.StabilityWorkingPath)) - { - Directory.CreateDirectory(timeSerieStabilityCalculator.StabilityWorkingPath); - } - int locationCounter = 0; - var safetyFactorsTimeSerieCollection = new TimeSerieCollection(); - foreach (DamJob damJob in (damProjectData.WaterBoardJob as WaterBoardJob).Jobs) - { - DikeJob dikeJob = damJob as DikeJob; - foreach (LocationJob locationJob in dikeJob.Jobs) - { - if (locationJob.Run.Value && locationJob.WaterLevelTimeSerie != null) - { - TimeSerie safefactorsTimeSerie = timeSerieStabilityCalculator.CreateStabilityInsideSafetyFactorTimeSerie( - locationJob.WaterLevelTimeSerie, - dikeJob.Dike, - locationJob.Location, - locationCounter, - ProjectDataDirectory, - failureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters, - null); - locationJob.LocationResult.StabilityTimeSerie = safefactorsTimeSerie; - safefactorsTimeSerie.LocationId = locationJob.Location.Name; - safetyFactorsTimeSerieCollection.Series.Add(safefactorsTimeSerie); - locationCounter++; - } - } - timeSerieStabilityCalculator.IsCalculateAllStabilityProjectsAtOnce = true; - timeSerieStabilityCalculator.CalculateSafetyFactorFromTimeSeries(TimeSerieParameters.StabilityInsideFactor.ToString(), - dikeJob.Dike, safetyFactorsTimeSerieCollection); - } - ThrowHelper.ThrowWhenConditionIsTrue("No locations specified.",() => locationCounter == 0); - } - public void CalculateDamProject(DamProjectData damProject, string defaultProjectWorkingPath) { - damProjectData = damProject; - - // Set default working directory - if (ProjectWorkingDirectory.Equals("")) - { - ProjectWorkingDirectory = defaultProjectWorkingPath; - } - - this.failureMechanismIndex = -1; - ThrowHelper.ThrowWhenConditionIsTrue("No actual calculation specified.", - () => damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Count == 0); - - Parallel.Run(damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications, this.RunFailureMechanism, this.progressDelegate, this.MaxCalculationCores); +// damProjectData = damProject; +// +// // Set default working directory +// if (ProjectWorkingDirectory.Equals("")) +// { +// ProjectWorkingDirectory = defaultProjectWorkingPath; +// } +// +// this.failureMechanismIndex = -1; +// ThrowHelper.ThrowWhenConditionIsTrue("No actual calculation specified.", +// () => damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Count == 0); +// +// Parallel.Run(damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications, this.RunFailureMechanism, this.progressDelegate, this.MaxCalculationCores); } private int GetFailureMechanismIndex() @@ -295,16 +295,16 @@ } } - private void RunFailureMechanism(object task) - { - DamFailureMechanismeCalculationSpecification failureMechanismCalculationSpecification = (DamFailureMechanismeCalculationSpecification)task; - string failureMechanismWorkingDirectory = String.Format(@"{0}\FM{1}\", ProjectWorkingDirectory, GetFailureMechanismIndex()); - DeleteDirectoryWithFiles(failureMechanismWorkingDirectory); - if (failureMechanismCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) - { - CalculateFailureMechanismStabilityInsideMStab(failureMechanismCalculationSpecification, failureMechanismWorkingDirectory); - } - } +// private void RunFailureMechanism(object task) +// { +// DamFailureMechanismeCalculationSpecification failureMechanismCalculationSpecification = (DamFailureMechanismeCalculationSpecification)task; +// string failureMechanismWorkingDirectory = String.Format(@"{0}\FM{1}\", ProjectWorkingDirectory, GetFailureMechanismIndex()); +// DeleteDirectoryWithFiles(failureMechanismWorkingDirectory); +// if (failureMechanismCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) +// { +// CalculateFailureMechanismStabilityInsideMStab(failureMechanismCalculationSpecification, failureMechanismWorkingDirectory); +// } +// } /// /// Delete all files in directory and all files in it