Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4036)
@@ -837,7 +837,7 @@
},
{
MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan
- },
+ }
};
return translationTable[stabilityModelType];
}
@@ -859,7 +859,7 @@
},
{
InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan
- },
+ }
};
return translationTable[inputStabilityModelType];
}
@@ -881,7 +881,7 @@
},
{
MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan
- },
+ }
};
return translationTable[stabilityModelType];
}
@@ -903,7 +903,7 @@
},
{
DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan
- },
+ }
};
return translationTable[outputStabilityModelType];
}
@@ -1139,7 +1139,7 @@
},
{
ShearStrengthModel.CPhiOrSuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated
- },
+ }
};
return translationTable[shearStrengthModel];
}
@@ -1236,7 +1236,7 @@
},
{
SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrSuCalculated
- },
+ }
};
return translationTable[soilShearStrengthModel];
}
@@ -1258,7 +1258,7 @@
},
{
DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi
- },
+ }
};
return translationTable[dilatancyType];
}
@@ -1280,7 +1280,7 @@
},
{
SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi
- },
+ }
};
return translationTable[soilDilatancyType];
}
@@ -1361,7 +1361,7 @@
},
{
MStabModelTypeSpencerLow, MStabModelType.SpencerLow
- },
+ }
};
return translationTable[inputMStabModelType];
}
@@ -1404,7 +1404,7 @@
},
{
MStabModelType.SpencerLow, MStabModelTypeSpencerLow
- },
+ }
};
return translationTable[mStabModelType];
}
@@ -1491,7 +1491,7 @@
},
{
TimeStepUnitNonequidistant, TimeStepUnit.Nonequidistant
- },
+ }
};
return translationTable[timeStepUnit];
}
@@ -1528,7 +1528,7 @@
},
{
TimeStepUnit.Nonequidistant, TimeStepUnitNonequidistant
- },
+ }
};
return translationTable[timeStepUnit];
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 4036)
@@ -175,7 +175,7 @@
},
{
StabilityModelOptionType.UpliftVan, MStabModelType.UpliftVan
- },
+ }
//{MacroStability.CSharpWrapper.Output.StabilityModelOption.Spencer, MStabModelType.UpliftSpencerWti}
};
return translationTable[modelOption];
@@ -330,7 +330,7 @@
// RheologicalCoefficient = 1.07, // is purely needed for Nails which are NOT yet to be implemented
//Todo #Bka We keep this as "truth" for now. But maybe Dam should become above/below too
ShearStrengthModel = ConvertToDamShearStrengthModel(soil.ShearStrengthAbovePhreaticLevelModel),
- StrengthIncreaseExponent = soil.StrengthIncreaseExponent,
+ StrengthIncreaseExponent = soil.StrengthIncreaseExponent
// Following parameters are not available in MacroStability soil and will not be translated (they are for Piping).
//CuBottom = 0.00,
//DiameterD70 = 0.00,
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/CharacteristicPointType.cs
===================================================================
diff -u -r3893 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/CharacteristicPointType.cs (.../CharacteristicPointType.cs) (revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/CharacteristicPointType.cs (.../CharacteristicPointType.cs) (revision 4036)
@@ -115,6 +115,6 @@
///
/// The surface level inside
///
- SurfaceLevelInside = 25, // Maaiveld binnenwaarts
+ SurfaceLevelInside = 25 // Maaiveld binnenwaarts
}
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs (.../FillXmlOutputFromDam.cs) (revision 4036)
@@ -52,7 +52,7 @@
Results = new OutputResults
{
// Calculation messages
- CalculationMessages = new Message[damProjectData.CalculationMessages.Count],
+ CalculationMessages = new Message[damProjectData.CalculationMessages.Count]
}
};
CreateCalculationMessages(damProjectData, output);
@@ -78,7 +78,7 @@
LocationName = designResult.LocationName,
ScenarioName = designResult.ScenarioName,
ProfileName = designResult.ProfileName,
- CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(designResult.CalculationResult),
+ CalculationResult = ConversionHelper.ConvertToOutputCalculationResult(designResult.CalculationResult)
};
if (designResult.PipingDesignResults != null)
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 4036)
@@ -3342,7 +3342,7 @@
SuCalculatedWithYield,
///
- CPhiOrSuCalculated,
+ CPhiOrSuCalculated
}
///
@@ -3358,7 +3358,7 @@
Zero,
///
- MinusPhi,
+ MinusPhi
}
///
@@ -3973,7 +3973,7 @@
OptimizedSlopeAndShoulderAdaption,
///
- SlopeAdaptionBeforeShoulderAdaption,
+ SlopeAdaptionBeforeShoulderAdaption
}
///
@@ -4116,7 +4116,7 @@
Sensors,
///
- None,
+ None
}
///
@@ -4138,7 +4138,7 @@
HydroStatic,
///
- SemiTimeDependent,
+ SemiTimeDependent
}
///
@@ -4157,7 +4157,7 @@
ClayDikeOnSand,
///
- SandDikeOnSand,
+ SandDikeOnSand
}
///
@@ -5031,7 +5031,7 @@
Operational,
///
- Design,
+ Design
}
///
@@ -5050,7 +5050,7 @@
Sellmeijer4Forces,
///
- WtiSellmeijerRevised,
+ WtiSellmeijerRevised
}
///
@@ -5066,7 +5066,7 @@
UpliftVan,
///
- BishopUpliftVan,
+ BishopUpliftVan
}
///
@@ -5079,6 +5079,6 @@
NoAdaption,
///
- AdaptGeometry,
+ AdaptGeometry
}
}
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs (.../IKernelWrapper.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Interfaces/IKernelWrapper.cs (.../IKernelWrapper.cs) (revision 4036)
@@ -68,7 +68,7 @@
/// Iterative process.
/// First slope adaption is done then shoulder adaption
///
- SlopeAdaptionBeforeShoulderAdaption,
+ SlopeAdaptionBeforeShoulderAdaption
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreator.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreator.cs (.../SensorPlLineCreator.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/SensorPlLineCreator.cs (.../SensorPlLineCreator.cs) (revision 4036)
@@ -66,7 +66,7 @@
{
PlLineType.Pl1,
PlLineType.Pl3,
- PlLineType.Pl4,
+ PlLineType.Pl4
});
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 4036)
@@ -612,7 +612,7 @@
Warning,
///
- Info,
+ Info
}
///
@@ -2296,7 +2296,7 @@
Shansep,
///
- SuTable,
+ SuTable
}
///
@@ -3342,7 +3342,7 @@
UpliftVan,
///
- BishopUpliftVan,
+ BishopUpliftVan
}
///
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs (.../FillDamFromXmlInputTests.cs) (revision 4036)
@@ -156,7 +156,7 @@
"Curves",
"Surfaces",
"SurfaceLine",
- "Loops",
+ "Loops"
}; // TODO i.m.o the serializing of the geometry should be improved, so these ignores are not needed anymore
ComparisonResult result = compare.Compare(expected, actual);
Assert.AreEqual(0, result.Differences.Count,
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs (.../FactoryForDamProjectData.cs) (revision 4036)
@@ -343,7 +343,7 @@
{
X = xCoordinate,
Y = 0.0,
- Z = zCoordinate,
+ Z = zCoordinate
};
surfaceLine.AddCharacteristicPoint(geometryPoint, characteristicPointType);
}
@@ -396,12 +396,11 @@
TrafficLoad = 10.0 * i + 0.44,
TrafficLoadDegreeOfConsolidation = 10.0 * i + 0.45,
MinimalCircleDepth = 10.0 * i + 0.46,
- SoilDatabaseName = "test.mdb",
+ SoilDatabaseName = "test.mdb"
};
location.RedesignDikeHeight = false;
location.RedesignDikeShoulder = false;
location.ShoulderEmbankmentMaterial = "ShoulderMat" + (i + 1);
- ;
location.StabilityShoulderGrowSlope = 10.0 * i + 0.50;
location.StabilityShoulderGrowDeltaX = 10.0 * i + 0.51;
location.StabilitySlopeAdaptionDeltaX = 10.0 * i + 0.52;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs
===================================================================
diff -u -r4000 -r4036
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs (.../SurfaceLine2Tests.cs) (revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SurfaceLine2Tests.cs (.../SurfaceLine2Tests.cs) (revision 4036)
@@ -60,7 +60,7 @@
{
X = xCoordinate,
Y = 0.0,
- Z = zCoordinate,
+ Z = zCoordinate
};
surfaceLine.AddCharacteristicPoint(geometryPoint, characteristicPointType);
}