Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs
===================================================================
diff -u -r3159 -r3163
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs (.../LayerCreator.cs) (revision 3159)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs (.../LayerCreator.cs) (revision 3163)
@@ -71,8 +71,13 @@
{
loggedLocations.Add(string.Format("Handling location {0} with surface line {1}", location.LocationId, location.SurfacelineId));
SurfaceLine surfaceLine = FindSurfaceLine(location.SurfacelineId);
- var geometryCreator = new GeometryCreator(location, surfaceLine, OutputFolderName);
- geometryCreator.Execute();
+ var layerSurfaceLine = DetermineSurfaceLineForGivenLayerData(surfaceLine, location.LayerThickness);
+
+ var layerGeometryCreator = new GeometryCreator(location, surfaceLine, layerSurfaceLine, OutputFolderName);
+ var stiFileName = layerGeometryCreator.Execute(true);
+
+ location.SoilGeometryName = stiFileName;
+ layerGeometryCreator.Execute(false);
}
WriteToLog(loggedLocations);
throw new System.NotImplementedException();
@@ -118,6 +123,12 @@
string fullFilePath = Path.Combine(OutputFolderName, logFile);
File.AppendAllLines(fullFilePath, linesToAdd);
}
+
+ private SurfaceLine DetermineSurfaceLineForGivenLayerData(SurfaceLine originalSurfaceLine, double layerThickness)
+ {
+ // Todo create this
+ return null;
+ }
}
}
\ No newline at end of file
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/GeometryCreator.cs
===================================================================
diff -u -r3089 -r3163
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/GeometryCreator.cs (.../GeometryCreator.cs) (revision 3089)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/GeometryCreator.cs (.../GeometryCreator.cs) (revision 3163)
@@ -26,21 +26,36 @@
///
internal class GeometryCreator
{
+ private Location location;
+ private SurfaceLine surfaceLine;
+ private SurfaceLine loweredSurfaceLine;
+
/// Initializes a new instance of the class.
/// The location.
/// The surface line.
+ ///
/// Name of the output folder.
///
- public GeometryCreator(Location location, SurfaceLine surfaceLine, string outputFolderName)
+ public GeometryCreator(Location location, SurfaceLine surfaceLine, SurfaceLine loweredSurfaceLine, string outputFolderName)
{
+ this.location = location;
+ this.surfaceLine = surfaceLine;
+ this.loweredSurfaceLine = loweredSurfaceLine;
throw new System.NotImplementedException();
}
/// Executes this instance.
///
- public void Execute()
+ public string Execute(bool firstForLoweredLayer)
{
+ if (firstForLoweredLayer)
+ {
+ //todo call with low surfacline, return name of intermediate sti file.
+ return "InterimStiFile.sti";
+ }
+ //todo call with normal surfaceline
throw new System.NotImplementedException();
+ return "";
}
}
}
\ No newline at end of file