Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2168 -r2190
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2168)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2190)
@@ -715,6 +715,7 @@
location.IsUseOriginalPLLineAssignments = locationRecord.UseOriginalPllineAssignments.GetValueOrDefault(location.IsUseOriginalPLLineAssignments);
location.PenetrationLength = locationRecord.PenetrationLength.GetValueOrDefault(location.PenetrationLength);
location.TrafficLoad = locationRecord.TrafficLoad.GetValueOrDefault(location.TrafficLoad);
+ location.TL_DegreeOfConsolidation = locationRecord.TL_DegreeOfConsolidation.GetValueOrDefault(location.TL_DegreeOfConsolidation);
location.PLLineCreationMethod = locationRecord.PLLineCreationMethod.GetValueOrDefault(location.PLLineCreationMethod);
location.PlLineOffsetBelowDikeTopAtRiver = locationRecord.PLLineOffsetBelowDikeTopAtRiver.GetValueOrDefault(location.PlLineOffsetBelowDikeTopAtRiver);
location.PlLineOffsetBelowDikeTopAtPolder = locationRecord.PLLineOffsetBelowDikeTopAtPolder.GetValueOrDefault(location.PlLineOffsetBelowDikeTopAtPolder);
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2168 -r2190
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2168)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 2190)
@@ -335,11 +335,11 @@
using (var writer = File.CreateText(importFile))
{
writer.WriteLine(
- "location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;DikeTableHeight;SlopeDampingPiezometricHeightPolderSide;StabilityDesignMethod;SlopeAdaptionStartCotangent;SlopeAdaptionEndCotangent;SlopeAdaptionStepCotangent; UseNewDikeTopWidth; NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;newSlopeAngleDitch;NewDepthDitch;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth;PLLineOffsetBelowDikeCrestMiddle;PLLineOffsetFactorBelowShoulderCrest;UsePLLineOffsetDryBelowDikeCrestMiddle;PLLineOffsetDryBelowDikeCrestMiddle;UsePLLineOffsetDryFactorBelowShoulderCrest;PLLineOffsetDryFactorBelowShoulderCrest;IntrusionVerticalWaterPressure");
+ "location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;DikeTableHeight;SlopeDampingPiezometricHeightPolderSide;StabilityDesignMethod;SlopeAdaptionStartCotangent;SlopeAdaptionEndCotangent;SlopeAdaptionStepCotangent; UseNewDikeTopWidth; NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;newSlopeAngleDitch;NewDepthDitch;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth;PLLineOffsetBelowDikeCrestMiddle;PLLineOffsetFactorBelowShoulderCrest;UsePLLineOffsetDryBelowDikeCrestMiddle;PLLineOffsetDryBelowDikeCrestMiddle;UsePLLineOffsetDryFactorBelowShoulderCrest;PLLineOffsetDryFactorBelowShoulderCrest;IntrusionVerticalWaterPressure;TL_DegreeOfConsolidation");
writer.WriteLine(
- "16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0.9;0.2;13.056;0.9;0.8;1;1;klei;klei2;1;2;3;12;TRUE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.01;OptimizedSlopeAndShoulderAdaption;3.0;6.0;0.5;TRUE;1.8;TRUE;1.9;TRUE;2.9;TRUE;2.8;TRUE;2.7;TRUE;0.6;TRUE;2.6;TRUE;1.1;1.2;1.3;ZoneAreas;0.5;1.6;1.0;0.1;TRUE;1.1;FALSE;0.11;Standard");
+ "16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0.9;0.2;13.056;0.9;0.8;1;1;klei;klei2;1;2;3;12;TRUE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.01;OptimizedSlopeAndShoulderAdaption;3.0;6.0;0.5;TRUE;1.8;TRUE;1.9;TRUE;2.9;TRUE;2.8;TRUE;2.7;TRUE;0.6;TRUE;2.6;TRUE;1.1;1.2;1.3;ZoneAreas;0.5;1.6;1.0;0.1;TRUE;1.1;FALSE;0.11;Standard;10.1");
writer.WriteLine(
- "25-2-2-A-1-A;25-2-2-A-1-A;106;66586;424173;2;25-2-2-A-1-A;-0.25;-0.25;0.8727;-0.25;-0.25;1;1;klei;klei2;1;2;3;12;FALSE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.2;SlopeAdaptionBeforeShoulderAdaption;4.5;6.5;0.25;FALSE;0.8;FALSE;0.9;FALSE;1.9;FALSE;1.8;FALSE;1.7;FALSE;0.7;FALSE;1.6;FALSE;1.4;1.5;1.6;ForbiddenZone;0.9;2.1; 1.1;0.11;FALSE; 1.0;TRUE;0.1;SemiTimeDependent");
+ "25-2-2-A-1-A;25-2-2-A-1-A;106;66586;424173;2;25-2-2-A-1-A;-0.25;-0.25;0.8727;-0.25;-0.25;1;1;klei;klei2;1;2;3;12;FALSE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.2;SlopeAdaptionBeforeShoulderAdaption;4.5;6.5;0.25;FALSE;0.8;FALSE;0.9;FALSE;1.9;FALSE;1.8;FALSE;1.7;FALSE;0.7;FALSE;1.6;FALSE;1.4;1.5;1.6;ForbiddenZone;0.9;2.1; 1.1;0.11;FALSE; 1.0;TRUE;0.1;SemiTimeDependent;55.5");
}
}
@@ -705,6 +705,8 @@
Assert.AreEqual(false, locationRecords[1].UseOriginalPllineAssignments);
Assert.AreEqual(1.3, locationRecords[1].PenetrationLength, tolerance);
Assert.AreEqual(10, locationRecords[1].TrafficLoad, tolerance);
+ Assert.AreEqual(10.1, locationRecords[0].TL_DegreeOfConsolidation, tolerance);
+ Assert.AreEqual(55.5, locationRecords[1].TL_DegreeOfConsolidation, tolerance);
Assert.AreEqual(1.5, locationRecords[1].MinimalCircleDepth, tolerance);
Assert.AreEqual(30.0, locationRecords[1].DempingsfactorPl3, tolerance);
Assert.AreEqual(40.0, locationRecords[1].DempingsfactorPl4, tolerance);
@@ -1117,6 +1119,7 @@
Assert.AreEqual(false, location.IsUseOriginalPLLineAssignments);
Assert.AreEqual(1.3, location.PenetrationLength, tolerance);
Assert.AreEqual(10, location.TrafficLoad, tolerance);
+ Assert.AreEqual(22.44, location.TL_DegreeOfConsolidation, tolerance);
Assert.AreEqual(1.5, location.MinimalCircleDepth, tolerance);
Assert.AreEqual(0.3, location.DampingFactorPL3, tolerance);
Assert.AreEqual(0.4, location.DampingFactorPL4, tolerance);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
===================================================================
diff -u -r2135 -r2190
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2135)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs (.../EntityFactory.cs) (revision 2190)
@@ -300,6 +300,7 @@
Location location1 = new Location();
location1.PenetrationLength = 1.0;
location1.TrafficLoad = 13.0;
+ location1.TL_DegreeOfConsolidation = 14.1;
location1.DampingFactorPL3 = 0.3;
location1.DampingFactorPL4 = 0.4;
location1.PL1Line = pL1Line;
@@ -327,6 +328,7 @@
location1.IntrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.FullHydroStatic;
location1.PenetrationLength = 3.6;
location1.TrafficLoad = 3.7;
+ location1.TL_DegreeOfConsolidation = 3.8;
location1.MinimalCircleDepth = 1.11;
location1.LevelReductionInside = 1.12;
location1.LevelReductionOutside = 1.13;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2168 -r2190
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2168)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2190)
@@ -40,7 +40,6 @@
using Deltares.Standard.Attributes;
using Deltares.Standard.EventPublisher;
using Deltares.Standard.Language;
-using Deltares.Standard.Reflection;
using Deltares.Standard.Units;
using Deltares.Standard.Validation;
@@ -69,6 +68,7 @@
public const string IsUseOriginalPLLineAssignments = "IsUseOriginalPLLineAssignments";
public const string PenetrationLength = "PenetrationLength";
public const string TrafficLoad = "TrafficLoad";
+ public const string TL_DegreeOfConsolidation = "TL_DegreeOfConsolidation";
public const string PLLineCreationMethod = "PLLineCreationMethod";
public const string PLLineOffsetBelowDikeTopAtRiver = "PLLineOffsetBelowDikeTopAtRiver";
public const string PLLineOffsetBelowDikeTopAtPolder = "PLLineOffsetBelowDikeTopAtPolder";
@@ -211,6 +211,7 @@
private SurfaceLine2 surfaceLine2;
private string surfaceLineId = "";
private double trafficLoad = 0;
+ private double degreeOfConsolidation = 0;
private bool useNewDikeSlopeInside;
private bool useNewDikeSlopeOutside;
private bool useNewDikeTopWidth;
@@ -437,6 +438,26 @@
}
}
+ [Unit(UnitType.Percentage)]
+ [Label("Degree of consolidation")]
+ [Description("Degree of consolidation")]
+ [Format("F3")]
+ [Category(DikeCategory)]
+ [PropertyOrder(1, 21)]
+ public virtual double TL_DegreeOfConsolidation
+ {
+ get
+ {
+ return degreeOfConsolidation;
+ }
+ set
+ {
+ DataEventPublisher.BeforeChange(this, "TL_DegreeOfConsolidation");
+ degreeOfConsolidation = value;
+ DataEventPublisher.AfterChange(this, "TL_DegreeOfConsolidation");
+ }
+ }
+
[Browsable(false)]
public virtual bool IsUseOriginalPLLineAssignments
{
@@ -2303,6 +2324,7 @@
nameValuePairs.Add(LocationParameterNames.StabilitySlopeAdaptionDeltaX, StabilitySlopeAdaptionDeltaX.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.IsUseOriginalPLLineAssignments, IsUseOriginalPLLineAssignments.ToString());
nameValuePairs.Add(LocationParameterNames.TrafficLoad, TrafficLoad.ToString(numberFormatInfo));
+ nameValuePairs.Add(LocationParameterNames.TL_DegreeOfConsolidation, TL_DegreeOfConsolidation.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.MinimalCircleDepth, MinimalCircleDepth.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.LevelReductionInside, LevelReductionInside.ToString(numberFormatInfo));
nameValuePairs.Add(LocationParameterNames.LevelReductionOutside, LevelReductionOutside.ToString(numberFormatInfo));
@@ -2700,6 +2722,10 @@
{
TrafficLoad = Convert.ToDouble(parameterValue, numberFormatInfo);
}
+ if (parameterName.Equals(LocationParameterNames.TL_DegreeOfConsolidation))
+ {
+ TL_DegreeOfConsolidation = Convert.ToDouble(parameterValue, numberFormatInfo);
+ }
if (parameterName.Equals(LocationParameterNames.MinimalCircleDepth))
{
MinimalCircleDepth = Convert.ToDouble(parameterValue, numberFormatInfo);
@@ -2949,6 +2975,8 @@
return true;
case "TrafficLoad":
return true;
+ case "TL_DegreeOfConsolidation":
+ return true;
case "PolderLevel":
return true;
case "HeadPL2":
Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs
===================================================================
diff -u -r2088 -r2190
--- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 2088)
+++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 2190)
@@ -52,6 +52,8 @@
this.LoadGroupControl = new DevExpress.XtraEditors.GroupControl();
this.TrafficLoadEdit = new DevExpress.XtraEditors.SpinEdit();
this.TrafficLoadLabel = new DevExpress.XtraEditors.LabelControl();
+ this.TL_DegreeOfConsolidationEdit = new DevExpress.XtraEditors.SpinEdit();
+ this.TL_DegreeOfConsolidationLabel = new DevExpress.XtraEditors.LabelControl();
this.IdentificationGroupControl = new DevExpress.XtraEditors.GroupControl();
this.DikeEdit = new DevExpress.XtraEditors.TextEdit();
this.DikeLabel = new DevExpress.XtraEditors.LabelControl();
@@ -100,6 +102,7 @@
((System.ComponentModel.ISupportInitialize)(this.LoadGroupControl)).BeginInit();
this.LoadGroupControl.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TrafficLoadEdit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.TL_DegreeOfConsolidationEdit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.IdentificationGroupControl)).BeginInit();
this.IdentificationGroupControl.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DikeEdit.Properties)).BeginInit();
@@ -136,10 +139,12 @@
//
this.LoadGroupControl.Controls.Add(this.TrafficLoadEdit);
this.LoadGroupControl.Controls.Add(this.TrafficLoadLabel);
+ this.LoadGroupControl.Controls.Add(this.TL_DegreeOfConsolidationEdit);
+ this.LoadGroupControl.Controls.Add(this.TL_DegreeOfConsolidationLabel);
this.LoadGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
this.LoadGroupControl.Location = new System.Drawing.Point(0, 155);
this.LoadGroupControl.Name = "LoadGroupControl";
- this.LoadGroupControl.Size = new System.Drawing.Size(287, 67);
+ this.LoadGroupControl.Size = new System.Drawing.Size(287, 93);
this.LoadGroupControl.TabIndex = 13;
this.LoadGroupControl.Text = "Load";
//
@@ -153,7 +158,7 @@
0,
0});
this.TrafficLoadEdit.EnterMoveNextControl = true;
- this.TrafficLoadEdit.Location = new System.Drawing.Point(154, 35);
+ this.TrafficLoadEdit.Location = new System.Drawing.Point(154, 61);
this.TrafficLoadEdit.Name = "TrafficLoadEdit";
this.TrafficLoadEdit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
this.TrafficLoadEdit.Properties.EditFormat.FormatString = "F3";
@@ -171,6 +176,34 @@
this.TrafficLoadLabel.TabIndex = 8;
this.TrafficLoadLabel.Text = "Traffic load";
//
+ // TL_DegreeOfConsolidationEdit
+ //
+ this.TL_DegreeOfConsolidationEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.TL_DegreeOfConsolidationEdit.EditValue = new decimal(new int[] {
+ 0,
+ 0,
+ 0,
+ 0});
+ this.TL_DegreeOfConsolidationEdit.EnterMoveNextControl = true;
+ this.TL_DegreeOfConsolidationEdit.Location = new System.Drawing.Point(154, 35);
+ this.TL_DegreeOfConsolidationEdit.Name = "TL_DegreeOfConsolidationEdit";
+ this.TL_DegreeOfConsolidationEdit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+ this.TL_DegreeOfConsolidationEdit.Properties.EditFormat.FormatString = "F3";
+ this.TL_DegreeOfConsolidationEdit.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+ this.TL_DegreeOfConsolidationEdit.Properties.HideSelection = false;
+ this.TL_DegreeOfConsolidationEdit.Properties.ValidateOnEnterKey = true;
+ this.TL_DegreeOfConsolidationEdit.Size = new System.Drawing.Size(119, 20);
+ this.TL_DegreeOfConsolidationEdit.TabIndex = 9;
+ //
+ // TL_DegreeOfConsolidationLabel
+ //
+ this.TL_DegreeOfConsolidationLabel.Location = new System.Drawing.Point(12, 64);
+ this.TL_DegreeOfConsolidationLabel.Name = "TL_DegreeOfConsolidationLabel";
+ this.TL_DegreeOfConsolidationLabel.Size = new System.Drawing.Size(113, 13);
+ this.TL_DegreeOfConsolidationLabel.TabIndex = 8;
+ this.TL_DegreeOfConsolidationLabel.Text = "Degree of consolidation";
+ //
// IdentificationGroupControl
//
this.IdentificationGroupControl.Controls.Add(this.DikeEdit);
@@ -287,7 +320,7 @@
this.PiezometricGroupControl.Controls.Add(this.HeadPL2Edit);
this.PiezometricGroupControl.Controls.Add(this.HeadPL2Label);
this.PiezometricGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
- this.PiezometricGroupControl.Location = new System.Drawing.Point(0, 394);
+ this.PiezometricGroupControl.Location = new System.Drawing.Point(0, 420);
this.PiezometricGroupControl.Name = "PiezometricGroupControl";
this.PiezometricGroupControl.Size = new System.Drawing.Size(287, 111);
this.PiezometricGroupControl.TabIndex = 48;
@@ -390,7 +423,7 @@
this.DesignGroupControl.Controls.Add(this.StabilityShoulderGrowSlopeEdit);
this.DesignGroupControl.Controls.Add(this.StabilityShoulderGrowSlopeLabel);
this.DesignGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
- this.DesignGroupControl.Location = new System.Drawing.Point(0, 615);
+ this.DesignGroupControl.Location = new System.Drawing.Point(0, 641);
this.DesignGroupControl.Name = "DesignGroupControl";
this.DesignGroupControl.Size = new System.Drawing.Size(287, 172);
this.DesignGroupControl.TabIndex = 51;
@@ -523,7 +556,7 @@
this.CalculationGroupControl.Controls.Add(this.ZoneEdit);
this.CalculationGroupControl.Controls.Add(this.ZoneLabel);
this.CalculationGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
- this.CalculationGroupControl.Location = new System.Drawing.Point(0, 505);
+ this.CalculationGroupControl.Location = new System.Drawing.Point(0, 531);
this.CalculationGroupControl.Name = "CalculationGroupControl";
this.CalculationGroupControl.Size = new System.Drawing.Size(287, 110);
this.CalculationGroupControl.TabIndex = 52;
@@ -603,7 +636,7 @@
this.WaterLevelGroup.Controls.Add(this.BoezemLevelTpEdit);
this.WaterLevelGroup.Controls.Add(this.BoezemLevelTpLabel);
this.WaterLevelGroup.Dock = System.Windows.Forms.DockStyle.Top;
- this.WaterLevelGroup.Location = new System.Drawing.Point(0, 222);
+ this.WaterLevelGroup.Location = new System.Drawing.Point(0, 248);
this.WaterLevelGroup.Name = "WaterLevelGroup";
this.WaterLevelGroup.Size = new System.Drawing.Size(287, 172);
this.WaterLevelGroup.TabIndex = 53;
@@ -765,6 +798,7 @@
this.LoadGroupControl.ResumeLayout(false);
this.LoadGroupControl.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.TrafficLoadEdit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.TL_DegreeOfConsolidationEdit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.IdentificationGroupControl)).EndInit();
this.IdentificationGroupControl.ResumeLayout(false);
this.IdentificationGroupControl.PerformLayout();
@@ -834,6 +868,8 @@
private DevExpress.XtraEditors.LabelControl DikeEmbankmentMaterialLabel;
private DevExpress.XtraEditors.SpinEdit TrafficLoadEdit;
private DevExpress.XtraEditors.LabelControl TrafficLoadLabel;
+ private DevExpress.XtraEditors.SpinEdit TL_DegreeOfConsolidationEdit;
+ private DevExpress.XtraEditors.LabelControl TL_DegreeOfConsolidationLabel;
private DevExpress.XtraEditors.GroupControl CalculationGroupControl;
private DevExpress.XtraEditors.LabelControl ZoneLabel;
private DevExpress.XtraEditors.ComboBoxEdit ZoneEdit;
Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs
===================================================================
diff -u -r2144 -r2190
--- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 2144)
+++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 2190)
@@ -49,6 +49,7 @@
BindSupport.BindTextValueAndUnit(this, this.HeadPL4Label, this.HeadPL4Edit, typeof (Location), "HeadPl4");
BindSupport.BindTextValueAndUnit(this, this.TrafficLoadLabel, this.TrafficLoadEdit, typeof (Location), "TrafficLoad");
+ BindSupport.BindTextValueAndUnit(this, this.TL_DegreeOfConsolidationLabel, this.TL_DegreeOfConsolidationEdit, typeof(Location), "TL_DegreeOfConsolidation");
BindSupport.BindTextAndValue(this, this.DikeEmbankmentMaterialLabel, this.DikeEmbankmentMaterialEdit, typeof (Location), "DikeEmbankmentMaterial");
BindSupport.BindTextAndValue(this, this.ShoulderEmbankmentMaterialLabel, this.ShoulderEmbankmentMaterialEdit, typeof (Location), "ShoulderEmbankmentMaterial");
BindSupport.BindTextValueAndUnit(this, this.StabilityShoulderGrowSlopeLabel, this.StabilityShoulderGrowSlopeEdit, typeof (Location), "StabilityShoulderGrowSlope");
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u -r2168 -r2190
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2168)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2190)
@@ -168,6 +168,16 @@
///
+ /// TL_DegreeOfConsolidation
+ /// CustomShape
+ /// TL_DegreeOfConsolidation.shp
+ /// TL_DegOfCo
+ /// double
+ ///
+ public const string TL_DegreeOfConsolidationAttributeId = LocationCsvColumnNames.TL_DegreeOfConsolidationColumnName;
+
+
+ ///
/// PLLineCreationMethod
/// CustomShape
/// PLLineCreationMethod.shp
@@ -703,6 +713,7 @@
createItem(ProbabilityOfFailureStabilityOuterSlopeAttributeId, "probability_of_failure_stability_outerslope.shp", "probstabo", (t, value) => t.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope = value.ToType()),
createItem(ProbabilityOfFailurePipingAttributeId, "probability_of_failure_piping.shp", "probpiping", (t, value) => t.ModelFactors.RequiredProbabilityOfFailurePiping = value.ToType()),
createItem(TrafficLoadAttributeId, "trafficload.shp", "TrafLoad", (t, value) => t.TrafficLoad = value.ToType() ),
+ createItem(TL_DegreeOfConsolidationAttributeId, "TL_DegreeOfConsolidation.shp", "TL_DegOfCo", (t, value) => t.TrafficLoad = value.ToType() ),
createItem(SafetyFactorPipingAttributeId, "safety_factor_piping.shp", "fpiping", (t, value) => t.ModelFactors.RequiredSafetyFactorPiping = value.ToType()),
createItem(SafetyFactorStabilityInnerSlopeAttributeId, "safety_factor_stability_inner_slope.shp", "fstabinner", (t, value) => t.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = value.ToType()),
createItem(SafetyFactorStabilityOuterSlopeAttributeId, "safety_factor_stability_outer_slope.shp", "fstabouter", (t, value) => t.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = value.ToType()),
Index: DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs
===================================================================
diff -u -r2135 -r2190
--- DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2135)
+++ DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2190)
@@ -58,6 +58,7 @@
const bool areLocalXzObjectsCreated = false;
const double penetrationLength = 0.0;
const double trafficLoad = 0.0;
+ const double tL_DegreeOfConsolidation = 0.0;
const PLLineCreationMethod plLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD;
const double plLineOffsetBelowDikeTopAtRiver = 0.5;
const double plLineOffsetBelowDikeTopAtPolder = 1.5;
@@ -74,6 +75,7 @@
Assert.AreEqual(areLocalXzObjectsCreated, actualLocation.AreLocalXZObjectsCreated);
Assert.AreEqual(penetrationLength, actualLocation.PenetrationLength);
Assert.AreEqual(trafficLoad, actualLocation.TrafficLoad);
+ Assert.AreEqual(tL_DegreeOfConsolidation, actualLocation.TL_DegreeOfConsolidation);
Assert.AreEqual(plLineCreationMethod, actualLocation.PLLineCreationMethod);
Assert.AreEqual(plLineOffsetBelowDikeTopAtRiver, actualLocation.PlLineOffsetBelowDikeTopAtRiver);
Assert.AreEqual(plLineOffsetBelowDikeTopAtPolder, actualLocation.PlLineOffsetBelowDikeTopAtPolder);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs
===================================================================
diff -u -r2163 -r2190
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs (.../LocationCsvColumnNames.cs) (revision 2163)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs (.../LocationCsvColumnNames.cs) (revision 2190)
@@ -136,6 +136,11 @@
public const string TrafficLoadColumnName = "TrafficLoad";
///
+ /// TrafficLoad
+ ///
+ public const string TL_DegreeOfConsolidationColumnName = "TL_DegreeOfConsolidation";
+
+ ///
/// PLLineCreationMethod
///
public const string PlLineCreationMethodColumnName = "PLLineCreationMethod";
Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv
===================================================================
diff -u -r875 -r2190
--- DamClients/DamUI/trunk/src/Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv (.../branches/CalcualtionIncluded/src/Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv) (revision 875)
+++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv (.../trunk/src/Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv) (revision 2190)
@@ -1,3 +1,3 @@
-location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;DikeTableHeight
-16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0,9;0,2;13,056;0,9;0,8;1;1;klei;klei2;1;2;3;12;TRUE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;3,5
-25-2-2-A-1-A;25-2-2-A-1-A;106;66586;424173;2;25-2-2-A-1-A;-0,25;-0,25;0,8727;-0,25;-0,25;1;1;klei;klei2;1;2;3;12;FALSE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;3,5
+location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;DikeTableHeight;TL_DegreeOfConsolidation
+16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0,9;0,2;13,056;0,9;0,8;1;1;klei;klei2;1;2;3;12;TRUE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;3,5;10,12
+25-2-2-A-1-A;25-2-2-A-1-A;106;66586;424173;2;25-2-2-A-1-A;-0,25;-0,25;0,8727;-0,25;-0,25;1;1;klei;klei2;1;2;3;12;FALSE;1,3;10;1,5;0,30;0,40;ExpertKnowledgeRRD;1;2;Uniform;0,1;1,2;1,3;1,4;0,01;0,02;0,03;1,1;1,2;klei;1,0;1,1;1,2;2,0;2,1;0,5;0,6;0,1;0,2;0,6;1,6;0,2;0,3;2,0;0,2;0,5;0,9;3,5;22,44
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r2168 -r2190
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2168)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 2190)
@@ -60,6 +60,7 @@
public bool? UseOriginalPllineAssignments { get; set; }
public double? PenetrationLength { get; set; }
public double? TrafficLoad { get; set; }
+ public double? TL_DegreeOfConsolidation { get; set; }
public double? MinimalCircleDepth { get; set; }
public double? DempingsfactorPl3 { get; set; }
public double? DempingsfactorPl4 { get; set; }
@@ -157,6 +158,7 @@
int colIndexUseOriginalPllineAssignments = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.UseOriginalPlLineAssignmentsColumnName);
int colIndexPenetrationLength = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.PenetrationLengthColumnName);
int colIndexTrafficLoad = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.TrafficLoadColumnName);
+ int colIndexTL_DegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.TL_DegreeOfConsolidationColumnName);
int colIndexMinimalCircleDepth = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.MinimalCircleDepthColumnName);
int colIndexDempingsfactorPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DampingFactorPl3ColumnName);
int colIndexDempingsfactorPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, LocationCsvColumnNames.DampingFactorPl4ColumnName);
@@ -312,6 +314,11 @@
colIndex = colIndexTrafficLoad;
locationRecord.TrafficLoad = Convert.ToDouble(csv[colIndexTrafficLoad]);
}
+ if (colIndexTL_DegreeOfConsolidation > -1)
+ {
+ colIndex = colIndexTL_DegreeOfConsolidation;
+ locationRecord.TL_DegreeOfConsolidation = Convert.ToDouble(csv[colIndexTL_DegreeOfConsolidation]);
+ }
if (colIndexMinimalCircleDepth > -1)
{
colIndex = colIndexMinimalCircleDepth;