Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs
===================================================================
diff -u -r337 -r404
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 337)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 404)
@@ -54,10 +54,6 @@
 
         private double designRequiredFactor = 0.0;
 
-        public LocationJob()
-        {
-        }
-
         public LocationJob(object subject)
             : base(subject)
         {
@@ -156,106 +152,12 @@
                         locationResult.StabilityTimeSerie.Entries.Count > 0 && HasUsableStabilityTimeSerieEntries()));
             }
         }
-
-        public LocationResult GetLocationResultWithStabilityTimeSerie(string locationName)
-        {
-            LocationResult result = null;
-            if (locationResult != null && locationResult.StabilityTimeSerie != null &&
-                locationResult.StabilityTimeSerie.LocationId == locationName &&
-                locationResult.StabilityTimeSerie.Entries != null && locationResult.StabilityTimeSerie.Entries.Count > 1)
-            {
-                result = locationResult;
-            }
-            return result;
-        }
-        
-        public LocationResult GetFirstLocationResultWithStabilityTimeSerie()
-        {
-            LocationResult result = null;
-            if (locationResult != null && locationResult.StabilityTimeSerie != null && 
-                locationResult.StabilityTimeSerie.Entries != null && locationResult.StabilityTimeSerie.Entries.Count > 1)
-            {
-                result = locationResult;
-            }
-            return result;
-        }
-
-        public RWScenarioProfileResult GetAssesmentResultByProfile(ScenarioType scenarioType, string profileName)
-        {
-            if (this.HasRWScenarioResults)
-            {
-                RWScenarioResult scenarioResult = this.LocationResult.RWScenariosResult.GetScenarioResult(scenarioType);
-                if (scenarioResult != null)
-                {
-                    foreach (var res in scenarioResult.RWScenarioProfileResults)
-                    {
-                        if (res.SoilProfileName == profileName)
-                            return res;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        public CsvExportData GetFirstDesignResult()
-        {
-            if (this.HasScenarioResults)
-            {
-                DesignScenario scenario = Location.Scenarios[0]; 
-                if (scenario != null && scenario.CalculationResults.Count > 0)
-                {
-                    return scenario.CalculationResults[0];
-                }
-            }
-            return null;
-        }
-
-        public CsvExportData GetDesignResultByProfileScenarioAndCalculationName(string profileName, string scenarioName, 
-            string calculationName)
-        {
-            if (this.HasScenarioResults)
-            {
-                foreach (var scenario in Location.Scenarios)
-                {
-                    foreach (var calculationResult in scenario.CalculationResults)
-                    {
-                        if (calculationResult.ProfileName == profileName &&
-                            calculationResult.ScenarioName == scenarioName &&
-                            calculationResult.Calculation == calculationName)
-                            return calculationResult;
-                    }                    
-                }                
-            }
-            return null;
-        }
-        
+     
         /// <summary>
         /// Return the result of the profile with highest probability of occurrence
         /// </summary>
         /// <param name="scenarioType"></param>
         /// <returns></returns>
-        public RWScenarioProfileResult GetRWScenarioResultOfProfileWithHighestProbablilityOfOccurrence(ScenarioType scenarioType)
-        {
-            if (this.HasRWScenarioResults)
-            {
-                RWScenarioResult scenarioResult = this.LocationResult.RWScenariosResult.GetScenarioResult(scenarioType);
-                if (scenarioResult != null && scenarioResult.RWScenarioProfileResults.Count > 0)
-                {
-                    RWScenarioProfileResult rwScenarioProfileResult = scenarioResult.RWScenarioProfileResults[0];
-                    for (int i = 1; i < scenarioResult.RWScenarioProfileResults.Count; i++)
-                    {
-                        if (scenarioResult.RWScenarioProfileResults[i].SoilProfileProbability > rwScenarioProfileResult.SoilProfileProbability)
-                        {
-                            rwScenarioProfileResult = scenarioResult.RWScenarioProfileResults[i];
-                        }
-                    }
-                    return rwScenarioProfileResult;
-                }
-            }
-            return null;
-        }
-
         /// <summary>
         /// Return result with the lowest safetyfactor
         /// </summary>
@@ -332,10 +234,10 @@
                         if (calculationResult.SafetyFactor.Value < res)
                         {
                             res = calculationResult.SafetyFactor.Value;
-                            if (calculationResult.RequiredSafetyFactor != null)
-                            {
-                                designRequiredFactor = calculationResult.RequiredSafetyFactor.Value;
-                            }
+//                            if (calculationResult.RequiredSafetyFactor != null) #Bka should come from input, not results
+//                            {
+//                                designRequiredFactor = calculationResult.RequiredSafetyFactor.Value;
+//                            }
                         }
                     }
                 }
@@ -356,23 +258,23 @@
             {
                 foreach (var calculationResult in scenario.CalculationResults)
                 {
-                    if (calculationResult.Calculation.Equals("FlowSlide"))
+//                    if (calculationResult.Calculation.Equals("FlowSlide")) #Bka: flowslide not for now!
+//                    {
+//                        designRequiredFactor = 1.0; // This is a hack to make FlowSlide color display correct;
+//                        // TODO: make a good generic method to display colored results
+//                    }
+                   // else
                     {
-                        designRequiredFactor = 1.0; // This is a hack to make FlowSlide color display correct;
-                        // TODO: make a good generic method to display colored results
-                    }
-                    else
-                    {
                         if (calculationResult.PipingFailureProbability != null)
                         {
                             if (calculationResult.PipingFailureProbability.Value > res &&
                                 calculationResult.PipingFailureProbability.Value < DamGlobalConstants.NoRunValue)
                             {
                                 res = calculationResult.PipingFailureProbability.Value;
-                                if (calculationResult.RequiredFailureProbability != null)
-                                {
-                                    designRequiredFactor = calculationResult.RequiredFailureProbability.Value;
-                                }
+//                                if (calculationResult.RequiredFailureProbability != null)  #Bka required value must come from input, not results
+//                                {
+//                                    designRequiredFactor = calculationResult.RequiredFailureProbability.Value;
+//                                }
                             }
                         }
 
@@ -539,48 +441,6 @@
         }
 
         [XmlIgnore]
-        public double X
-        {
-            get { return this.Location.XRd; }
-            set { this.Location.XRd = value; }
-        }
-
-        [XmlIgnore]
-        public double Y
-        {
-            get { return this.Location.YRd; }
-            set { this.Location.YRd = value; }
-        }
-
-        [XmlIgnore]
-        public static ScenarioType CurrentScenarioType
-        {
-            get { return currentScenarioType; }
-            set { currentScenarioType = value; }
-        }
-
-        [XmlIgnore]
-        public static string CurrentProfileName
-        {
-            get { return currentProfileName; }
-            set { currentProfileName = value; }
-        }
-
-        [XmlIgnore]
-        public static string CurrentScenarioName
-        {
-            get { return currentScenarioName; }
-            set { currentScenarioName = value; }
-        }
-
-        [XmlIgnore]
-        public static string CurrentCalculation
-        {
-            get { return currentCalculation; }
-            set { currentCalculation = value; }
-        }
-
-        [XmlIgnore]
         public static DateTime CurrentTime
         {
             get { return currentTime; }