From 459f937cb66972a889397eaf750dff0c6cdc3bd4 Mon Sep 17 00:00:00 2001 From: Adam Jermyn Date: Tue, 5 Apr 2022 13:32:34 -0400 Subject: [PATCH 01/20] [ci optional] Implemented Sunny Wong rotation brunt change --- star/private/rotation_mix_info.f90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/star/private/rotation_mix_info.f90 b/star/private/rotation_mix_info.f90 index ca65a4cb4..08a1afd61 100644 --- a/star/private/rotation_mix_info.f90 +++ b/star/private/rotation_mix_info.f90 @@ -589,10 +589,8 @@ subroutine setup(ierr) Hj(1) = Hj(2); Hj(nz) = Hj(nz-1) do i = 1, nz - dlnRho_dlnP = s% grad_density(i) - dlnT_dlnP = s% grad_temperature(i) - N2(i) = -grav(i)*(1/gamma1(i) - dlnRho_dlnP)/scale_height(i) - N2_mu(i) = -grav(i)/scale_height(i)*(1/chiRho(i) - delta(i)*dlnT_dlnP - dlnRho_dlnP) + N2(i) = s%brunt_N2(i) + N2_mu(i) = s%brunt_N2_composition_term(i) end do do k=1,nz From e6a7b5b857a5e6f80aa9e88c2a983c40d38bec6a Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Fri, 16 Jun 2023 16:09:22 +0200 Subject: [PATCH 02/20] [ci fpe] fpe check From 6d1a0c698c2731b944df7edcce1d9282908bc4ba Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 16 Jun 2023 13:55:43 -0400 Subject: [PATCH 03/20] test including brunt updates during solver iterations --- star/private/hydro_vars.f90 | 2 +- star/private/solver_support.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star/private/hydro_vars.f90 b/star/private/hydro_vars.f90 index fe87faeb2..7a4bf8ef1 100644 --- a/star/private/hydro_vars.f90 +++ b/star/private/hydro_vars.f90 @@ -606,7 +606,7 @@ subroutine set_hydro_vars( & end if - if (.not. skip_brunt) then ! skip_brunt during solver iterations + if (.not. skip_brunt) then if (dbg) write(*,*) 'call do_brunt_N2' call do_brunt_N2(s, nzlo, nzhi, ierr) if (failed('do_brunt_N2')) return diff --git a/star/private/solver_support.f90 b/star/private/solver_support.f90 index 87f421e7d..9c1919781 100644 --- a/star/private/solver_support.f90 +++ b/star/private/solver_support.f90 @@ -829,7 +829,7 @@ subroutine set_vars_for_solver(s, nvar, nzlo, nzhi, dt, ierr) skip_grads = .true., & skip_rotation = .true., & skip_m_grav_and_grav = .true., & - skip_brunt = .true., & + skip_brunt = .false., & ! .true., & ! EXPERIMENTAL: tesing not skipping brunt updates during solver iterations skip_mixing_info = .true., & skip_set_cz_bdy_mass = .true., & skip_other_cgrav = .true. From 68dd89df55b53b81fa63600910917fd2c7fa4d9b Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 16 Jun 2023 13:58:55 -0400 Subject: [PATCH 04/20] [ci optional] full test From ad07031042bcb4ca1ad586fe6e970ca5ecfab79d Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:32:21 -0400 Subject: [PATCH 05/20] revert --- star/private/hydro_vars.f90 | 2 +- star/private/solver_support.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star/private/hydro_vars.f90 b/star/private/hydro_vars.f90 index 7a4bf8ef1..fe87faeb2 100644 --- a/star/private/hydro_vars.f90 +++ b/star/private/hydro_vars.f90 @@ -606,7 +606,7 @@ subroutine set_hydro_vars( & end if - if (.not. skip_brunt) then + if (.not. skip_brunt) then ! skip_brunt during solver iterations if (dbg) write(*,*) 'call do_brunt_N2' call do_brunt_N2(s, nzlo, nzhi, ierr) if (failed('do_brunt_N2')) return diff --git a/star/private/solver_support.f90 b/star/private/solver_support.f90 index 9c1919781..87f421e7d 100644 --- a/star/private/solver_support.f90 +++ b/star/private/solver_support.f90 @@ -829,7 +829,7 @@ subroutine set_vars_for_solver(s, nvar, nzlo, nzhi, dt, ierr) skip_grads = .true., & skip_rotation = .true., & skip_m_grav_and_grav = .true., & - skip_brunt = .false., & ! .true., & ! EXPERIMENTAL: tesing not skipping brunt updates during solver iterations + skip_brunt = .true., & skip_mixing_info = .true., & skip_set_cz_bdy_mass = .true., & skip_other_cgrav = .true. From 3b48f67a23d130d3ba66d2e43693ef4c430e363f Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Mon, 19 Jun 2023 15:25:16 +0200 Subject: [PATCH 06/20] [ci fpe] fpe check ppisn was disabling the filling arrays with nans --- star/test_suite/ppisn/inlist_ppisn | 1 - 1 file changed, 1 deletion(-) diff --git a/star/test_suite/ppisn/inlist_ppisn b/star/test_suite/ppisn/inlist_ppisn index 61abdbb65..12e10f50c 100644 --- a/star/test_suite/ppisn/inlist_ppisn +++ b/star/test_suite/ppisn/inlist_ppisn @@ -64,7 +64,6 @@ &controls - fill_arrays_with_nans = .false. report_solver_progress = .false. max_resid_jump_limit = 1d99 From 031b8253940c29846f4ab22bebfbc0357eeb9ce4 Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Tue, 20 Jun 2023 15:03:18 +0200 Subject: [PATCH 07/20] Turn off parallelisation in set_rotation_mixing_info --- star/private/rotation_mix_info.f90 | 2 -- star/test_suite/do1_test_source | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/star/private/rotation_mix_info.f90 b/star/private/rotation_mix_info.f90 index 08a1afd61..ac78945ed 100644 --- a/star/private/rotation_mix_info.f90 +++ b/star/private/rotation_mix_info.f90 @@ -109,7 +109,6 @@ subroutine set_rotation_mixing_info(s, ierr) unstable(:,1:nz) = .false. growth_limit = 1d-10 -!$OMP PARALLEL DO PRIVATE(which, k, q, age_fraction, op_err) SCHEDULE(dynamic,2) do which = 1, num_instabilities if (ierr /= 0) cycle @@ -257,7 +256,6 @@ subroutine set_rotation_mixing_info(s, ierr) end select end do -!$OMP END PARALLEL DO if (failed('set_rotation_mixing_info instabilities', ierr)) return if (s% D_omega_flag .and. s% doing_finish_load_model) then diff --git a/star/test_suite/do1_test_source b/star/test_suite/do1_test_source index 52d1bc469..3ad101721 100755 --- a/star/test_suite/do1_test_source +++ b/star/test_suite/do1_test_source @@ -4,6 +4,10 @@ # Slow cases do_one ppisn "Successful test: evolved 100 days past first relax" "final.mod" x150 + + +return +do_one ppisn "Successful test: evolved 100 days past first relax" "final.mod" x150 do_one 1M_pre_ms_to_wd "stop because log_surface_luminosity <= log_L_lower_limit" "final.mod" auto do_one ccsn_IIp "shock has reached target location 1" "shock_part5.mod" auto do_one 1M_thermohaline "all values are within tolerances" "final.mod" auto From 4a096fd0c58b83678cbc370f3a3939249643d4f0 Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Tue, 20 Jun 2023 16:48:45 +0200 Subject: [PATCH 08/20] Re enable parallelisation --- star/private/rotation_mix_info.f90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/star/private/rotation_mix_info.f90 b/star/private/rotation_mix_info.f90 index ac78945ed..08a1afd61 100644 --- a/star/private/rotation_mix_info.f90 +++ b/star/private/rotation_mix_info.f90 @@ -109,6 +109,7 @@ subroutine set_rotation_mixing_info(s, ierr) unstable(:,1:nz) = .false. growth_limit = 1d-10 +!$OMP PARALLEL DO PRIVATE(which, k, q, age_fraction, op_err) SCHEDULE(dynamic,2) do which = 1, num_instabilities if (ierr /= 0) cycle @@ -256,6 +257,7 @@ subroutine set_rotation_mixing_info(s, ierr) end select end do +!$OMP END PARALLEL DO if (failed('set_rotation_mixing_info instabilities', ierr)) return if (s% D_omega_flag .and. s% doing_finish_load_model) then From a96eaba4379ecd4df739ee4cdfd5b31b7bb34fc2 Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Wed, 21 Jun 2023 13:19:35 +0200 Subject: [PATCH 09/20] Fix fpe in time smooth for ST Time smoothing needs mstar_old but after a restart we have s% generations=0 so no _old values. --- star/private/photo_in.f90 | 2 +- star/private/photo_out.f90 | 2 +- star_data/public/star_data_def.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/star/private/photo_in.f90 b/star/private/photo_in.f90 index b6ac575e0..450811eba 100644 --- a/star/private/photo_in.f90 +++ b/star/private/photo_in.f90 @@ -148,7 +148,7 @@ subroutine read_star_photo(s, fname, ierr) s% dq(1:nz), s% xa(:,1:nz), s% xh(:,1:nz), & s% omega(1:nz), s% j_rot(1:nz), s% mlt_vc(1:nz), s% conv_vel(1:nz), & s% D_ST_start(1:nz), s% nu_ST_start(1:nz), & ! needed for ST time smoothing - s% have_ST_start_info + s% have_ST_start_info, s% mstar_old ! needed for ST time smoothing call read_part_number(iounit) if (failed('rsp_num_periods')) return diff --git a/star/private/photo_out.f90 b/star/private/photo_out.f90 index 74aeac541..fde46220e 100644 --- a/star/private/photo_out.f90 +++ b/star/private/photo_out.f90 @@ -85,7 +85,7 @@ subroutine output_star_photo(s,iounit,ierr) s% dq(1:nz), s% xa(:,1:nz), s% xh(:,1:nz), & s% omega(1:nz), s% j_rot(1:nz), s% mlt_vc(1:nz), s% conv_vel(1:nz), & s% D_ST_start(1:nz), s% nu_ST_start(1:nz), & ! needed for ST time smoothing - s% have_ST_start_info + s% have_ST_start_info, s% mstar_old ! needed for ST time smoothing call write_part_number(iounit) write(iounit) & diff --git a/star_data/public/star_data_def.inc b/star_data/public/star_data_def.inc index d0b7e1740..8cc626462 100644 --- a/star_data/public/star_data_def.inc +++ b/star_data/public/star_data_def.inc @@ -1,7 +1,7 @@ character(len=24) :: version_number ! mesa version from file $MESA_DIR/data/version_number - integer, parameter :: star_def_version = 17 + integer, parameter :: star_def_version = 18 integer, parameter :: nz_alloc_extra = 200 From 0080f2c39b2afafb5517d495c257cb83884d10d6 Mon Sep 17 00:00:00 2001 From: pmocz Date: Wed, 22 Jan 2025 09:41:00 -0500 Subject: [PATCH 10/20] fix conflicts in rebase --- star/private/brunt.f90 | 37 ++++++++++------ star/private/rotation_mix_info.f90 | 68 ++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 12 deletions(-) diff --git a/star/private/brunt.f90 b/star/private/brunt.f90 index 2af4acdd1..2e68fefae 100644 --- a/star/private/brunt.f90 +++ b/star/private/brunt.f90 @@ -56,13 +56,14 @@ subroutine do_brunt_B(s,nzlo,nzhi,ierr) ierr = 0 nz = s% nz - - if (.not. s% calculate_Brunt_B) then - call set_nan(s% brunt_B(1:nz)) - call set_nan(s% unsmoothed_brunt_B(1:nz)) - return + + if (s% fill_arrays_with_nans) then + call set_nan(s% brunt_B(nzlo:nzhi)) + call set_nan(s% unsmoothed_brunt_B(nzlo:nzhi)) end if + if (.not. s% calculate_Brunt_B) return + if (s% use_other_brunt) then call s% other_brunt(s% id, ierr) if (ierr /= 0) then @@ -88,6 +89,7 @@ subroutine do_brunt_B(s,nzlo,nzhi,ierr) end do allocate(smoothing_array(nz)) + if(s% fill_arrays_with_nans) call fill_with_nans(smoothing_array) call smooth_brunt_B(smoothing_array) if (s% use_other_brunt_smoothing) then call s% other_brunt_smoothing(s% id, ierr) @@ -132,15 +134,20 @@ subroutine do_brunt_N2(s,nzlo,nzhi,ierr) ierr = 0 nz = s% nz - if (.not. (s% calculate_Brunt_B .and. s% calculate_Brunt_N2)) then - call set_nan(s% brunt_N2(1:nz)) - call set_nan(s% brunt_N2_composition_term(1:nz)) - return + if (s% fill_arrays_with_NaNs) then + call set_nan(s% brunt_N2(nzlo:nzhi)) + call set_nan(s% brunt_N2_composition_term(nzlo:nzhi)) end if + if (.not. (s% calculate_Brunt_B .and. s% calculate_Brunt_N2)) return + allocate(rho_P_chiT_chiRho(nz), rho_P_chiT_chiRho_face(nz)) + if(s% fill_arrays_with_NaNs) then + call fill_with_nans(rho_P_chiT_chiRho) + call fill_with_nans(rho_P_chiT_chiRho_face) + end if - do k=1,nz + do k=nzlo,nzhi rho_P_chiT_chiRho(k) = (s% rho(k)/s% Peos(k))*(s% chiT(k)/s% chiRho(k)) ! correct for difference between gravitational mass density and baryonic mass density (rho) if (s% use_mass_corrections) then @@ -156,7 +163,7 @@ subroutine do_brunt_N2(s,nzlo,nzhi,ierr) return end if - do k=1,nz ! clip B and calculate N^2 from B + do k=nzlo,nzhi ! clip B and calculate N^2 from B if (abs(s% brunt_B(k)) < s% min_magnitude_brunt_B .or. & s% gradT(k) == 0 .or. is_bad(s% gradT_sub_grada(k))) then s% brunt_B(k) = 0 @@ -178,7 +185,7 @@ subroutine do_brunt_N2(s,nzlo,nzhi,ierr) end do if (s% brunt_N2_coefficient /= 1d0) then - do k=1,nz + do k=nzlo,nzhi s% brunt_N2(k) = s% brunt_N2_coefficient*s% brunt_N2(k) s% brunt_N2_composition_term(k) = & s% brunt_N2_coefficient*s% brunt_N2_composition_term(k) @@ -210,6 +217,12 @@ subroutine do_brunt_B_MHM_form(s, nzlo, nzhi, ierr) species = s% species allocate(T_face(nz), rho_face(nz), chiT_face(nz), chiRho_face(nz)) + if(s% fill_arrays_with_nans) then + call fill_with_nans(T_face) + call fill_with_nans(rho_face) + call fill_with_nans(chiT_face) + call fill_with_nans(chiRho_face) + end if call get_face_values(s, s% chiT, chiT_face, ierr) if (ierr /= 0) return diff --git a/star/private/rotation_mix_info.f90 b/star/private/rotation_mix_info.f90 index 08a1afd61..a57c5df83 100644 --- a/star/private/rotation_mix_info.f90 +++ b/star/private/rotation_mix_info.f90 @@ -354,6 +354,18 @@ subroutine mix_D_omega allocate(sig(nz), rhs(nz), d(nz), du(nz), dl(nz), bp(nz), vp(nz), xp(nz), x(nz)) + if(s% fill_arrays_with_NaNs) then + call fill_with_NaNs(sig) + call fill_with_NaNs(rhs) + call fill_with_NaNs(d) + call fill_with_NaNs(du) + call fill_with_NaNs(dl) + call fill_with_NaNs(bp) + call fill_with_NaNs(vp) + call fill_with_NaNs(xp) + call fill_with_NaNs(x) + end if + rate = min(s% D_omega_mixing_rate, 1d0/dt) do k=2,nz-1 if (s% D_omega(k) == 0 .or. s% D_omega(k+1) == 0) then @@ -479,6 +491,62 @@ subroutine setup(ierr) smooth_work(nz,num_instabilities), saved(nz,num_instabilities), & unstable(num_instabilities,nz)) + if(s% fill_arrays_with_NaNs) then + call fill_with_NaNs(csound) + call fill_with_NaNs(rho) + call fill_with_NaNs(T) + call fill_with_NaNs(P) + call fill_with_NaNs(cp) + call fill_with_NaNs(cv) + call fill_with_NaNs(chiRho) + call fill_with_NaNs(abar) + call fill_with_NaNs(zbar) + call fill_with_NaNs(opacity) + call fill_with_NaNs(kap_cond) + call fill_with_NaNs(gamma1) + call fill_with_NaNs(mu_alt) + call fill_with_NaNs(omega) + call fill_with_NaNs(cell_dr) + call fill_with_NaNs(eps_nuc) + call fill_with_NaNs(enu) + call fill_with_NaNs(L_neu) + call fill_with_NaNs(gradT_sub_grada) + call fill_with_NaNs(delta) + call fill_with_NaNs(scale_height) + call fill_with_NaNs(dRho) + call fill_with_NaNs(dr) + call fill_with_NaNs(dPressure) + call fill_with_NaNs(domega) + call fill_with_NaNs(d_mu) + call fill_with_NaNs(d_j_rot) + call fill_with_NaNs(dRho_dr) + call fill_with_NaNs(dRho_dr_ad) + call fill_with_NaNs(dr2omega) + call fill_with_NaNs(H_T) + call fill_with_NaNs(domega_dlnR) + call fill_with_NaNs(Hj) + call fill_with_NaNs(dlnR_domega) + call fill_with_NaNs(t_dyn) + call fill_with_NaNs(t_kh) + call fill_with_NaNs(Ri_mu) + call fill_with_NaNs(Ri_T) + call fill_with_NaNs(ve0) + call fill_with_NaNs(ve_mu) + call fill_with_NaNs(v_ssi) + call fill_with_NaNs(h_ssi) + call fill_with_NaNs(Ris_1) + call fill_with_NaNs(Ris_2) + call fill_with_NaNs(v_es) + call fill_with_NaNs(H_es) + call fill_with_NaNs(v_gsf) + call fill_with_NaNs(H_gsf) + call fill_with_NaNs(N2) + call fill_with_NaNs(N2_mu) + call fill_with_NaNs_2d(smooth_work) + call fill_with_NaNs_2d(saved) + end if + + ! interpolate by mass to get values at cell boundaries enu00 = s% eps_nuc_neu_total(1) + s% non_nuc_neu(1) enu(1) = enu00 From a6b09fdd71258871893f1107165983235080498e Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:34:30 -0400 Subject: [PATCH 11/20] [ci fpe] fpe check again From fa4cf0b3817510024fe2885b1d571f8f254186b3 Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:15:26 +0200 Subject: [PATCH 12/20] [ci fpe] [ci optional] fpe check From 3bc152b21cd532a4f5d6380b301305b51bf26161 Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Fri, 16 Jun 2023 16:09:22 +0200 Subject: [PATCH 13/20] [ci fpe] fpe check From ef5fa636b38607d5ad7b3f88d18aebd866cfbba4 Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 16 Jun 2023 13:55:43 -0400 Subject: [PATCH 14/20] test including brunt updates during solver iterations --- star/private/hydro_vars.f90 | 2 +- star/private/solver_support.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star/private/hydro_vars.f90 b/star/private/hydro_vars.f90 index fe87faeb2..7a4bf8ef1 100644 --- a/star/private/hydro_vars.f90 +++ b/star/private/hydro_vars.f90 @@ -606,7 +606,7 @@ subroutine set_hydro_vars( & end if - if (.not. skip_brunt) then ! skip_brunt during solver iterations + if (.not. skip_brunt) then if (dbg) write(*,*) 'call do_brunt_N2' call do_brunt_N2(s, nzlo, nzhi, ierr) if (failed('do_brunt_N2')) return diff --git a/star/private/solver_support.f90 b/star/private/solver_support.f90 index 87f421e7d..9c1919781 100644 --- a/star/private/solver_support.f90 +++ b/star/private/solver_support.f90 @@ -829,7 +829,7 @@ subroutine set_vars_for_solver(s, nvar, nzlo, nzhi, dt, ierr) skip_grads = .true., & skip_rotation = .true., & skip_m_grav_and_grav = .true., & - skip_brunt = .true., & + skip_brunt = .false., & ! .true., & ! EXPERIMENTAL: tesing not skipping brunt updates during solver iterations skip_mixing_info = .true., & skip_set_cz_bdy_mass = .true., & skip_other_cgrav = .true. From eb87510c033d53fdd6915631f082e5c6c261972e Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 16 Jun 2023 13:58:55 -0400 Subject: [PATCH 15/20] [ci optional] full test From 959eec817329eabe99da37bb24a98b9a0698aa44 Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:32:21 -0400 Subject: [PATCH 16/20] revert --- star/private/hydro_vars.f90 | 2 +- star/private/solver_support.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star/private/hydro_vars.f90 b/star/private/hydro_vars.f90 index 7a4bf8ef1..fe87faeb2 100644 --- a/star/private/hydro_vars.f90 +++ b/star/private/hydro_vars.f90 @@ -606,7 +606,7 @@ subroutine set_hydro_vars( & end if - if (.not. skip_brunt) then + if (.not. skip_brunt) then ! skip_brunt during solver iterations if (dbg) write(*,*) 'call do_brunt_N2' call do_brunt_N2(s, nzlo, nzhi, ierr) if (failed('do_brunt_N2')) return diff --git a/star/private/solver_support.f90 b/star/private/solver_support.f90 index 9c1919781..87f421e7d 100644 --- a/star/private/solver_support.f90 +++ b/star/private/solver_support.f90 @@ -829,7 +829,7 @@ subroutine set_vars_for_solver(s, nvar, nzlo, nzhi, dt, ierr) skip_grads = .true., & skip_rotation = .true., & skip_m_grav_and_grav = .true., & - skip_brunt = .false., & ! .true., & ! EXPERIMENTAL: tesing not skipping brunt updates during solver iterations + skip_brunt = .true., & skip_mixing_info = .true., & skip_set_cz_bdy_mass = .true., & skip_other_cgrav = .true. From 05b8adc3eeb6e26283f9d74abd481155a13ff1e1 Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Tue, 20 Jun 2023 15:03:18 +0200 Subject: [PATCH 17/20] Turn off parallelisation in set_rotation_mixing_info --- star/private/rotation_mix_info.f90 | 2 -- 1 file changed, 2 deletions(-) diff --git a/star/private/rotation_mix_info.f90 b/star/private/rotation_mix_info.f90 index a57c5df83..7d4c94b8a 100644 --- a/star/private/rotation_mix_info.f90 +++ b/star/private/rotation_mix_info.f90 @@ -109,7 +109,6 @@ subroutine set_rotation_mixing_info(s, ierr) unstable(:,1:nz) = .false. growth_limit = 1d-10 -!$OMP PARALLEL DO PRIVATE(which, k, q, age_fraction, op_err) SCHEDULE(dynamic,2) do which = 1, num_instabilities if (ierr /= 0) cycle @@ -257,7 +256,6 @@ subroutine set_rotation_mixing_info(s, ierr) end select end do -!$OMP END PARALLEL DO if (failed('set_rotation_mixing_info instabilities', ierr)) return if (s% D_omega_flag .and. s% doing_finish_load_model) then From ab96103b4d085039ec26eaa7dbac6a001abb002b Mon Sep 17 00:00:00 2001 From: Rob Farmer Date: Tue, 20 Jun 2023 16:48:45 +0200 Subject: [PATCH 18/20] Re enable parallelisation --- star/private/rotation_mix_info.f90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/star/private/rotation_mix_info.f90 b/star/private/rotation_mix_info.f90 index 7d4c94b8a..a57c5df83 100644 --- a/star/private/rotation_mix_info.f90 +++ b/star/private/rotation_mix_info.f90 @@ -109,6 +109,7 @@ subroutine set_rotation_mixing_info(s, ierr) unstable(:,1:nz) = .false. growth_limit = 1d-10 +!$OMP PARALLEL DO PRIVATE(which, k, q, age_fraction, op_err) SCHEDULE(dynamic,2) do which = 1, num_instabilities if (ierr /= 0) cycle @@ -256,6 +257,7 @@ subroutine set_rotation_mixing_info(s, ierr) end select end do +!$OMP END PARALLEL DO if (failed('set_rotation_mixing_info instabilities', ierr)) return if (s% D_omega_flag .and. s% doing_finish_load_model) then From 53415c32921c16d11ca7e0415241d7e9d8897845 Mon Sep 17 00:00:00 2001 From: evbauer <18405113+evbauer@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:34:30 -0400 Subject: [PATCH 19/20] [ci fpe] fpe check again From 0b2a374d2ae04fd94034bf9cc68299e66b7636d2 Mon Sep 17 00:00:00 2001 From: pmocz Date: Mon, 10 Feb 2025 09:47:54 -0500 Subject: [PATCH 20/20] [ci fpe] trigger