Index: DamEngine/trunk/release/Deltares.DamEngine.Version.pdb =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs =================================================================== diff -u -r1832 -r1966 --- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1832) +++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs (.../DamEngineRunner.cs) (revision 1966) @@ -238,6 +238,8 @@ } } + // Wat te doen: debug input xml file (InputFile.xml in debug dir DamLive) oppakken en gebruiken in DamEngine via de aanstuurtruc van Tom en dan kijken wat daar gebeurt. + /// /// Runs this instance. /// Index: DamEngine/trunk/release/Deltares.DamEngine.Version.dll =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs =================================================================== diff -u -r1947 -r1966 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1947) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1966) @@ -392,7 +392,7 @@ {PipingModelType.Bligh, InputPipingModelType.Bligh}, {PipingModelType.Sellmeijer, InputPipingModelType.SellmeijerVnk}, {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces}, - {PipingModelType.Wti2017, InputPipingModelType.WbiSellmeijerRevised} + {PipingModelType.Wti2017, InputPipingModelType.WtiSellmeijerRevised} }; return translationTable[pipingModelType]; } @@ -409,7 +409,7 @@ {InputPipingModelType.Bligh, PipingModelType.Bligh}, {InputPipingModelType.SellmeijerVnk, PipingModelType.Sellmeijer}, {InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces}, - {InputPipingModelType.WbiSellmeijerRevised, PipingModelType.Wti2017} + {InputPipingModelType.WtiSellmeijerRevised, PipingModelType.Wti2017} }; return translationTable[inputPipingModelType]; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r1947 -r1966 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1947) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 1966) @@ -204,20 +204,20 @@ if (designResult.PipingDesignResults.Sellmeijer4ForcesHcriticalSpecified) desResult.Sellmeijer4ForcesHCritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical; if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) desResult.SellmeijerPipingFactor = designResult.PipingDesignResults.SellmeijerVnkFactor; if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) desResult.SellmeijerHCritical = designResult.PipingDesignResults.SellmeijerVnkHcritical; - if (designResult.PipingDesignResults.Wbi2017BackwardErosionFactorSpecified) desResult.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wbi2017BackwardErosionFactor; - if (designResult.PipingDesignResults.Wbi2017BackwardErosionHcriticalSpecified) desResult.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wbi2017BackwardErosionHcritical; - if (designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiCSpecified) desResult.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiC; - if (designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReducedSpecified) desResult.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wbi2017BackwardErosionDeltaPhiReduced; - if (designResult.PipingDesignResults.Wbi2017UpliftFactorSpecified) desResult.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wbi2017UpliftFactor; - if (designResult.PipingDesignResults.Wbi2017UpliftHcriticalSpecified) desResult.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wbi2017UpliftHcritical; - if (designResult.PipingDesignResults.Wbi2017DeltaPhiCuSpecified) desResult.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wbi2017DeltaPhiCu; - if (designResult.PipingDesignResults.Wbi2017HeaveFactorSpecified) desResult.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wbi2017HeaveFactor; - if (designResult.PipingDesignResults.Wbi2017HeaveHcriticalSpecified) desResult.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wbi2017HeaveHcritical; - if (designResult.PipingDesignResults.Wbi2017GradientSpecified) desResult.Wti2017Gradient = designResult.PipingDesignResults.Wbi2017Gradient; - if (designResult.PipingDesignResults.Wbi2017FactorOverallSpecified) desResult.Wti2017SafetyFactorOverall = designResult.PipingDesignResults.Wbi2017FactorOverall; - if (designResult.PipingDesignResults.Wbi2017HcriticalOverallSpecified) desResult.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wbi2017HcriticalOverall; - if (designResult.PipingDesignResults.Wbi2017EffectiveStressSpecified) desResult.Wti2017EffectiveStress = designResult.PipingDesignResults.Wbi2017EffectiveStress; - if (designResult.PipingDesignResults.Wbi2017CCreepSpecified) desResult.Wti2017CCreep = designResult.PipingDesignResults.Wbi2017CCreep; + if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified) desResult.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wti2017BackwardErosionFactor; + if (designResult.PipingDesignResults.Wti2017BackwardErosionHcriticalSpecified) desResult.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiCSpecified) desResult.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC; + if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReducedSpecified) desResult.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced; + if (designResult.PipingDesignResults.Wti2017UpliftFactorSpecified) desResult.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wti2017UpliftFactor; + if (designResult.PipingDesignResults.Wti2017UpliftHcriticalSpecified) desResult.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical; + if (designResult.PipingDesignResults.Wti2017DeltaPhiCuSpecified) desResult.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wti2017DeltaPhiCu; + if (designResult.PipingDesignResults.Wti2017HeaveFactorSpecified) desResult.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wti2017HeaveFactor; + if (designResult.PipingDesignResults.Wti2017HeaveHcriticalSpecified) desResult.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical; + if (designResult.PipingDesignResults.Wti2017GradientSpecified) desResult.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient; + if (designResult.PipingDesignResults.Wti2017FactorOverallSpecified) desResult.Wti2017SafetyFactorOverall = designResult.PipingDesignResults.Wti2017FactorOverall; + if (designResult.PipingDesignResults.Wti2017HcriticalOverallSpecified) desResult.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall; + if (designResult.PipingDesignResults.Wti2017EffectiveStressSpecified) desResult.Wti2017EffectiveStress = designResult.PipingDesignResults.Wti2017EffectiveStress; + if (designResult.PipingDesignResults.Wti2017CCreepSpecified) desResult.Wti2017CCreep = designResult.PipingDesignResults.Wti2017CCreep; if (designResult.PipingDesignResults.ExitPointXSpecified) desResult.LocalPipingExitPointX = designResult.PipingDesignResults.ExitPointX; Index: DamEngine/trunk/release/Deltares.DamEngine.Io.dll =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamEngine/trunk/release/Deltares.DamEngine.Data.dll =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamEngine/trunk/release/Deltares.DamEngine.Io.pdb =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamEngine/trunk/release/Deltares.DamEngine.Data.pdb =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamEngine/trunk/release/Deltares.DamEngine.Calculators.dll =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamEngine/trunk/release/Deltares.DamEngine.Interface.dll =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamEngine/trunk/release/Deltares.DamEngine.Calculators.pdb =================================================================== diff -u -r1946 -r1966 Binary files differ Index: DamEngine/trunk/release/Deltares.DamEngine.Interface.pdb =================================================================== diff -u -r1946 -r1966 Binary files differ