Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillWtiFromDamEngine.cs
===================================================================
diff -u -r1987 -r1989
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillWtiFromDamEngine.cs (.../FillWtiFromDamEngine.cs) (revision 1987)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillWtiFromDamEngine.cs (.../FillWtiFromDamEngine.cs) (revision 1989)
@@ -19,8 +19,15 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System;
+using System.Collections.Generic;
using Deltares.DamEngine.Data.General;
+using Deltares.MacroStability.Data;
+using Deltares.MacroStability.Geometry;
using Deltares.MacroStability.Kernel;
+using Deltares.MacroStability.Preprocessing;
+using Deltares.MacroStability.WaternetCreator;
+using Location = Deltares.MacroStability.WaternetCreator.Location;
namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo
{
@@ -31,11 +38,16 @@
/// The KernelModel filled with the Dam Project Data
public static KernelModel CreateKernelModelFromDamProjectData(DamProjectData damProjectData)
{
- TransferWtiStabilityModel();
+ KernelModel kernelModel = new KernelModel();
+ kernelModel.StabilityModel = new StabilityModel();
+ kernelModel.PreprocessingModel = new PreprocessingModel();
+ TransferWtiStabilityModel(damProjectData, kernelModel.StabilityModel);
TransferVersionInfo();
- TransferSoilModel();
+ TransferSoilModel(damProjectData, kernelModel.StabilityModel.SoilModel.Soils);
+ kernelModel.StabilityModel.SoilProfile = new SoilProfile2D();
+ TransferSoilProfile(damProjectData, kernelModel.StabilityModel.SoilProfile);
TransferSurfaceLine();
- TransferLocation();
+ TransferLocation(damProjectData, kernelModel.PreprocessingModel.LastStage.Locations);
TransferPreconsolidationStresses();
TransferUniformLoads();
TransferConsolidationValues();
@@ -45,32 +57,41 @@
TransferUpliftVanCalculationGrid();
TransferSlipPlaneConstraints();
TransferLevenbergMarquardtOptions();
- return null;
+ return kernelModel;
}
- private static void TransferWtiStabilityModel()
+ private static void TransferSoilProfile(DamProjectData damProjectData, SoilProfile2D soilProfile2D)
{
+ soilProfile2D.Geometry = new GeometryData();
+ soilProfile2D.Geometry.Points.Add(new Point2D());
+ soilProfile2D.Geometry.Curves.Add(new GeometryCurve());
+ }
+
+ private static void TransferWtiStabilityModel(DamProjectData damProjectData, StabilityModel stabilityModel)
+ {
+
}
private static void TransferVersionInfo()
{
}
- private static void TransferSoilModel()
+ private static void TransferSoilModel(DamProjectData damProjectData, IList soils)
{
-
+ soils.Add(new Soil());
}
+
private static void TransferSurfaceLine()
{
}
- private static void TransferLocation()
+ private static void TransferLocation(DamProjectData damProjectData, IList locations)
{
-
+ locations.Add(new Location());
}
private static void TransferPreconsolidationStresses()