Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs =================================================================== diff -u -r5820 -r5881 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5820) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5881) @@ -277,7 +277,6 @@ BelowPhreaticLevel = soil.BelowPhreaticLevel, Cohesion = soil.Cohesion, FrictionAngle = soil.FrictionAngle, - RRatio = soil.RRatio, RatioCuPc = soil.RatioCuPc, StrengthIncreaseExponent = soil.StrengthIncreaseExponent, UseSoilClassification = false, // Soil type is not given so make sure it is not used. @@ -346,25 +345,10 @@ BelowPhreaticLevel = soil.BelowPhreaticLevel, Cohesion = soil.Cohesion, FrictionAngle = soil.FrictionAngle, - RRatio = soil.RRatio, RatioCuPc = soil.RatioCuPc, - // RheologicalCoefficient = 1.07, // is purely needed for Nails which are NOT yet to be implemented + StrengthIncreaseExponent = soil.StrengthIncreaseExponent, //Todo #Bka We keep this as "truth" for now. But maybe Dam should become above/below too - ShearStrengthModel = ConvertToDamShearStrengthModel(soil.ShearStrengthAbovePhreaticLevelModel), - 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, - //CuTop = 0.00, - //DiameterD90 = 0.00, - //DryUnitWeight = 0.00, - //Ocr = 0.00, - //PermeabKx = 0.00, - //PoP = 0.00, - //SlopeRestProfile = 0.00, - //SoilType = SoilType.Clay, - //UseDefaultShearStrengthModel = false, - //WhitesConstant = 0.00, + ShearStrengthModel = ConvertToDamShearStrengthModel(soil.ShearStrengthAbovePhreaticLevelModel) }; if (soil.SigmaTauTable != null) Index: DamEngine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex =================================================================== diff -u -r5789 -r5881 --- DamEngine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex (.../DAM Engine - Technical Design.tex) (revision 5789) +++ DamEngine/trunk/doc/Dam Engine - Technical Design/DAM Engine - Technical Design.tex (.../DAM Engine - Technical Design.tex) (revision 5881) @@ -983,15 +983,18 @@ \small \begin{tabular}{|p{70mm}|p{\textwidth-70mm-24pt}|} \hline \textbf{Macrostability} Soil & \textbf{\ProgramName} Soil \\ \hline + Name & Name \\ \hline AbovePhreaticLevel & AbovePhreaticLevel \\ \hline BelowPhreaticLevel & BelowPhreaticLevel \\ \hline - DilatancyType & DilatancyType \\ \hline Cohesion & Cohesion \\ \hline FrictionAngle & FrictionAngle \\ \hline RatioCuPc & RatioCuPc \\ \hline StrengthIncreaseExponent & StrengthIncreaseExponent \\ \hline - OCR & OCR \\ \hline ShearStrengthModel & ShearStrengthModel \\ \hline + SigmaTauTable & SigmaTauCurve \\ \hline + SuTable & SuTableCurve \\ \hline + Dilatancy & DilatancyType \\ \hline + FixedSoilStress.POP & PoP \\ \hline \end{tabular} \caption{\small Mapping of the \MacrostabilityKernel Soils to the \ProgramName Soils.} \label{table-MappingDamEngineSoilsMacrostability}