WMM2025 World Magnetic Model

MANIFEST.in

@@ -1,3 +1,3 @@
-include src/wmm2020/meson.build src/wmm2020/CMakeLists.txt src/wmm2020/setup.cmake src/wmm2020/test_input.asc src/wmm2020/WMM.COF
-recursive-include src/wmm2020/src *.c
-recursive-include src/wmm2020/src *.h
+include src/wmm2025/meson.build src/wmm2025/CMakeLists.txt src/wmm2025/setup.cmake src/wmm2025/test_input.asc src/wmm2025/WMM.COF
+recursive-include src/wmm2025/src *.c
+recursive-include src/wmm2025/src *.h

README.md

@@ -1,57 +1,57 @@
-# WMM2020
+# WMM2025
 
-![Actions Status](https://github.com/space-physics/wmm2020/workflows/ci/badge.svg)
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/space-physics/wmm2020.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/space-physics/wmm2020/context:python)
-[![Python versions (PyPI)](https://img.shields.io/pypi/pyversions/wmm2020.svg)](https://pypi.python.org/pypi/wmm2020)
-[![Downloads](http://pepy.tech/badge/wmm2020)](http://pepy.tech/project/wmm2020)
+![Actions Status](https://github.com/space-physics/wmm2025/workflows/ci/badge.svg)
+[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/space-physics/wmm2025.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/space-physics/wmm2025/context:python)
+[![Python versions (PyPI)](https://img.shields.io/pypi/pyversions/wmm2025.svg)](https://pypi.python.org/pypi/wmm2025)
+[![Downloads](http://pepy.tech/badge/wmm2025)](http://pepy.tech/project/wmm2025)
 
 
-WMM2020 World Magnetic Model...in simple, object-oriented Python.
+WMM2025 World Magnetic Model...in simple, object-oriented Python.
 [WMM2015](https://github.com/space-physics/wmm2015) is also available.
 Tested on Linux, Mac and Windows.
 Most C compilers work.
 At this time Visual Studio is not supported since MSVC doesn't export function symbols without additional headers,
 which is typically done with something like SWIG.
 
-![image](./src/wmm2020/tests/incldecl.png)
+![image](./src/wmm2025/tests/incldecl.png)
 
 ## Install
 
 for the latest release from PyPi:
 
 ```sh
-python -m pip install wmm2020
+python -m pip install wmm2025
 ```
 
 Optionally, to get the cutting-edge development version:
 
 ```sh
-git clone https://github.com/space-physics/wmm2020
+git clone https://github.com/space-physics/wmm2025
 
-python -m pip install -e wmm2020
+python -m pip install -e wmm2025
 ```
 
-This Python wrapper of WMM2020 uses our build-on-run technique.
-The first time you use WMM2020, you will see messages from the Meson build system and your C compiler.
+This Python wrapper of WMM2025 uses our build-on-run technique.
+The first time you use WMM2025, you will see messages from the Meson build system and your C compiler.
 
 
 ## Usage
 
 an example script
 
 ```sh
-python RunWMM2020.py
+python RunWMM2025.py
 ```
 
 or as a Python module:
 
 ```python
-import wmm2020
+import wmm2025
 
-mag = wmm2020.wmm(glat, glon, alt_km, yeardec)
+mag = wmm2025.wmm(glat, glon, alt_km, yeardec)
 ```
 
 ## Reference
 
-* WMM2020 [inclination map](https://www.ngdc.noaa.gov/geomag/WMM/data/WMM2020/WMM2020_I_MERC.pdf)
-* WMM2020 [declination map](https://www.ngdc.noaa.gov/geomag/WMM/data/WMM2020/WMM2020_D_MERC.pdf)
+* WMM2025 [inclination map](https://www.ngdc.noaa.gov/geomag/WMM/data/WMM2025/WMM2025_I_MERC.pdf)
+* WMM2025 [declination map](https://www.ngdc.noaa.gov/geomag/WMM/data/WMM2025/WMM2025_D_MERC.pdf)

RunWMM2020.py

@@ -3,12 +3,12 @@
 from matplotlib.pyplot import show
 import argparse
 
-import wmm2020 as wmm
-import wmm2020.plots as plt
+import wmm2025 as wmm
+import wmm2025.plots as plt
 
 
 p = argparse.ArgumentParser()
-p.add_argument("yeardec", help="decimal year e.g. 2020.62", type=float)
+p.add_argument("yeardec", help="decimal year e.g. 2025.62", type=float)
 p.add_argument("alt_km", help="altitude (km) default: 0.", type=float, default=0.0)
 P = p.parse_args()
 

setup.cfg

@@ -1,9 +1,9 @@
 [metadata]
-name = wmm2020
+name = wmm2025
 version = 1.1.1
 author = Michael Hirsch, Ph.D.
-url = https://github.com/space-physics/wmm2020
-description = WMM2020 geomagnetic model with simple object-oriented Python interface
+url = https://github.com/space-physics/wmm2025
+description = WMM2025 geomagnetic model with simple object-oriented Python interface
 keywords =
   geomagnetic
 classifiers =

src/wmm2020/CMakeLists.txt → src/wmm2025/CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 add_library(wmm20 SHARED src/wmm_point_sub.c)
 target_link_libraries(wmm20 PRIVATE geo)
 
-# https://www.ngdc.noaa.gov/geomag/WMM/data/WMM2020/WMM2020testvalues.pdf
+# https://www.ngdc.noaa.gov/geomag/WMM/data/WMM2025/WMM2025testvalues.pdf
 add_executable(wmm20_file src/wmm_file.c)
 target_link_libraries(wmm20_file geo)
 

src/wmm2025/WMM.COF

@@ -0,0 +1,93 @@
+    2025.0            WMM-2025     11/13/2024
+  1  0  -29351.8       0.0       12.0        0.0
+  1  1   -1410.8    4545.4        9.7      -21.5
+  2  0   -2556.6       0.0      -11.6        0.0
+  2  1    2951.1   -3133.6       -5.2      -27.7
+  2  2    1649.3    -815.1       -8.0      -12.1
+  3  0    1361.0       0.0       -1.3        0.0
+  3  1   -2404.1     -56.6       -4.2        4.0
+  3  2    1243.8     237.5        0.4       -0.3
+  3  3     453.6    -549.5      -15.6       -4.1
+  4  0     895.0       0.0       -1.6        0.0
+  4  1     799.5     278.6       -2.4       -1.1
+  4  2      55.7    -133.9       -6.0        4.1
+  4  3    -281.1     212.0        5.6        1.6
+  4  4      12.1    -375.6       -7.0       -4.4
+  5  0    -233.2       0.0        0.6        0.0
+  5  1     368.9      45.4        1.4       -0.5
+  5  2     187.2     220.2        0.0        2.2
+  5  3    -138.7    -122.9        0.6        0.4
+  5  4    -142.0      43.0        2.2        1.7
+  5  5      20.9     106.1        0.9        1.9
+  6  0      64.4       0.0       -0.2        0.0
+  6  1      63.8     -18.4       -0.4        0.3
+  6  2      76.9      16.8        0.9       -1.6
+  6  3    -115.7      48.8        1.2       -0.4
+  6  4     -40.9     -59.8       -0.9        0.9
+  6  5      14.9      10.9        0.3        0.7
+  6  6     -60.7      72.7        0.9        0.9
+  7  0      79.5       0.0       -0.0        0.0
+  7  1     -77.0     -48.9       -0.1        0.6
+  7  2      -8.8     -14.4       -0.1        0.5
+  7  3      59.3      -1.0        0.5       -0.8
+  7  4      15.8      23.4       -0.1        0.0
+  7  5       2.5      -7.4       -0.8       -1.0
+  7  6     -11.1     -25.1       -0.8        0.6
+  7  7      14.2      -2.3        0.8       -0.2
+  8  0      23.2       0.0       -0.1        0.0
+  8  1      10.8       7.1        0.2       -0.2
+  8  2     -17.5     -12.6        0.0        0.5
+  8  3       2.0      11.4        0.5       -0.4
+  8  4     -21.7      -9.7       -0.1        0.4
+  8  5      16.9      12.7        0.3       -0.5
+  8  6      15.0       0.7        0.2       -0.6
+  8  7     -16.8      -5.2       -0.0        0.3
+  8  8       0.9       3.9        0.2        0.2
+  9  0       4.6       0.0       -0.0        0.0
+  9  1       7.8     -24.8       -0.1       -0.3
+  9  2       3.0      12.2        0.1        0.3
+  9  3      -0.2       8.3        0.3       -0.3
+  9  4      -2.5      -3.3       -0.3        0.3
+  9  5     -13.1      -5.2        0.0        0.2
+  9  6       2.4       7.2        0.3       -0.1
+  9  7       8.6      -0.6       -0.1       -0.2
+  9  8      -8.7       0.8        0.1        0.4
+  9  9     -12.9      10.0       -0.1        0.1
+ 10  0      -1.3       0.0        0.1        0.0
+ 10  1      -6.4       3.3        0.0        0.0
+ 10  2       0.2       0.0        0.1       -0.0
+ 10  3       2.0       2.4        0.1       -0.2
+ 10  4      -1.0       5.3       -0.0        0.1
+ 10  5      -0.6      -9.1       -0.3       -0.1
+ 10  6      -0.9       0.4        0.0        0.1
+ 10  7       1.5      -4.2       -0.1        0.0
+ 10  8       0.9      -3.8       -0.1       -0.1
+ 10  9      -2.7       0.9       -0.0        0.2
+ 10 10      -3.9      -9.1       -0.0       -0.0
+ 11  0       2.9       0.0        0.0        0.0
+ 11  1      -1.5       0.0       -0.0       -0.0
+ 11  2      -2.5       2.9        0.0        0.1
+ 11  3       2.4      -0.6        0.0       -0.0
+ 11  4      -0.6       0.2        0.0        0.1
+ 11  5      -0.1       0.5       -0.1       -0.0
+ 11  6      -0.6      -0.3        0.0       -0.0
+ 11  7      -0.1      -1.2       -0.0        0.1
+ 11  8       1.1      -1.7       -0.1       -0.0
+ 11  9      -1.0      -2.9       -0.1        0.0
+ 11 10      -0.2      -1.8       -0.1        0.0
+ 11 11       2.6      -2.3       -0.1        0.0
+ 12  0      -2.0       0.0        0.0        0.0
+ 12  1      -0.2      -1.3        0.0       -0.0
+ 12  2       0.3       0.7       -0.0        0.0
+ 12  3       1.2       1.0       -0.0       -0.1
+ 12  4      -1.3      -1.4       -0.0        0.1
+ 12  5       0.6      -0.0       -0.0       -0.0
+ 12  6       0.6       0.6        0.1       -0.0
+ 12  7       0.5      -0.1       -0.0       -0.0
+ 12  8      -0.1       0.8        0.0        0.0
+ 12  9      -0.4       0.1        0.0       -0.0
+ 12 10      -0.2      -1.0       -0.1       -0.0
+ 12 11      -1.3       0.1       -0.0        0.0
+ 12 12      -0.7       0.2       -0.1       -0.1
+999999999999999999999999999999999999999999999999
+999999999999999999999999999999999999999999999999

src/wmm2020/plots.py → src/wmm2025/plots.py

@@ -6,7 +6,7 @@ def plotwmm(mag: xarray.Dataset):
 
     fg = figure()
     ax = fg.subplots(1, 2, sharey=True)
-    fg.suptitle("WMM2020  {}".format(mag.time))
+    fg.suptitle("WMM2025  {}".format(mag.time))
     h = ax[0].contour(mag.glon, mag.glat, mag.decl, range(-90, 90 + 20, 20))
     ax[0].clabel(h, inline=True, fmt="%0.1f")
     ax[0].set_title("Magnetic Declination [degrees]")

src/wmm2020/src/GeomagnetismLibrary.c → src/wmm2025/src/GeomagnetismLibrary.c

@@ -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) 2015-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 NCEI.

src/wmm2025/test_input.asc

@@ -0,0 +1 @@
+2025.5 E F30000 70.3 30.8

src/wmm2020/tests/test_all.py → src/wmm2025/tests/test_all.py

@@ -1,10 +1,10 @@
 from pytest import approx
 import xarray
 
-import wmm2020 as wmm
+import wmm2025 as wmm
 
 
-def test_wmm2020():
+def test_wmm2025():
     mag = wmm.wmm(65, 85, alt_km=0, yeardec=2012.52868852459)
 
     assert isinstance(mag, xarray.Dataset)
@@ -18,7 +18,7 @@ def test_wmm2020():
     assert mag.decl.item() == approx(15.67178464900435)
 
 
-def test_wmm2020_point():
+def test_wmm2025_point():
     mag = wmm.wmm_point(65, 85, alt_km=0, yeardec=2012.52868852459)
     assert isinstance(mag, dict)