Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs
===================================================================
diff -u -r220611cdf66f9c106ad7c1970b61f06c119f01f5 -racbfe5601241d7e7e0470194aab84b9425621d54
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs (.../GeneralStabilityPointStructuresInput.cs) (revision 220611cdf66f9c106ad7c1970b61f06c119f01f5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs (.../GeneralStabilityPointStructuresInput.cs) (revision acbfe5601241d7e7e0470194aab84b9425621d54)
@@ -51,12 +51,6 @@
StandardDeviation = (RoundedDouble) 0.2
};
- ModelFactorSubCriticalFlow = new VariationCoefficientNormalDistribution(2)
- {
- Mean = (RoundedDouble) 1,
- CoefficientOfVariation = (RoundedDouble) 0.1
- };
-
ModelFactorCollisionLoad = new VariationCoefficientNormalDistribution(1)
{
Mean = (RoundedDouble) 1,
@@ -119,11 +113,6 @@
public LogNormalDistribution ModelFactorStorageVolume { get; }
///
- /// Gets the model factor for sub critical flow.
- ///
- public VariationCoefficientNormalDistribution ModelFactorSubCriticalFlow { get; }
-
- ///
/// Gets the model factor for collision load.
///
public VariationCoefficientNormalDistribution ModelFactorCollisionLoad { get; }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs
===================================================================
diff -u -r542e6889ed73c6d8a1947a0135abe955c0910037 -racbfe5601241d7e7e0470194aab84b9425621d54
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 542e6889ed73c6d8a1947a0135abe955c0910037)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision acbfe5601241d7e7e0470194aab84b9425621d54)
@@ -45,9 +45,8 @@
private const int gravitationalAccelerationPropertyIndex = 6;
private const int nPropertyIndex = 7;
private const int modelFactorStorageVolumePropertyIndex = 8;
- private const int modelFactorSubCriticalFlowPropertyIndex = 9;
- private const int modelFactorCollisionLoadPropertyIndex = 10;
- private const int modelFactorLoadEffectPropertyIndex = 11;
+ private const int modelFactorCollisionLoadPropertyIndex = 9;
+ private const int modelFactorLoadEffectPropertyIndex = 10;
///
/// Creates a new instance of .
@@ -99,7 +98,6 @@
|| nameof(N).Equals(propertyName)
|| nameof(GravitationalAcceleration).Equals(propertyName)
|| nameof(ModelFactorStorageVolume).Equals(propertyName)
- || nameof(ModelFactorSubCriticalFlow).Equals(propertyName)
|| nameof(ModelFactorCollisionLoad).Equals(propertyName)
|| nameof(ModelFactorLoadEffect).Equals(propertyName);
}
@@ -199,20 +197,6 @@
}
[DynamicVisible]
- [PropertyOrder(modelFactorSubCriticalFlowPropertyIndex)]
- [TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))]
- [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_DisplayName))]
- [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.StructuresInputFailureMechanismContext_ModelFactorSubCriticalFlow_Description))]
- public VariationCoefficientNormalDistributionProperties ModelFactorSubCriticalFlow
- {
- get
- {
- return new VariationCoefficientNormalDistributionProperties(data.GeneralInput.ModelFactorSubCriticalFlow);
- }
- }
-
- [DynamicVisible]
[PropertyOrder(modelFactorCollisionLoadPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))]
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs
===================================================================
diff -u -r98544d1ded83f880238cb8e69f77b58ec1dbcc19 -racbfe5601241d7e7e0470194aab84b9425621d54
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision 98544d1ded83f880238cb8e69f77b58ec1dbcc19)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision acbfe5601241d7e7e0470194aab84b9425621d54)
@@ -41,12 +41,6 @@
StandardDeviation = (RoundedDouble) 0.2
};
- var modelFactorSubCriticalFlow = new VariationCoefficientNormalDistribution(2)
- {
- Mean = (RoundedDouble) 1,
- CoefficientOfVariation = (RoundedDouble) 0.1
- };
-
var modelFactorCollisionLoad = new VariationCoefficientNormalDistribution(1)
{
Mean = (RoundedDouble) 1,
@@ -70,7 +64,6 @@
Assert.AreEqual(9.81, inputParameters.GravitationalAcceleration, inputParameters.GravitationalAcceleration.GetAccuracy());
DistributionAssert.AreEqual(modelFactorStorageVolume, inputParameters.ModelFactorStorageVolume);
- DistributionAssert.AreEqual(modelFactorSubCriticalFlow, inputParameters.ModelFactorSubCriticalFlow);
DistributionAssert.AreEqual(modelFactorCollisionLoad, inputParameters.ModelFactorCollisionLoad);
DistributionAssert.AreEqual(modelFactorLoadEffect, inputParameters.ModelFactorLoadEffect);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r542e6889ed73c6d8a1947a0135abe955c0910037 -racbfe5601241d7e7e0470194aab84b9425621d54
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 542e6889ed73c6d8a1947a0135abe955c0910037)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision acbfe5601241d7e7e0470194aab84b9425621d54)
@@ -87,8 +87,6 @@
Assert.AreEqual(generalInput.GravitationalAcceleration, properties.GravitationalAcceleration);
Assert.AreEqual(generalInput.ModelFactorStorageVolume.Mean, properties.ModelFactorStorageVolume.Mean);
Assert.AreEqual(generalInput.ModelFactorStorageVolume.StandardDeviation, properties.ModelFactorStorageVolume.StandardDeviation);
- Assert.AreEqual(generalInput.ModelFactorSubCriticalFlow.Mean, properties.ModelFactorSubCriticalFlow.Mean);
- Assert.AreEqual(generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, properties.ModelFactorSubCriticalFlow.CoefficientOfVariation);
Assert.AreEqual(generalInput.ModelFactorCollisionLoad.Mean, properties.ModelFactorCollisionLoad.Mean);
Assert.AreEqual(generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, properties.ModelFactorCollisionLoad.CoefficientOfVariation);
Assert.AreEqual(generalInput.ModelFactorLoadEffect.Mean, properties.ModelFactorLoadEffect.Mean);
@@ -316,7 +314,6 @@
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.N)));
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.GravitationalAcceleration)));
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume)));
- Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorSubCriticalFlow)));
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorCollisionLoad)));
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorLoadEffect)));