Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Parallel.cs
===================================================================
diff -u -r3522 -r3668
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Parallel.cs (.../Parallel.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Parallel.cs (.../Parallel.cs) (revision 3668)
@@ -112,8 +112,9 @@
thread.Start(Context.CurrentContext); // Pass the current context as task context
if (i == 0)
{
- // Delay after the first trhead is started to give DGSMStabDam.dll time to initiliaze
- // If this is not included DGSMStabDam.dll crashes, because it is trying to initilialize muliple times
+ // Delay was there to prevent problems with DGSMStabDam.dll initilializing muliple times after the first thread
+ // If this was not included, DGSMStabDam.dll crashed. So this Sleep could probably be removed now that
+ // DGSMStabDam.dll is no longer used. Keep it here for now, later halve it first then try without.
System.Threading.Thread.Sleep(1000);
}
}
Fisheye: Tag 3668 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DTo1DConverterTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3668 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/Geometry2DTo1DConverter.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3668 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/TestFiles/expectedTest.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r3612 -r3668
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 3612)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 3668)
@@ -69,7 +69,6 @@
-
@@ -131,9 +130,6 @@
PreserveNewest
-
- PreserveNewest
- PreserveNewest
Fisheye: Tag 3668 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Interfaces/DGSMStabDAMInterface.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs
===================================================================
diff -u -r3522 -r3668
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs (.../UpliftLocationDeterminator.cs) (revision 3668)
@@ -242,8 +242,8 @@
{
return SoilProfile2D.GetSoilProfile1D(xCoordinate);
}
- var geometry2DTo1DConverter = new Geometry2DTo1DConverter(this.SoilGeometry2DName, this.SurfaceLine, this.DikeEmbankmentMaterial, this.SoilList, -this.XSoilGeometry2DOrigin);
- return geometry2DTo1DConverter.Convert(xCoordinate);
+ // This possibly should become conversion from StixFile
+ throw new NotImplementedException(string.Format(@"Using full 2D geometry (based on stix file) not yet available."));
}
///
Fisheye: Tag 3668 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Interfaces/DGSStandardDLLInterface.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs
===================================================================
diff -u -r3522 -r3668
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 3522)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 3668)
@@ -177,10 +177,8 @@
cachedSoilProfiles1D[xCoordinate] = soilProfile;
return soilProfile;
case SoilProfileType.ProfileTypeStiFile:
- var geometry2DTo1DConverter = new Geometry2DTo1DConverter(this.SoilGeometry2DName, this.SurfaceLine, this.DikeEmbankmentMaterial, this.SoilList, -this.XSoilGeometry2DOrigin);
- soilProfile = geometry2DTo1DConverter.Convert(xCoordinate);
- cachedSoilProfiles1D[xCoordinate] = soilProfile;
- return soilProfile;
+ // This possibly should become conversion from StixFile
+ throw new NotImplementedException(string.Format(@"Using full 2D geometry (based on stix file) not yet available."));
default:
return null;
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r3621 -r3668
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 3621)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj (.../Deltares.DamEngine.Calculators.csproj) (revision 3668)
@@ -120,14 +120,11 @@
-
-
-
@@ -170,8 +167,6 @@
Resources.resx
-
-
@@ -185,8 +180,10 @@
Deltares.DamEngine.Data
-
+
+
+
Copying.AGPL.licenseheader
@@ -235,12 +232,6 @@
MPipingCalc2.dll
-
-
- DGSMStabDAM.dll
- PreserveNewest
-
-
Fisheye: Tag 3668 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityServiceAgent.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3668 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityServiceAgentException.cs'.
Fisheye: No comparison available. Pass `N' to diff?