Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -r28141adef35144c8d3abc6d6088524022536cff7 -r7210f8076038249d046cd566e7088027e778f02b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 28141adef35144c8d3abc6d6088524022536cff7) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 7210f8076038249d046cd566e7088027e778f02b) @@ -138,7 +138,7 @@ if (propertyName == nameof(ModelFactorSuperCriticalFlow)) { - return data.WrappedData.InflowModelType != ClosingStructureInflowModelType.FloodedCulvert; + return data.WrappedData.InflowModelType == ClosingStructureInflowModelType.VerticalWall; } if (propertyName == nameof(DrainCoefficient)) Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r069018f7dd77a94885b177e9b0b1e55bbe1c2494 -r7210f8076038249d046cd566e7088027e778f02b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 069018f7dd77a94885b177e9b0b1e55bbe1c2494) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 7210f8076038249d046cd566e7088027e778f02b) @@ -408,7 +408,7 @@ const string modelSettingsCategory = "Modelinstellingen"; PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(23, dynamicProperties.Count); + Assert.AreEqual(22, dynamicProperties.Count); PropertyDescriptor insideWaterLevelProperty = dynamicProperties[lowSillInsideWaterLevelPropertyIndex]; Assert.IsInstanceOf(insideWaterLevelProperty.Converter); @@ -459,14 +459,6 @@ "Faalkans herstel van gefaalde situatie [1/jaar]", "Faalkans herstel van gefaalde situatie."); - PropertyDescriptor modelFactorSuperCriticalFlowProperty = dynamicProperties[lowSillModelFactorSuperCriticalFlowPropertyIndex]; - Assert.IsInstanceOf(modelFactorSuperCriticalFlowProperty.Converter); - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(modelFactorSuperCriticalFlowProperty, - modelSettingsCategory, - "Modelfactor overloopdebiet volkomen overlaat [-]", - "Modelfactor voor het overloopdebiet over een volkomen overlaat.", - true); - PropertyDescriptor factorStormDurationOpenStructureProperty = dynamicProperties[lowSillFactorStormDurationOpenStructurePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(factorStormDurationOpenStructureProperty, modelSettingsCategory, @@ -785,7 +777,7 @@ // Call & Assert Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(ClosingStructuresInputContextProperties.InsideWaterLevel))); - Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(ClosingStructuresInputContextProperties.ModelFactorSuperCriticalFlow))); + Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(ClosingStructuresInputContextProperties.ModelFactorSuperCriticalFlow))); Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(ClosingStructuresInputContextProperties.DrainCoefficient))); Assert.IsFalse(properties.DynamicVisibleValidationMethod(nameof(ClosingStructuresInputContextProperties.StructureNormalOrientation))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(ClosingStructuresInputContextProperties.ThresholdHeightOpenWeir))); @@ -943,9 +935,8 @@ private const int lowSillForeshoreProfilePropertyIndex = 17; private const int lowSillUseBreakWaterPropertyIndex = 18; private const int lowSillUseForeshorePropertyIndex = 19; - private const int lowSillModelFactorSuperCriticalFlowPropertyIndex = 20; - private const int lowSillFactorStormDurationOpenStructurePropertyIndex = 21; - private const int lowSillCalculateIllustrationPointsPropertyIndex = 22; + private const int lowSillFactorStormDurationOpenStructurePropertyIndex = 20; + private const int lowSillCalculateIllustrationPointsPropertyIndex = 21; #endregion