Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r1644 -r1648
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 1644)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 1648)
@@ -80,6 +80,14 @@
         /// <param name="damProjectData">The dam project data.</param>
         public void Execute(DamProjectData damProjectData)
         {
+            if (damProjectData.CalculationMessages == null)
+            {
+                damProjectData.CalculationMessages = new List<LogMessage>();
+            }
+            else
+            {
+                damProjectData.CalculationMessages.Clear();
+            }
             outputParameter = DetermineOutputParameter(damProjectData.DamProjectCalculationSpecification.CurrentSpecification);
             // counter to determine if locations are processed
             int locationCount = 0;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r1636 -r1648
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 1636)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 1648)
@@ -148,6 +148,7 @@
                 sensorLocation.SourceTypePl1WaterLevelAtRiver = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1WaterLevelAtRiver);
                 sensorLocation.SourceTypePl3 = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl3);
                 sensorLocation.SourceTypePl4 = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl4);
+                sensorLocation.SensorGroup = sensorData.SensorGroups.FirstOrDefault(sg => sg.ID.Equals(inputSensorLocation.GroupId));
                 sensorData.SensorLocations.Add(sensorLocation);
             }
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml
===================================================================
diff -u -r1640 -r1648
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml	(.../OperationalSet2.xml)	(revision 1640)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml	(.../OperationalSet2.xml)	(revision 1648)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Operational" FailureMechanismSystemType="0" StabilityModelType="Bishop" ProjectPath="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\LiveDikeIntegrationTestWorkingFolder\89b4dc038eab4f2abe0f9068a94cc4d3" CalculationMap="output.Calc" MaxCalculationCores="1">
+<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Operational" FailureMechanismSystemType="0" StabilityModelType="Bishop" ProjectPath="D:\src\dam\DamClients\DamLive\trunk\src\bin\Debug\LiveDikeIntegrationTestWorkingFolder\fe01703c58fe406187e7c8b76a98feec" CalculationMap="output.Calc" MaxCalculationCores="1">
   <Locations>
     <Location SurfaceLineName="1C_31_5_bishop_binnen" SegmentName="1C_31_5_bishop_binnen" Name="1C_31_5_bishop_binnen" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="0" DikeTableHeight="0">
       <AssesmentRegionalOptions DikeSoilType="0" BoezemLevelLbp="0" BoezemLevelTp="0" BoezemLevelHbp="0" DetrimentFactor="0.95" DredgingDepth="0" RegionalBankProtectionBottomLevel="0" />
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.3333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="-1.33" PolderLevelLow="0" HeadPl2="0.04" HeadPl3="0.04" HeadPl4="0.04" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="0.5" Pl1BelowShoulderCrestPolderside="0" Pl1BelowToeDikePolderside="0.1" DryPl1BelowDikeTopAtRiver="0.5" DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1" DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard" />
       <DesignScenarios />
-      <StabilityOptions MapForSoilgeometries2D="output.Geometries" SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\89b4dc038eab4f2abe0f9068a94cc4d3\output0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="output.Geometries" SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\fe01703c58fe406187e7c8b76a98feec\output0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3" MinimumCircleDepth="1.5" />
       <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.2" RequiredSafetyFactorStabilityOuterSlope="0.9" RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2" />
     </Location>
     <Location SurfaceLineName="1D_34_bishop_binnen" SegmentName="1D_34_bishop_binnen" Name="1D_34_bishop_binnen" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="0" DikeTableHeight="0">
       <AssesmentRegionalOptions DikeSoilType="0" BoezemLevelLbp="0" BoezemLevelTp="0" BoezemLevelHbp="0" DetrimentFactor="0.95" DredgingDepth="0" RegionalBankProtectionBottomLevel="0" />
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.3333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="-1.33" PolderLevelLow="0" HeadPl2="0.04" HeadPl3="0.04" HeadPl4="0.04" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="0.5" Pl1BelowShoulderCrestPolderside="0" Pl1BelowToeDikePolderside="0.1" DryPl1BelowDikeTopAtRiver="0.5" DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1" DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard" />
       <DesignScenarios />
-      <StabilityOptions MapForSoilgeometries2D="output.Geometries" SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\89b4dc038eab4f2abe0f9068a94cc4d3\output0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="output.Geometries" SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\fe01703c58fe406187e7c8b76a98feec\output0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3" MinimumCircleDepth="1.5" />
       <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.2" RequiredSafetyFactorStabilityOuterSlope="0.9" RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2" />
     </Location>
     <Location SurfaceLineName="2A_37_bishop_binnen" SegmentName="2A_37_bishop_binnen" Name="2A_37_bishop_binnen" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="0" DikeTableHeight="0">
       <AssesmentRegionalOptions DikeSoilType="0" BoezemLevelLbp="0" BoezemLevelTp="0" BoezemLevelHbp="0" DetrimentFactor="0.95" DredgingDepth="0" RegionalBankProtectionBottomLevel="0" />
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.3333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="-0.69" PolderLevelLow="0" HeadPl2="1.32" HeadPl3="1.32" HeadPl4="1.32" DampingFactorPl3="0" DampingFactorPl4="0" PenetrationLength="0" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="0.5" Pl1BelowShoulderCrestPolderside="0" Pl1BelowToeDikePolderside="0.1" DryPl1BelowDikeTopAtRiver="0.5" DryPl1DryBelowDikeTopAtPolder="1.5" DryPl1BelowShoulderBaseInside="0.1" DryPl1DryBelowDikeToeAtPolder="0.1" IntrusionVerticalWaterPressure="Standard" />
       <DesignScenarios />
-      <StabilityOptions MapForSoilgeometries2D="output.Geometries" SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\89b4dc038eab4f2abe0f9068a94cc4d3\output0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="output.Geometries" SoilDatabaseName="LiveDikeIntegrationTestWorkingFolder\fe01703c58fe406187e7c8b76a98feec\output0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13.3" MinimumCircleDepth="1.5" />
       <ModelFactors RequiredSafetyFactorStabilityInnerSlope="1.2" RequiredSafetyFactorStabilityOuterSlope="0.9" RequiredSafetyFactorPiping="1.2" UpliftCriterionPiping="1.2" UpliftCriterionStability="1.2" />
     </Location>
   </Locations>
@@ -175,7 +175,7 @@
     </Segment>
   </Segments>
   <SoilProfiles1D />
-  <StabilityParameters SearchMethod="0" GridDetermination="0" BishopTangentLinesDefinition="0" BishopTangentLinesDistance="0.25" BishopGridVerticalPointsCount="10" BishopGridVerticalPointsDistance="2.5" BishopGridHorizontalPointsCount="10" BishopGridHorizontalPointsDistance="2.5" UpliftVanGridLeftVerticalPointsCount="36" UpliftVanGridLeftVerticalPointsDistance="2" UpliftVanGridLeftHorizontalPointsCount="14" UpliftVanGridLeftHorizontalPointsDistance="2" UpliftVanGridRightVerticalPointsCount="3" UpliftVanGridRightVerticalPointsDistance="2" UpliftVanGridRightHorizontalPointsCount="6" UpliftVanGridRightHorizontalPointsDistance="2" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0.25" />
+  <StabilityParameters SearchMethod="0" GridDetermination="0" BishopTangentLinesDefinition="0" BishopTangentLinesDistance="0" BishopGridVerticalPointsCount="0" BishopGridVerticalPointsDistance="0" BishopGridHorizontalPointsCount="0" BishopGridHorizontalPointsDistance="0" UpliftVanGridLeftVerticalPointsCount="0" UpliftVanGridLeftVerticalPointsDistance="0" UpliftVanGridLeftHorizontalPointsCount="0" UpliftVanGridLeftHorizontalPointsDistance="0" UpliftVanGridRightVerticalPointsCount="0" UpliftVanGridRightVerticalPointsDistance="0" UpliftVanGridRightHorizontalPointsCount="0" UpliftVanGridRightHorizontalPointsDistance="0" UpliftVanTangentLinesDefinition="0" UpliftVanTangentLinesDistance="0" />
   <AquiferSoils>
     <AquiferSoil Soilname="Dijkzand" IsAquifer="false" />
     <AquiferSoil Soilname="Veen" IsAquifer="false" />
@@ -285,7 +285,17 @@
     </TimeSerie>
   </OperationalInputTimeSeries>
   <SensorData>
-    <SensorGroups />
+    <SensorGroups>
+      <SensorGroup Id="-1">
+        <SensorIds SensorId="1" />
+        <SensorIds SensorId="2" />
+        <SensorIds SensorId="3" />
+        <SensorIds SensorId="4" />
+        <SensorIds SensorId="5" />
+        <SensorIds SensorId="6" />
+        <SensorIds SensorId="7" />
+      </SensorGroup>
+    </SensorGroups>
     <Sensors>
       <Sensor Id="1" RelativeLocation="50" SensorType="1" Name="Sensor 1 bws">
         <PlLineMapping PLineType="1" />