From 8a2cab8fee694c47d5649df3218281b7edd30ed6 Mon Sep 17 00:00:00 2001 From: Debraheem Date: Fri, 29 Nov 2024 18:24:21 -0500 Subject: [PATCH] correct gyre calls from RSP2 for gyre 7.2 --- .../dev_BEP/src/run_star_extras.f90 | 2 +- .../dev_BW_Vul/src/run_star_extras.f90 | 4 ++-- .../dev_Cepheid/src/run_star_extras.f90 | 4 ++-- .../dev_Cepheid_6M/src/run_star_extras.f90 | 2 +- .../dev_Cepheid_9M/src/run_star_extras.f90 | 2 +- .../dev_Delta_Scuti/src/run_star_extras.f90 | 2 +- .../dev_Mira/src/run_star_extras.f90 | 2 +- .../dev_RR_Lyrae/src/run_star_extras.f90 | 2 +- .../dev_RSG/src/run_star_extras.f90 | 2 +- .../src/run_star_extras.f90 | 2 +- .../dev_beta_Cepheid/src/run_star_extras.f90 | 2 +- .../dev_rsp2_BEP/src/run_star_extras.f90 | 2 +- .../dev_rsp2_BLAP/src/run_star_extras.f90 | 2 +- .../dev_rsp2_Cepheid/src/run_star_extras.f90 | 2 +- .../src/run_star_extras.f90 | 2 +- .../src/run_star_extras.f90 | 2 +- .../dev_rsp2_RR_Lyrae/src/run_star_extras.f90 | 2 +- .../src/run_star_extras.f90 | 2 +- .../gyre_in_mesa_extras_set_velocities.inc | 20 +++++++++---------- star/rsp2_utils/run_star_extras_rsp2.inc | 20 +++++++++---------- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/star/dev_cases_star_to_RSP2/dev_BEP/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_BEP/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_BEP/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_BEP/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_BW_Vul/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_BW_Vul/src/run_star_extras.f90 index de3be8785..3631c0280 100644 --- a/star/dev_cases_star_to_RSP2/dev_BW_Vul/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_BW_Vul/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none @@ -185,7 +185,7 @@ end subroutine extras_startup subroutine gyre_linear_analysis_and_set_velocities(s,restart,ierr) use const_def use math_lib - use gyre_lib + use gyre_mesa_m type (star_info), pointer :: s logical, intent(in) :: restart integer, intent(out) :: ierr diff --git a/star/dev_cases_star_to_RSP2/dev_Cepheid/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_Cepheid/src/run_star_extras.f90 index b60fd942c..84b2a218a 100644 --- a/star/dev_cases_star_to_RSP2/dev_Cepheid/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_Cepheid/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none @@ -514,7 +514,7 @@ end subroutine data_for_extra_profile_columns subroutine gyre_linear_analysis_and_set_velocities(s,restart,ierr) use const_def use math_lib - use gyre_lib + use gyre_mesa_m type (star_info), pointer :: s logical, intent(in) :: restart integer, intent(out) :: ierr diff --git a/star/dev_cases_star_to_RSP2/dev_Cepheid_6M/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_Cepheid_6M/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_Cepheid_6M/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_Cepheid_6M/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_Cepheid_9M/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_Cepheid_9M/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_Cepheid_9M/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_Cepheid_9M/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_Delta_Scuti/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_Delta_Scuti/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_Delta_Scuti/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_Delta_Scuti/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_Mira/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_Mira/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_Mira/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_Mira/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_RR_Lyrae/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_RR_Lyrae/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_RR_Lyrae/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_RR_Lyrae/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_RSG/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_RSG/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_RSG/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_RSG/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_Type_II_Cepheid/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_Type_II_Cepheid/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_Type_II_Cepheid/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_Type_II_Cepheid/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_star_to_RSP2/dev_beta_Cepheid/src/run_star_extras.f90 b/star/dev_cases_star_to_RSP2/dev_beta_Cepheid/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_star_to_RSP2/dev_beta_Cepheid/src/run_star_extras.f90 +++ b/star/dev_cases_star_to_RSP2/dev_beta_Cepheid/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_test_RSP2/dev_rsp2_BEP/src/run_star_extras.f90 b/star/dev_cases_test_RSP2/dev_rsp2_BEP/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_test_RSP2/dev_rsp2_BEP/src/run_star_extras.f90 +++ b/star/dev_cases_test_RSP2/dev_rsp2_BEP/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_test_RSP2/dev_rsp2_BLAP/src/run_star_extras.f90 b/star/dev_cases_test_RSP2/dev_rsp2_BLAP/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_test_RSP2/dev_rsp2_BLAP/src/run_star_extras.f90 +++ b/star/dev_cases_test_RSP2/dev_rsp2_BLAP/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_test_RSP2/dev_rsp2_Cepheid/src/run_star_extras.f90 b/star/dev_cases_test_RSP2/dev_rsp2_Cepheid/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_test_RSP2/dev_rsp2_Cepheid/src/run_star_extras.f90 +++ b/star/dev_cases_test_RSP2/dev_rsp2_Cepheid/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_test_RSP2/dev_rsp2_Cepheid_6M/src/run_star_extras.f90 b/star/dev_cases_test_RSP2/dev_rsp2_Cepheid_6M/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_test_RSP2/dev_rsp2_Cepheid_6M/src/run_star_extras.f90 +++ b/star/dev_cases_test_RSP2/dev_rsp2_Cepheid_6M/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_test_RSP2/dev_rsp2_Delta_Scuti/src/run_star_extras.f90 b/star/dev_cases_test_RSP2/dev_rsp2_Delta_Scuti/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_test_RSP2/dev_rsp2_Delta_Scuti/src/run_star_extras.f90 +++ b/star/dev_cases_test_RSP2/dev_rsp2_Delta_Scuti/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_test_RSP2/dev_rsp2_RR_Lyrae/src/run_star_extras.f90 b/star/dev_cases_test_RSP2/dev_rsp2_RR_Lyrae/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_test_RSP2/dev_rsp2_RR_Lyrae/src/run_star_extras.f90 +++ b/star/dev_cases_test_RSP2/dev_rsp2_RR_Lyrae/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/dev_cases_test_RSP2/dev_rsp2_Type_II_Cepheid/src/run_star_extras.f90 b/star/dev_cases_test_RSP2/dev_rsp2_Type_II_Cepheid/src/run_star_extras.f90 index d762800bf..cf7eb6925 100644 --- a/star/dev_cases_test_RSP2/dev_rsp2_Type_II_Cepheid/src/run_star_extras.f90 +++ b/star/dev_cases_test_RSP2/dev_rsp2_Type_II_Cepheid/src/run_star_extras.f90 @@ -26,7 +26,7 @@ module run_star_extras use star_def use const_def use math_lib - use gyre_lib + use gyre_mesa_m implicit none diff --git a/star/job/gyre_in_mesa_extras_set_velocities.inc b/star/job/gyre_in_mesa_extras_set_velocities.inc index 2e7301709..0e7b4f45a 100644 --- a/star/job/gyre_in_mesa_extras_set_velocities.inc +++ b/star/job/gyre_in_mesa_extras_set_velocities.inc @@ -42,17 +42,17 @@ r_old(nz_max), r_new(nz_max), v_old(nz_max), v_new(nz_max)) npts(:) = 0 - call gyre_init('gyre.in') + call init('gyre.in') - call gyre_set_constant('G_GRAVITY', standard_cgrav) - call gyre_set_constant('C_LIGHT', clight) - call gyre_set_constant('A_RADIATION', crad) + call set_constant('G_GRAVITY', standard_cgrav) + call set_constant('C_LIGHT', clight) + call set_constant('A_RADIATION', crad) - call gyre_set_constant('M_SUN', Msun) - call gyre_set_constant('R_SUN', Rsun) - call gyre_set_constant('L_SUN', Lsun) + call set_constant('M_SUN', Msun) + call set_constant('R_SUN', Rsun) + call set_constant('L_SUN', Lsun) - call gyre_set_constant('GYRE_DIR', TRIM(mesa_dir)//'/gyre/gyre') + call set_constant('GYRE_DIR', TRIM(mesa_dir)//'/gyre/gyre') mode_l = 0 ! mode l (e.g. 0 for p modes, 1 for g modes) ! should match gyre.in mode l @@ -74,7 +74,7 @@ end if !write(*,*) 'call gyre_set_model' - call gyre_set_model(global_data, point_data, s%gyre_data_schema) + call set_model(global_data, point_data, s%gyre_data_schema) write(*, 100) 'order', 'freq (Hz)', & 'P (sec)', 'P (day)', 'growth', 'cycles to double' @@ -87,7 +87,7 @@ ipar(4) = 3 ! max number of modes to output per call ipar(5) = 0 ! num_written - call gyre_get_modes(mode_l, process_mode_, ipar, rpar) + call get_modes(mode_l, process_mode_, ipar, rpar) if (s% x_ctrl(4) == 1d0) then mode = 2 diff --git a/star/rsp2_utils/run_star_extras_rsp2.inc b/star/rsp2_utils/run_star_extras_rsp2.inc index 58335c2f7..e3155f6ff 100644 --- a/star/rsp2_utils/run_star_extras_rsp2.inc +++ b/star/rsp2_utils/run_star_extras_rsp2.inc @@ -40,7 +40,7 @@ ierr = 0 call star_ptr(id, s, ierr) if (ierr /= 0) return - if (.not. restart) then + if (.not. restart) then num_periods = 0 run_num_steps_end_prev = 0 run_num_iters_end_prev = 0 @@ -76,14 +76,14 @@ best_cycles_to_double = 0 end if if (.not. s% x_logical_ctrl(5)) then - call gyre_init('gyre.in') - call gyre_set_constant('G_GRAVITY', standard_cgrav) - call gyre_set_constant('C_LIGHT', clight) - call gyre_set_constant('A_RADIATION', crad) - call gyre_set_constant('M_SUN', Msun) - call gyre_set_constant('R_SUN', Rsun) - call gyre_set_constant('L_SUN', Lsun) - call gyre_set_constant('GYRE_DIR', TRIM(mesa_dir)//'/gyre/gyre') + call init('gyre.in') + call set_constant('G_GRAVITY', standard_cgrav) + call set_constant('C_LIGHT', clight) + call set_constant('A_RADIATION', crad) + call set_constant('M_SUN', Msun) + call set_constant('R_SUN', Rsun) + call set_constant('L_SUN', Lsun) + call set_constant('GYRE_DIR', TRIM(mesa_dir)//'/gyre/gyre') else call gyre_in_mesa_extras_set_velocities(s,restart,ierr) end if @@ -300,7 +300,7 @@ integer, intent(in) :: id integer, intent(out) :: ierr ierr = 0 - call gyre_final() + call final() end subroutine rsp2_extras_after_evolve