Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs =================================================================== diff -u -r4412 -r4422 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 4412) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculator.cs (.../DesignCalculator.cs) (revision 4422) @@ -94,7 +94,6 @@ { // During the design calculation the location.SurfaceLine is adapted; so store a copy to restore it after the calculation Location location = damKernelInput.Location; - DesignScenario designScenario = location.CurrentScenario; SurfaceLine2 orgLocationSurfaceLine = location.SurfaceLine.FullDeepClone(); try { @@ -344,23 +343,20 @@ if (analysisType == AnalysisType.AdaptGeometry && damKernelInput.Location.RedesignDikeHeight) { double? dikeHeight = location.SurfaceLine.GetDikeHeight(); - if (dikeHeight.HasValue) + if (dikeHeight.HasValue && location.CurrentScenario.DikeTableHeight > dikeHeight.Value) { - if (location.CurrentScenario.DikeTableHeight > dikeHeight.Value) - { - orgLocationSurfaceLine = location.SurfaceLine.FullDeepClone(); - // Redesign the surface line to the desired Dike Table Height - var surfaceLineHeightAdapter = - new SurfaceLineHeightAdapter(location.SurfaceLine, location, location.CurrentScenario.PolderLevel); - SurfaceLine2 adaptedSurfaceLine = - surfaceLineHeightAdapter.ConstructNewSurfaceLine( - location.CurrentScenario.DikeTableHeight ?? - location.SurfaceLine.GetDefaultDikeTableHeight() ?? 0); - location.CurrentScenario.SetRedesignedSurfaceLine(damKernelInput.SubSoilScenario.SoilProfile1D, - damKernelInput.SubSoilScenario.SoilProfile2D, - adaptedSurfaceLine); - damKernelInput.Location.SurfaceLine = adaptedSurfaceLine; - } + orgLocationSurfaceLine = location.SurfaceLine.FullDeepClone(); + // Redesign the surface line to the desired Dike Table Height + var surfaceLineHeightAdapter = + new SurfaceLineHeightAdapter(location.SurfaceLine, location, location.CurrentScenario.PolderLevel); + SurfaceLine2 adaptedSurfaceLine = + surfaceLineHeightAdapter.ConstructNewSurfaceLine( + location.CurrentScenario.DikeTableHeight ?? + location.SurfaceLine.GetDefaultDikeTableHeight() ?? 0); + location.CurrentScenario.SetRedesignedSurfaceLine(damKernelInput.SubSoilScenario.SoilProfile1D, + damKernelInput.SubSoilScenario.SoilProfile2D, + adaptedSurfaceLine); + damKernelInput.Location.SurfaceLine = adaptedSurfaceLine; } } Index: DamEngine/trunk/src/common/settings/General.DotSettings =================================================================== diff -u -r3998 -r4422 --- DamEngine/trunk/src/common/settings/General.DotSettings (.../General.DotSettings) (revision 3998) +++ DamEngine/trunk/src/common/settings/General.DotSettings (.../General.DotSettings) (revision 4422) @@ -1,500 +1,502 @@ - - ERROR - ERROR - DO_NOT_SHOW - WARNING - DO_NOT_SHOW - True - <?xml version="1.0" encoding="utf-16"?><Profile name="DeltaresClean"><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>IMPLICIT_WHEN_INITIALIZER_HAS_TYPE</LocalVariableStyle><ForeachVariableStyle>ALWAYS_IMPLICIT</ForeachVariableStyle></CSUseVar><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseAutoProperty>True</CSUseAutoProperty><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><CSArrangeQualifiers>True</CSArrangeQualifiers><StyleCop.Documentation><SA1600ElementsMustBeDocumented>False</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>False</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>False</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>False</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>False</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>False</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>False</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>False</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>False</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>False</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>Ignore</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>False</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>False</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>False</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>False</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="True" ArrangeAttributes="False" ArrangeArgumentsStyle="False" ArrangeCodeBodyStyle="False" ArrangeVarStyle="True" ArrangeTrailingCommas="False" ArrangeObjectCreation="False" ArrangeDefaultValue="True" /><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><XMLReformatCode>True</XMLReformatCode><CppAddOverrideSpecifier>True</CppAddOverrideSpecifier><CppReplaceExpressionWithBooleanConst>True</CppReplaceExpressionWithBooleanConst><CppMakeLocalVarConstDescriptor>True</CppMakeLocalVarConstDescriptor><CppReplaceTypeByAuto>True</CppReplaceTypeByAuto><CppCStyleToStaticCastDescriptor>True</CppCStyleToStaticCastDescriptor><CppRemoveUnusedIncludes>True</CppRemoveUnusedIncludes><CppAddTypenameTemplateKeywords>True</CppAddTypenameTemplateKeywords><CppReplaceImportDirective>True</CppReplaceImportDirective><CppJoinDeclarationAndAssignmentDescriptor>True</CppJoinDeclarationAndAssignmentDescriptor><CppMakeMethodConst>True</CppMakeMethodConst><CppMakeMethodStatic>True</CppMakeMethodStatic><CppRemoveElseKeyword>True</CppRemoveElseKeyword><CppRemoveRedundantMemberInitializerDescriptor>True</CppRemoveRedundantMemberInitializerDescriptor><CppRemoveRedundantParentheses>True</CppRemoveRedundantParentheses><CppShortenQualifiedName>True</CppShortenQualifiedName><CppDeleteRedundantSpecifier>True</CppDeleteRedundantSpecifier><CppRemoveStatement>True</CppRemoveStatement><CppDeleteRedundantTypenameTemplateKeywords>True</CppDeleteRedundantTypenameTemplateKeywords><CppMakeIfConstexpr>True</CppMakeIfConstexpr><CppReformatCode>True</CppReformatCode><CppUpdateFileHeader>True</CppUpdateFileHeader><CSUpdateFileHeader>True</CSUpdateFileHeader><IDEA_SETTINGS>&lt;profile version="1.0"&gt; - &lt;option name="myName" value="DeltaresClean" /&gt; -&lt;/profile&gt;</IDEA_SETTINGS></Profile> - DeltaresClean - DeltaresClean - TOGETHER_SAME_LINE - Required - Required - Required - RequiredForMultiline - Required - False - 999 - True - True - True - True - True - True - True - True - True - True - TOGETHER_SAME_LINE - ALWAYS_ADD - ALWAYS_ADD - ALWAYS_ADD - ALWAYS_ADD - ALWAYS_ADD - 1 - 1 - False - 1 - NEVER - False - NEVER - False - False - False - True - False - CHOP_ALWAYS - 130 - False - <?xml version="1.0" encoding="utf-16"?> -<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> - <TypePattern Priority="100" DisplayName="COM interface"> - <TypePattern.Match> - <Or> - <And> - <Kind Is="Interface" /> - <Or> - <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> - <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> - </Or> - </And> - <HasAttribute Name="System.Runtime.InteropServices.StructLayoutAttribute" /> - </Or> - </TypePattern.Match> - </TypePattern> - <TypePattern Priority="100" DisplayName="Unit Tests"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> - </And> - </TypePattern.Match> - <Entry DisplayName="Constants"> - <Entry.Match> - <Kind Is="Constant" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Fields"> - <Entry.Match> - <Kind Is="Field" /> - </Entry.Match> - <Entry.SortBy> - <Access /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Properties"> - <Entry.Match> - <Kind Is="Property" /> - </Entry.Match> - <Entry.SortBy> - <Access /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="SetUp and TearDown methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <Or> - <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TestFixtureSetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TestFixtureTearDownAttribute" Inherited="True" /> - </Or> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Anything else" /> - </TypePattern> - <TypePattern DisplayName="Other classes"> - <Entry DisplayName="Enumerators (move to own class)"> - <Entry.Match> - <Kind Is="Enum" /> - </Entry.Match> - <Entry.SortBy> - <Access /> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Constant and static fields"> - <Entry.Match> - <Or> - <Kind Is="Constant" /> - <And> - <Kind Is="Field" /> - <Static /> - </And> - </Or> - </Entry.Match> - <Entry.SortBy> - <Access /> - <Kind Order="Constant Field" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Static Constructor"> - <Entry.Match> - <And> - <Kind Is="Constructor" /> - <Static /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Other fields"> - <Entry.Match> - <And> - <Kind Is="Field" /> - <Not> - <Static /> - </Not> - </And> - </Entry.Match> - <Entry.SortBy> - <Readonly /> - <Access /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Event and Delegates"> - <Entry.Match> - <Or> - <Kind Is="Event" /> - <Kind Is="Delegate" /> - </Or> - </Entry.Match> - <Entry.SortBy> - <Access /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Constructors"> - <Entry.Match> - <Kind Is="Constructor" /> - </Entry.Match> - <Entry.SortBy> - <Access /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Public properties and indexers"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Or> - <Kind Is="Property" /> - <Kind Is="Indexer" /> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Public (non-implementing) properties" Priority="100"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Property" /> - <Not> - <Or> - <ImplementsInterface /> - <Override /> - </Or> - </Not> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Implemented Properties" Priority="100"> - <Entry.Match> - <And> - <Kind Is="Property" /> - <ImplementsInterface /> - </And> - </Entry.Match> - <Entry.SortBy> - <ImplementsInterface Immediate="True" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Public methods"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Method" /> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Public override methods" Priority="100"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Method" /> - <Override /> - <Not> - <ImplementsInterface /> - </Not> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="Implemented methods" Priority="100"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <ImplementsInterface /> - </And> - </Entry.Match> - <Entry.SortBy> - <ImplementsInterface Immediate="True" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Other (protected/private) members"> - <Entry.Match> - <Kind Is="Member" /> - </Entry.Match> - <Entry.SortBy> - <Access /> - <Kind Order="Property Method" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Anything else" /> - <Entry DisplayName="Sub types"> - <Entry.Match> - <Kind Is="Type" /> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> -</Patterns> - CustomLayout - UseVarWhenEvident - UseVarWhenEvident - UseVarWhenEvident - True - - True - - True - - True - - True - - True - <NamingElement Priority="7"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="scoped enumerator" /><type Name="unscoped enumerator" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - - True - <NamingElement Priority="5"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="event" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - <NamingElement Priority="6"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="class field" /><type Name="struct field" /><type Name="union member" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - <NamingElement Priority="3"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="global function" /><type Name="member function" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - <NamingElement Priority="11"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="True" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="global variable" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></NamingElement> - - True - - True - - True - <NamingElement Priority="12"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="macro" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></NamingElement> - <NamingElement Priority="1"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="namespace" /><type Name="namespace alias" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - <NamingElement Priority="13"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="non-type template parameter" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - <NamingElement Priority="10"><Descriptor Static="True" Constexpr="Indeterminate" Const="True" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="class field" /><type Name="local variable" /><type Name="struct field" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></NamingElement> - <NamingElement Priority="9"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="function parameter" /><type Name="lambda parameter" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></NamingElement> - <NamingElement Priority="4"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="property" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - - True - - True - <NamingElement Priority="2"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="__interface" /><type Name="class" /><type Name="enum" /><type Name="struct" /><type Name="type alias" /><type Name="type template parameter" /><type Name="typedef" /><type Name="union" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> - - True - - True - <NamingElement Priority="8"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="global variable" /><type Name="local variable" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></NamingElement> - IO - XY - False - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> - False - True - True - DO_NOTHING - LIVE_MONITOR - LIVE_MONITOR - DO_NOTHING - LIVE_MONITOR - LIVE_MONITOR - LIVE_MONITOR - LIVE_MONITOR - LIVE_MONITOR - LIVE_MONITOR - LIVE_MONITOR - LIVE_MONITOR - DO_NOTHING - LIVE_MONITOR - True - True - True - <data /> - <data><IncludeFilters /><ExcludeFilters><Filter ModuleMask="*Test" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="*Demo*" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="*" ModuleVersionMask="*" ClassMask="*.Properties.*" FunctionMask="*" IsEnabled="False" /></ExcludeFilters></data> - True - True - True - True - True - True - True - True - False - True - True - Unit test - True - 0 - True - True - 2.0 - InCSharpFile - test - True - [Test] -public static void $METHOD$() -{$END$} - True - True - Test fixture - True - 1 - True - 0 - True - True - 2.0 - InCSharpFile - fixture - True - [TestFixture] -public class $FIXTURE$ { -[SetUp] -public static void Arrange() { -$ARRANGE$ -} -} - True - True - Tests constructor with null parameter - True - 0 - True - 1 - True - 2 - True - True - 2.0 - InCSharpFile - nulltest - True - [Test] - public static void WhenCreating$CLASS$Without$PARAM$_ThenArgumentNullExceptionIsThrown() - { - Assert.That(() => new $CLASS$(null!), - Throws.ArgumentNullException.With.ParamName().EqualTo("$PARAMNAME$")); - } - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True + + ERROR + ERROR + DO_NOT_SHOW + WARNING + DO_NOT_SHOW + True + <?xml version="1.0" encoding="utf-16"?><Profile name="DeltaresClean"><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>IMPLICIT_WHEN_INITIALIZER_HAS_TYPE</LocalVariableStyle><ForeachVariableStyle>ALWAYS_IMPLICIT</ForeachVariableStyle></CSUseVar><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseAutoProperty>True</CSUseAutoProperty><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><CSArrangeQualifiers>True</CSArrangeQualifiers><StyleCop.Documentation><SA1600ElementsMustBeDocumented>False</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>False</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>False</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>False</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>False</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>False</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>False</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>False</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>False</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>False</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>Ignore</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>False</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>False</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>False</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>False</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="True" ArrangeAttributes="False" ArrangeArgumentsStyle="False" ArrangeCodeBodyStyle="False" ArrangeVarStyle="True" ArrangeTrailingCommas="False" ArrangeObjectCreation="False" ArrangeDefaultValue="True" /><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><XMLReformatCode>True</XMLReformatCode><CppAddOverrideSpecifier>True</CppAddOverrideSpecifier><CppReplaceExpressionWithBooleanConst>True</CppReplaceExpressionWithBooleanConst><CppMakeLocalVarConstDescriptor>True</CppMakeLocalVarConstDescriptor><CppReplaceTypeByAuto>True</CppReplaceTypeByAuto><CppCStyleToStaticCastDescriptor>True</CppCStyleToStaticCastDescriptor><CppRemoveUnusedIncludes>True</CppRemoveUnusedIncludes><CppAddTypenameTemplateKeywords>True</CppAddTypenameTemplateKeywords><CppReplaceImportDirective>True</CppReplaceImportDirective><CppJoinDeclarationAndAssignmentDescriptor>True</CppJoinDeclarationAndAssignmentDescriptor><CppMakeMethodConst>True</CppMakeMethodConst><CppMakeMethodStatic>True</CppMakeMethodStatic><CppRemoveElseKeyword>True</CppRemoveElseKeyword><CppRemoveRedundantMemberInitializerDescriptor>True</CppRemoveRedundantMemberInitializerDescriptor><CppRemoveRedundantParentheses>True</CppRemoveRedundantParentheses><CppShortenQualifiedName>True</CppShortenQualifiedName><CppDeleteRedundantSpecifier>True</CppDeleteRedundantSpecifier><CppRemoveStatement>True</CppRemoveStatement><CppDeleteRedundantTypenameTemplateKeywords>True</CppDeleteRedundantTypenameTemplateKeywords><CppMakeIfConstexpr>True</CppMakeIfConstexpr><CppReformatCode>True</CppReformatCode><CppUpdateFileHeader>True</CppUpdateFileHeader><CSUpdateFileHeader>True</CSUpdateFileHeader><IDEA_SETTINGS>&lt;profile version="1.0"&gt; + &lt;option name="myName" value="DeltaresClean" /&gt; +&lt;/profile&gt;</IDEA_SETTINGS></Profile> + DeltaresClean + DeltaresClean + TOGETHER_SAME_LINE + Required + Required + Required + RequiredForMultiline + Required + False + 999 + True + True + True + True + True + True + True + True + True + True + TOGETHER_SAME_LINE + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + 1 + 1 + False + 1 + NEVER + False + NEVER + False + False + False + True + False + CHOP_ALWAYS + 130 + False + <?xml version="1.0" encoding="utf-16"?> +<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> + <TypePattern Priority="100" DisplayName="COM interface"> + <TypePattern.Match> + <Or> + <And> + <Kind Is="Interface" /> + <Or> + <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> + <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> + </Or> + </And> + <HasAttribute Name="System.Runtime.InteropServices.StructLayoutAttribute" /> + </Or> + </TypePattern.Match> + </TypePattern> + <TypePattern Priority="100" DisplayName="Unit Tests"> + <TypePattern.Match> + <And> + <Kind Is="Class" /> + <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> + </And> + </TypePattern.Match> + <Entry DisplayName="Constants"> + <Entry.Match> + <Kind Is="Constant" /> + </Entry.Match> + </Entry> + <Entry DisplayName="Fields"> + <Entry.Match> + <Kind Is="Field" /> + </Entry.Match> + <Entry.SortBy> + <Access /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Properties"> + <Entry.Match> + <Kind Is="Property" /> + </Entry.Match> + <Entry.SortBy> + <Access /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="SetUp and TearDown methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <Or> + <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.TestFixtureSetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.TestFixtureTearDownAttribute" Inherited="True" /> + </Or> + </And> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Test Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <HasAttribute Name="NUnit.Framework.TestAttribute" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Anything else" /> + </TypePattern> + <TypePattern DisplayName="Other classes"> + <Entry DisplayName="Enumerators (move to own class)"> + <Entry.Match> + <Kind Is="Enum" /> + </Entry.Match> + <Entry.SortBy> + <Access /> + <Name /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Constant and static fields"> + <Entry.Match> + <Or> + <Kind Is="Constant" /> + <And> + <Kind Is="Field" /> + <Static /> + </And> + </Or> + </Entry.Match> + <Entry.SortBy> + <Access /> + <Kind Order="Constant Field" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Static Constructor"> + <Entry.Match> + <And> + <Kind Is="Constructor" /> + <Static /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Other fields"> + <Entry.Match> + <And> + <Kind Is="Field" /> + <Not> + <Static /> + </Not> + </And> + </Entry.Match> + <Entry.SortBy> + <Readonly /> + <Access /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Event and Delegates"> + <Entry.Match> + <Or> + <Kind Is="Event" /> + <Kind Is="Delegate" /> + </Or> + </Entry.Match> + <Entry.SortBy> + <Access /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Constructors"> + <Entry.Match> + <Kind Is="Constructor" /> + </Entry.Match> + <Entry.SortBy> + <Access /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Public properties and indexers"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Or> + <Kind Is="Property" /> + <Kind Is="Indexer" /> + </Or> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Public (non-implementing) properties" Priority="100"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Property" /> + <Not> + <Or> + <ImplementsInterface /> + <Override /> + </Or> + </Not> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Implemented Properties" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Property" /> + <ImplementsInterface /> + </And> + </Entry.Match> + <Entry.SortBy> + <ImplementsInterface Immediate="True" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Public methods"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Method" /> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Public override methods" Priority="100"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Method" /> + <Override /> + <Not> + <ImplementsInterface /> + </Not> + </And> + </Entry.Match> + </Entry> + <Entry DisplayName="Implemented methods" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <ImplementsInterface /> + </And> + </Entry.Match> + <Entry.SortBy> + <ImplementsInterface Immediate="True" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Other (protected/private) members"> + <Entry.Match> + <Kind Is="Member" /> + </Entry.Match> + <Entry.SortBy> + <Access /> + <Kind Order="Property Method" /> + </Entry.SortBy> + </Entry> + <Entry DisplayName="Anything else" /> + <Entry DisplayName="Sub types"> + <Entry.Match> + <Kind Is="Type" /> + </Entry.Match> + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + </TypePattern> +</Patterns> + CustomLayout + UseVarWhenEvident + UseVarWhenEvident + UseVarWhenEvident + True + + True + + True + + True + + True + + True + <NamingElement Priority="7"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="scoped enumerator" /><type Name="unscoped enumerator" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + + True + <NamingElement Priority="5"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="event" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + <NamingElement Priority="6"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="class field" /><type Name="struct field" /><type Name="union member" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + <NamingElement Priority="3"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="global function" /><type Name="member function" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + <NamingElement Priority="11"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="True" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="global variable" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></NamingElement> + + True + + True + + True + <NamingElement Priority="12"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="macro" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></NamingElement> + <NamingElement Priority="1"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="namespace" /><type Name="namespace alias" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + <NamingElement Priority="13"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="non-type template parameter" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + <NamingElement Priority="10"><Descriptor Static="True" Constexpr="Indeterminate" Const="True" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="class field" /><type Name="local variable" /><type Name="struct field" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></NamingElement> + <NamingElement Priority="9"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="function parameter" /><type Name="lambda parameter" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></NamingElement> + <NamingElement Priority="4"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="property" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + + True + + True + <NamingElement Priority="2"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="__interface" /><type Name="class" /><type Name="enum" /><type Name="struct" /><type Name="type alias" /><type Name="type template parameter" /><type Name="typedef" /><type Name="union" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></NamingElement> + + True + + True + <NamingElement Priority="8"><Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"><type Name="global variable" /><type Name="local variable" /></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></NamingElement> + IO + XY + False + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + False + True + True + DO_NOTHING + LIVE_MONITOR + LIVE_MONITOR + DO_NOTHING + LIVE_MONITOR + LIVE_MONITOR + LIVE_MONITOR + LIVE_MONITOR + LIVE_MONITOR + LIVE_MONITOR + LIVE_MONITOR + LIVE_MONITOR + DO_NOTHING + LIVE_MONITOR + True + True + True + <data /> + <data><IncludeFilters /><ExcludeFilters><Filter ModuleMask="*Test" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="*Demo*" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /><Filter ModuleMask="*" ModuleVersionMask="*" ClassMask="*.Properties.*" FunctionMask="*" IsEnabled="False" /></ExcludeFilters></data> + True + True + True + True + True + True + True + True + False + True + True + Unit test + True + 0 + True + True + 2.0 + InCSharpFile + test + True + [Test] +public static void $METHOD$() +{$END$} + True + True + Test fixture + True + 1 + True + 0 + True + True + 2.0 + InCSharpFile + fixture + True + [TestFixture] +public class $FIXTURE$ { +[SetUp] +public static void Arrange() { +$ARRANGE$ +} +} + True + True + Tests constructor with null parameter + True + 0 + True + 1 + True + 2 + True + True + 2.0 + InCSharpFile + nulltest + True + [Test] + public static void WhenCreating$CLASS$Without$PARAM$_ThenArgumentNullExceptionIsThrown() + { + Assert.That(() => new $CLASS$(null!), + Throws.ArgumentNullException.With.ParamName().EqualTo("$PARAMNAME$")); + } + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r4245 -r4422 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4245) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4422) @@ -20,9 +20,11 @@ // All rights reserved. using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Text.RegularExpressions; +using System.Threading; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Geometry; using Deltares.DamEngine.Data.Geotechnics; @@ -41,7 +43,9 @@ [TestFixture] public class MacroStabilityInwardsTests { - private const double Tolerance = 0.0005; + private const double tolerance = 0.0005; + private const string mapTestFiles = @"TestFiles\"; + private const double tol2Digits = 0.005; [TearDown] public void TearDown() @@ -102,7 +106,7 @@ Assert.IsNotNull(outputString); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.IsNotNull(output.Results.CalculationResults, "No results available"); - Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.282, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); // NumberOfIterations=0 Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); @@ -119,12 +123,12 @@ UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; Assert.IsNotNull(upliftSituation); Assert.AreEqual(true, upliftSituation.IsUplift); - Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, Tolerance); - Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, Tolerance); - Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, Tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, Tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, Tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, Tolerance); + Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, tolerance); + Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, tolerance); + Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, tolerance); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); @@ -158,7 +162,7 @@ Assert.IsNotNull(outputString); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.115, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); // NumberOfIterations=0 Assert.AreEqual(0, output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations); @@ -175,12 +179,12 @@ UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; Assert.IsNotNull(upliftSituation); Assert.AreEqual(true, upliftSituation.IsUplift); - Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, Tolerance); - Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, Tolerance); - Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, Tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, Tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, Tolerance); - Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, Tolerance); + Assert.AreEqual(1.141, upliftSituation.Pl3MinUplift, tolerance); + Assert.AreEqual(4.4, upliftSituation.Pl3HeadAdjusted, tolerance); + Assert.AreEqual(60.64, upliftSituation.Pl3LocationXMinUplift, tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4MinUplift, tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4HeadAdjusted, tolerance); + Assert.AreEqual(0.0, upliftSituation.Pl4LocationXMinUplift, tolerance); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults[0].CalculationResult)); @@ -216,20 +220,20 @@ Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); // Bishop DesignResult result = output.Results.CalculationResults[0]; - Assert.AreEqual(1.282, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.282, result.StabilityDesignResults.SafetyFactor, tolerance); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); Assert.IsTrue(result.StabilityDesignResults.UpliftSituation.IsUplift); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType); Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); // Uplift Van result = output.Results.CalculationResults[1]; - Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityDesignResults.StabilityModelType); Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2]; - Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.115, result.StabilityDesignResults.SafetyFactor, tolerance); Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityDesignResults.StabilityModelType); Assert.AreEqual("Loc(DWP_1)_Sce(1)_Pro(DWP_1)", result.BaseFileName); @@ -270,18 +274,18 @@ Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; - Assert.AreEqual(0.452, result.SafetyFactor, Tolerance); + Assert.AreEqual(0.452, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.IsTrue(result.UpliftSituation.IsUplift); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); // Uplift Van result = output.Results.CalculationResults[1].StabilityDesignResults; - Assert.AreEqual(0.574, result.SafetyFactor, Tolerance); + Assert.AreEqual(0.574, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, result.StabilityModelType); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; - Assert.AreEqual(0.452, result.SafetyFactor, Tolerance); + Assert.AreEqual(0.452, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); @@ -322,7 +326,7 @@ // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; Assert.IsTrue(result.SafetyFactorSpecified); - Assert.AreEqual(1.458, result.SafetyFactor, Tolerance); + Assert.AreEqual(1.458, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.IsFalse(result.UpliftSituation.IsUplift); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityModelType); @@ -334,7 +338,7 @@ // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; Assert.IsTrue(result.SafetyFactorSpecified); - Assert.AreEqual(1.458, result.SafetyFactor, Tolerance); + Assert.AreEqual(1.458, result.SafetyFactor, tolerance); Assert.IsNotNull(result.UpliftSituation); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, result.StabilityModelType); @@ -383,14 +387,14 @@ DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.972 (Zone Areas) - Assert.AreEqual(1.972, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.972, result.StabilityDesignResults.SafetyFactor, tolerance); Assert.AreEqual("DWP_10_2", result.LocationName); Assert.AreEqual("DWP_10.sti", result.ProfileName); Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); result = output.Results.CalculationResults[1]; // SafetyFactor=2.034 (Forbidden Zone) - Assert.AreEqual(2.034, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(2.034, result.StabilityDesignResults.SafetyFactor, tolerance); Assert.AreEqual("DWP_10_6", result.LocationName); Assert.AreEqual("DWP_10.sti", result.ProfileName); Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); @@ -436,7 +440,7 @@ // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=1.814 - Assert.AreEqual(1.814, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.814, result.StabilityDesignResults.SafetyFactor, tolerance); result = output.Results.CalculationResults[1]; Assert.AreEqual("6-4-3-A-1-C", result.LocationName); @@ -452,15 +456,15 @@ // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=2.099 - Assert.AreEqual(2.099, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(2.099, result.StabilityDesignResults.SafetyFactor, tolerance); result = output.Results.CalculationResults[3]; Assert.AreEqual("6-4-3-B-1-D", result.LocationName); Assert.AreEqual("6-4-3-B-1-D_2_s", result.ProfileName); // Calculation Result Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=2.300 - Assert.AreEqual(2.300, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(2.300, result.StabilityDesignResults.SafetyFactor, tolerance); } [Test, Category("Slow")] @@ -505,7 +509,7 @@ // Bishop Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); // SafetyFactor=2.219 - Assert.AreEqual(2.219, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(2.219, result.StabilityDesignResults.SafetyFactor, tolerance); Assert.AreEqual(DesignResultStabilityDesignResultsStabilityModelType.Bishop, result.StabilityDesignResults.StabilityModelType); result = output.Results.CalculationResults[4]; @@ -562,6 +566,165 @@ } [Test, Category("Slow")] + public void DesignBishopOptimizedSlopeAndShoulderAdaptionWithScenariosForHeadPL3CalculatesCorrect() + { + const string inputFilename = "InputFileMultiCoreTestForScenarioAdaption.xml"; + string fullInputFilename = Path.Combine(mapTestFiles, inputFilename); + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + string inputString = File.ReadAllText(fullInputFilename); + var engineInterface = new EngineInterface(inputString); + engineInterface.DamProjectData.MaxCalculationCores = 1; + var calcDir = engineInterface.DamProjectData.CalculationMap + "_SingleCore"; + + engineInterface.DamProjectData.CalculationMap = calcDir; + Assert.IsNotNull(engineInterface.DamProjectData); + calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir; + if (Directory.Exists(calcDir)) + { + Directory.Delete(calcDir, true); // delete previous results + } + + string result = engineInterface.Validate(); + Assert.IsTrue(result == null, "Validation must succeed but does not, see output xml in debugger"); + string outputString = engineInterface.Run(); + File.WriteAllText("Results_Single_Core" + ".xml", outputString); + Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Assert.AreEqual(18, output.Results.CalculationResults.Length); + Assert.AreEqual(3299, output.Results.CalculationMessages.Length); + int resultsFound = 0; + foreach (var designResult in output.Results.CalculationResults) + { + if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)")) + { + Assert.AreEqual(5.306, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D1-KR093_0013-1)_Ite(4)")) + { + Assert.AreEqual(4.986, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D2-KR093_0013-2)_Ite(3)")) + { + Assert.AreEqual(5.155, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D2-KR093_0013-2)_Ite(4)")) + { + Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(3)_Pro(segment_627_1D3-KR093_0013-3)_Ite(3)")) + { + Assert.AreEqual(5.188, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-0.94, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0013)_Sce(4)_Pro(segment_627_1D3-KR093_0013-3)_Ite(4)")) + { + Assert.AreEqual(5.194, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)")) + { + Assert.AreEqual(1.752, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D1-KR093_0018-1)_Ite(29)")) + { + Assert.AreEqual(1.270, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.52, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)")) + { + Assert.AreEqual(1.409, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D2-KR093_0018-2)_Ite(29)")) + { + Assert.AreEqual(1.224, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(3)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)")) + { + Assert.AreEqual(1.598, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-1.00, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0018)_Sce(4)_Pro(segment_629_1D3-KR093_0018-3)_Ite(29)")) + { + Assert.AreEqual(1.382, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)")) + { + Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D1-KR093_0019-1)_Ite(25)")) + { + Assert.AreEqual(5.848, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.57, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D2-KR093_0019-2)_Ite(25)")) + { + Assert.AreEqual(1.552, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D2-KR093_0019-2)_Ite(5)")) + { + Assert.AreEqual(2.876, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(3)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)")) + { + Assert.AreEqual(3.538, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("3", designResult.ScenarioName); + Assert.AreEqual(-1.03, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + if (designResult.BaseFileName.Equals("Loc(KR093_0019)_Sce(4)_Pro(segment_629_1D3-KR093_0019-3)_Ite(25)")) + { + Assert.AreEqual(1.503, designResult.StabilityDesignResults.SafetyFactor, tolerance); + Assert.AreEqual("4", designResult.ScenarioName); + Assert.AreEqual(-0.37, designResult.StabilityDesignResults.UpliftSituation.Pl3HeadAdjusted, tol2Digits); + resultsFound++; + } + } + Assert.AreEqual(18, resultsFound); + } + + [Test, Category("Slow")] public void TestRunSlopeAdaptionBeforeShoulderAdaptionSucceeds() { // Inputfile was created with .\data\Dam\Benchmarks\Validatie SlopeAdaption\SlopeAdaption.damx @@ -588,7 +751,7 @@ Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.IsNotNull(output.Results.CalculationResults); - Assert.AreEqual(1.724, output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.724, output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, tolerance); } [Test, Category("Slow")] @@ -633,17 +796,17 @@ output.Results.CalculationResults[0].CalculationResult)); DesignResultStabilityDesignResults stabilityDesignResults = output.Results.CalculationResults[0].StabilityDesignResults; - Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(expectedSafetyFactor, stabilityDesignResults.SafetyFactor, tolerance); Assert.AreEqual(expectedNumberOfIterations, stabilityDesignResults.NumberOfIterations); Assert.AreEqual(expectedResultMessage, stabilityDesignResults.ResultMessage); SurfaceLine2 redesignedSurfaceLine = actualDamProjectData.DesignCalculations[0].StabilityDesignResults.RedesignedSurfaceLine; if (redesignedSurfaceLine != null) { - Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(expectedDikeLength).Within(Tolerance)); + Assert.That(redesignedSurfaceLine.GetDikeLength(), Is.EqualTo(expectedDikeLength).Within(tolerance)); GeometryPoint pointShoulderBaseInside = redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); if (pointShoulderBaseInside != null) { - Assert.AreEqual(expectedShoulderHeight, pointShoulderBaseInside.Z, Tolerance); + Assert.AreEqual(expectedShoulderHeight, pointShoulderBaseInside.Z, tolerance); } } } @@ -752,7 +915,7 @@ DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, tolerance); // skip testing some of the results like uplift etc. @@ -762,10 +925,10 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.644 - Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, tolerance); result = output.Results.CalculationResults[2]; // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, tolerance); // Stix file var fileList = new List @@ -827,7 +990,7 @@ DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.638 DSTAB 1.518 (1.079) - Assert.AreEqual(1.638, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.638, result.StabilityDesignResults.SafetyFactor, tolerance); // skip testing some of the results like uplift etc. @@ -837,7 +1000,7 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.551 DSTAB 1.414. 1.097 - Assert.AreEqual(1.551, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.551, result.StabilityDesignResults.SafetyFactor, tolerance); Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(result.CalculationResult)); var fileList = new List @@ -898,7 +1061,7 @@ DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.638 - Assert.AreEqual(1.638, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.638, result.StabilityDesignResults.SafetyFactor, tolerance); // skip testing some of the results like uplift etc. @@ -908,7 +1071,7 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.551 - Assert.AreEqual(1.551, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.551, result.StabilityDesignResults.SafetyFactor, tolerance); // Stix file var fileList = new List @@ -972,7 +1135,7 @@ DesignResult result = output.Results.CalculationResults[0]; // SafetyFactor=1.682 - Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.682, result.StabilityDesignResults.SafetyFactor, tolerance); // skip testing some of the results like uplift etc. @@ -982,7 +1145,7 @@ // test safety factor for other profiles result = output.Results.CalculationResults[1]; // SafetyFactor=1.644 - Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, Tolerance); + Assert.AreEqual(1.644, result.StabilityDesignResults.SafetyFactor, tolerance); // Stix file var existingFilesList = new List