TidalPy 0.6.4__tar.gz → 0.6.5__tar.gz

{tidalpy-0.6.4/TidalPy.egg-info → tidalpy-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TidalPy
-Version: 0.6.4
+Version: 0.6.5
 Summary: Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python
 Author-email: "Joe P. Renaud" <TidalPy@gmail.com>
 License-Expression: CC-BY-NC-SA-4.0
@@ -81,7 +81,7 @@ Dynamic: license-file
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.4 Alpha-orange" alt="TidalPy Version 0.6.4 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.4 Alpha-orange" alt="TidalPy Version 0.6.5 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 
@@ -110,7 +110,13 @@ system and performing the following in a terminal:
 
 `pip install TidalPy`
 
-_TidalPy can not currently be installed via `conda install`._
+Alternatively you can use conda to install TidalPy:
+
+`conda install -c conda-forge TidalPy`
+
+or 
+
+`mamba install TidalPy`
 
 ## Accessing Jupyter Notebooks
 There are several jupyter notebooks with TidalPy demos found in the /Demos/ folder of this repository.

{tidalpy-0.6.4 → tidalpy-0.6.5}/README.md

@@ -11,7 +11,7 @@
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.4 Alpha-orange" alt="TidalPy Version 0.6.4 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.4 Alpha-orange" alt="TidalPy Version 0.6.5 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 
@@ -40,7 +40,13 @@ system and performing the following in a terminal:
 
 `pip install TidalPy`
 
-_TidalPy can not currently be installed via `conda install`._
+Alternatively you can use conda to install TidalPy:
+
+`conda install -c conda-forge TidalPy`
+
+or 
+
+`mamba install TidalPy`
 
 ## Accessing Jupyter Notebooks
 There are several jupyter notebooks with TidalPy demos found in the /Demos/ folder of this repository.

{tidalpy-0.6.4 → tidalpy-0.6.5}/Tests/Test_Old/Test_SetK_PlanetBuild/test_b_build_layered.py

@@ -63,7 +63,6 @@ def value_check(world, config_to_compare: dict, check_name: bool = True):
     np.testing.assert_approx_equal(world.mass, layer_mass_combined)
     return True
 
-
 def test_build_layered_from_manual_config():
     """ This will test loading a LayeredWorld from a user-provided configuration dictionary. """
 
@@ -146,3 +145,22 @@ def test_build_complex_layered_world():
 
     # Make sure that there are four layers in the world
     assert len(earth_simple.layers) == 4
+
+def test_planet_array_edit():
+    """ Make sure that planet.paint does not change the underlying arrays. """
+    
+    from TidalPy.structures import build_world
+
+    io_simple = build_world('io_simple')
+
+    # Current work around; make a copy of any relevant arrays.
+    radii_2 = np.copy(io_simple.radii)
+
+    # Make a call to something that could change the underlying array.
+    _ = io_simple.paint(auto_show=False) # Comment/uncomment this line to check the result.
+    
+    assert np.allclose(io_simple.radii, radii_2)
+    
+    # While the values in these arrays should be the same; the arrays themselves should not be.
+    assert np.allclose(io_simple._radii, io_simple.radii)
+    assert not (io_simple._radii is io_simple.radii)

{tidalpy-0.6.4 → tidalpy-0.6.5}/TidalPy/Material/eos/ode.pyx

@@ -25,7 +25,6 @@ cdef void eos_diffeq(
     eos_function(<char*>eos_output_ptr, radius, y_ptr, input_args)
     
     cdef double rho = eos_output_ptr.density
-    
     # Solve for the dependent variables
     # gravity is proportionate to 1 / r so there is a singularity at r=0. Let's set all derivatives equal to zero.
     if (radius < d_EPS_DBL_10) or (radius > eos_input_ptr.planet_radius):

{tidalpy-0.6.4 → tidalpy-0.6.5}/TidalPy/RadialSolver/boundaries/surface_bc.pyx

@@ -4,9 +4,6 @@
 import numpy as np
 cimport numpy as cnp
 
-from libc.stdio cimport printf
-from libc.stdlib cimport exit
-
 from TidalPy.exceptions import ArgumentException, UnknownModelError
 from TidalPy.constants cimport d_NAN_DBL
 

{tidalpy-0.6.4 → tidalpy-0.6.5}/TidalPy/RadialSolver/derivatives/odes.pyx

@@ -1,10 +1,8 @@
 # distutils: language = c++
 # cython: boundscheck=False, wraparound=False, nonecheck=False, cdivision=True, initializedcheck=False
 
-from TidalPy.utilities.math.complex cimport cf_build_dblcmplx, cf_cabs, cf_cinv
+from TidalPy.utilities.math.complex cimport cf_build_dblcmplx, cf_cinv
 from TidalPy.constants cimport d_EPS_DBL
-from libc.float cimport DBL_DIG
-from libc.stdio cimport printf
 from libc.math cimport fabs
 from libcpp cimport bool as cpp_bool
 from libcpp.cmath cimport ilogb, ldexp

{tidalpy-0.6.4 → tidalpy-0.6.5}/TidalPy/RadialSolver/shooting.pyx

@@ -123,6 +123,7 @@ cdef int cf_shooting_solver(
         ) noexcept nogil:
     """ Solves the viscoelastic-gravitational problem for planets using a shooting method.
     """
+
     # Feedback
     cdef char[256] message
     cdef char* message_ptr = &message[0]
@@ -458,11 +459,10 @@ cdef int cf_shooting_solver(
             last_radius_check = last_layer_upper_radius
 
     # Step through the solution vector and NAN out data below the starting radius
-    for ytype_i in range(num_ytypes):
-        for y_i in range(MAX_NUM_Y_REAL):
-            for slice_i in range(last_index_before_start + 1):
-                # TODO: Check that this indexing is correct.
-                solution_ptr[slice_i * MAX_NUM_Y_REAL + ytype_i * MAX_NUM_Y_REAL + y_i] = cmplx_NAN
+    for slice_i in range(last_index_before_start + 1):
+        for ytype_i in range(num_ytypes):
+            for y_i in range(MAX_NUM_Y):
+                solution_ptr[slice_i * MAX_NUM_Y * num_ytypes + ytype_i * MAX_NUM_Y + y_i] = cmplx_NAN
 
     for current_layer_i in range(start_layer_i, num_layers):
         # Get layer's index information
@@ -747,7 +747,7 @@ cdef int cf_shooting_solver(
             
             # Decrement the shared pointer for the solution
             integration_solution.reset()
-                
+
         if solution_storage_ptr.error_code != 0:
             # Error was encountered during integration
             solution_storage_ptr.success = False
@@ -834,6 +834,7 @@ cdef int cf_shooting_solver(
                     gravity_lower = layer_gravity_ptr[0]
                     bulk_lower    = layer_bulk_mod_ptr[0]
                     shear_lower   = layer_shear_mod_ptr[0]
+
                 radius_upper  = layer_radius_ptr[layer_slices - 1]
                 density_upper = layer_density_ptr[layer_slices - 1]
                 gravity_upper = layer_gravity_ptr[layer_slices - 1]
@@ -931,7 +932,7 @@ cdef int cf_shooting_solver(
                     layer_above_constant_vector_ptr[0] = constant_vector_ptr[0]
                     layer_above_constant_vector_ptr[1] = constant_vector_ptr[1]
                     layer_above_constant_vector_ptr[2] = constant_vector_ptr[2]
-            
+
             # Ready for next y-type
 
     # Free memory
@@ -948,7 +949,7 @@ cdef int cf_shooting_solver(
                     if not (main_storage_ptr[current_layer_i][solution_i] is NULL):
                         free_mem(main_storage_ptr[current_layer_i][solution_i])
                         main_storage_ptr[current_layer_i][solution_i] = NULL
-                
+
                 free_mem(main_storage_ptr[current_layer_i])
                 main_storage_ptr[current_layer_i] = NULL
         free_mem(main_storage_ptr)

{tidalpy-0.6.4 → tidalpy-0.6.5}/TidalPy/RadialSolver/solver.pyx

@@ -222,7 +222,6 @@ cdef int cf_radial_solver(
         starting_radius_to_use  = starting_radius
 
     # Solve the equation of state for the planet
-
     # TODO: For now there is only one accepted EOS, the interpolated kind. In the future additional EOS will be supplied
     # either via arguments to this function or a more OOP approach where they are built into the layers.
     # Build arrays of EOS inputs.
@@ -825,10 +824,10 @@ def radial_solver(
     
     # Finalize radial solver solution storage
     solution.finalize_python_storage()
-    
+
     if log_info:
         solution.print_diagnostics(print_diagnostics = False, log_diagnostics = True)
-    
+
     if ((not solution.success) or (rs_error_code < 0)) and raise_on_fail:
         if "not implemented" in solution.message:
             raise NotImplementedError(solution.message)

{tidalpy-0.6.4 → tidalpy-0.6.5}/TidalPy/structures/physical.py

@@ -614,7 +614,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def radii(self) -> np.ndarray:
         """ Physical Object's Radius Slices (bottom to top) [m] """
-        return self._radii
+        if self._radii is None:
+            return None
+        return np.copy(self._radii)
 
     @radii.setter
     def radii(self, value):
@@ -623,7 +625,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def depths(self) -> np.ndarray:
         """ Physical Object's Depth Slices (bottom to top) [m] """
-        return self._depths
+        if self._depths is None:
+            return None
+        return np.copy(self._depths)
 
     @depths.setter
     def depths(self, value):
@@ -632,7 +636,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def volume_slices(self) -> np.ndarray:
         """ Physical Object's Volume Slices (bottom to top) [m3] """
-        return self._volume_slices
+        if self._volume_slices is None:
+            return None
+        return np.copy(self._volume_slices)
 
     @volume_slices.setter
     def volume_slices(self, value):
@@ -641,7 +647,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def sa_slices(self) -> np.ndarray:
         """ Physical Object's Surface Area Slices (bottom to top) [m2] """
-        return self._sa_slices
+        if self._sa_slices is None:
+            return None
+        return np.copy(self._sa_slices)
 
     @sa_slices.setter
     def sa_slices(self, value):
@@ -650,7 +658,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def mass_slices(self) -> np.ndarray:
         """ Mass of each Slice within the Physical Object [kg] """
-        return self._mass_slices
+        if self._mass_slices is None:
+            return None
+        return np.copy(self._mass_slices)
 
     @mass_slices.setter
     def mass_slices(self, value):
@@ -659,7 +669,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def mass_below_slices(self) -> np.ndarray:
         """ Mass Below each Slice of the Physical Object [kg] """
-        return self._mass_below_slices
+        if self._mass_below_slices is None:
+            return None
+        return np.copy(self._mass_below_slices)
 
     @mass_below_slices.setter
     def mass_below_slices(self, value):
@@ -668,7 +680,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def pressure_slices(self) -> np.ndarray:
         """ Physical Object's Pressure Slices (bottom to top) [Pa] """
-        return self._pressure_slices
+        if self._pressure_slices is None:
+            return None
+        return np.copy(self._pressure_slices)
 
     @pressure_slices.setter
     def pressure_slices(self, value):
@@ -677,7 +691,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def density_slices(self) -> np.ndarray:
         """ Physical Object's Density Slices (bottom to top) [kg m3] """
-        return self._density_slices
+        if self._density_slices is None:
+            return None
+        return np.copy(self._density_slices)
 
     @density_slices.setter
     def density_slices(self, value):
@@ -686,7 +702,9 @@ class PhysicalObjSpherical(ConfigHolder):
     @property
     def gravity_slices(self) -> np.ndarray:
         """ Physical Object's Acceleration due to Gravity Slices (bottom to top) [m s-2] """
-        return self._gravity_slices
+        if self._gravity_slices is None:
+            return None
+        return np.copy(self._gravity_slices)
 
     @gravity_slices.setter
     def gravity_slices(self, value):
@@ -848,7 +866,7 @@ class PhysicalObjSpherical(ConfigHolder):
     def radius_outer(self, value):
         self.radius = value
 
-    # Slice properties
+    # Alias of slice properties
     @property
     def volumes(self):
         """ Alias of PhysicalObjSpherical.volume_slices [m3] """

{tidalpy-0.6.4 → tidalpy-0.6.5/TidalPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TidalPy
-Version: 0.6.4
+Version: 0.6.5
 Summary: Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python
 Author-email: "Joe P. Renaud" <TidalPy@gmail.com>
 License-Expression: CC-BY-NC-SA-4.0
@@ -81,7 +81,7 @@ Dynamic: license-file
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.4 Alpha-orange" alt="TidalPy Version 0.6.4 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.4 Alpha-orange" alt="TidalPy Version 0.6.5 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 
@@ -110,7 +110,13 @@ system and performing the following in a terminal:
 
 `pip install TidalPy`
 
-_TidalPy can not currently be installed via `conda install`._
+Alternatively you can use conda to install TidalPy:
+
+`conda install -c conda-forge TidalPy`
+
+or 
+
+`mamba install TidalPy`
 
 ## Accessing Jupyter Notebooks
 There are several jupyter notebooks with TidalPy demos found in the /Demos/ folder of this repository.

{tidalpy-0.6.4 → tidalpy-0.6.5}/_build_tidalpy.py

@@ -14,14 +14,22 @@ from Cython.Build import cythonize
 import numpy as np
 import CyRK
 
+DEBUG_MODE = False
+
 num_procs = os.cpu_count()
 num_threads = max(1, num_procs - 1)
+if DEBUG_MODE:
+    num_threads = 1
 
 install_platform = platform.system()
 
 if install_platform.lower() == 'windows':
     extra_compile_args = ['/openmp']
     extra_link_args = []
+    if DEBUG_MODE:
+        extra_compile_args.append('/Ox')
+        extra_compile_args.append('/Zi')
+        extra_link_args.append("/debug:full")
 elif install_platform.lower() == 'darwin':
     extra_compile_args = ['-O3', '-Wno-error=incompatible-function-pointer-types', '-fopenmp']
     extra_link_args = ['-lomp']
@@ -91,6 +99,6 @@ class build_tidalpy(_build_py):
                 self.distribution.ext_modules,
                 compiler_directives={'language_level': "3"},
                 include_path=['.', np.get_include()],
-                nthreads=num_threads 
+                nthreads=num_threads, emit_linenums=DEBUG_MODE
                 )
         print('!-- Finished Cythonizing TidalPy')

{tidalpy-0.6.4 → tidalpy-0.6.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name='TidalPy'
-version = '0.6.4'
+version = '0.6.5'
 description='Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python'
 authors= [ 
     {name = 'Joe P. Renaud', email = 'TidalPy@gmail.com'}

{tidalpy-0.6.4 → tidalpy-0.6.5}/setup.py

@@ -6,11 +6,17 @@ from setuptools import Extension, setup
 import numpy as np
 import CyRK
 
+DEBUG_MODE = False
+
 install_platform = platform.system()
 
 if install_platform.lower() == 'windows':
     extra_compile_args = ['/openmp']
     extra_link_args = []
+    if DEBUG_MODE:
+        extra_compile_args.append('/Ox')
+        extra_compile_args.append('/Zi')
+        extra_link_args.append("/debug:full")
 elif install_platform.lower() == 'darwin':
     extra_compile_args = ['-O3', '-Wno-error=incompatible-function-pointer-types', '-fopenmp']
     extra_link_args = ['-lomp']