Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63bf36a2 authored by Peng Xu's avatar Peng Xu
Browse files

Update GeomagneticField parameters according to WMM-2015 

Test: compiles and corresponding cts test pass
Bug: 31216311
Change-Id: I36f26086b1e2f62f81974d81d90c9a9c315a3445
parent d1d961bd

core/java/android/hardware/GeomagneticField.java

+52 −52
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import java.util.GregorianCalendar; 
 * <p>This uses the World Magnetic Model produced by the United States National

 * Geospatial-Intelligence Agency.  More details about the model can be found at

 * <a href="http://www.ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml">http://www.ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml</a>.

 * This class currently uses WMM-2010 which is valid until 2015, but should

 * This class currently uses WMM-2015 which is valid until 2020, but should

 * produce acceptable results for several years after that. Future versions of

 * Android may use a newer version of the model.

 */
@@ -48,69 +48,69 @@ public class GeomagneticField { 
    static private final float EARTH_REFERENCE_RADIUS_KM = 6371.2f;



    // These coefficients and the formulae used below are from:

    // NOAA Technical Report: The US/UK World Magnetic Model for 2010-2015

    // NOAA Technical Report: The US/UK World Magnetic Model for 2015-2020

    static private final float[][] G_COEFF = new float[][] {

        { 0.0f },

        { -29496.6f, -1586.3f },

        { -2396.6f, 3026.1f, 1668.6f },

        { 1340.1f, -2326.2f, 1231.9f, 634.0f },

        { 912.6f, 808.9f, 166.7f, -357.1f, 89.4f },

        { -230.9f, 357.2f, 200.3f, -141.1f, -163.0f, -7.8f },

        { 72.8f, 68.6f, 76.0f, -141.4f, -22.8f, 13.2f, -77.9f },

        { 80.5f, -75.1f, -4.7f, 45.3f, 13.9f, 10.4f, 1.7f, 4.9f },

        { 24.4f, 8.1f, -14.5f, -5.6f, -19.3f, 11.5f, 10.9f, -14.1f, -3.7f },

        { 5.4f, 9.4f, 3.4f, -5.2f, 3.1f, -12.4f, -0.7f, 8.4f, -8.5f, -10.1f },

        { -2.0f, -6.3f, 0.9f, -1.1f, -0.2f, 2.5f, -0.3f, 2.2f, 3.1f, -1.0f, -2.8f },

        { 3.0f, -1.5f, -2.1f, 1.7f, -0.5f, 0.5f, -0.8f, 0.4f, 1.8f, 0.1f, 0.7f, 3.8f },

        { -2.2f, -0.2f, 0.3f, 1.0f, -0.6f, 0.9f, -0.1f, 0.5f, -0.4f, -0.4f, 0.2f, -0.8f, 0.0f } };

        { -29438.5f, -1501.1f },

        { -2445.3f, 3012.5f, 1676.6f },

        { 1351.1f, -2352.3f, 1225.6f, 581.9f },

        { 907.2f, 813.7f, 120.3f, -335.0f, 70.3f },

        { -232.6f, 360.1f, 192.4f, -141.0f, -157.4f, 4.3f },

        { 69.5f, 67.4f, 72.8f, -129.8f, -29.0f, 13.2f, -70.9f },

        { 81.6f, -76.1f, -6.8f, 51.9f, 15.0f, 9.3f, -2.8f, 6.7f },

        { 24.0f, 8.6f, -16.9f, -3.2f, -20.6f, 13.3f, 11.7f, -16.0f, -2.0f },

        { 5.4f, 8.8f, 3.1f, -3.1f, 0.6f, -13.3f, -0.1f, 8.7f, -9.1f, -10.5f },

        { -1.9f, -6.5f, 0.2f, 0.6f, -0.6f, 1.7f, -0.7f, 2.1f, 2.3f, -1.8f, -3.6f },

        { 3.1f, -1.5f, -2.3f, 2.1f, -0.9f, 0.6f, -0.7f, 0.2f, 1.7f, -0.2f, 0.4f, 3.5f },

        { -2.0f, -0.3f, 0.4f, 1.3f, -0.9f, 0.9f, 0.1f, 0.5f, -0.4f, -0.4f, 0.2f, -0.9f, 0.0f } };



    static private final float[][] H_COEFF = new float[][] {

        { 0.0f },

        { 0.0f, 4944.4f },

        { 0.0f, -2707.7f, -576.1f },

        { 0.0f, -160.2f, 251.9f, -536.6f },

        { 0.0f, 286.4f, -211.2f, 164.3f, -309.1f },

        { 0.0f, 44.6f, 188.9f, -118.2f, 0.0f, 100.9f },

        { 0.0f, -20.8f, 44.1f, 61.5f, -66.3f, 3.1f, 55.0f },

        { 0.0f, -57.9f, -21.1f, 6.5f, 24.9f, 7.0f, -27.7f, -3.3f },

        { 0.0f, 11.0f, -20.0f, 11.9f, -17.4f, 16.7f, 7.0f, -10.8f, 1.7f },

        { 0.0f, -20.5f, 11.5f, 12.8f, -7.2f, -7.4f, 8.0f, 2.1f, -6.1f, 7.0f },

        { 0.0f, 2.8f, -0.1f, 4.7f, 4.4f, -7.2f, -1.0f, -3.9f, -2.0f, -2.0f, -8.3f },

        { 0.0f, 0.2f, 1.7f, -0.6f, -1.8f, 0.9f, -0.4f, -2.5f, -1.3f, -2.1f, -1.9f, -1.8f },

        { 0.0f, -0.9f, 0.3f, 2.1f, -2.5f, 0.5f, 0.6f, 0.0f, 0.1f, 0.3f, -0.9f, -0.2f, 0.9f } };

        { 0.0f, 4796.2f },

        { 0.0f, -2845.6f, -642.0f },

        { 0.0f, -115.3f, 245.0f, -538.3f },

        { 0.0f, 283.4f, -188.6f, 180.9f, -329.5f },

        { 0.0f, 47.4f, 196.9f, -119.4f, 16.1f, 100.1f },

        { 0.0f, -20.7f, 33.2f, 58.8f, -66.5f, 7.3f, 62.5f },

        { 0.0f, -54.1f, -19.4f, 5.6f, 24.4f, 3.3f, -27.5f, -2.3f },

        { 0.0f, 10.2f, -18.1f, 13.2f, -14.6f, 16.2f, 5.7f, -9.1f, 2.2f },

        { 0.0f, -21.6f, 10.8f, 11.7f, -6.8f, -6.9f, 7.8f, 1.0f, -3.9f, 8.5f },

        { 0.0f, 3.3f, -0.3f, 4.6f, 4.4f, -7.9f, -0.6f, -4.1f, -2.8f, -1.1f, -8.7f },

        { 0.0f, -0.1f, 2.1f, -0.7f, -1.1f, 0.7f, -0.2f, -2.1f, -1.5f, -2.5f, -2.0f, -2.3f },

        { 0.0f, -1.0f, 0.5f, 1.8f, -2.2f, 0.3f, 0.7f, -0.1f, 0.3f, 0.2f, -0.9f, -0.2f, 0.7f } };



    static private final float[][] DELTA_G = new float[][] {

        { 0.0f },

        { 11.6f, 16.5f },

        { -12.1f, -4.4f, 1.9f },

        { 0.4f, -4.1f, -2.9f, -7.7f },

        { -1.8f, 2.3f, -8.7f, 4.6f, -2.1f },

        { -1.0f, 0.6f, -1.8f, -1.0f, 0.9f, 1.0f },

        { -0.2f, -0.2f, -0.1f, 2.0f, -1.7f, -0.3f, 1.7f },

        { 0.1f, -0.1f, -0.6f, 1.3f, 0.4f, 0.3f, -0.7f, 0.6f },

        { -0.1f, 0.1f, -0.6f, 0.2f, -0.2f, 0.3f, 0.3f, -0.6f, 0.2f },

        { 0.0f, -0.1f, 0.0f, 0.3f, -0.4f, -0.3f, 0.1f, -0.1f, -0.4f, -0.2f },

        { 0.0f, 0.0f, -0.1f, 0.2f, 0.0f, -0.1f, -0.2f, 0.0f, -0.1f, -0.2f, -0.2f },

        { 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.1f, 0.0f },

        { 0.0f, 0.0f, 0.1f, 0.1f, -0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.1f, 0.1f } };

        { 10.7f, 17.9f },

        { -8.6f, -3.3f, 2.4f },

        { 3.1f, -6.2f, -0.4f, -10.4f },

        { -0.4f, 0.8f, -9.2f, 4.0f, -4.2f },

        { -0.2f, 0.1f, -1.4f, 0.0f, 1.3f, 3.8f },

        { -0.5f, -0.2f, -0.6f, 2.4f, -1.1f, 0.3f, 1.5f },

        { 0.2f, -0.2f, -0.4f, 1.3f, 0.2f, -0.4f, -0.9f, 0.3f },

        { 0.0f, 0.1f, -0.5f, 0.5f, -0.2f, 0.4f, 0.2f, -0.4f, 0.3f },

        { 0.0f, -0.1f, -0.1f, 0.4f, -0.5f, -0.2f, 0.1f, 0.0f, -0.2f, -0.1f },

        { 0.0f, 0.0f, -0.1f, 0.3f, -0.1f, -0.1f, -0.1f, 0.0f, -0.2f, -0.1f, -0.2f },

        { 0.0f, 0.0f, -0.1f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.1f, -0.1f },

        { 0.1f, 0.0f, 0.0f, 0.1f, -0.1f, 0.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f } };



    static private final float[][] DELTA_H = new float[][] {

        { 0.0f },

        { 0.0f, -25.9f },

        { 0.0f, -22.5f, -11.8f },

        { 0.0f, 7.3f, -3.9f, -2.6f },

        { 0.0f, 1.1f, 2.7f, 3.9f, -0.8f },

        { 0.0f, 0.4f, 1.8f, 1.2f, 4.0f, -0.6f },

        { 0.0f, -0.2f, -2.1f, -0.4f, -0.6f, 0.5f, 0.9f },

        { 0.0f, 0.7f, 0.3f, -0.1f, -0.1f, -0.8f, -0.3f, 0.3f },

        { 0.0f, -0.1f, 0.2f, 0.4f, 0.4f, 0.1f, -0.1f, 0.4f, 0.3f },

        { 0.0f, 0.0f, -0.2f, 0.0f, -0.1f, 0.1f, 0.0f, -0.2f, 0.3f, 0.2f },

        { 0.0f, 0.1f, -0.1f, 0.0f, -0.1f, -0.1f, 0.0f, -0.1f, -0.2f, 0.0f, -0.1f },

        { 0.0f, 0.0f, 0.1f, 0.0f, 0.1f, 0.0f, 0.1f, 0.0f, -0.1f, -0.1f, 0.0f, -0.1f },

        { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f } };

        { 0.0f, -26.8f },

        { 0.0f, -27.1f, -13.3f },

        { 0.0f, 8.4f, -0.4f, 2.3f },

        { 0.0f, -0.6f, 5.3f, 3.0f, -5.3f },

        { 0.0f, 0.4f, 1.6f, -1.1f, 3.3f, 0.1f },

        { 0.0f, 0.0f, -2.2f, -0.7f, 0.1f, 1.0f, 1.3f },

        { 0.0f, 0.7f, 0.5f, -0.2f, -0.1f, -0.7f, 0.1f, 0.1f },

        { 0.0f, -0.3f, 0.3f, 0.3f, 0.6f, -0.1f, -0.2f, 0.3f, 0.0f },

        { 0.0f, -0.2f, -0.1f, -0.2f, 0.1f, 0.1f, 0.0f, -0.2f, 0.4f, 0.3f },

        { 0.0f, 0.1f, -0.1f, 0.0f, 0.0f, -0.2f, 0.1f, -0.1f, -0.2f, 0.1f, -0.1f },

        { 0.0f, 0.0f, 0.1f, 0.0f, 0.1f, 0.0f, 0.0f, 0.1f, 0.0f, -0.1f, 0.0f, -0.1f },

        { 0.0f, 0.0f, 0.0f, -0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f } };



    static private final long BASE_TIME =

        new GregorianCalendar(2010, 1, 1).getTimeInMillis();

            new GregorianCalendar(2015, 1, 1).getTimeInMillis();



    // The ratio between the Gauss-normalized associated Legendre functions and

    // the Schmid quasi-normalized ones. Compute these once staticly since they
@@ -190,7 +190,7 @@ public class GeomagneticField { 
        // We now compute the magnetic field strength given the geocentric

        // location. The magnetic field is the derivative of the potential

        // function defined by the model. See NOAA Technical Report: The US/UK

        // World Magnetic Model for 2010-2015 for the derivation.

        // World Magnetic Model for 2015-2020 for the derivation.

        float gcX = 0.0f;  // Geocentric northwards component.

        float gcY = 0.0f;  // Geocentric eastwards component.

        float gcZ = 0.0f;  // Geocentric downwards component.