TidalPy 0.5.2__tar.gz → 0.6.1__tar.gz

{TidalPy-0.5.2 → tidalpy-0.6.1}/Benchmarks & Performance/Performance/performance suite/multimode_solver.py

@@ -6,7 +6,6 @@ import TidalPy
 TidalPy.config['stream_level'] = 'WARNING'
 TidalPy.reinit()
 from TidalPy.tides.modes.multilayer_modes import collapse_multilayer_modes
-from TidalPy.tides.modes.multilayer_modes_numba import collapse_multilayer_modes as collapse_multilayer_modes_numba
 from TidalPy.rheology.complex_compliance.compliance_models import maxwell
 from TidalPy.utilities.spherical_helper.volume import calculate_voxel_volumes
 from TidalPy.utilities.spherical_helper.mass import calculate_mass_gravity_arrays

{TidalPy-0.5.2 → tidalpy-0.6.1}/LICENSE.md

@@ -1,6 +1,5 @@
-# License
+# Creative Commons Attribution-ShareAlike 4.0 International
 
-## Creative Commons Attribution-ShareAlike 4.0 International
 Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
 
 **Using Creative Commons Public Licenses**
@@ -11,6 +10,8 @@ Creative Commons public licenses provide a standard set of terms and conditions
 
 * __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
 
+## Creative Commons Attribution-ShareAlike 4.0 International Public License
+
 By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
 
 ### Section 1 – Definitions.

tidalpy-0.6.1/MANIFEST.in

@@ -0,0 +1,23 @@
+# MANIFEST.in
+
+# Include data files used for plotting and benchmarking
+include TidalPy/utilities/graphics/multilayer/*.csv
+
+# Include World Configuration Files
+include TidalPy/WorldPack/*.zip
+
+# Include Cython pyx and pxd files
+global-include *.pxd
+global-include *.pyx
+include cython_extensions.json
+
+# Include required hpp and cpp files
+include TidalPy/utilities/arrays/interp_.cpp
+include TidalPy/utilities/arrays/interp_.hpp
+include TidalPy/RadialSolver/love_.cpp
+include TidalPy/RadialSolver/love_.hpp
+include TidalPy/RadialSolver/rs_solution_.cpp
+include TidalPy/RadialSolver/rs_solution_.hpp
+include TidalPy/Material/eos/eos_solution_.cpp
+include TidalPy/Material/eos/eos_solution_.hpp
+include TidalPy/utilities/dimensions/nondimensional_.hpp

{TidalPy-0.5.2 → tidalpy-0.6.1}/PKG-INFO

@@ -1,11 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: TidalPy
-Version: 0.5.2
+Version: 0.6.1
 Summary: Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python
 Author-email: "Joe P. Renaud" <TidalPy@gmail.com>
-License: # License
+License: # Creative Commons Attribution-ShareAlike 4.0 International
         
-        ## Creative Commons Attribution-ShareAlike 4.0 International
         Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
         
         **Using Creative Commons Public Licenses**
@@ -16,6 +15,8 @@ License: # License
         
         * __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
         
+        ## Creative Commons Attribution-ShareAlike 4.0 International Public License
+        
         By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
         
         ### Section 1 – Definitions.
@@ -181,6 +182,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Cython
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -201,19 +203,22 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: numba>=0.54.1
 Requires-Dist: numpy<1.27,>=1.22
-Requires-Dist: scipy>=1.9.3
-Requires-Dist: platformdirs>=3.11.0
+Requires-Dist: scipy<1.14,>=1.9.3
+Requires-Dist: platformdirs<4,>=3.11.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: dill>=0.3.2
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: pathos>=0.2.0
-Requires-Dist: cyrk>=0.8.6
+Requires-Dist: cyrk<0.13.0,>=0.12.1
 Requires-Dist: astropy
 Requires-Dist: astroquery
+Requires-Dist: ipympl<0.10.0,>=0.9.6
+Requires-Dist: matplotlib<4.0.0,>=3.4.2
+Requires-Dist: cmcrameri<2.0,>=1.4
 Provides-Extra: dev
 Requires-Dist: jupyter; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
-Requires-Dist: cmcrameri>=1.4; extra == "dev"
+Requires-Dist: cmcrameri<2.0,>=1.4; extra == "dev"
 Requires-Dist: matplotlib>=3.4.2; extra == "dev"
 Requires-Dist: palettable>=3.3.0; extra == "dev"
 Requires-Dist: ipympl>=0.8.7; extra == "dev"
@@ -221,13 +226,13 @@ Requires-Dist: julia>=0.5.7; extra == "dev"
 Requires-Dist: diffeqpy>=1.2.0; extra == "dev"
 Provides-Extra: graphics
 Requires-Dist: jupyter; extra == "graphics"
-Requires-Dist: cmcrameri>=1.4; extra == "graphics"
+Requires-Dist: cmcrameri<2.0,>=1.4; extra == "graphics"
 Requires-Dist: matplotlib>=3.4.2; extra == "graphics"
 Requires-Dist: palettable>=3.3.0; extra == "graphics"
 Requires-Dist: ipympl>=0.8.7; extra == "graphics"
 Provides-Extra: burnman
 Requires-Dist: autograd; extra == "burnman"
-Requires-Dist: burnman; extra == "burnman"
+Requires-Dist: burnman<3,>=2.1.0; extra == "burnman"
 Provides-Extra: cartopy
 Requires-Dist: cartopy>=0.22.0; extra == "cartopy"
 Provides-Extra: julia
@@ -247,48 +252,24 @@ Requires-Dist: diffeqpy>=1.2.0; extra == "julia"
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.5.2 Alpha-orange" alt="TidalPy Version 0.5.1 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.1 Alpha-orange" alt="TidalPy Version 0.6.1 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 
 TidalPy is an open-source software suite that utilizes a semi-analytic approach to estimate tidal heating,
 orbit-rotation evolution, and thermal changes for rocky and icy worlds. It has been used to simulate the thermal-orbital
 evolution of moons within our Solar System as well as exoplanets beyond. TidalPy's `RadialSolver` package can accurately
-estimate the viscoelastic Love and Shida numbers for a multi-layered world, including the effects of liquid layers,
-compressibility, dynamic tides, and advanced rheological models. This model has been used to study the tidal response
-of Mercury, Venus, Earth, our Moon, and Mars.
+estimate the viscoelastic Love and Shida numbers for a multi-layered, rocky or icy world, including the effects of liquid layers,
+compressibility, dynamic tides, and advanced rheological models. This module has been used to study the tidal response
+of Mercury, Venus, Earth, our Moon, Mars, and much more.
 
 Have any questions? Feel free to leave an [issue](https://github.com/jrenaud90/TidalPy/issues) or send a message to
 [TidalPy@gmail.com](mailto:tidalpy@gmail.com).
 
-## Related Software
-
-Below is a non-exhaustive list of publicly available software that perform similar or parallel calculations as TidalPy.
-
-* Are you interested in the habitability of a planet? With considerations of tides, atmospheres, water content, solar
-  interactions? Check out...
-  * [VPLanet](https://github.com/VirtualPlanetaryLaboratory/vplanet)
-* Are you interested in the orbital evolution of multiple planets with each planet influencing one another? Consider an
-  N-body approach like...
-  * [Posidonius (formerly Mercury-T)](https://github.com/marblestation/posidonius)
-  * [ReboundX](https://github.com/dtamayo/reboundx)
-* Don't care about tides or orbital dynamics but are instead interested in interior structure and composition of
-  planets?
-  * [BurnMan](https://github.com/geodynamics/burnman)
-  * [PerpleX](http://www.perplex.ethz.ch/)
-* Are you interested in tides, interiors, *and* the chemical evolution of small worlds but don't care about
-  non-synchronous rotation or compressibility of planets?
-  * [IcyDwarf](https://github.com/MarcNeveu/IcyDwarf)
-
-However, if you want high fidelity tidal, orbital, spin, and interior models --- then you have come to the right place!
-Read below for instructions on how to install and use TidalPy.
-
 # How to Install
 
 ## Compatibility
 
-*As of TidalPy v0.5.0*:
-
 * **Windows-Latest**: *Installation & tests passed.*
 * **MacOS-Latest**: *Installation & tests passed.*
 * **Ubuntu-Latest**: *Installation & tests passed.*
@@ -339,21 +320,6 @@ After GEOS is installed you can pip install the rest,
 
 `pip install pyproj shapely pyshp cartopy`
 
-## DiffEqPy / Julia
-
-TidalPy provides the option to use the [Julia](https://julialang.org/) programming language's differential equation 
-solver for python: [diffeqpy](https://github.com/SciML/diffeqpy). To utilize this package you first need to ensure
-that Julia is installed on your machine and available via the system's environment path.
-
-* Install the Julia language from [https://julialang.org/downloads/](https://julialang.org/downloads/)
-* Add Julia's directory and its `bin` subdirectory to your system's path.
-* Open an elevated ("as administrator") terminal, command prompt, or powershell.
-  * If you are using a virtual Python environment make sure it is active.
-* Install `julia` and `diffeqpy` for python using pip
-  * Run `pip install julia diffeqpy`
-* Open Python on your elevated terminal (the following steps may take a while to compile). 
-  * Run `import julia; julia.install(); import diffeqpy; diffeqpy.install()`
-
 ## Installation Troubleshooting
 
 _If you ran into a problem that is not listed below please [submit an issue](https://github.com/jrenaud90/TidalPy/issues) and we will work on addressing it!_
@@ -366,7 +332,7 @@ _If you ran into a problem that is not listed below please [submit an issue](htt
 
 # How to Use TidalPy
 
-Check out the `Documentation\Getting Started.md` file. This is pretty bare bones at the moment but offers some basic
+Check out the `Documentation\1 - Getting Started.md` file. This is pretty bare bones at the moment but offers some basic
 info about TidalPy. For now the best way to learn how to use TidalPy is by checking out the `Demos` directory. There
 are "beginner" [Jupyter notebooks](https://jupyter.org/) that are a great starting point.
 
@@ -381,9 +347,9 @@ the end of this file.
 
 ## Citing TidalPy
 
-If you use TidalPy for your research please cite its Zenodo [doi: 10.5281/zenodo.7017474](https://zenodo.org/records/7017560).
+If you use TidalPy for your research please cite its Zenodo [doi: 10.5281/zenodo.7017474](https://doi.org/10.5281/zenodo.7017474).
 
-The science used in TidalPy is described in the following papers and software (and references therein):
+The science used in TidalPy is described in the following papers and software (with additional references therein):
 
 * Rheological Modeling Package:
   * [Tidally Heated Terrestrial Exoplanets: Viscoelastic Response Models](https://ui.adsabs.harvard.edu/abs/2009ApJ...707.1000H/abstract)
@@ -432,6 +398,8 @@ TidalPy has been improved by numerous contributors some of which you can find [h
 
 TidalPy has benefited from work and conversations with the following:
 - Wade G. Henning (U. of Maryland, College Park / NASA GSFC)
+- Michael Efroimsky (U.S. Naval Observatory)
 - Sander Goossens (NASA GSFC)
 - Marc Neveu (U. of Maryland, College Park / NASA GSFC)
 - Gael Cascioli (U. of Maryland, Baltimore County / NASA GSFC)
+- Nick Wagner (Brown U.)

{TidalPy-0.5.2 → tidalpy-0.6.1}/README.md

@@ -11,48 +11,24 @@
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.5.2 Alpha-orange" alt="TidalPy Version 0.5.1 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.1 Alpha-orange" alt="TidalPy Version 0.6.1 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 
 TidalPy is an open-source software suite that utilizes a semi-analytic approach to estimate tidal heating,
 orbit-rotation evolution, and thermal changes for rocky and icy worlds. It has been used to simulate the thermal-orbital
 evolution of moons within our Solar System as well as exoplanets beyond. TidalPy's `RadialSolver` package can accurately
-estimate the viscoelastic Love and Shida numbers for a multi-layered world, including the effects of liquid layers,
-compressibility, dynamic tides, and advanced rheological models. This model has been used to study the tidal response
-of Mercury, Venus, Earth, our Moon, and Mars.
+estimate the viscoelastic Love and Shida numbers for a multi-layered, rocky or icy world, including the effects of liquid layers,
+compressibility, dynamic tides, and advanced rheological models. This module has been used to study the tidal response
+of Mercury, Venus, Earth, our Moon, Mars, and much more.
 
 Have any questions? Feel free to leave an [issue](https://github.com/jrenaud90/TidalPy/issues) or send a message to
 [TidalPy@gmail.com](mailto:tidalpy@gmail.com).
 
-## Related Software
-
-Below is a non-exhaustive list of publicly available software that perform similar or parallel calculations as TidalPy.
-
-* Are you interested in the habitability of a planet? With considerations of tides, atmospheres, water content, solar
-  interactions? Check out...
-  * [VPLanet](https://github.com/VirtualPlanetaryLaboratory/vplanet)
-* Are you interested in the orbital evolution of multiple planets with each planet influencing one another? Consider an
-  N-body approach like...
-  * [Posidonius (formerly Mercury-T)](https://github.com/marblestation/posidonius)
-  * [ReboundX](https://github.com/dtamayo/reboundx)
-* Don't care about tides or orbital dynamics but are instead interested in interior structure and composition of
-  planets?
-  * [BurnMan](https://github.com/geodynamics/burnman)
-  * [PerpleX](http://www.perplex.ethz.ch/)
-* Are you interested in tides, interiors, *and* the chemical evolution of small worlds but don't care about
-  non-synchronous rotation or compressibility of planets?
-  * [IcyDwarf](https://github.com/MarcNeveu/IcyDwarf)
-
-However, if you want high fidelity tidal, orbital, spin, and interior models --- then you have come to the right place!
-Read below for instructions on how to install and use TidalPy.
-
 # How to Install
 
 ## Compatibility
 
-*As of TidalPy v0.5.0*:
-
 * **Windows-Latest**: *Installation & tests passed.*
 * **MacOS-Latest**: *Installation & tests passed.*
 * **Ubuntu-Latest**: *Installation & tests passed.*
@@ -103,21 +79,6 @@ After GEOS is installed you can pip install the rest,
 
 `pip install pyproj shapely pyshp cartopy`
 
-## DiffEqPy / Julia
-
-TidalPy provides the option to use the [Julia](https://julialang.org/) programming language's differential equation 
-solver for python: [diffeqpy](https://github.com/SciML/diffeqpy). To utilize this package you first need to ensure
-that Julia is installed on your machine and available via the system's environment path.
-
-* Install the Julia language from [https://julialang.org/downloads/](https://julialang.org/downloads/)
-* Add Julia's directory and its `bin` subdirectory to your system's path.
-* Open an elevated ("as administrator") terminal, command prompt, or powershell.
-  * If you are using a virtual Python environment make sure it is active.
-* Install `julia` and `diffeqpy` for python using pip
-  * Run `pip install julia diffeqpy`
-* Open Python on your elevated terminal (the following steps may take a while to compile). 
-  * Run `import julia; julia.install(); import diffeqpy; diffeqpy.install()`
-
 ## Installation Troubleshooting
 
 _If you ran into a problem that is not listed below please [submit an issue](https://github.com/jrenaud90/TidalPy/issues) and we will work on addressing it!_
@@ -130,7 +91,7 @@ _If you ran into a problem that is not listed below please [submit an issue](htt
 
 # How to Use TidalPy
 
-Check out the `Documentation\Getting Started.md` file. This is pretty bare bones at the moment but offers some basic
+Check out the `Documentation\1 - Getting Started.md` file. This is pretty bare bones at the moment but offers some basic
 info about TidalPy. For now the best way to learn how to use TidalPy is by checking out the `Demos` directory. There
 are "beginner" [Jupyter notebooks](https://jupyter.org/) that are a great starting point.
 
@@ -145,9 +106,9 @@ the end of this file.
 
 ## Citing TidalPy
 
-If you use TidalPy for your research please cite its Zenodo [doi: 10.5281/zenodo.7017474](https://zenodo.org/records/7017560).
+If you use TidalPy for your research please cite its Zenodo [doi: 10.5281/zenodo.7017474](https://doi.org/10.5281/zenodo.7017474).
 
-The science used in TidalPy is described in the following papers and software (and references therein):
+The science used in TidalPy is described in the following papers and software (with additional references therein):
 
 * Rheological Modeling Package:
   * [Tidally Heated Terrestrial Exoplanets: Viscoelastic Response Models](https://ui.adsabs.harvard.edu/abs/2009ApJ...707.1000H/abstract)
@@ -196,6 +157,8 @@ TidalPy has been improved by numerous contributors some of which you can find [h
 
 TidalPy has benefited from work and conversations with the following:
 - Wade G. Henning (U. of Maryland, College Park / NASA GSFC)
+- Michael Efroimsky (U.S. Naval Observatory)
 - Sander Goossens (NASA GSFC)
 - Marc Neveu (U. of Maryland, College Park / NASA GSFC)
 - Gael Cascioli (U. of Maryland, Baltimore County / NASA GSFC)
+- Nick Wagner (Brown U.)

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Functions/test_rheology.py

@@ -1,9 +1,6 @@
 import numpy as np
 from math import isclose, isnan
 
-import TidalPy
-TidalPy.test_mode = True
-
 from TidalPy.rheology import (
     Elastic,
     Newton,

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Math/test_utilities_complex.py

@@ -5,10 +5,8 @@ from math import isclose, isinf, isnan, nan, inf
 import pytest
 import numpy as np
 
-import TidalPy
-TidalPy.test_mode = True
 
-from TidalPy.utilities.math.complex import hypot, csqrt, cexp, clog, cpow, cipow
+from TidalPy.utilities.math.complex import hypot, csqrt, cexp, clog, cpow, cipow, cinv, cabs, cabs2
 
 
 def compare_values(value_1, value_2):
@@ -61,6 +59,33 @@ standard_list_float = (
     inf
     )
 
+@pytest.mark.parametrize('z', standard_list_complex)
+def test_cabs(z):
+
+    np_result = np.abs(z)
+    tpy_result = cabs(z)
+
+    compare_values_complex(np_result, tpy_result)
+
+@pytest.mark.parametrize('z', standard_list_complex)
+def test_cabs2(z):
+
+    np_result = np.abs(z)**2
+    tpy_result = cabs2(z)
+
+    compare_values_complex(np_result, tpy_result)
+
+@pytest.mark.parametrize('z', standard_list_complex)
+def test_cinv(z):
+
+    np_result = 1. / np.asarray(z, dtype=np.complex128)
+    np_result = np_result
+    tpy_result = cinv(z)
+
+    try:
+        compare_values_complex(np_result, tpy_result)
+    except:
+        breakpoint()
 
 @pytest.mark.parametrize('a', standard_list_float)
 @pytest.mark.parametrize('b', standard_list_float)

tidalpy-0.6.1/Tests/Test_Math/test_utilities_numerics.py

@@ -0,0 +1,24 @@
+import pytest
+
+from math import isclose as py_isclose
+from math import nan
+
+from TidalPy.utilities.math.numerics import isclose
+
+
+@pytest.mark.parametrize('a', (0.0, -55.222226, 10., 1.0e200, -1.0e200, 1.0e-9, 1.0e-5, -1.0e-9, -1.0e-5, 1.4562221e34, 1.0e-14, 0.98e-14))
+@pytest.mark.parametrize('b', (0.0, -55.222222, 10., 1.0e200, -1.0e200, 1.0e-9, 1.0e-5, -1.0e-9, -1.0e-5, 1.4582221e34, 1.0e-14, 0.98e-14))
+@pytest.mark.parametrize('rtol', (3.0, 1.0e-9, 1.0e-3))
+@pytest.mark.parametrize('atol', (3.0, 1.0e-3, 0.0))
+def test_math_isclose(a, b, rtol, atol):
+
+    pyresult  = py_isclose(a, b, rel_tol=rtol, abs_tol=atol)
+    tpyresult = isclose(a, b, rtol, atol)
+
+    assert pyresult == tpyresult
+
+def test_math_isclose_nans():
+
+    assert isclose(nan, 10.0) == False
+    assert isclose(10.0, nan) == False
+

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Math/test_utilities_special.py

@@ -3,10 +3,7 @@ from scipy.special import factorial2
 
 import pytest
 
-import TidalPy
-TidalPy.test_mode = True
-
-from TidalPy.utilities.math.special_x import double_factorial
+from TidalPy.utilities.math.special import double_factorial
 
 @pytest.mark.parametrize('l', (0, 2, 3, 4, 5, 10, 20, 100))
 def test_double_factorial(l):

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Old/Test_SetB_Package/test_c_tools_conversions.py

@@ -2,9 +2,9 @@ import math
 
 import numpy as np
 import pytest
-from scipy.constants import G
 
 import TidalPy
+from TidalPy.constants import G
 from TidalPy.exceptions import BadValueError
 from TidalPy.utilities.conversions import (Au2m, days2rads, m2Au, myr2sec, orbital_motion2semi_a, rads2days, sec2myr,
                                                semi_a2orbital_motion)

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Old/Test_SetB_Package/test_g_math_special_funcs.py

@@ -5,7 +5,7 @@ import numpy as np
 import TidalPy
 
 
-from TidalPy.utilities.math.special import sqrt_neg
+from TidalPy.utilities.math.numba_special import sqrt_neg
 
 
 def test_sqrt_neg():

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Old/Test_SetF_Functional/Test_Tides/test_b_dissipation.py

@@ -1,8 +1,8 @@
 import numpy as np
 import pytest
-from scipy.constants import G
 
 import TidalPy
+from TidalPy.constants import G
 
 
 earth_radius = 6.37101e6

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Old/Test_SetK_PlanetBuild/test_a_build_star.py

@@ -1,11 +1,9 @@
 import os
 
 import numpy as np
-from scipy.constants import G
 
 import TidalPy
-
-
+from TidalPy.constants import G
 from TidalPy.paths import get_worlds_dir
 from TidalPy.structures import build_world
 

{TidalPy-0.5.2 → tidalpy-0.6.1}/Tests/Test_Old/Test_SetK_PlanetBuild/test_d_build_burnman_planet.py

@@ -4,9 +4,6 @@ import pytest
 import toml
 import numpy as np
 
-import TidalPy
-TidalPy.test_mode = True
-
 from TidalPy.structures import build_world, scale_from_world
 from TidalPy.Extending.burnman import burnman_installed