From 7daf195399bafe58a19ad61134e4deda4b38bdba Mon Sep 17 00:00:00 2001 From: EbF Date: Sat, 15 Feb 2025 01:22:30 -0500 Subject: [PATCH 1/6] remove fe_core_mass limit for tracking velocity --- star/private/report.f90 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/star/private/report.f90 b/star/private/report.f90 index e311fdd64..b8b701e58 100644 --- a/star/private/report.f90 +++ b/star/private/report.f90 @@ -401,8 +401,7 @@ subroutine do_report(s, ierr) if(-velocity(k) > s% fe_core_infall) mass_sum = mass_sum + s% dm(k) end do - if ((mass_sum > s% fe_core_infall_mass*msun) .and. & - (s%m(k_min) <= s%fe_core_mass*msun)) then + if (mass_sum > s% fe_core_infall_mass*msun) then s% fe_core_infall = -velocity(k_min) end if end if From 63e3a1389c650c216b8e08d1d259aab0a0a234c8 Mon Sep 17 00:00:00 2001 From: EbF Date: Fri, 7 Mar 2025 15:57:17 -0500 Subject: [PATCH 2/6] new fe_core infall routine --- star/private/report.f90 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/star/private/report.f90 b/star/private/report.f90 index b8b701e58..e30b544c5 100644 --- a/star/private/report.f90 +++ b/star/private/report.f90 @@ -401,9 +401,12 @@ subroutine do_report(s, ierr) if(-velocity(k) > s% fe_core_infall) mass_sum = mass_sum + s% dm(k) end do - if (mass_sum > s% fe_core_infall_mass*msun) then - s% fe_core_infall = -velocity(k_min) - end if + k = s%nz + do while (k > 1 .and. s% m(k) <= s% fe_core_mass * Msun) + k = k-1 ! loop outwards + end do + ! k is now the outer index of the fe core + if (maxval(abs(s%v(k:s%nz))) >= s% fe_core_infall_limit) then end if non_fe_core_mass = s% he_core_mass From b5242723d68912aba508b4ff96a524822057e09e Mon Sep 17 00:00:00 2001 From: EbF Date: Fri, 7 Mar 2025 22:23:32 -0500 Subject: [PATCH 3/6] fix infall, test --- star/private/report.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/star/private/report.f90 b/star/private/report.f90 index e30b544c5..c5f78bd95 100644 --- a/star/private/report.f90 +++ b/star/private/report.f90 @@ -401,12 +401,12 @@ subroutine do_report(s, ierr) if(-velocity(k) > s% fe_core_infall) mass_sum = mass_sum + s% dm(k) end do - k = s%nz + k = nz do while (k > 1 .and. s% m(k) <= s% fe_core_mass * Msun) k = k-1 ! loop outwards end do ! k is now the outer index of the fe core - if (maxval(abs(s%v(k:s%nz))) >= s% fe_core_infall_limit) then + s% fe_core_infall = minval(s%v(k:nz)) end if non_fe_core_mass = s% he_core_mass From 7cb847ba9b809fa3cab00c4d5ede298421afc2b5 Mon Sep 17 00:00:00 2001 From: EbF Date: Sat, 8 Mar 2025 10:44:42 -0500 Subject: [PATCH 4/6] fix minus sign --- star/private/report.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/star/private/report.f90 b/star/private/report.f90 index c5f78bd95..ff79c7b4d 100644 --- a/star/private/report.f90 +++ b/star/private/report.f90 @@ -406,7 +406,7 @@ subroutine do_report(s, ierr) k = k-1 ! loop outwards end do ! k is now the outer index of the fe core - s% fe_core_infall = minval(s%v(k:nz)) + s% fe_core_infall = - minval(s%v(k:nz)) end if non_fe_core_mass = s% he_core_mass From e439d103bada807fb10e51807e6477343b864f7e Mon Sep 17 00:00:00 2001 From: Ebraheem Farag <63124736+Debraheem@users.noreply.github.com> Date: Sat, 8 Mar 2025 12:15:28 -0500 Subject: [PATCH 5/6] [ci skip] formatting --- star/private/report.f90 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/star/private/report.f90 b/star/private/report.f90 index ff79c7b4d..126b19e45 100644 --- a/star/private/report.f90 +++ b/star/private/report.f90 @@ -401,12 +401,12 @@ subroutine do_report(s, ierr) if(-velocity(k) > s% fe_core_infall) mass_sum = mass_sum + s% dm(k) end do - k = nz - do while (k > 1 .and. s% m(k) <= s% fe_core_mass * Msun) - k = k-1 ! loop outwards - end do - ! k is now the outer index of the fe core - s% fe_core_infall = - minval(s%v(k:nz)) + k = nz + do while (k > 1 .and. s% m(k) <= s% fe_core_mass * Msun) + k = k-1 ! loop outwards + end do + ! k is now the outer index of the fe core + s% fe_core_infall = - minval(s%v(k:nz)) end if non_fe_core_mass = s% he_core_mass From fe622b0e5ad024ebd071724334507301fbbbd485 Mon Sep 17 00:00:00 2001 From: EbF Date: Mon, 10 Mar 2025 18:36:01 -0400 Subject: [PATCH 6/6] empty commit test