Index: DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/EvaluationJob.cs =================================================================== diff -u -r1065 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/EvaluationJob.cs (.../EvaluationJob.cs) (revision 1065) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/EvaluationJob.cs (.../EvaluationJob.cs) (revision 1120) @@ -32,8 +32,7 @@ private List locations = new List(); private List failedEvaluatedLocations = new List(); private List results = new List(); - private List schematizationFactorResults = new List(); - + public string DikeName { get { return dikeName; } @@ -52,13 +51,7 @@ set { results = value; } } - public List SchematizationFactorResults - { - get { return schematizationFactorResults; } - set { schematizationFactorResults = value; } - } - -// public string XML + // public string XML // { // get // { @@ -119,25 +112,7 @@ // { // scenarioProfileResult.Location = locationJob.Location; // } -// } #Bka: if this is really needed, location must be added as non serializeable object. - - - if ((this.locations.IndexOf(location) >= 0) || (this.locations.IndexOf(location) < this.results.Count)) - { - if (schematizationFactorResults.Count > this.locations.IndexOf(location)) - { - locationJob.LocationResult.SchematizationFactorsResult = - schematizationFactorResults[this.locations.IndexOf(location)]; - } - } - -// if (locationJob.LocationResult.SchematizationFactorsResult != null) -// { -// foreach (var schematizationFactorResult in locationJob.LocationResult.SchematizationFactorsResult.SchematizationFactorResults) -// { -// schematizationFactorResult.Location = locationJob.Location; -// } -// } #Bka: if this is really needed, location must be given a setter. +// } #Bka: if this is really needed, location must be added as non serializeable object. } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs =================================================================== diff -u -r1119 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1119) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 1120) @@ -273,20 +273,20 @@ outputLocationResult.RegionalScenariosResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(locationJob.LocationResult.RegionalScenariosResult.CalculationResult); outputLocationResult.RegionalScenariosResult.RegionalScenarioResult = new RegionalScenarioResult[locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults.Count]; var scentel = 0; - foreach (var rwScenarioResult in locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults) + foreach (var regionalScenarioResult in locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults) { - var outputRwScenarioResult = new RegionalScenarioResult(); - outputRwScenarioResult.LoadSituation = ConversionHelper.ConvertToOutputLoadSituation(rwScenarioResult.LoadSituation); - outputRwScenarioResult.DikeDrySensitivity = ConversionHelper.ConvertToOutputDikeDrySensitivity(rwScenarioResult.DikeDrySensitivity); - outputRwScenarioResult.HydraulicShortcutType = ConversionHelper.ConvertToOutputHydraulicShortcutType(rwScenarioResult.HydraulicShortcutType); - outputRwScenarioResult.UpliftType = ConversionHelper.ConvertToOutputUpliftType(rwScenarioResult.UpliftType); - outputRwScenarioResult.ModelOption = ConversionHelper.ConvertToOutputMStabModelType(rwScenarioResult.ModelOption); - outputRwScenarioResult.ScenarioType = ConversionHelper.ConvertToOutputScenarioType(rwScenarioResult.ScenarioType); - outputRwScenarioResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(rwScenarioResult.CalculationResult); - outputRwScenarioResult.SafetyFactor = rwScenarioResult.SafetyFactor; - outputRwScenarioResult.RegionalScenarioProfileResults = new RegionalScenarioResultRegionalScenarioProfileResult[rwScenarioResult.RegionalScenarioProfileResults.Count]; + var outputRegionalScenarioResult = new RegionalScenarioResult(); + outputRegionalScenarioResult.LoadSituation = ConversionHelper.ConvertToOutputLoadSituation(regionalScenarioResult.LoadSituation); + outputRegionalScenarioResult.DikeDrySensitivity = ConversionHelper.ConvertToOutputDikeDrySensitivity(regionalScenarioResult.DikeDrySensitivity); + outputRegionalScenarioResult.HydraulicShortcutType = ConversionHelper.ConvertToOutputHydraulicShortcutType(regionalScenarioResult.HydraulicShortcutType); + outputRegionalScenarioResult.UpliftType = ConversionHelper.ConvertToOutputUpliftType(regionalScenarioResult.UpliftType); + outputRegionalScenarioResult.ModelOption = ConversionHelper.ConvertToOutputMStabModelType(regionalScenarioResult.ModelOption); + outputRegionalScenarioResult.ScenarioType = ConversionHelper.ConvertToOutputScenarioType(regionalScenarioResult.ScenarioType); + outputRegionalScenarioResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(regionalScenarioResult.CalculationResult); + outputRegionalScenarioResult.SafetyFactor = regionalScenarioResult.SafetyFactor; + outputRegionalScenarioResult.RegionalScenarioProfileResults = new RegionalScenarioResultRegionalScenarioProfileResult[regionalScenarioResult.RegionalScenarioProfileResults.Count]; var proftel = 0; - foreach (var profileResult in rwScenarioResult.RegionalScenarioProfileResults) + foreach (var profileResult in regionalScenarioResult.RegionalScenarioProfileResults) { var outputProfileResult = new RegionalScenarioResultRegionalScenarioProfileResult(); outputProfileResult.LocationName = profileResult.LocationName; @@ -309,31 +309,8 @@ outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel].RegionalScenarioProfileResults[proftel] = outputProfileResult; proftel++; } - outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel] = outputRwScenarioResult; - scentel++; - - // RWSchematizationFactors Result later - // Note that xsd should be adapted first: the types should be stored as int, not as string! This to be able to reuse the converters -// outputLocationResult.RegionalSchematizationFactorsResult = new CalculationResultsLocationResultRegionalSchematizationFactorsResult(); -// outputLocationResult.RegionalSchematizationFactorsResult.RegionalSchematizationFactorResult = new CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResult[damProjectData.SchematizationFactors.Count]; -// var factortel = 0; -// foreach (var rwSchematizationFactorResult in damProjectData.SchematizationFactors) -// { -// var factorResult = new CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResult(); -// factorResult.LocationName = rwSchematizationFactorResult.LocationName; -// factorResult.SchematizationType = rwSchematizationFactorResult.SchematizationType; -// factorResult.SoilProfileName = rwSchematizationFactorResult.SoilProfileName; -// factorResult.OriginalDecisiveSoilProfileName = rwSchematizationFactorResult.OriginalDecisiveSoilProfileName; -// factorResult.SchematizationFactor = rwSchematizationFactorResult.SchematizationFactor; -// factorResult.SummedProfileProbability = rwSchematizationFactorResult.SummedProfileProbability; -// factorResult.DecisiveRegionalScenarioName = rwSchematizationFactorResult.DecisiveScenarioName; -// factorResult.DetrimentFactor = rwSchematizationFactorResult.DetrimentFactor; -// factorResult.SafetyFactor = rwSchematizationFactorResult.SafetyFactor; -// factorResult.CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(rwSchematizationFactorResult.CalculationResult); -// outputLocationResult.RegionalSchematizationFactorsResult.RegionalSchematizationFactorResult[factortel] = factorResult; -// factortel++; -// } - + outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel] = outputRegionalScenarioResult; + scentel++; } output.Results.CalculationResults.LocationResults[jobtel] = outputLocationResult; jobtel++; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs =================================================================== diff -u -r1065 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs (.../LocationResult.cs) (revision 1065) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs (.../LocationResult.cs) (revision 1120) @@ -29,8 +29,7 @@ private TimeSerie stabilityTimeSerie = new TimeSerie(); private TimeSerie pipingTimeSerie = new TimeSerie(); private RegionalScenariosResult regionalScenariosResult; - private RWSchematizationFactorsResult schematizationFactorsResult; - + public virtual TimeSerie StabilityTimeSerie { get { return stabilityTimeSerie; } @@ -56,15 +55,6 @@ { regionalScenariosResult = value; } - } - - public RWSchematizationFactorsResult SchematizationFactorsResult - { - get { return schematizationFactorsResult; } - set - { - schematizationFactorsResult = value; - } - } + } } } Fisheye: Tag 1120 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/RWSchematizationFactorsResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs =================================================================== diff -u -r1119 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1119) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1120) @@ -410,14 +410,14 @@ { SoilProfile soilProfile = soilGeometryProbability.SoilProfile1D; - IList rwScenarios; + IList regionalScenarios; try { - rwScenarios = GetRegionalScenarios(location, soilGeometryProbability); + regionalScenarios = GetRegionalScenarios(location, soilGeometryProbability); } catch (Exception e) { - rwScenarios = null; + regionalScenarios = null; // Add this location to the failed locations if (evaluationJob.FailedEvaluatedLocations.IndexOf(location) < 0) { @@ -427,9 +427,9 @@ String.Format("Soilprofile: {0}", soilProfile.Name))); } } - if (rwScenarios != null) + if (regionalScenarios != null) { - foreach (RegionalScenarioProfileResult job in rwScenarios) + foreach (RegionalScenarioProfileResult job in regionalScenarios) { tasks.Add(job); } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs =================================================================== diff -u -r1119 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 1119) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs (.../LocationJob.cs) (revision 1120) @@ -34,8 +34,8 @@ public interface ILocationJob { Location Location { get; } - IEnumerable RWScenarioResults { get; } - bool HasRWScenarioResults { get; } + IEnumerable RegionalScenarioResults { get; } + bool HasRegionalScenarioResults { get; } } public class LocationJob : DamJob, ILocationJob @@ -82,36 +82,22 @@ } } - public virtual IEnumerable RWScenarioResults + public virtual IEnumerable RegionalScenarioResults { get { - return !this.HasRWScenarioResults ? + return !this.HasRegionalScenarioResults ? new List() : this.locationResult.RegionalScenariosResult.RegionalScenarioResults; } } - public virtual IEnumerable SchematizationFactorResults + public bool HasRegionalScenarioResults { - get - { - return !this.HasSchematizationFactorResults ? - new List() : this.locationResult.SchematizationFactorsResult.SchematizationFactorResults; - } - } - - public bool HasRWScenarioResults - { get { return this.locationResult != null && this.locationResult.RegionalScenariosResult != null && this.locationResult.RegionalScenariosResult.RegionalScenarioResults.Any(); } } - public bool HasSchematizationFactorResults - { - get { return this.locationResult != null && this.locationResult.SchematizationFactorsResult != null; } - } - public virtual LocationResult LocationResult { get { return locationResult; } @@ -146,20 +132,20 @@ locationResult.StabilityTimeSerie.Entries.Count > 0 && HasUsableStabilityTimeSerieEntries())); } } - + /// /// Return the result of the profile with highest probability of occurrence /// - /// /// /// /// Return result with the lowest safetyfactor /// - /// + /// + /// /// public RegionalScenarioProfileResult GetRWScenarioResultWithLowestSafetyFactor(ScenarioType scenarioType) { - if (this.HasRWScenarioResults) + if (this.HasRegionalScenarioResults) { var scenarioResult = this.LocationResult.RegionalScenariosResult.GetScenarioResult(scenarioType); if (scenarioResult != null && scenarioResult.RegionalScenarioProfileResults.Count > 0) @@ -248,7 +234,7 @@ } else if (DamProjectType == DamProjectType.Assessment) { - if (this.HasRWScenarioResults && GetRWScenarioResultWithLowestSafetyFactor(currentScenarioType) != null) + if (this.HasRegionalScenarioResults && GetRWScenarioResultWithLowestSafetyFactor(currentScenarioType) != null) { return GetRWScenarioResultWithLowestSafetyFactor(currentScenarioType).SafetyFactor; } @@ -300,7 +286,7 @@ public bool AreRWScenarioResultsMixed(ScenarioType scenarioType) { - if (this.HasRWScenarioResults) + if (this.HasRegionalScenarioResults) { var scenarioResult = this.LocationResult.RegionalScenariosResult.GetScenarioResult(scenarioType); if (scenarioResult != null && scenarioResult.RegionalScenarioProfileResults.Count > 0) Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs =================================================================== diff -u -r1119 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamProjectData.cs) (revision 1119) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamProjectData.cs) (revision 1120) @@ -21,12 +21,9 @@ using System; using System.Collections.Generic; -using System.Linq; -using Deltares.DamEngine.Data.Design; using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.General.Sensors; using Deltares.DamEngine.Data.RegionalAssessmentResults; -using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Data.Standard.Language; using Deltares.DamEngine.Data.Standard.Logging; using Deltares.DamEngine.Data.Standard.Validation; @@ -45,9 +42,8 @@ private DamProjectType damProjectType = DamProjectType.Operational; private ProgramType programType = ProgramType.MStab; private List jobs = new List(); - private List calculations = null; // will be created and initialized in property - private List designCalculations = null; - private List schematizationFactors = null; + private List designCalculations; + /// /// Gets or sets the calculation messages. /// @@ -71,13 +67,6 @@ segments = new List(); } - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers - public static string MStabExePath - { - get; - set; - } - public virtual string Name { get { return String.Format(LocalizationManager.GetTranslatedText(this, "WaterBoard")); } @@ -166,103 +155,10 @@ } } - public List Calculations - { - get - { - if (calculations == null) - { - calculations = new List(); - this.UpdateCalculations(); - } - - return calculations; - } - } - - public void UpdateCalculations() - { - if (calculations != null) - { - calculations.Clear(); - - foreach (LocationJob locationJob in this.LocationJobs) - { - if (locationJob.HasRWScenarioResults) - { - foreach (var locationResult in locationJob.RWScenarioResults) - { - calculations.AddRange(locationResult.RegionalScenarioProfileResults); - } - } - } - } - } - - private List CreateScenarioListForDeletion() - { - List scenarios = new List(); ; - - List locations = this.LocationJobs.Select(x => x.Location).ToList(); - foreach (Location location in locations) - { - if (location.Scenarios != null) - { - scenarios.AddRange(location.Scenarios); - } - } - - return scenarios; - } - - private List CreateScenarioListForCalculation() - { - List scenarios = new List(); ; - - List locations = this.SelectedLocationJobs.Select(x => x.Location).ToList(); - foreach (Location location in locations) - { - if (location.Scenarios != null) - { - scenarios.AddRange(location.Scenarios); - } - } - - return scenarios; - } - - /// - /// Updates the design calculations. - /// - public void UpdateDesignCalculations() - { - if (designCalculations == null) - { - designCalculations = new List(); - } - else - { - designCalculations.Clear(); - } - var scenarios = CreateScenarioListForCalculation(); - foreach (DesignScenario scenario in scenarios) - { - if (scenario.CalculationResults != null && scenario.CalculationResults.Count > 0) - { - designCalculations.AddRange(scenario.CalculationResults); - } - } - } - public List DesignCalculations { get { - if (designCalculations == null) - { - this.UpdateDesignCalculations(); - } - return designCalculations; } set @@ -271,67 +167,6 @@ } } - public List SchematizationFactors - { - get - { - if (schematizationFactors == null) - { - schematizationFactors = new List(); - this.UpdateSchematizationFactors(); - } - - return schematizationFactors; - } - } - - public void UpdateSchematizationFactors() - { - if (schematizationFactors != null) - { - schematizationFactors.Clear(); - - foreach (LocationJob locationJob in this.LocationJobs) - { - if (locationJob.HasSchematizationFactorResults) - { - foreach ( - var rwSchematizationFactorResult in - locationJob.LocationResult.SchematizationFactorsResult.SchematizationFactorResults) - { - schematizationFactors.Add(rwSchematizationFactorResult); - } - } - } - } - } - - public CalculationResult Validate() - { - try - { - dike.Validate(); - return CalculationResult.Succeeded; - } - catch - { - return CalculationResult.InvalidInputData; - } - } - - public LocationJob GetLocationJob(Location location) - { - foreach (LocationJob locationJob in this.LocationJobs) - { - if (locationJob.Location == location) - { - return locationJob; - } - } - - return null; - } - public List LocationJobs { get @@ -351,49 +186,13 @@ } } - public LocationJob GetFirstLocationJobWithDesignResults() - { - foreach (LocationJob locationJob in this.LocationJobs) - { - if (locationJob.HasScenarioResults) - { - return locationJob; - } - } - return null; - } - - public LocationJob GetFirstLocationJobWithAssesmentResults() - { - foreach (LocationJob locationJob in this.LocationJobs) - { - if (locationJob.HasRWScenarioResults) - { - return locationJob; - } - } - return null; - } - - public LocationJob GetFirstLocationJobWithCalamityResults() - { - foreach (LocationJob locationJob in this.LocationJobs) - { - if (locationJob.HasTimeSeriesLocationResults) - { - return locationJob; - } - } - return null; - } - [Validate] public List SelectedLocationJobs { get { List selectedLocationJobs = new List(); - foreach (LocationJob locationJob in this.LocationJobs) + foreach (var locationJob in LocationJobs) { if (locationJob.Run.HasValue && locationJob.Run.Value) { @@ -405,24 +204,6 @@ } } - [Validate] - public ValidationResult[] ValidateEnoughLocationJobs() - { - if (this.SelectedLocationJobs.Count == 0) - { - return new ValidationResult[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "NoLocationsSelected"), - this) - }; - } - else - { - return new ValidationResult[0]; - } - } - // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers public ProgramType ProgramType { @@ -486,11 +267,12 @@ public EvaluationJob GetEvaluationJob() { - EvaluationJob evaluationJob = new EvaluationJob(); + EvaluationJob evaluationJob = new EvaluationJob + { + DikeName = dike.Name + }; - evaluationJob.DikeName = dike.Name; - - foreach (LocationJob locationJob in this.LocationJobs) + foreach (var locationJob in LocationJobs) { if (locationJob.Run != null && locationJob.Run.Value) { @@ -505,116 +287,6 @@ return evaluationJob; } - /// - /// Ensures the proper zone safety factors are available for all locations. - /// - public void EnsureProperZoneSafetyFactors() - { - if (dike != null) - { - foreach (var location in dike.Locations) - { - location.EnsureProperZoneSafetyFactors(); - } - } - } - - public void DeleteResults() - { - if (dikeJob != null && dikeJob.Jobs != null) - { - dikeJob.Jobs.Clear(); - } - dikeJob = null; - if (jobs != null) - { - jobs.Clear(); - } - if (calculations != null) - { - calculations.Clear(); - } - if (schematizationFactors != null) - { - schematizationFactors.Clear(); - } - - // Delete calculationresults in scenarios - var scenarios = CreateScenarioListForDeletion(); - foreach (DesignScenario scenario in scenarios) - { - scenario.ClearResults(); - scenario.ClearErrors(); - } - - if (designCalculations != null) - { - designCalculations.Clear(); - } - } - - private EvaluationJob GetCalculatedEvaluationJob() - { - EvaluationJob evaluationJob = new EvaluationJob(); - - evaluationJob.DikeName = dike.Name; - - foreach (LocationJob locationJob in this.LocationJobs) - { - if ((locationJob.Result != JobResult.NoRun || (locationJob.HasRWScenarioResults)) && locationJob.Run != null && locationJob.Run.Value) - { - if (dike.Locations.Contains(locationJob.Location)) - { - dike.UpdateLocation(locationJob.Location); - break; - } - evaluationJob.Locations.Add(locationJob.Location); - } - } - return evaluationJob; - } - - public bool HasResults() - { - bool hasResults = dike != null && dikeJob != null && dikeJob.Jobs.Count > 0; - if (hasResults) - { - EvaluationJob evaluationJob = GetCalculatedEvaluationJob(); - hasResults = evaluationJob.Locations != null && evaluationJob.Locations.Count > 0; - } - return hasResults; - } - - /// - /// Check if design with geometry adaption is allowed - /// - /// - private bool IsDesignWithGeometryAdaptionAllowed() - { - bool isAdoption = this.DamProjectType == DamProjectType.Design && DamProjectCalculationSpecification.SelectedAnalysisType != AnalysisType.NoAdaption; - bool isStabilityOutside = this.DamProjectCalculationSpecification.DamCalculationSpecifications.Any(specification => specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside); - return (!isAdoption || !isStabilityOutside); - } - - /// - /// Validates the geometry adaption setting. - /// - /// - [Validate] - public ValidationResult[] ValidateGeometryAdaptionSetting() - { - if (!IsDesignWithGeometryAdaptionAllowed()) - { - return new[]{ new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "DesignAndAdaptionNotAllowedForStabilityOutside"), - this)}; - } - else - { - return new ValidationResult[0]; - } - - } - public override string ToString() { return Name; Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj =================================================================== diff -u -r1065 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 1065) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 1120) @@ -67,7 +67,6 @@ - Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs =================================================================== diff -u -r1119 -r1120 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1119) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlOutput.cs (.../FillDamFromXmlOutput.cs) (revision 1120) @@ -279,8 +279,6 @@ // } // outputLocationResult.RegionalScenariosResult.RegionalScenarioResult[scentel] = outputRwScenarioResult; // scentel++; -// -// // RWSchematizationFactors Result later // } // output.Results.CalculationResults.LocationResults[jobtel] = outputLocationResult; // jobtel++;