Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r7f4ee0fa245a18426c81c11c8f9ea18e73e42d07
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 7f4ee0fa245a18426c81c11c8f9ea18e73e42d07)
@@ -19,7 +19,6 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System;
using Core.Common.Base;
using Core.Common.Base.Data;
using Ringtoets.Common.Data.Calculation;
@@ -34,7 +33,6 @@
public class HeightStructuresInput : Observable, ICalculationInput
{
private readonly NormalDistribution levelOfCrestOfStructure;
- private readonly GeneralHeightStructuresInput generalInputParameters;
private readonly NormalDistribution modelFactorOvertoppingSuperCriticalFlow;
private readonly LogNormalDistribution allowableIncreaseOfLevelForStorage;
private readonly LogNormalDistribution storageStructureArea;
@@ -49,16 +47,8 @@
///
/// Creates a new instance of the class.
///
- /// General height structures calculation input parameters that apply to each calculation.
- /// When is null.
- public HeightStructuresInput(GeneralHeightStructuresInput generalInputParameters)
+ public HeightStructuresInput()
{
- if (generalInputParameters == null)
- {
- throw new ArgumentNullException("generalInputParameters");
- }
- this.generalInputParameters = generalInputParameters;
-
levelOfCrestOfStructure = new NormalDistribution(2)
{
StandardDeviation = (RoundedDouble) 0.05
@@ -300,53 +290,5 @@
}
#endregion
-
- #region General input parameters
-
- ///
- /// Gets the gravitational acceleration.
- ///
- public RoundedDouble GravitationalAcceleration
- {
- get
- {
- return generalInputParameters.GravitationalAcceleration;
- }
- }
-
- ///
- /// Gets the model factor overtopping flow.
- ///
- public LogNormalDistribution ModelFactorOvertoppingFlow
- {
- get
- {
- return generalInputParameters.ModelFactorOvertoppingFlow;
- }
- }
-
- ///
- /// Gets the model factor for storage volume.
- ///
- public LogNormalDistribution ModelFactorForStorageVolume
- {
- get
- {
- return generalInputParameters.ModelFactorForStorageVolume;
- }
- }
-
- ///
- /// Gets the model factor for incoming flow volume.
- ///
- public RoundedDouble ModelFactorForIncomingFlowVolume
- {
- get
- {
- return generalInputParameters.ModelFactorForIncomingFlowVolume;
- }
- }
-
- #endregion
}
}
\ No newline at end of file