Skip to content

Commit

Permalink
Update WMM 2020-2025 / Tests has been updated as well
Browse files Browse the repository at this point in the history
  • Loading branch information
NasH5169 committed Dec 11, 2019
1 parent d2ffd80 commit af36592
Show file tree
Hide file tree
Showing 3 changed files with 153 additions and 154 deletions.
186 changes: 93 additions & 93 deletions ObjectiveWMM/WMM.COF
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
2015.0 WMM-2015v2 09/18/2018
1 0 -29438.2 0.0 7.0 0.0
1 1 -1493.5 4796.3 9.0 -30.2
2 0 -2444.5 0.0 -11.0 0.0
2 1 3014.7 -2842.4 -6.2 -29.6
2 2 1679.0 -638.8 0.3 -17.3
3 0 1351.8 0.0 2.4 0.0
3 1 -2351.6 -113.7 -5.7 6.5
3 2 1223.6 246.5 2.0 -0.8
3 3 582.3 -537.4 -11.0 -2.0
4 0 907.5 0.0 -0.8 0.0
4 1 814.8 283.3 -0.9 -0.4
4 2 117.8 -188.6 -6.5 5.8
4 3 -335.6 180.7 5.2 3.8
4 4 69.7 -330.0 -4.0 -3.5
5 0 -232.9 0.0 -0.3 0.0
5 1 360.1 46.9 0.6 0.2
5 2 191.7 196.5 -0.8 2.3
5 3 -141.3 -119.9 0.1 -0.0
5 4 -157.2 16.0 1.2 3.3
5 5 7.7 100.6 1.4 -0.6
6 0 69.4 0.0 -0.8 0.0
6 1 67.7 -20.1 -0.5 0.3
6 2 72.3 32.8 -0.1 -1.5
6 3 -129.1 59.1 1.6 -1.2
6 4 -28.4 -67.1 -1.6 0.4
6 5 13.6 8.1 0.0 0.2
6 6 -70.3 61.9 1.2 1.3
7 0 81.7 0.0 -0.3 0.0
7 1 -75.9 -54.3 -0.2 0.6
7 2 -7.1 -19.5 -0.3 0.5
7 3 52.2 6.0 0.9 -0.8
7 4 15.0 24.5 0.1 -0.2
7 5 9.1 3.5 -0.6 -1.1
7 6 -3.0 -27.7 -0.9 0.1
7 7 5.9 -2.9 0.7 0.2
8 0 24.2 0.0 -0.1 0.0
8 1 8.9 10.1 0.2 -0.4
8 2 -16.9 -18.3 -0.2 0.6
8 3 -3.1 13.3 0.5 -0.1
8 4 -20.7 -14.5 -0.1 0.6
8 5 13.3 16.2 0.4 -0.2
8 6 11.6 6.0 0.4 -0.5
8 7 -16.3 -9.2 -0.1 0.5
8 8 -2.1 2.4 0.4 0.1
9 0 5.5 0.0 -0.1 0.0
9 1 8.8 -21.8 -0.1 -0.3
9 2 3.0 10.7 -0.0 0.1
9 3 -3.2 11.8 0.4 -0.4
9 4 0.6 -6.8 -0.4 0.3
9 5 -13.2 -6.9 0.0 0.1
9 6 -0.1 7.9 0.3 -0.0
9 7 8.7 1.0 0.0 -0.1
9 8 -9.1 -3.9 -0.0 0.5
9 9 -10.4 8.5 -0.3 0.2
10 0 -2.0 0.0 0.0 0.0
10 1 -6.1 3.3 -0.0 0.0
10 2 0.2 -0.4 -0.1 0.1
10 3 0.6 4.6 0.2 -0.2
10 4 -0.5 4.4 -0.1 0.1
10 5 1.8 -7.9 -0.2 -0.1
10 6 -0.7 -0.6 -0.0 0.1
10 7 2.2 -4.2 -0.1 -0.0
10 8 2.4 -2.9 -0.2 -0.1
10 9 -1.8 -1.1 -0.1 0.2
10 10 -3.6 -8.8 -0.0 -0.0
11 0 3.0 0.0 -0.0 0.0
11 1 -1.4 -0.0 0.0 0.0
11 2 -2.3 2.1 -0.0 0.1
11 3 2.1 -0.6 0.0 0.0
11 4 -0.8 -1.1 -0.0 0.1
11 5 0.6 0.7 -0.1 -0.0
11 6 -0.7 -0.2 0.0 -0.0
11 7 0.1 -2.1 -0.0 0.1
11 8 1.7 -1.5 -0.0 -0.0
11 9 -0.2 -2.6 -0.1 -0.1
11 10 0.4 -2.0 -0.0 -0.0
11 11 3.5 -2.3 -0.1 -0.1
12 0 -2.0 0.0 0.0 0.0
12 1 -0.1 -1.0 0.0 -0.0
12 2 0.5 0.3 -0.0 0.0
12 3 1.2 1.8 0.0 -0.1
12 4 -0.9 -2.2 -0.1 0.1
12 5 0.9 0.3 -0.0 -0.0
12 6 0.1 0.7 0.0 0.0
12 7 0.6 -0.1 -0.0 -0.0
12 8 -0.4 0.3 0.0 0.0
12 9 -0.5 0.2 -0.0 0.0
12 10 0.2 -0.9 -0.0 -0.0
12 11 -0.9 -0.2 -0.0 0.0
12 12 -0.0 0.8 -0.1 -0.1
999999999999999999999999999999999999999999999999
999999999999999999999999999999999999999999999999
2020.0 WMM-2020 12/10/2019
1 0 -29404.5 0.0 6.7 0.0
1 1 -1450.7 4652.9 7.7 -25.1
2 0 -2500.0 0.0 -11.5 0.0
2 1 2982.0 -2991.6 -7.1 -30.2
2 2 1676.8 -734.8 -2.2 -23.9
3 0 1363.9 0.0 2.8 0.0
3 1 -2381.0 -82.2 -6.2 5.7
3 2 1236.2 241.8 3.4 -1.0
3 3 525.7 -542.9 -12.2 1.1
4 0 903.1 0.0 -1.1 0.0
4 1 809.4 282.0 -1.6 0.2
4 2 86.2 -158.4 -6.0 6.9
4 3 -309.4 199.8 5.4 3.7
4 4 47.9 -350.1 -5.5 -5.6
5 0 -234.4 0.0 -0.3 0.0
5 1 363.1 47.7 0.6 0.1
5 2 187.8 208.4 -0.7 2.5
5 3 -140.7 -121.3 0.1 -0.9
5 4 -151.2 32.2 1.2 3.0
5 5 13.7 99.1 1.0 0.5
6 0 65.9 0.0 -0.6 0.0
6 1 65.6 -19.1 -0.4 0.1
6 2 73.0 25.0 0.5 -1.8
6 3 -121.5 52.7 1.4 -1.4
6 4 -36.2 -64.4 -1.4 0.9
6 5 13.5 9.0 -0.0 0.1
6 6 -64.7 68.1 0.8 1.0
7 0 80.6 0.0 -0.1 0.0
7 1 -76.8 -51.4 -0.3 0.5
7 2 -8.3 -16.8 -0.1 0.6
7 3 56.5 2.3 0.7 -0.7
7 4 15.8 23.5 0.2 -0.2
7 5 6.4 -2.2 -0.5 -1.2
7 6 -7.2 -27.2 -0.8 0.2
7 7 9.8 -1.9 1.0 0.3
8 0 23.6 0.0 -0.1 0.0
8 1 9.8 8.4 0.1 -0.3
8 2 -17.5 -15.3 -0.1 0.7
8 3 -0.4 12.8 0.5 -0.2
8 4 -21.1 -11.8 -0.1 0.5
8 5 15.3 14.9 0.4 -0.3
8 6 13.7 3.6 0.5 -0.5
8 7 -16.5 -6.9 0.0 0.4
8 8 -0.3 2.8 0.4 0.1
9 0 5.0 0.0 -0.1 0.0
9 1 8.2 -23.3 -0.2 -0.3
9 2 2.9 11.1 -0.0 0.2
9 3 -1.4 9.8 0.4 -0.4
9 4 -1.1 -5.1 -0.3 0.4
9 5 -13.3 -6.2 -0.0 0.1
9 6 1.1 7.8 0.3 -0.0
9 7 8.9 0.4 -0.0 -0.2
9 8 -9.3 -1.5 -0.0 0.5
9 9 -11.9 9.7 -0.4 0.2
10 0 -1.9 0.0 0.0 0.0
10 1 -6.2 3.4 -0.0 -0.0
10 2 -0.1 -0.2 -0.0 0.1
10 3 1.7 3.5 0.2 -0.3
10 4 -0.9 4.8 -0.1 0.1
10 5 0.6 -8.6 -0.2 -0.2
10 6 -0.9 -0.1 -0.0 0.1
10 7 1.9 -4.2 -0.1 -0.0
10 8 1.4 -3.4 -0.2 -0.1
10 9 -2.4 -0.1 -0.1 0.2
10 10 -3.9 -8.8 -0.0 -0.0
11 0 3.0 0.0 -0.0 0.0
11 1 -1.4 -0.0 -0.1 -0.0
11 2 -2.5 2.6 -0.0 0.1
11 3 2.4 -0.5 0.0 0.0
11 4 -0.9 -0.4 -0.0 0.2
11 5 0.3 0.6 -0.1 -0.0
11 6 -0.7 -0.2 0.0 0.0
11 7 -0.1 -1.7 -0.0 0.1
11 8 1.4 -1.6 -0.1 -0.0
11 9 -0.6 -3.0 -0.1 -0.1
11 10 0.2 -2.0 -0.1 0.0
11 11 3.1 -2.6 -0.1 -0.0
12 0 -2.0 0.0 0.0 0.0
12 1 -0.1 -1.2 -0.0 -0.0
12 2 0.5 0.5 -0.0 0.0
12 3 1.3 1.3 0.0 -0.1
12 4 -1.2 -1.8 -0.0 0.1
12 5 0.7 0.1 -0.0 -0.0
12 6 0.3 0.7 0.0 0.0
12 7 0.5 -0.1 -0.0 -0.0
12 8 -0.2 0.6 0.0 0.1
12 9 -0.5 0.2 -0.0 -0.0
12 10 0.1 -0.9 -0.0 -0.0
12 11 -1.1 -0.0 -0.0 0.0
12 12 -0.3 0.5 -0.1 -0.1
999999999999999999999999999999999999999999999999
999999999999999999999999999999999999999999999999
6 changes: 3 additions & 3 deletions ObjectiveWMM/WMM/GeomagnetismLibrary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* ABSTRACT
*
* The purpose of Geomagnetism Library is primarily to support the World Magnetic Model (WMM) 2015-2020.
* The purpose of Geomagnetism Library is primarily to support the World Magnetic Model (WMM) 2020-2025.
* It however is built to be used for spherical harmonic models of the Earth's magnetic field
* generally and supports models even with a large (>>12) number of degrees. It is also used in many
* other geomagnetic models distributed by NGDC.
Expand Down Expand Up @@ -732,7 +732,7 @@ char MAG_GeomagIntroduction_EMM(MAGtype_MagneticModel *MagneticModel, char* Vers
printf("\n The Enhanced Magnetic Model (EMM) for %d", (int) MagneticModel->epoch);
printf("\n is a model of Earth's main Magnetic and crustal field. The EMM");
printf("\n is recomputed every five (5) years, in years divisible by ");
printf("\n five (i.e. 2010, 2015). See the contact information below");
printf("\n five (i.e. 2015, 2020). See the contact information below");
printf("\n to obtain more information on the EMM and associated software.");
printf("\n ");
printf("\n Input required is the location in geodetic latitude and");
Expand Down Expand Up @@ -808,7 +808,7 @@ char MAG_GeomagIntroduction_WMM(MAGtype_MagneticModel *MagneticModel, char *Vers
printf("\n The World Magnetic Model (WMM) for %d", (int) MagneticModel->epoch);
printf("\n is a model of Earth's main Magnetic field. The WMM");
printf("\n is recomputed every five (5) years, in years divisible by ");
printf("\n five (i.e. 2010, 2015). See the contact information below");
printf("\n five (i.e. 2015, 2020). See the contact information below");
printf("\n to obtain more information on the WMM and associated software.");
printf("\n ");
printf("\n Input required is the location in geodetic latitude and");
Expand Down
Loading

0 comments on commit af36592

Please sign in to comment.