Added in hooks to change EOS method for the future

jrenaud90 · Nov 26, 2024 · 55b4987 · 55b4987
1 parent 7f1628f
commit 55b4987
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 127 deletions.
diff --git a/Benchmarks & Performance/RadialSolver/RadialSolver Benchmarks.ipynb b/Benchmarks & Performance/RadialSolver/RadialSolver Benchmarks.ipynb
diff --git a/TidalPy/Material/eos/methods/__init__.pxd b/TidalPy/Material/eos/methods/__init__.pxd
@@ -0,0 +1 @@
+from TidalPy.Material.eos.methods.interpolate cimport EOS_INTERPOLATE_METHOD_INT, preeval_interpolate, InterpolateEOSInput
diff --git a/TidalPy/Material/eos/methods/interpolate.pxd b/TidalPy/Material/eos/methods/interpolate.pxd
@@ -2,6 +2,8 @@ from libcpp cimport bool as cpp_bool
 
 from TidalPy.Material.eos.ode cimport EOS_ODEInput
 
+cdef int EOS_INTERPOLATE_METHOD_INT = 0
+
 cdef struct InterpolateEOSInput:
     size_t num_slices
     double* radius_array_ptr

diff --git a/TidalPy/RadialSolver/solver.pxd b/TidalPy/RadialSolver/solver.pxd
@@ -16,8 +16,8 @@ cdef void cf_radial_solver(
         double planet_bulk_density,
         size_t num_layers,
         int* layer_types_ptr,
-        bint* is_static_by_layer_ptr,
-        bint* is_incompressible_by_layer_ptr,
+        bint* is_static_bylayer_ptr,
+        bint* is_incompressible_bylayer_ptr,
         double surface_pressure,
         int degree_l,
         size_t num_bc_models,
@@ -29,13 +29,14 @@ cdef void cf_radial_solver(
         int integration_method_int,
         double integration_rtol,
         double integration_atol,
-        cpp_bool scale_rtols_by_layer_type,
+        cpp_bool scale_rtols_bylayer_type,
         size_t max_num_steps,
         size_t expected_size,
         size_t max_ram_MB,
         double max_step,
         cpp_bool nondimensionalize,
         cpp_bool use_prop_matrix,
+        int* eos_integration_method_int_bylayer_ptr,
         int eos_integration_method,
         double eos_rtol,
         double eos_atol,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		from TidalPy.Material.eos.methods.interpolate cimport EOS_INTERPOLATE_METHOD_INT, preeval_interpolate, InterpolateEOSInput