Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs
===================================================================
diff -u -r599 -r669
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 599)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 669)
@@ -406,11 +406,6 @@
                 dike.MapForSoilGeometries2D);
             damFailureMechanismeCalculator.CalculationBaseDirectory = CalculationBaseDirectory;
 
-            if (analysisType == AnalysisType.AdaptNWO)
-            {
-                damFailureMechanismeCalculator.NonWaterRetainingObject = dike.NonWaterRetainingObjects[0];
-            }
-
             if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
                 damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)
             {
@@ -432,85 +427,25 @@
                 }
 
                 var recordIndex = 0;
-                var firstNwoSoilProfileProbability = true;
                 var validSoilProfileProbabilities = DamFailureMechanismeCalculator.SelectProbabilitiesForFailureMechanism(
                     damFailureMechanismeCalculationSpecification.FailureMechanismSystemType, scenario.Location.Segment.SoilProfileProbabilities);
                 foreach (var soilProfileProbability in validSoilProfileProbabilities)
                 {
-                    if (analysisType == AnalysisType.AdaptNWO)
-                    {
-                        if (firstNwoSoilProfileProbability)
-                        {
-                            // for NWO, only add results for every first soilProfileProbability as the others are already part of the nwo results.
-                            foreach (var nwoResult in scenario.NwoResults)
-                            {
-                                var resultMessage = scenario.GetResultMessage(
-                                    nwoResult.SoilProfileProbability.SoilProfile1D,
-                                    nwoResult.SoilProfileProbability.StiFileName);
-                                // The error message can contain "," and ";" and should therefor be surrounded with double quotes, so it will be read correctly as a scv file
-                                damProjectCalculatorLogBuilder.Append(
-                                    @"""",
-                                    ++recordIndex,
-                                    " - ",
-                                    resultMessage,
-                                    " - ",
-                                    nwoResult.NwoId,
-                                    " - ",
-                                    nwoResult.LocationXrdStart,
-                                    " - ",
-                                    nwoResult.MStabResults.CalculationName,
-                                    @""""
-                                );
+                    // The error message can contain "," and ";" and should therefor be surrounded with double quotes, so it will be read correctly as a scv file
+                    var resultMessage = scenario.GetResultMessage(
+                        soilProfileProbability.SoilProfile1D,
+                        soilProfileProbability.StiFileName);
 
-                                scenario.CalculationResults.Add(damProjectCalculatorLogBuilder.Build(nwoResult.SoilProfileProbability, scenario.NwoResults.IndexOf(nwoResult)));
-                                scenario.CalculationResult = CalculationResult.Succeeded;
-                            }
-                            foreach (var error in scenario.Errors)
-                            {
-                                damProjectCalculatorLogBuilder.Append(error);
-                                scenario.CalculationResults.Add(damProjectCalculatorLogBuilder.Build(soilProfileProbability));
-                                scenario.CalculationResult = CalculationResult.Succeeded;
-                            }
-                            firstNwoSoilProfileProbability = false;
-                        }
-                        else
-                        {
-                            if (scenario.CalculationResult != CalculationResult.NoRun)
-                            {
-                                // The error message can contain "," and ";" and should therefor be surrounded with double quotes, so it will be read correctly as a csv file
-                                string resultMessage = scenario.GetResultMessage(soilProfileProbability.SoilProfile1D,
-                                                                                    soilProfileProbability.StiFileName);
-                                damProjectCalculatorLogBuilder.Append(
-                                    @"""",
-                                    ++recordIndex,
-                                    " - ",
-                                    resultMessage,
-                                    @""""
-                                );
+                    damProjectCalculatorLogBuilder.Append(
+                        @"""",
+                        ++recordIndex,
+                        " - ",
+                        resultMessage,
+                        @""""
+                    );
 
-                                scenario.CalculationResults.Add(damProjectCalculatorLogBuilder.Build(soilProfileProbability));
-                            }
-                            scenario.CalculationResult = CalculationResult.Succeeded;
-                        }
-                    }
-                    else
-                    {
-                        // The error message can contain "," and ";" and should therefor be surrounded with double quotes, so it will be read correctly as a scv file
-                        var resultMessage = scenario.GetResultMessage(
-                            soilProfileProbability.SoilProfile1D,
-                            soilProfileProbability.StiFileName);
-
-                        damProjectCalculatorLogBuilder.Append(
-                            @"""",
-                            ++recordIndex,
-                            " - ",
-                            resultMessage,
-                            @""""
-                        );
-
-                        scenario.CalculationResults.Add(damProjectCalculatorLogBuilder.Build(soilProfileProbability, damFailureMechanismeCalculationSpecification.StabilityKernelType));
-                        scenario.CalculationResult = CalculationResult.Succeeded;
-                    }
+                    scenario.CalculationResults.Add(damProjectCalculatorLogBuilder.Build(soilProfileProbability, damFailureMechanismeCalculationSpecification.StabilityKernelType));
+                    scenario.CalculationResult = CalculationResult.Succeeded;                    
                 }
             }
             catch (Exception exception)
@@ -726,7 +661,6 @@
                     {
                         return SelectStabilityNormativeResultDeterministicNormal(liftVanCalculationResult, bishopCalculationRecord);                        
                     }
-                case AnalysisType.AdaptNWO:
                 case AnalysisType.AdaptGeometry:
                     {
                         return SelectStabilityNormativeResultDeterministicDesign(liftVanCalculationResult, bishopCalculationRecord);