Merged latest-dev-branch into master.

Author: ancklo

CHANGELOG.rst

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+Version 0.10
+------------
+| **Date:** July 1, 2022
+| **Release:** v0.10
+| **Version of CHAOS:** CHAOS-7.11 (0711)
+
+Features
+^^^^^^^^
+* Updated RC-index file to RC_1997-2022_June_v3.
+
 Version 0.9
 -----------
 | **Date:** April 1, 2022

README.rst

@@ -18,8 +18,8 @@ The documentation of the current release is available on
 .. |pypi| image:: https://badge.fury.io/py/chaosmagpy.svg
     :target: https://badge.fury.io/py/chaosmagpy
 
-.. |docs| image:: https://readthedocs.org/projects/chaosmagpy/badge/?version=stable
-   :target: https://chaosmagpy.readthedocs.io/en/stable/?badge=stable
+.. |docs| image:: https://readthedocs.org/projects/chaosmagpy/badge/?version=master
+   :target: https://chaosmagpy.readthedocs.io/en/master/?badge=master
    :alt: Documentation Status
 
 .. |license| image:: https://img.shields.io/badge/License-MIT-blue.svg

chaosmagpy/__init__.py

@@ -4,7 +4,7 @@
     "basicConfig", "synth_values"
 ]
 
-__version__ = "0.9"
+__version__ = "0.10"
 
 from .chaos import (
     CHAOS,

chaosmagpy/chaos.py

@@ -444,7 +444,7 @@ def power_spectrum(self, time, radius=None, **kwargs):
 
         coeffs = self.synth_coeffs(time, **kwargs)
 
-        return mu.power_spectrum(coeffs, radius)
+        return mu.power_spectrum(coeffs, radius, source=self.source)
 
     def plot_power_spectrum(self, time, **kwargs):
         """

chaosmagpy/config_utils.py

@@ -139,7 +139,7 @@ def check_version_string(s):
                       lambda x: check_vector(x, len=3)],
     'params.ellipsoid': [np.array([6378.137, 6356.752]),
                          lambda x: check_vector(x, len=2)],
-    'params.CHAOS_version': ['7.10', check_version_string],
+    'params.CHAOS_version': ['7.11', check_version_string],
     'params.cdf_to_mjd': [730485, check_int],
 
     # location of coefficient files

chaosmagpy/lib/RC_index.h5

@@ -309,7 +309,7 @@ def synth_from_pp(breaks, order, coeffs, time, radius, theta, phi, *,
     if nmax is None:
         nmax = nmax_coeffs
     elif nmax > nmax_coeffs:
-        warnings.warn('Provided nmax = {0} is incompatible with number of '
+        warnings.warn('Supplied nmax = {0} is incompatible with number of '
                       'model coefficients. Using nmax = {1} instead.'.format(
                         nmax, nmax_coeffs))
         nmax = nmax_coeffs
@@ -492,7 +492,7 @@ def synth_values(coeffs, radius, theta, phi, *, nmax=None, nmin=None,
 
     if (theta_min <= 0.0) or (theta_max >= 180.0):
         if (theta_min == 0.0) or (theta_max == 180.0):
-            warnings.warn('Provided coordinates include the poles.')
+            warnings.warn('Supplied coordinates include the poles.')
             poles = True
         else:
             raise ValueError('Colatitude outside bounds [0, 180].')
@@ -724,7 +724,7 @@ def design_gauss(radius, theta, phi, nmax, *, nmin=None, mmax=None,
     # check if poles are included
     if (theta_min <= 0.0) or (theta_max >= 180.0):
         if (theta_min == 0.0) or (theta_max == 180.0):
-            warnings.warn('Provided coordinates include the poles.')
+            warnings.warn('Supplied coordinates include the poles.')
             poles = True
         else:
             raise ValueError('Colatitude outside bounds [0, 180].')

chaosmagpy/model_utils.py

@@ -27,7 +27,8 @@ Change RC index file
 
 Download a new RC-index file either directly as txt-file from
 `spacecenter.dk <http://www.spacecenter.dk/files/magnetic-models/RC/current/>`_
-or by using the function :func:`data_utils.save_RC_h5file` (saves as h5-file):
+or by using the function :func:`~.data_utils.save_RC_h5file` (saves as
+h5-file):
 
 .. code-block:: python
 

docs/source/configuration.rst

@@ -25,6 +25,8 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Topic :: Scientific/Engineering :: Physics
 
 [options]