diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf index 4df7d3f6eb9d833d7d9a745eb8fc8bebf1aa5d7c..28a1c516775fb50ccf7b173b678b76477e065391 100644 Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx index b67e950255fd778cc4022066423ac9e36b49f8c6..ebda673dd80210f058421bdcaea09d831cf32dce 100644 Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs index 0e63c8286c4c9761f33a4629698cc2180fe48e92..add85eb1a6e4beeb6366e547c90729d4dc57d2be 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs @@ -82,12 +82,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data protected SquareMeter DeltaCdxA(double beta) { - var idx = FindIndex(beta); - return VectoMath.Interpolate(AirDragEntries[idx - 1].Beta, AirDragEntries[idx].Beta, AirDragEntries[idx - 1].DeltaCdA, - AirDragEntries[idx].DeltaCdA, beta); + var (first, second) = FindIndex(beta); + return VectoMath.Interpolate(first.Beta, second.Beta, first.DeltaCdA, + second.DeltaCdA, beta); } - protected int FindIndex(double beta) + protected (CrossWindCorrectionCurveReader.AirDragBetaEntry, CrossWindCorrectionCurveReader.AirDragBetaEntry) FindIndex(double beta) { if (beta < AirDragEntries.First().Beta) { throw new VectoSimulationException("Beta / CdxA Lookup table does not cover beta={0}", beta); @@ -96,8 +96,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data throw new VectoSimulationException("Beta / CdxA Lookup table does not cover beta={0}", beta); } - AirDragEntries.GetSection(x => x.Beta < beta, out var index); - return index + 1; + return AirDragEntries.GetSection(x => x.Beta < beta); + } } } \ No newline at end of file diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4 index d7dbf9feaad787938124242673fa9a823162e64a..a8ebf5cc4aece262653ec0b5296305ac55aa6b8f 100644 --- a/VectoCore/VectoCore/VersionNumber.t4 +++ b/VectoCore/VectoCore/VersionNumber.t4 @@ -6,6 +6,6 @@ int GetBuildNumber() string GetVectoCoreVersionNumber() { - return "0.7.5." + GetBuildNumber(); + return "0.7.6." + GetBuildNumber(); } #> \ No newline at end of file