Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r69252f8c0e925637e9978bcf127dc32193efc6b3 -rd6fd6d35d668c6d15e3e45480150b8d02f4288ab
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 69252f8c0e925637e9978bcf127dc32193efc6b3)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision d6fd6d35d668c6d15e3e45480150b8d02f4288ab)
@@ -114,7 +114,7 @@
&& TrySetVerticalDistance(readCalculation, calculation)
&& readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile, calculation.Name, Log))
{
- SetsFactorStormDurationOpenStructure(readCalculation, calculation);
+ SetFactorStormDurationOpenStructure(readCalculation, calculation);
SetVolumicWeightWater(readCalculation, calculation);
ReadWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
return calculation;
@@ -130,7 +130,7 @@
/// false when the evaluation level is invalid or when there is an
/// evaluation level but no structure defined, true otherwise.
private bool TrySetEvaluationLevel(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.EvaluationLevel.HasValue)
{
@@ -150,7 +150,7 @@
}
private bool TrySetStochasts(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (!readCalculation.ValidateStructureBaseStochasts(Log))
{
@@ -161,135 +161,137 @@
return false;
}
+ string calculationName = calculation.Name;
+ StabilityPointStructuresInput input = calculation.InputParameters;
return TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.AllowedLevelIncreaseStorage,
i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d)
&& TryReadStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.AreaFlowApertures,
i => i.AreaFlowApertures, (i, d) => i.AreaFlowApertures = d)
&& TryReadStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.BankWidthStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.BankWidth,
i => i.BankWidth, (i, d) => i.BankWidth = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.CriticalOvertoppingDischarge,
i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d)
&& TryReadStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.DrainCoefficient,
i => i.DrainCoefficient, (i, d) => i.DrainCoefficient = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.FailureCollisionEnergyStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.FailureCollisionEnergy,
i => i.FailureCollisionEnergy, (i, d) => i.FailureCollisionEnergy = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.FlowVelocityStructureClosable,
i => i.FlowVelocityStructureClosable, (i, d) => i.FlowVelocityStructureClosable = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.FlowWidthAtBottomProtection,
i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d)
&& TryReadStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.InsideWaterLevelStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.InsideWaterLevel,
i => i.InsideWaterLevel, (i, d) => i.InsideWaterLevel = d)
&& TryReadStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.InsideWaterLevelFailureConstructionStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.InsideWaterLevelFailureConstruction,
i => i.InsideWaterLevelFailureConstruction, (i, d) => i.InsideWaterLevelFailureConstruction = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ModelFactorSuperCriticalFlow,
i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d)
&& TryReadStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.LevelCrestStructureStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.LevelCrestStructure,
i => i.LevelCrestStructure, (i, d) => i.LevelCrestStructure = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthLinearLoadModelStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ConstructiveStrengthLinearLoadModel,
i => i.ConstructiveStrengthLinearLoadModel, (i, d) => i.ConstructiveStrengthLinearLoadModel = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthQuadraticLoadModelStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ConstructiveStrengthQuadraticLoadModel,
i => i.ConstructiveStrengthQuadraticLoadModel, (i, d) => i.ConstructiveStrengthQuadraticLoadModel = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ShipMassStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ShipMass,
i => i.ShipMass, (i, d) => i.ShipMass = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ShipVelocityStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ShipVelocity,
i => i.ShipVelocity, (i, d) => i.ShipVelocity = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.StabilityLinearLoadModelStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StabilityLinearLoadModel,
i => i.StabilityLinearLoadModel, (i, d) => i.StabilityLinearLoadModel = d)
&& TryReadVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.StabilityQuadraticLoadModelStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StabilityQuadraticLoadModel,
i => i.StabilityQuadraticLoadModel, (i, d) => i.StabilityQuadraticLoadModel = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StorageStructureArea,
i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StormDurationStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StormDuration,
i => i.StormDuration, (i, d) => i.StormDuration = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
&& TryReadStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ThresholdHeightOpenWeirStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ThresholdHeightOpenWeir,
i => i.ThresholdHeightOpenWeir, (i, d) => i.ThresholdHeightOpenWeir = d);
}
@@ -320,8 +322,8 @@
/// The calculation to configure.
/// false when the structure normal orientation is invalid or when there
/// is a structure normal orientation but no structure defined, true otherwise.
- private bool TrySetStructureNormalOrientation(StructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ private bool TrySetStructureNormalOrientation(StructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.StructureNormalOrientation.HasValue)
{
@@ -363,7 +365,7 @@
/// false when the failure probability repair closure is invalid or when there
/// is a failure probability repair closure but no structure defined, true otherwise.
private bool TrySetFailureProbabilityRepairClosure(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (!readCalculation.FailureProbabilityRepairClosure.HasValue)
{
@@ -407,7 +409,7 @@
/// false when the orientation is invalid or when there is a failure probability
/// structure with erosion but no structure defined, true otherwise.
private bool TrySetFailureProbabilityStructureWithErosion(StructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.FailureProbabilityStructureWithErosion.HasValue)
{
@@ -442,7 +444,7 @@
/// when there is a probability collision secondary structure but no structure defined,
/// true otherwise.
private bool TrySetProbabilityCollisionSecondaryStructure(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.ProbabilityCollisionSecondaryStructure.HasValue)
{
@@ -482,21 +484,22 @@
///
/// The calculation read from the imported file.
/// The calculation to configure.
- private void SetsFactorStormDurationOpenStructure(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ private void SetFactorStormDurationOpenStructure(StabilityPointStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.FactorStormDurationOpenStructure.HasValue)
{
calculation.InputParameters.FactorStormDurationOpenStructure = (RoundedDouble) readCalculation.FactorStormDurationOpenStructure.Value;
}
}
+
///
/// Sets the volumic weight water.
///
/// The calculation read from the imported file.
/// The calculation to configure.
private void SetVolumicWeightWater(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.VolumicWeightWater.HasValue)
{
@@ -512,7 +515,7 @@
/// false when the inflow model type is invalid or when there is a
/// inflow model type but no structure defined, true otherwise.
private bool TrySetInflowModelType(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.InflowModelType.HasValue)
{
@@ -541,7 +544,7 @@
/// false when the load schematization type is invalid or when there is a
/// load schematization type but no structure defined, true otherwise.
private bool TrySetLoadSchematizationType(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.LoadSchematizationType.HasValue)
{
@@ -563,14 +566,14 @@
}
///
- /// Sets the leveling count.
+ /// Sets the levelling count.
///
/// The calculation read from the imported file.
/// The calculation to configure.
- /// false when the leveling count is invalid or when there is a
- /// leveling count but no structure defined, true otherwise.
+ /// false when the levelling count is invalid or when there is a
+ /// levelling count but no structure defined, true otherwise.
private bool TrySetLevellingCount(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.LevellingCount.HasValue)
{
@@ -597,7 +600,7 @@
/// false when the vertical distance is invalid or when there is a
/// vertical distance but no structure defined, true otherwise.
private bool TrySetVerticalDistance(StabilityPointStructuresCalculationConfiguration readCalculation,
- StructuresCalculation calculation)
+ StructuresCalculation calculation)
{
if (readCalculation.VerticalDistance.HasValue)
{