Skip to content

Commit a387682

Browse files
TronaldTronald
authored
Merge pull request #180 from Tronald/develop
Base 2.9.4.2 and Magnetic 1.0.0.0
2 parents eba119c + f605479 commit a387682

36 files changed

+1407
-1406
lines changed

‎Benchmarks .NET CORE/Benchmarks .NET CORE.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9+
<ProjectReference Include="..\CoordinateSharp.Magnetic\CoordinateSharp.Magnetic.csproj" />
910
<ProjectReference Include="..\CoordinateSharp\CoordinateSharp.csproj" />
1011
</ItemGroup>
1112

‎Benchmarks .NET CORE/Program.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Diagnostics;
33
using CoordinateSharp;
44
using CoordinateSharp.Debuggers;
5+
using CoordinateSharp.Magnetic;
56
namespace Benchmarks
67
{
78
class Program
@@ -13,10 +14,23 @@ static void Main()
1314
Console.WriteLine();
1415

1516
Benchmarkers.Run_Benchmarks(OutputOption.Console);
16-
17+
Magnetic_Calculations(OutputOption.Console);
1718
Console.WriteLine();
1819
Console.WriteLine("TEST COMPLETE");
1920
Console.ReadKey();
2021
}
22+
23+
/// <summary>
24+
/// Benchmark magnetic calculations.
25+
/// </summary>
26+
/// <param name="opt"></param>
27+
static void Magnetic_Calculations(OutputOption opt)
28+
{
29+
Coordinate c = new Coordinate(45, 45, new DateTime(2021, 1, 1), new EagerLoad(false));
30+
31+
Benchmarkers.Benchmark(() => {
32+
Magnetic m = new Magnetic(c, DataModel.WMM2020);
33+
}, 100, "Magnetic Calculation Times", opt);
34+
}
2135
}
2236
}

‎Benchmarks .NET Framework/Benchmarks .NET Framework.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
<None Include="App.config" />
5050
</ItemGroup>
5151
<ItemGroup>
52+
<ProjectReference Include="..\CoordinateSharp.Magnetic\CoordinateSharp.Magnetic.csproj">
53+
<Project>{0ca21056-3299-4be5-9d8a-44eaa2095c1c}</Project>
54+
<Name>CoordinateSharp.Magnetic</Name>
55+
</ProjectReference>
5256
<ProjectReference Include="..\CoordinateSharp\CoordinateSharp.csproj">
5357
<Project>{82b32704-3306-49fd-a7fa-db48b67b7b64}</Project>
5458
<Name>CoordinateSharp</Name>

‎Benchmarks .NET Framework/Program.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Diagnostics;
33
using CoordinateSharp;
44
using CoordinateSharp.Debuggers;
5+
using CoordinateSharp.Magnetic;
56
namespace Benchmarks
67
{
78
class Program
@@ -13,12 +14,26 @@ static void Main(string[] args)
1314
Console.WriteLine();
1415

1516
Benchmarkers.Run_Benchmarks(OutputOption.Console);
17+
Magnetic_Calculations(OutputOption.Console);
1618

1719
Console.WriteLine();
1820
Console.WriteLine("TEST COMPLETE");
1921
Console.ReadKey();
2022
}
2123

22-
24+
/// <summary>
25+
/// Benchmark magnetic calculations.
26+
/// </summary>
27+
/// <param name="opt"></param>
28+
static void Magnetic_Calculations(OutputOption opt)
29+
{
30+
Coordinate c = new Coordinate(45, 45, new DateTime(2021, 1, 1), new EagerLoad(false));
31+
32+
Benchmarkers.Benchmark(() => {
33+
Magnetic m = new Magnetic(c, DataModel.WMM2020);
34+
}, 100, "Magnetic Calculation Times", opt);
35+
}
36+
37+
2338
}
2439
}

‎CoordinateSharp.Magnetic/CoordinateSharp.Magnetic.csproj

Lines changed: 189 additions & 189 deletions
Large diffs are not rendered by default.

‎CoordinateSharp.Magnetic/DataModels/WMM2020COF.cs

Lines changed: 91 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -55,96 +55,97 @@ public static List<CoefficientModel> Data
5555
List<CoefficientModel> models = new List<CoefficientModel>();
5656

5757
//Convert COF to models.
58-
models.Add(new CoefficientModel(1, 0, -29438.5, 0, 10.7, 0));
59-
models.Add(new CoefficientModel(1, 1, -1501.1, 4796.2, 17.9, -26.8));
60-
models.Add(new CoefficientModel(2, 0, -2445.3, 0, -8.6, 0));
61-
models.Add(new CoefficientModel(2, 1, 3012.5, -2845.6, -3.3, -27.1));
62-
models.Add(new CoefficientModel(2, 2, 1676.6, -642, 2.4, -13.3));
63-
models.Add(new CoefficientModel(3, 0, 1351.1, 0, 3.1, 0));
64-
models.Add(new CoefficientModel(3, 1, -2352.3, -115.3, -6.2, 8.4));
65-
models.Add(new CoefficientModel(3, 2, 1225.6, 245, -0.4, -0.4));
66-
models.Add(new CoefficientModel(3, 3, 581.9, -538.3, -10.4, 2.3));
67-
models.Add(new CoefficientModel(4, 0, 907.2, 0, -0.4, 0));
68-
models.Add(new CoefficientModel(4, 1, 813.7, 283.4, 0.8, -0.6));
69-
models.Add(new CoefficientModel(4, 2, 120.3, -188.6, -9.2, 5.3));
70-
models.Add(new CoefficientModel(4, 3, -335, 180.9, 4, 3));
71-
models.Add(new CoefficientModel(4, 4, 70.3, -329.5, -4.2, -5.3));
72-
models.Add(new CoefficientModel(5, 0, -232.6, 0, -0.2, 0));
73-
models.Add(new CoefficientModel(5, 1, 360.1, 47.4, 0.1, 0.4));
74-
models.Add(new CoefficientModel(5, 2, 192.4, 196.9, -1.4, 1.6));
75-
models.Add(new CoefficientModel(5, 3, -141, -119.4, 0, -1.1));
76-
models.Add(new CoefficientModel(5, 4, -157.4, 16.1, 1.3, 3.3));
77-
models.Add(new CoefficientModel(5, 5, 4.3, 100.1, 3.8, 0.1));
78-
models.Add(new CoefficientModel(6, 0, 69.5, 0, -0.5, 0));
79-
models.Add(new CoefficientModel(6, 1, 67.4, -20.7, -0.2, 0));
80-
models.Add(new CoefficientModel(6, 2, 72.8, 33.2, -0.6, -2.2));
81-
models.Add(new CoefficientModel(6, 3, -129.8, 58.8, 2.4, -0.7));
82-
models.Add(new CoefficientModel(6, 4, -29, -66.5, -1.1, 0.1));
83-
models.Add(new CoefficientModel(6, 5, 13.2, 7.3, 0.3, 1));
84-
models.Add(new CoefficientModel(6, 6, -70.9, 62.5, 1.5, 1.3));
85-
models.Add(new CoefficientModel(7, 0, 81.6, 0, 0.2, 0));
86-
models.Add(new CoefficientModel(7, 1, -76.1, -54.1, -0.2, 0.7));
87-
models.Add(new CoefficientModel(7, 2, -6.8, -19.4, -0.4, 0.5));
88-
models.Add(new CoefficientModel(7, 3, 51.9, 5.6, 1.3, -0.2));
89-
models.Add(new CoefficientModel(7, 4, 15, 24.4, 0.2, -0.1));
90-
models.Add(new CoefficientModel(7, 5, 9.3, 3.3, -0.4, -0.7));
91-
models.Add(new CoefficientModel(7, 6, -2.8, -27.5, -0.9, 0.1));
92-
models.Add(new CoefficientModel(7, 7, 6.7, -2.3, 0.3, 0.1));
93-
models.Add(new CoefficientModel(8, 0, 24, 0, 0, 0));
94-
models.Add(new CoefficientModel(8, 1, 8.6, 10.2, 0.1, -0.3));
95-
models.Add(new CoefficientModel(8, 2, -16.9, -18.1, -0.5, 0.3));
96-
models.Add(new CoefficientModel(8, 3, -3.2, 13.2, 0.5, 0.3));
97-
models.Add(new CoefficientModel(8, 4, -20.6, -14.6, -0.2, 0.6));
98-
models.Add(new CoefficientModel(8, 5, 13.3, 16.2, 0.4, -0.1));
99-
models.Add(new CoefficientModel(8, 6, 11.7, 5.7, 0.2, -0.2));
100-
models.Add(new CoefficientModel(8, 7, -16, -9.1, -0.4, 0.3));
101-
models.Add(new CoefficientModel(8, 8, -2, 2.2, 0.3, 0));
102-
models.Add(new CoefficientModel(9, 0, 5.4, 0, 0, 0));
103-
models.Add(new CoefficientModel(9, 1, 8.8, -21.6, -0.1, -0.2));
104-
models.Add(new CoefficientModel(9, 2, 3.1, 10.8, -0.1, -0.1));
105-
models.Add(new CoefficientModel(9, 3, -3.1, 11.7, 0.4, -0.2));
106-
models.Add(new CoefficientModel(9, 4, 0.6, -6.8, -0.5, 0.1));
107-
models.Add(new CoefficientModel(9, 5, -13.3, -6.9, -0.2, 0.1));
108-
models.Add(new CoefficientModel(9, 6, -0.1, 7.8, 0.1, 0));
109-
models.Add(new CoefficientModel(9, 7, 8.7, 1, 0, -0.2));
110-
models.Add(new CoefficientModel(9, 8, -9.1, -3.9, -0.2, 0.4));
111-
models.Add(new CoefficientModel(9, 9, -10.5, 8.5, -0.1, 0.3));
112-
models.Add(new CoefficientModel(10, 0, -1.9, 0, 0, 0));
113-
models.Add(new CoefficientModel(10, 1, -6.5, 3.3, 0, 0.1));
114-
models.Add(new CoefficientModel(10, 2, 0.2, -0.3, -0.1, -0.1));
115-
models.Add(new CoefficientModel(10, 3, 0.6, 4.6, 0.3, 0));
116-
models.Add(new CoefficientModel(10, 4, -0.6, 4.4, -0.1, 0));
117-
models.Add(new CoefficientModel(10, 5, 1.7, -7.9, -0.1, -0.2));
118-
models.Add(new CoefficientModel(10, 6, -0.7, -0.6, -0.1, 0.1));
119-
models.Add(new CoefficientModel(10, 7, 2.1, -4.1, 0, -0.1));
120-
models.Add(new CoefficientModel(10, 8, 2.3, -2.8, -0.2, -0.2));
121-
models.Add(new CoefficientModel(10, 9, -1.8, -1.1, -0.1, 0.1));
122-
models.Add(new CoefficientModel(10, 10, -3.6, -8.7, -0.2, -0.1));
123-
models.Add(new CoefficientModel(11, 0, 3.1, 0, 0, 0));
124-
models.Add(new CoefficientModel(11, 1, -1.5, -0.1, 0, 0));
125-
models.Add(new CoefficientModel(11, 2, -2.3, 2.1, -0.1, 0.1));
126-
models.Add(new CoefficientModel(11, 3, 2.1, -0.7, 0.1, 0));
127-
models.Add(new CoefficientModel(11, 4, -0.9, -1.1, 0, 0.1));
128-
models.Add(new CoefficientModel(11, 5, 0.6, 0.7, 0, 0));
129-
models.Add(new CoefficientModel(11, 6, -0.7, -0.2, 0, 0));
130-
models.Add(new CoefficientModel(11, 7, 0.2, -2.1, 0, 0.1));
131-
models.Add(new CoefficientModel(11, 8, 1.7, -1.5, 0, 0));
132-
models.Add(new CoefficientModel(11, 9, -0.2, -2.5, 0, -0.1));
133-
models.Add(new CoefficientModel(11, 10, 0.4, -2, -0.1, 0));
134-
models.Add(new CoefficientModel(11, 11, 3.5, -2.3, -0.1, -0.1));
135-
models.Add(new CoefficientModel(12, 0, -2, 0, 0.1, 0));
136-
models.Add(new CoefficientModel(12, 1, -0.3, -1, 0, 0));
137-
models.Add(new CoefficientModel(12, 2, 0.4, 0.5, 0, 0));
138-
models.Add(new CoefficientModel(12, 3, 1.3, 1.8, 0.1, -0.1));
139-
models.Add(new CoefficientModel(12, 4, -0.9, -2.2, -0.1, 0));
140-
models.Add(new CoefficientModel(12, 5, 0.9, 0.3, 0, 0));
141-
models.Add(new CoefficientModel(12, 6, 0.1, 0.7, 0.1, 0));
142-
models.Add(new CoefficientModel(12, 7, 0.5, -0.1, 0, 0));
143-
models.Add(new CoefficientModel(12, 8, -0.4, 0.3, 0, 0));
144-
models.Add(new CoefficientModel(12, 9, -0.4, 0.2, 0, 0));
145-
models.Add(new CoefficientModel(12, 10, 0.2, -0.9, 0, 0));
146-
models.Add(new CoefficientModel(12, 11, -0.9, -0.2, 0, 0));
147-
models.Add(new CoefficientModel(12, 12, 0, 0.7, 0, 0));
58+
models.Add(new CoefficientModel(1, 0, -29404.5, 0.0, 6.7, 0.0));
59+
models.Add(new CoefficientModel(1, 1, -1450.7, 4652.9, 7.7, -25.1));
60+
models.Add(new CoefficientModel(2, 0, -2500.0, 0.0, -11.5, 0.0));
61+
models.Add(new CoefficientModel(2, 1, 2982.0, -2991.6, -7.1, -30.2));
62+
models.Add(new CoefficientModel(2, 2, 1676.8, -734.8, -2.2, -23.9));
63+
models.Add(new CoefficientModel(3, 0, 1363.9, 0.0, 2.8, 0.0));
64+
models.Add(new CoefficientModel(3, 1, -2381.0, -82.2, -6.2, 5.7));
65+
models.Add(new CoefficientModel(3, 2, 1236.2, 241.8, 3.4, -1.0));
66+
models.Add(new CoefficientModel(3, 3, 525.7, -542.9, -12.2, 1.1));
67+
models.Add(new CoefficientModel(4, 0, 903.1, 0.0, -1.1, 0.0));
68+
models.Add(new CoefficientModel(4, 1, 809.4, 282.0, -1.6, 0.2));
69+
models.Add(new CoefficientModel(4, 2, 86.2, -158.4, -6.0, 6.9));
70+
models.Add(new CoefficientModel(4, 3, -309.4, 199.8, 5.4, 3.7));
71+
models.Add(new CoefficientModel(4, 4, 47.9, -350.1, -5.5, -5.6));
72+
models.Add(new CoefficientModel(5, 0, -234.4, 0.0, -0.3, 0.0));
73+
models.Add(new CoefficientModel(5, 1, 363.1, 47.7, 0.6, 0.1));
74+
models.Add(new CoefficientModel(5, 2, 187.8, 208.4, -0.7, 2.5));
75+
models.Add(new CoefficientModel(5, 3, -140.7, -121.3, 0.1, -0.9));
76+
models.Add(new CoefficientModel(5, 4, -151.2, 32.2, 1.2, 3.0));
77+
models.Add(new CoefficientModel(5, 5, 13.7, 99.1, 1.0, 0.5));
78+
models.Add(new CoefficientModel(6, 0, 65.9, 0.0, -0.6, 0.0));
79+
models.Add(new CoefficientModel(6, 1, 65.6, -19.1, -0.4, 0.1));
80+
models.Add(new CoefficientModel(6, 2, 73.0, 25.0, 0.5, -1.8));
81+
models.Add(new CoefficientModel(6, 3, -121.5, 52.7, 1.4, -1.4));
82+
models.Add(new CoefficientModel(6, 4, -36.2, -64.4, -1.4, 0.9));
83+
models.Add(new CoefficientModel(6, 5, 13.5, 9.0, -0.0, 0.1));
84+
models.Add(new CoefficientModel(6, 6, -64.7, 68.1, 0.8, 1.0));
85+
models.Add(new CoefficientModel(7, 0, 80.6, 0.0, -0.1, 0.0));
86+
models.Add(new CoefficientModel(7, 1, -76.8, -51.4, -0.3, 0.5));
87+
models.Add(new CoefficientModel(7, 2, -8.3, -16.8, -0.1, 0.6));
88+
models.Add(new CoefficientModel(7, 3, 56.5, 2.3, 0.7, -0.7));
89+
models.Add(new CoefficientModel(7, 4, 15.8, 23.5, 0.2, -0.2));
90+
models.Add(new CoefficientModel(7, 5, 6.4, -2.2, -0.5, -1.2));
91+
models.Add(new CoefficientModel(7, 6, -7.2, -27.2, -0.8, 0.2));
92+
models.Add(new CoefficientModel(7, 7, 9.8, -1.9, 1.0, 0.3));
93+
models.Add(new CoefficientModel(8, 0, 23.6, 0.0, -0.1, 0.0));
94+
models.Add(new CoefficientModel(8, 1, 9.8, 8.4, 0.1, -0.3));
95+
models.Add(new CoefficientModel(8, 2, -17.5, -15.3, -0.1, 0.7));
96+
models.Add(new CoefficientModel(8, 3, -0.4, 12.8, 0.5, -0.2));
97+
models.Add(new CoefficientModel(8, 4, -21.1, -11.8, -0.1, 0.5));
98+
models.Add(new CoefficientModel(8, 5, 15.3, 14.9, 0.4, -0.3));
99+
models.Add(new CoefficientModel(8, 6, 13.7, 3.6, 0.5, -0.5));
100+
models.Add(new CoefficientModel(8, 7, -16.5, -6.9, 0.0, 0.4));
101+
models.Add(new CoefficientModel(8, 8, -0.3, 2.8, 0.4, 0.1));
102+
models.Add(new CoefficientModel(9, 0, 5.0, 0.0, -0.1, 0.0));
103+
models.Add(new CoefficientModel(9, 1, 8.2, -23.3, -0.2, -0.3));
104+
models.Add(new CoefficientModel(9, 2, 2.9, 11.1, -0.0, 0.2));
105+
models.Add(new CoefficientModel(9, 3, -1.4, 9.8, 0.4, -0.4));
106+
models.Add(new CoefficientModel(9, 4, -1.1, -5.1, -0.3, 0.4));
107+
models.Add(new CoefficientModel(9, 5, -13.3, -6.2, -0.0, 0.1));
108+
models.Add(new CoefficientModel(9, 6, 1.1, 7.8, 0.3, -0.0));
109+
models.Add(new CoefficientModel(9, 7, 8.9, 0.4, -0.0, -0.2));
110+
models.Add(new CoefficientModel(9, 8, -9.3, -1.5, -0.0, 0.5));
111+
models.Add(new CoefficientModel(9, 9, -11.9, 9.7, -0.4, 0.2));
112+
models.Add(new CoefficientModel(10, 0, -1.9, 0.0, 0.0, 0.0));
113+
models.Add(new CoefficientModel(10, 1, -6.2, 3.4, -0.0, -0.0));
114+
models.Add(new CoefficientModel(10, 2, -0.1, -0.2, -0.0, 0.1));
115+
models.Add(new CoefficientModel(10, 3, 1.7, 3.5, 0.2, -0.3));
116+
models.Add(new CoefficientModel(10, 4, -0.9, 4.8, -0.1, 0.1));
117+
models.Add(new CoefficientModel(10, 5, 0.6, -8.6, -0.2, -0.2));
118+
models.Add(new CoefficientModel(10, 6, -0.9, -0.1, -0.0, 0.1));
119+
models.Add(new CoefficientModel(10, 7, 1.9, -4.2, -0.1, -0.0));
120+
models.Add(new CoefficientModel(10, 8, 1.4, -3.4, -0.2, -0.1));
121+
models.Add(new CoefficientModel(10, 9, -2.4, -0.1, -0.1, 0.2));
122+
models.Add(new CoefficientModel(10, 10, -3.9, -8.8, -0.0, -0.0));
123+
models.Add(new CoefficientModel(11, 0, 3.0, 0.0, -0.0, 0.0));
124+
models.Add(new CoefficientModel(11, 1, -1.4, -0.0, -0.1, -0.0));
125+
models.Add(new CoefficientModel(11, 2, -2.5, 2.6, -0.0, 0.1));
126+
models.Add(new CoefficientModel(11, 3, 2.4, -0.5, 0.0, 0.0));
127+
models.Add(new CoefficientModel(11, 4, -0.9, -0.4, -0.0, 0.2));
128+
models.Add(new CoefficientModel(11, 5, 0.3, 0.6, -0.1, -0.0));
129+
models.Add(new CoefficientModel(11, 6, -0.7, -0.2, 0.0, 0.0));
130+
models.Add(new CoefficientModel(11, 7, -0.1, -1.7, -0.0, 0.1));
131+
models.Add(new CoefficientModel(11, 8, 1.4, -1.6, -0.1, -0.0));
132+
models.Add(new CoefficientModel(11, 9, -0.6, -3.0, -0.1, -0.1));
133+
models.Add(new CoefficientModel(11, 10, 0.2, -2.0, -0.1, 0.0));
134+
models.Add(new CoefficientModel(11, 11, 3.1, -2.6, -0.1, -0.0));
135+
models.Add(new CoefficientModel(12, 0, -2.0, 0.0, 0.0, 0.0));
136+
models.Add(new CoefficientModel(12, 1, -0.1, -1.2, -0.0, -0.0));
137+
models.Add(new CoefficientModel(12, 2, 0.5, 0.5, -0.0, 0.0));
138+
models.Add(new CoefficientModel(12, 3, 1.3, 1.3, 0.0, -0.1));
139+
models.Add(new CoefficientModel(12, 4, -1.2, -1.8, -0.0, 0.1));
140+
models.Add(new CoefficientModel(12, 5, 0.7, 0.1, -0.0, -0.0));
141+
models.Add(new CoefficientModel(12, 6, 0.3, 0.7, 0.0, 0.0));
142+
models.Add(new CoefficientModel(12, 7, 0.5, -0.1, -0.0, -0.0));
143+
models.Add(new CoefficientModel(12, 8, -0.2, 0.6, 0.0, 0.1));
144+
models.Add(new CoefficientModel(12, 9, -0.5, 0.2, -0.0, -0.0));
145+
models.Add(new CoefficientModel(12, 10, 0.1, -0.9, -0.0, -0.0));
146+
models.Add(new CoefficientModel(12, 11, -1.1, -0.0, -0.0, 0.0));
147+
models.Add(new CoefficientModel(12, 12, -0.3, 0.5, -0.1, -0.1));
148+
148149
models.Add(new CoefficientModel(13, 0, null, null, null, null));
149150
models.Add(new CoefficientModel(13, 1, null, null, null, null));
150151
models.Add(new CoefficientModel(13, 2, null, null, null, null));

‎CoordinateSharp.Magnetic/DataPoints/DataPoint.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ Organizations or use cases that fall under the following conditions may receive
4242
4343
For more information, please contact Signature Group, LLC at this address: sales@signatgroup.com
4444
*/
45+
using System;
4546

4647
namespace CoordinateSharp.Magnetic
47-
{
48+
{
49+
[Serializable]
4850
internal class DataPoint
4951
{
5052
public Magnetic Parent { get; }

‎CoordinateSharp.Magnetic/DataPoints/DataPoints.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Organizations or use cases that fall under the following conditions may receive
4848

4949
namespace CoordinateSharp.Magnetic
5050
{
51+
[Serializable]
5152
internal class DataPoints
5253
{
5354
public DataPoints(DataModel model, Magnetic magnetic)
@@ -94,6 +95,7 @@ private void Load_Data(List<CoefficientModel> models)
9495
//Time Dependents
9596
private void Load_TimeDependents()
9697
{
98+
9799
foreach (DataPoint dp in Points)
98100
{
99101
var dec = Parent.decimalDate - modelYear;
@@ -103,7 +105,7 @@ private void Load_TimeDependents()
103105
dp.TimeDependent_Gm = dp.Gm + dec * dp.Gtm;
104106
//Hm
105107
if (dp.Hm == null) { dp.TimeDependent_Hm = null; }
106-
dp.TimeDependent_Hm = dp.Hm + dec * dp.Htm;
108+
dp.TimeDependent_Hm = dp.Hm + dec * dp.Htm;
107109
}
108110
}
109111

@@ -120,6 +122,7 @@ private void Load_Schimdts_P()
120122
{
121123
int x = 0;
122124
int xx = 0;
125+
123126
foreach (DataPoint dp in Points)
124127
{
125128
if (dp.IsFactFactDouble)
@@ -151,6 +154,7 @@ private void Load_Schimdts_P()
151154
dp.Schmidt_Semi_P = (Math.Sin(Parent.nLatGC) * (2 * dp.Degree - 1) * Points[x].Schmidt_Semi_P) / (dp.Degree - dp.Order);
152155
x++;
153156
}
157+
154158
}
155159

156160
}

0 commit comments

Comments
 (0)