Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r500 -r510
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 500)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 510)
@@ -35,6 +35,9 @@
..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.BlighCalculator.dll
+
+ ..\..\lib\FailureMechanisms\DamPiping\Deltares.DamPiping.Sellmeijer4ForcesCalculator.dll
+
False
..\..\lib\log4net.2.0.3\log4net.dll
@@ -83,10 +86,18 @@
+
+
+
+
+ True
+ True
+ Resources.resx
+
@@ -117,6 +128,14 @@
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+ Designer
+
+
+
"$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (revision 510)
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 1.3
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ No input object defined for Sellmeijer 4 Forces
+
+
+ No output object defined for Sellmeijer 4 Forces
+
+
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (revision 510)
@@ -0,0 +1,83 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Deltares.DamEngine.Calculators.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Deltares.DamEngine.Calculators.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to No input object defined for Sellmeijer 4 Forces.
+ ///
+ internal static string DamPipingSellmeijer4ForcesKernelWrapper_PipingCalculatorSellmeijer4Forces_NoInputObjectDefinedForSellmeijer4Forces {
+ get {
+ return ResourceManager.GetString("DamPipingSellmeijer4ForcesKernelWrapper_PipingCalculatorSellmeijer4Forces_NoInput" +
+ "ObjectDefinedForSellmeijer4Forces", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to No output object defined for Sellmeijer 4 Forces.
+ ///
+ internal static string DamPipingSellmeijer4ForcesKernelWrapper_PostProcess_NoOutputObjectDefinedForSellmeijer4Forces {
+ get {
+ return ResourceManager.GetString("DamPipingSellmeijer4ForcesKernelWrapper_PostProcess_NoOutputObjectDefinedForSellm" +
+ "eijer4Forces", resourceCulture);
+ }
+ }
+ }
+}
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs (revision 510)
@@ -0,0 +1,98 @@
+using System.Collections.Generic;
+using System.Data;
+using Deltares.DamEngine.Calculators.KernelWrappers.Common;
+using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
+using Deltares.DamEngine.Calculators.Properties;
+using Deltares.DamEngine.Data.Design;
+using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Data.Standard.Logging;
+using Deltares.DamPiping.Sellmeijer4ForcesCalculator;
+
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijer4Forces
+{
+ class DamPipingSellmeijer4ForcesKernelWrapper : IKernelWrapper
+ {
+ public IKernelDataInput Prepare(DamKernelInput damKernelInput)
+ {
+ // TODO: this is just fake data
+ return new DamPipingSellmeijer4ForcesInput()
+ {
+ HRiver = 1.0,
+ HExit = 0.0,
+ Rc = 0.3,
+ DTotal = 2.0,
+ AquiferHeight = 8.0,
+ SeepageLength = 40.5,
+ D70 = 200.0,
+ WhitesConstant = 0.25,
+ BeddingAngle = 37.0,
+ WaterViscosity = 1.33E-06,
+ PermeabilityKx = 0.0001
+ };
+ }
+
+ public int Validate(IKernelDataInput kernelDataInput, out List messages)
+ {
+ var calculator = PipingCalculatorSellmeijer4Forces(kernelDataInput);
+ List kernelMessages = calculator.Validate();
+ messages = new List();
+ foreach (string stringMessage in kernelMessages)
+ {
+ messages.Add(new LogMessage() { Message = stringMessage, MessageType = LogMessageType.Error });
+ }
+ return messages.Count;
+ }
+
+ public IKernelDataOutput Execute(IKernelDataInput kernelDataInput, out List messages)
+ {
+ var calculatorBligh = PipingCalculatorSellmeijer4Forces(kernelDataInput);
+ calculatorBligh.Calculate();
+ var damPipingOutput = new DamPipingSellmeijer4ForcesOutput();
+ damPipingOutput.FoSp = calculatorBligh.FoSp;
+ damPipingOutput.Hc = calculatorBligh.Hc;
+ messages = new List();
+ return damPipingOutput;
+ }
+
+ private static PipingCalculatorSellmeijer4Forces PipingCalculatorSellmeijer4Forces(IKernelDataInput kernelDataInput)
+ {
+ DamPipingSellmeijer4ForcesInput damPipingInput = kernelDataInput as DamPipingSellmeijer4ForcesInput;
+ if (damPipingInput == null)
+ {
+ throw new NoNullAllowedException(Resources.DamPipingSellmeijer4ForcesKernelWrapper_PipingCalculatorSellmeijer4Forces_NoInputObjectDefinedForSellmeijer4Forces);
+ }
+ var calculator = new PipingCalculatorSellmeijer4Forces
+ {
+ HRiver = damPipingInput.HRiver,
+ HExit = damPipingInput.HExit,
+ Rc = damPipingInput.Rc,
+ DTotal = damPipingInput.DTotal,
+ SeepageLength = damPipingInput.SeepageLength,
+ D70 = damPipingInput.D70
+ };
+ return calculator;
+ }
+
+ public void PostProcess(IKernelDataOutput kernelDataOutput, out DesignResult designResult)
+ {
+ DamPipingSellmeijer4ForcesOutput damPipingOutput = kernelDataOutput as DamPipingSellmeijer4ForcesOutput;
+ if (damPipingOutput == null)
+ {
+ throw new NoNullAllowedException(Resources.DamPipingSellmeijer4ForcesKernelWrapper_PostProcess_NoOutputObjectDefinedForSellmeijer4Forces);
+ }
+ string id = "id";
+ string soilProfile2DName = "soilProfile2DName";
+ var d = new DamFailureMechanismeCalculationSpecification();
+ var s = new DesignScenario();
+ var p = new SoilProfile1D();
+
+ designResult = new DesignResult(id, d, s, p, soilProfile2DName, AnalysisType.NoAdaption, 0);
+ var pipingDesignResults = new PipingDesignResults(PipingModelType.Sellmeijer4Forces);
+ pipingDesignResults.BlighFactor = damPipingOutput.FoSp;
+ pipingDesignResults.BlighHcritical = damPipingOutput.Hc;
+ designResult.PipingDesignResults = pipingDesignResults;
+ }
+ }
+}
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (revision 510)
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Geen invoer object gedefinieerd voor Sellmeijer 4 Krachten
+
+
+ Geen uitvoer object gedefinieerd voor Sellmeijer 4 Krachten
+
+
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesOutput.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesOutput.cs (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesOutput.cs (revision 510)
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
+
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijer4Forces
+{
+ class DamPipingSellmeijer4ForcesOutput : IKernelDataOutput
+ {
+ public double FoSp { get; set; }
+ public double Hc { get; set; }
+ }
+}
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesInput.cs
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesInput.cs (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesInput.cs (revision 510)
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
+
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamPipingSellmeijer4Forces
+{
+ class DamPipingSellmeijer4ForcesInput : IKernelDataInput
+ {
+ public double HRiver { get; set; }
+ public double HExit { get; set; }
+ public double Rc { get; set; }
+ public double DTotal { get; set; }
+ public double AquiferHeight { get; set; }
+ public double SeepageLength { get; set; }
+ public double D70 { get; set; }
+ public double WhitesConstant { get; set; }
+ public double BeddingAngle { get; set; }
+ public double PermeabilityKx { get; set; }
+ public double WaterViscosity { get; set; }
+ }
+}