Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r1569 -r1594
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1569)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 1594)
@@ -407,8 +407,7 @@
if (arg.ToLower().Equals("-wti"))
{
projectData.DamProjectCalculationSpecification.VisibleEnabledProvider = this;
- StabilityKernelTypeSpecificationsVisible = true;
- ConfigurationManager.Wti = true;
+ StabilityKernelTypeSpecificationsVisible = true;
}
}
Context.CurrentContext = new DamContext
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs
===================================================================
diff -u -r1545 -r1594
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1545)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 1594)
@@ -51,14 +51,6 @@
}
///
- /// Gets or sets a value indicating whether this is wti.
- ///
- ///
- /// true if wti; otherwise, false.
- ///
- public static bool Wti { get; set; }
-
- ///
/// Indexer
///
///
@@ -171,16 +163,8 @@
switch (failureMechanismSystemType)
{
case FailureMechanismSystemType.Piping:
- bool isAddModel = true;
var pipingModeltype = (PipingModelType) i;
- if (failureMechanismSystemType == FailureMechanismSystemType.Piping && !Wti && pipingModeltype == PipingModelType.Wti2017)
- {
- isAddModel = false;
- }
- if (isAddModel)
- {
- availableList.Add(pipingModeltype);
- }
+ availableList.Add(pipingModeltype);
break;
case FailureMechanismSystemType.StabilityInside:
case FailureMechanismSystemType.StabilityOutside:
@@ -206,7 +190,6 @@
///
private void InitDefaultStatus()
{
- Wti = false;
configurationStatus = new ConfigurationStatus[GetLength(), GetLength(),
GetLength(),
GetLength(),
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r1571 -r1594
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1571)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1594)
@@ -374,7 +374,8 @@
{
{PipingModelType.Bligh, InputPipingModelType.Bligh},
{PipingModelType.Sellmeijer, InputPipingModelType.SellmeijerVnk},
- {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces}
+ {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces},
+ {PipingModelType.Wti2017, InputPipingModelType.WbiSellmeijerRevised}
};
return translationTable[pipingModelType];
}
@@ -390,7 +391,8 @@
{
{InputPipingModelType.Bligh, PipingModelType.Bligh},
{InputPipingModelType.SellmeijerVnk, PipingModelType.Sellmeijer},
- {InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces}
+ {InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces},
+ {InputPipingModelType.WbiSellmeijerRevised, PipingModelType.Wti2017}
};
return translationTable[inputPipingModelType];
}