TidalPy 0.6.6__tar.gz → 0.6.7__tar.gz

{tidalpy-0.6.6/TidalPy.egg-info → tidalpy-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TidalPy
-Version: 0.6.6
+Version: 0.6.7
 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.6 Alpha-orange" alt="TidalPy Version 0.6.6 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.7 Alpha-orange" alt="TidalPy Version 0.6.7 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 

{tidalpy-0.6.6 → tidalpy-0.6.7}/README.md

@@ -11,7 +11,7 @@
 
 ---
 
-<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.6 Alpha-orange" alt="TidalPy Version 0.6.6 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.7 Alpha-orange" alt="TidalPy Version 0.6.7 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 

{tidalpy-0.6.6 → tidalpy-0.6.7}/Tests/Test_Old/Test_SetY_MultiLayer/Test_Numerical_Int/test_m1_multilayer_modes.py

@@ -7,7 +7,7 @@ import TidalPy
 
 
 from TidalPy.constants import G, mass_trap1
-from TidalPy.rheology import Maxwell, Elastic
+from TidalPy.rheology import Maxwell, Elastic, Newton
 from TidalPy.tides.modes.multilayer_modes import collapse_multilayer_modes
 from TidalPy.utilities.conversions import orbital_motion2semi_a
 from TidalPy.utilities.spherical_helper.volume import calculate_voxel_volumes
@@ -68,8 +68,8 @@ input_kwargs = {
     'shear_array'                : shear_array,
     'bulk_viscosity_array'       : bulk_viscosity_array,
     'shear_viscosity_array'      : shear_viscosity_array,
-    'bulk_rheology_inst'         : bulk_rheology_inst,
-    'shear_rheology_inst'        : shear_rheology_inst,
+    'bulk_rheology_inst_bylayer' : tuple([bulk_rheology_inst]),
+    'shear_rheology_inst_bylayer': tuple([shear_rheology_inst]),
     'upper_radius_bylayer_array' : np.asarray((R,), dtype=np.float64),
     'density_array'              : density_array,
     'longitude_matrix'           : longitude_matrix,
@@ -548,6 +548,8 @@ def test_collapse_multilayer_modes_liquid_solid():
     input_kwargs_to_use['layer_types'] = ('liquid', 'solid')
     input_kwargs_to_use['is_static_bylayer'] = (True, False)
     input_kwargs_to_use['is_incompressible_bylayer'] = (True, False)
+    input_kwargs_to_use['bulk_rheology_inst_bylayer'] = (Elastic(), Elastic())
+    input_kwargs_to_use['shear_rheology_inst_bylayer'] = (Newton(), Maxwell())
     input_kwargs_to_use['upper_radius_bylayer_array'] = np.asarray((r_core, planet_R), dtype=np.float64)
 
     radius_array_to_use = np.concatenate((

{tidalpy-0.6.6 → tidalpy-0.6.7}/TidalPy/tides/modes/multilayer_modes.py

@@ -38,8 +38,9 @@ def calculate_mode_response_coupled(
         colatitude_domain: np.ndarray,
         time_domain: np.ndarray,
         tidal_potential_tuple: 'TidalPotentialOutput',
-        shear_rheology_inst: 'RheologyModelBase',
-        bulk_rheology_inst: 'RheologyModelBase',
+        shear_rheology_inst_bylayer: Tuple['RheologyModelBase'],
+        bulk_rheology_inst_bylayer: Tuple['RheologyModelBase'],
+        layer_indices: Tuple[float],
         layer_types: Tuple[str],
         is_static_bylayer: Tuple[bool],
         is_incompressible_bylayer: Tuple[bool],
@@ -99,30 +100,37 @@ def calculate_mode_response_coupled(
         mode_skipped = True
 
     else:
-        # Calculate Complex Shear Modulus at this mode's frequency
-        complex_shears_at_mode = np.empty(radius_array.size, dtype=np.complex128)
-
-        shear_rheology_inst.vectorize_modulus_viscosity(
-            mode_frequency,
-            shear_array,
-            shear_viscosity_array,
-            complex_shears_at_mode)
-
-        # Calculate Complex Bulk Modulus at this mode's frequency
-        complex_bulk_modulus = np.empty(radius_array.size, dtype=np.complex128)
-
-        bulk_rheology_inst.vectorize_modulus_viscosity(
-            mode_frequency,
-            bulk_array,
-            bulk_viscosity_array,
-            complex_bulk_modulus)
+        # Calculate Complex Shear and Bulk Modulus at this mode's frequency
+        complex_shears_at_mode_list = list()
+        complex_bulk_at_mode_list = list()
+        for layer_i, layer_index in enumerate(layer_indices):
+            shear_rheology_inst = shear_rheology_inst_bylayer[layer_i]
+            bulk_rheology_inst = bulk_rheology_inst_bylayer[layer_i]
+
+            complex_shears_at_mode_ = np.empty(radius_array[layer_index].size, dtype=np.complex128)
+            shear_rheology_inst.vectorize_modulus_viscosity(
+                mode_frequency,
+                shear_array[layer_index],
+                shear_viscosity_array[layer_index],
+                complex_shears_at_mode_)
+            complex_shears_at_mode_list.append(complex_shears_at_mode_)
+
+            complex_bulk_at_mode_ = np.empty(radius_array[layer_index].size, dtype=np.complex128)
+            bulk_rheology_inst.vectorize_modulus_viscosity(
+                mode_frequency,
+                bulk_array[layer_index],
+                bulk_viscosity_array[layer_index],
+                complex_bulk_at_mode_)
+            complex_bulk_at_mode_list.append(complex_bulk_at_mode_)
+        complex_shears_at_mode = np.concatenate(complex_shears_at_mode_list)
+        complex_bulk_at_mode = np.concatenate(complex_bulk_at_mode_list)
         
         # Calculate the radial functions using a shooting integration method.
         radial_solution_at_mode = \
             radial_solver(
                 radius_array,
                 density_array,
-                complex_bulk_modulus,
+                complex_bulk_at_mode,
                 complex_shears_at_mode,
                 mode_frequency,
                 planet_bulk_density,
@@ -169,7 +177,7 @@ def calculate_mode_response_coupled(
         strains_at_mode, stresses_at_mode = calculate_strain_stress(
             *tidal_potential_tuple,
             tidal_y_at_mode,
-            longitude_domain, colatitude_domain, time_domain, radius_array, complex_shears_at_mode, complex_bulk_modulus,
+            longitude_domain, colatitude_domain, time_domain, radius_array, complex_shears_at_mode, complex_bulk_at_mode,
             frequency=mode_frequency, degree_l=degree_l
             )
 
@@ -189,8 +197,8 @@ def collapse_multilayer_modes(
     shear_array: np.ndarray,
     bulk_viscosity_array: np.ndarray,
     shear_viscosity_array: np.ndarray,
-    shear_rheology_inst: 'RheologyModelBase',
-    bulk_rheology_inst: 'RheologyModelBase',
+    shear_rheology_inst_bylayer: Tuple['RheologyModelBase'],
+    bulk_rheology_inst_bylayer: Tuple['RheologyModelBase'],
     upper_radius_bylayer_array: np.ndarray,
     longitude_matrix: np.ndarray,
     colatitude_matrix: np.ndarray,
@@ -266,6 +274,7 @@ def collapse_multilayer_modes(
     layer_types               = tuple(layer_types)
     is_static_bylayer         = tuple(is_static_bylayer)
     is_incompressible_bylayer = tuple(is_incompressible_bylayer)
+    num_layers                = len(layer_types)
 
     # The shear array may have zero values for liquid layers. This will cause an issue with complex compliance calc.
     #     make it small instead
@@ -299,6 +308,24 @@ def collapse_multilayer_modes(
             'Multilayer tides (specifically the tidal potential) only works for '
             'l=2 at the moment.'
             )
+    
+    # Find layer indices
+    layer_indices = list()
+    last_upper_r = 0.0
+    for layer_i in range(num_layers):
+        upper_r = upper_radius_bylayer_array[layer_i]
+        layer_index = np.logical_and(radius_array <= upper_r, radius_array >= last_upper_r)
+        # The above will over count at layer interfaces. Fix lower one:
+        if last_upper_r != 0.0:
+            loc = np.where(radius_array==last_upper_r)[0][0]
+            layer_index[loc] = False
+        # Fix upper one
+        if upper_r != radius_array[-1]:
+            loc = np.where(radius_array==upper_r)[0][0]
+            layer_index[loc] = False
+        layer_indices.append(layer_index)
+        last_upper_r = upper_r
+    layer_indices = tuple(layer_indices)
 
     # Setup tidal potential functions
     # Check if obliquity is being used.
@@ -394,8 +421,9 @@ def collapse_multilayer_modes(
                 colatitude_domain,
                 time_domain,
                 tidal_potential_tuple,
-                shear_rheology_inst,
-                bulk_rheology_inst,
+                shear_rheology_inst_bylayer,
+                bulk_rheology_inst_bylayer,
+                layer_indices,
                 layer_types,
                 is_static_bylayer,
                 is_incompressible_bylayer,

{tidalpy-0.6.6 → tidalpy-0.6.7/TidalPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TidalPy
-Version: 0.6.6
+Version: 0.6.7
 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.6 Alpha-orange" alt="TidalPy Version 0.6.6 Alpha" /></a>
+<a href="https://github.com/jrenaud90/TidalPy/releases"><img src="https://img.shields.io/badge/TidalPy-0.6.7 Alpha-orange" alt="TidalPy Version 0.6.7 Alpha" /></a>
 
 **Tidal Dynamics and Thermal-Orbital Evolution Software Suite Implemented in Cython and Python**
 

{tidalpy-0.6.6 → tidalpy-0.6.7}/pyproject.toml

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