Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r1545 -r1947
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 1545)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 1947)
@@ -80,8 +80,21 @@
         private double? sellmeijer4ForcesHCritical;
         private double? sellmeijerPipingFactor;
         private double? sellmeijerHCritical;
-        private double? wti2017PipingFactor;
-        private double? wti2017HCritical;
+        private double? wti2017BackwardErosionSafetyFactor;
+        private double? wti2017BackwardErosionHcritical;
+        private double? wti2017UpliftSafetyFactor;
+        private double? wti2017UpliftHcritical;
+        private double? wti2017BackwardErosionDeltaPhiC;
+        private double? wti2017BackwardErosionDeltaPhiReduced;
+        private double? wti2017UpliftDeltaPhiC;
+        private double? wti2017HeaveSafetyFactor;
+        private double? wti2017HeaveHcritical;
+        private double? wti2017Gradient;
+        private double? wti2017SafetyFactorOverall;
+        private double? wti2017HcriticalOverall;
+        private double? wti2017EffectiveStress;
+        private double? wti2017CCreep;
+
         private bool? isUplift;
         private double? pl3MinUplift;
         private double? pl3HeadAdjusted;
@@ -369,7 +382,7 @@
         }
 
         [Label("Message")]
-        [PropertyOrder(7,1)]
+        [PropertyOrder(8,1)]
         [ReadOnly(true)]
         public string ResultMessage
         {
@@ -1256,26 +1269,25 @@
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
-        //[Browsable(false)]
+        [PropertyOrder(6, 11)]
         public double? UpliftFactor
         {
             get { return upliftFactor; }
             set { upliftFactor = value; }
         }
 
-        [Label("Heave Factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
-        //[Browsable(false)]
+        [PropertyOrder(6, 12)]
+        [Browsable(false)]
         public double? HeaveFactor
         {
             get { return heaveFactor; }
             set { heaveFactor = value; }
         }
 
         [CsvExportColumn("BlighPipingFactor", 63)]
-        [Label("Bligh piping factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -1371,40 +1383,312 @@
         }
 
         /// <summary>
-        /// Gets or sets the wti2017 piping factor.
+        /// Gets or sets the wti2017 safety factor for backward erosion.
         /// </summary>
         /// <value>
-        /// The wti2017 piping factor.
+        /// The wti2017 safety factor.
         /// </value>
-        [Label("WTI 2017 piping factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
-        [Browsable(false)]
-        public double? Wti2017PipingFactor
+        [CsvExportColumn("Wti2017BackwardErosionSafetyFactor", 71)]
+        [PropertyOrder(7, 1)]
+        public double? Wti2017BackwardErosionSafetyFactor
         {
-            get { return wti2017PipingFactor; }
-            set { wti2017PipingFactor = value; }
+            get { return wti2017BackwardErosionSafetyFactor; }
+            set { wti2017BackwardErosionSafetyFactor = value; }
         }
 
         /// <summary>
-        /// Gets or sets the wti2017 h critical.
+        /// Gets or sets the wti2017 safety factor for Uplift.
         /// </summary>
         /// <value>
-        /// The wti2017 h critical.
+        /// The wti2017 safety factor for Uplift.
         /// </value>
-        [Label("WTI 2017 H Critical")]
         [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017UpliftSafetyFactor", 72)]
+        [PropertyOrder(7, 5)]
+        public double? Wti2017UpliftSafetyFactor
+        {
+            get
+            {
+                return wti2017UpliftSafetyFactor;
+            }
+            set
+            {
+                wti2017UpliftSafetyFactor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 safety factor heave.
+        /// </summary>
+        /// <value>
+        /// The wti2017 safety factor heave.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017HeaveSafetyFactor", 73)]
+        [PropertyOrder(7, 8)]
+        public double? Wti2017HeaveSafetyFactor
+        {
+            get
+            {
+                return wti2017HeaveSafetyFactor;
+            }
+            set
+            {
+                wti2017HeaveSafetyFactor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 safety factor overall (see MWDAM-1299).
+        /// </summary>
+        /// <value>
+        /// The wti2017 safety factor overall.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017SafetyFactorOverall", 74)]
+        [PropertyOrder(7, 11)]
+        public double? Wti2017SafetyFactorOverall
+        {
+            get
+            {
+                return wti2017SafetyFactorOverall;
+            }
+            set
+            {
+                wti2017SafetyFactorOverall = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel for backward erosion.
+        /// </summary>
+        /// <value>
+        /// The wti2017 critical waterlevel backward erosion.
+        /// </value>
+        [Format("F3")]
         [Unit(UnitType.Length)]
         [ReadOnly(true)]
-        [Browsable(false)]
-        public double? Wti2017HCritical
+        [CsvExportColumn("Wti2017BackwardErosionHcritical", 75)]
+        [PropertyOrder(7, 2)]
+        public double? Wti2017BackwardErosionHcritical
         {
-            get { return wti2017HCritical; }
-            set { wti2017HCritical = value; }
+            get { return wti2017BackwardErosionHcritical; }
+            set { wti2017BackwardErosionHcritical = value; }
         }
 
-        [CsvExportColumn("DikeToeAtRiverXrd", 79)]
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel for Uplift.
+        /// </summary>
+        /// <value>
+        /// The wti2017 hcritical uplift.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017UpliftHcritical", 76)]
+        [PropertyOrder(7, 6)]
+        public double? Wti2017UpliftHcritical
+        {
+            get
+            {
+                return wti2017UpliftHcritical;
+            }
+            set
+            {
+                wti2017UpliftHcritical = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel for Heave.
+        /// </summary>
+        /// <value>
+        /// The wti2017 hcritical heave.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017HeaveHcritical", 77)]
+        [PropertyOrder(7, 9)]
+        public double? Wti2017HeaveHcritical
+        {
+            get
+            {
+                return wti2017HeaveHcritical;
+            }
+            set
+            {
+                wti2017HeaveHcritical = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel overall (see MWDAM-1299).
+        /// </summary>
+        /// <value>
+        /// The wti2017 hcritical overall.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017HcriticalOverall", 78)]
+        [PropertyOrder(7, 12)]
+        public double? Wti2017HcriticalOverall
+        {
+            get
+            {
+                return wti2017HcriticalOverall;
+            }
+            set
+            {
+                wti2017HcriticalOverall = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 delta phi c be (backward erosion, critical head difference).
+        /// </summary>
+        /// <value>
+        /// The wti2017 delta phi c be.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017BackwardErosionDeltaPhiC", 79)]
+        [PropertyOrder(7, 3)]
+        public double? Wti2017BackwardErosionDeltaPhiC
+        {
+            get
+            {
+                return wti2017BackwardErosionDeltaPhiC;
+            }
+            set
+            {
+                wti2017BackwardErosionDeltaPhiC = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 delta phi c be (backward erosion, reduced head difference).
+        /// </summary>
+        /// <value>
+        /// The wti2017 delta phi c be.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017BackwardErosionDeltaPhiReduced", 80)]
+        [PropertyOrder(7, 4)]
+        public double? Wti2017BackwardErosionDeltaPhiReduced
+        {
+            get
+            {
+                return wti2017BackwardErosionDeltaPhiReduced;
+            }
+            set
+            {
+                wti2017BackwardErosionDeltaPhiReduced = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 delta phi cu (Uplift, critical head difference).
+        /// </summary>
+        /// <value>
+        /// The wti2017 delta phi cu.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017UpliftDeltaPhiC", 81)]
+        [PropertyOrder(7, 7)]
+        public double? Wti2017UpliftDeltaPhiC
+        {
+            get
+            {
+                return wti2017UpliftDeltaPhiC;
+            }
+            set
+            {
+                wti2017UpliftDeltaPhiC = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 gradient (vertical outflow gradient for Heave).
+        /// </summary>
+        /// <value>
+        /// The wti2017 gradient.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017Gradient", 82)]
+        [PropertyOrder(7, 10)]
+        public double? Wti2017Gradient
+        {
+            get
+            {
+                return wti2017Gradient;
+            }
+            set
+            {
+                wti2017Gradient = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the effective stress (at exit point, as calculated with Wti EffectiveThicknessCalculator).
+        /// </summary>
+        /// <value>
+        /// The effective stress.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Pressure)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017EffectiveStress", 83)]
+        [PropertyOrder(7, 13)]
+        public double? Wti2017EffectiveStress
+        {
+            get
+            {
+                return wti2017EffectiveStress;
+            }
+            set
+            {
+                wti2017EffectiveStress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 c creep (Creep coefficient).
+        /// </summary>
+        /// <value>
+        /// The wti2017 c creep.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017CCreep", 84)]
+        [PropertyOrder(7, 14)]
+        public double? Wti2017CCreep
+        {
+            get { return wti2017CCreep; }
+            set { wti2017CCreep = value; }
+        }
+
+
+
+        [CsvExportColumn("DikeToeAtRiverXrd", 85)]
         [Browsable(false)]
         public double? DikeToeAtRiverXrd
         {
@@ -1418,7 +1702,7 @@
             }
         }
 
-        [CsvExportColumn("DikeToeAtRiverYrd", 80)]
+        [CsvExportColumn("DikeToeAtRiverYrd", 86)]
         [Browsable(false)]
         public double? DikeToeAtRiverYrd
         {
@@ -1432,7 +1716,7 @@
             }
         }
 
-        [CsvExportColumn("DikeToeAtRiverZrd", 81)]
+        [CsvExportColumn("DikeToeAtRiverZrd", 87)]
         [Browsable(false)]
         public double? DikeToeAtRiverZrd
         {
@@ -1446,7 +1730,7 @@
             }
         }
 
-        [CsvExportColumn("DikeTopAtRiverXrd", 82)]
+        [CsvExportColumn("DikeTopAtRiverXrd", 88)]
         [Browsable(false)]
         public double? DikeTopAtRiverXrd
         {
@@ -1460,7 +1744,7 @@
             }
         }
 
-        [CsvExportColumn("DikeTopAtRiverYrd", 83)]
+        [CsvExportColumn("DikeTopAtRiverYrd", 89)]
         [Browsable(false)]
         public double? DikeTopAtRiverYrd
         {
@@ -1474,7 +1758,7 @@
             }
         }
 
-        [CsvExportColumn("DikeTopAtRiverZrd", 84)]
+        [CsvExportColumn("DikeTopAtRiverZrd", 90)]
         [Browsable(false)]
         public double? DikeTopAtRiverZrd
         {
@@ -1488,7 +1772,7 @@
             }
         }
 
-        [CsvExportColumn("DikeTopAtPolderXrd", 85)]
+        [CsvExportColumn("DikeTopAtPolderXrd", 91)]
         [Browsable(false)]
         public double? DikeTopAtPolderXrd
         {
@@ -1502,7 +1786,7 @@
             }
         }
 
-        [CsvExportColumn("DikeTopAtPolderYrd", 86)]
+        [CsvExportColumn("DikeTopAtPolderYrd", 92)]
         [Browsable(false)]
         public double? DikeTopAtPolderYrd
         {
@@ -1516,7 +1800,7 @@
             }
         }
 
-        [CsvExportColumn("DikeTopAtPolderZrd", 87)]
+        [CsvExportColumn("DikeTopAtPolderZrd", 93)]
         [Browsable(false)]
         public double? DikeTopAtPolderZrd
         {
@@ -1530,7 +1814,7 @@
             }
         }
 
-        [CsvExportColumn("DikeToeAtPolderXrd", 88)]
+        [CsvExportColumn("DikeToeAtPolderXrd", 94)]
         [Browsable(false)]
         public double? DikeToeAtPolderXrd
         {
@@ -1544,7 +1828,7 @@
             }
         }
 
-        [CsvExportColumn("DikeToeAtPolderYrd", 89)]
+        [CsvExportColumn("DikeToeAtPolderYrd", 95)]
         [Browsable(false)]
         public double? DikeToeAtPolderYrd
         {
@@ -1558,7 +1842,7 @@
             }
         }
 
-        [CsvExportColumn("DikeToeAtPolderZrd", 90)]
+        [CsvExportColumn("DikeToeAtPolderZrd", 96)]
         [Browsable(false)]
         public double? DikeToeAtPolderZrd
         {
@@ -1940,7 +2224,7 @@
                             res = Sellmeijer4ForcesPipingFactor;
                             break;
                         case PipingModelType.Wti2017:
-                            res = Wti2017PipingFactor;
+                            res = Wti2017SafetyFactorOverall;
                             break;
                     }
                 }
@@ -2097,7 +2381,7 @@
                             res = Sellmeijer4ForcesHCritical;
                             break;
                         case PipingModelType.Wti2017:
-                            res = Wti2017HCritical;
+                            res = Wti2017HcriticalOverall;
                             break;
                     }
                 }