Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs
===================================================================
diff -u -r5844 -r6953
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs	(.../FillXmlCalculationParametersFromDomain.cs)	(revision 5844)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/FillXmlCalculationParametersFromDomain.cs	(.../FillXmlCalculationParametersFromDomain.cs)	(revision 6953)
@@ -27,45 +27,54 @@
 
 public static class FillXmlCalculationParametersFromDomain
 {
-    public static XmlCalculationParameters CreateCalculationParameters(CalculationParameters calculationParameters)
+    public static XmlCalculationParameters CreateCalculationParameters(DamFailureMechanismeCalculationSpecification calculationParameters)
     {
         var calculationParametersXml = new XmlCalculationParameters();
-        TransferCalculationModules(calculationParameters.CalculationModules, calculationParametersXml);
-        TransferStabilityParameters(calculationParameters.StabilityParameters, calculationParametersXml);
+        TransferCalculationModules(calculationParameters, calculationParametersXml);
+        TransferStabilityParameters(calculationParameters, calculationParametersXml);
 
         return calculationParametersXml;
     }
 
-    private static void TransferCalculationModules(CalculationModules calculationModules, XmlCalculationParameters calculationParametersXml)
+    private static void TransferCalculationModules(DamFailureMechanismeCalculationSpecification calculationParameters, 
+                                                   XmlCalculationParameters calculationParametersXml)
     {
         var xmlCalculationParametersCalculationModules = new XmlCalculationParametersCalculationModules();
 
-        if (calculationModules != null)
+        if (calculationParameters != null)
         {
             xmlCalculationParametersCalculationModules.PipingWtiSpecified = true;
             xmlCalculationParametersCalculationModules.PipingBlighSpecified = true;
             xmlCalculationParametersCalculationModules.StabilityInsideSpecified = true;
             xmlCalculationParametersCalculationModules.StabilityOutsideSpecified = true;
 
-            xmlCalculationParametersCalculationModules.PipingWti = calculationModules.PipingWti;
-            xmlCalculationParametersCalculationModules.PipingBligh = calculationModules.PipingBligh;
-            xmlCalculationParametersCalculationModules.StabilityInside = calculationModules.StabilityInside;
-            xmlCalculationParametersCalculationModules.StabilityOutside = calculationModules.StabilityOutside;
+            xmlCalculationParametersCalculationModules.PipingWti = 
+                calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
+                calculationParameters.PipingModelType == PipingModelType.Wti2017;
+            xmlCalculationParametersCalculationModules.PipingBligh = 
+                calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
+                calculationParameters.PipingModelType == PipingModelType.Bligh;
+            xmlCalculationParametersCalculationModules.StabilityInside = 
+                calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside;
+            xmlCalculationParametersCalculationModules.StabilityOutside = 
+                calculationParameters.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside;
         }
 
         calculationParametersXml.CalculationModules = xmlCalculationParametersCalculationModules;
     }
 
-    private static void TransferStabilityParameters(MStabParameters stabilityParameters, XmlCalculationParameters calculationParametersXml)
+    private static void TransferStabilityParameters(DamFailureMechanismeCalculationSpecification calculationParameters, 
+                                                    XmlCalculationParameters calculationParametersXml)
     {
         var xmlCalculationParametersStabilityParameters = new XmlCalculationParametersStabilityParameters();
-        if (stabilityParameters != null)
+        if (calculationParameters != null)
         {
             xmlCalculationParametersStabilityParameters.CalculationModelSpecified = true;
             xmlCalculationParametersStabilityParameters.SearchMethodSpecified = true;
 
-            xmlCalculationParametersStabilityParameters.CalculationModel = XmlConversionHelper.ConvertToModelType(stabilityParameters.Model);
-            xmlCalculationParametersStabilityParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(stabilityParameters.SearchMethod);
+            xmlCalculationParametersStabilityParameters.CalculationModel = 
+                XmlConversionHelper.ConvertToModelType(calculationParameters.StabilityModelType);
+            xmlCalculationParametersStabilityParameters.SearchMethod = XmlConversionHelper.ConvertToSearchMethod(calculationParameters.SearchMethod);
         }
 
         calculationParametersXml.StabilityParameters = xmlCalculationParametersStabilityParameters;