restore simplified version of convective_bdy_weight controls

Author: evbauer

star/defaults/controls.defaults

@@ -6265,6 +6265,16 @@
     mesh_dlog_other_dlogP_extra = 0.25d0
     mesh_dlog_photo_dlogP_extra = 1
 
+         !### convective_bdy_weight
+         !### convective_bdy_dq_limit
+         !### convective_bdy_min_dt_yrs
+
+         ! Mesh function to enhance resolution near convective boundaries
+         ! including regions that are newly nonconvective because of moving boundary.
+
+      convective_bdy_weight = 0
+      convective_bdy_dq_limit = 1d-4
+      convective_bdy_min_dt_yrs = 1d-3
 
       ! max_rel_delta_IE_for_mesh_total_energy_balance
       ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

star/private/ctrls_io.f90

@@ -233,6 +233,7 @@ module ctrls_io
     E_function_weight, E_function_param, P_function_weight, &
     mesh_logX_species, &
     mesh_logX_min_for_extra, mesh_dlogX_dlogP_extra, mesh_dlogX_dlogP_full_on, mesh_dlogX_dlogP_full_off, &
+    convective_bdy_min_dt_yrs, convective_bdy_dq_limit, convective_bdy_weight, &
 
     mesh_dlog_eps_min_for_extra, mesh_dlog_eps_dlogP_full_on, mesh_dlog_eps_dlogP_full_off, &
     mesh_dlog_pp_dlogP_extra, mesh_dlog_cno_dlogP_extra, mesh_dlog_3alf_dlogP_extra, &
@@ -1493,6 +1494,10 @@ subroutine store_controls(s, ierr)
  s% mesh_dlogX_dlogP_full_on = mesh_dlogX_dlogP_full_on
  s% mesh_dlogX_dlogP_full_off = mesh_dlogX_dlogP_full_off
 
+ s% convective_bdy_min_dt_yrs = convective_bdy_min_dt_yrs
+ s% convective_bdy_weight = convective_bdy_weight
+ s% convective_bdy_dq_limit = convective_bdy_dq_limit
+
  s% mesh_dlog_eps_min_for_extra = mesh_dlog_eps_min_for_extra
  s% mesh_dlog_eps_dlogP_full_on = mesh_dlog_eps_dlogP_full_on
  s% mesh_dlog_eps_dlogP_full_off = mesh_dlog_eps_dlogP_full_off
@@ -3179,6 +3184,10 @@ subroutine set_controls_for_writing(s, ierr)
  mesh_dlogX_dlogP_full_on = s% mesh_dlogX_dlogP_full_on
  mesh_dlogX_dlogP_full_off = s% mesh_dlogX_dlogP_full_off
 
+ convective_bdy_min_dt_yrs = s% convective_bdy_min_dt_yrs
+ convective_bdy_weight = s% convective_bdy_weight
+ convective_bdy_dq_limit = s% convective_bdy_dq_limit
+
  mesh_dlog_eps_min_for_extra = s% mesh_dlog_eps_min_for_extra
  mesh_dlog_eps_dlogP_full_on = s% mesh_dlog_eps_dlogP_full_on
  mesh_dlog_eps_dlogP_full_off = s% mesh_dlog_eps_dlogP_full_off

star/private/mesh_functions.f90

@@ -76,6 +76,7 @@ integer function num_mesh_functions(s)
          i = 0
          if (s% use_other_mesh_functions) &
             call s% how_many_other_mesh_fcns(s% id, i)
+         if (s% convective_bdy_weight > 0) i=i+1
          if (s% E_function_weight > 0) i=i+1
          if (s% P_function_weight > 0) i=i+1
          if (s% T_function1_weight > 0) i=i+1
@@ -175,6 +176,9 @@ subroutine set_mesh_function_data( &
          if (s% omega_function_weight > 0 .and. s% rotation_flag) then
             i = i+1; names(i) = 'omega_function'
          end if
+         if (s% convective_bdy_weight > 0) then
+            i = i+1; names(i) = 'newly_nonconv'
+         end if
          do k=1,num_xa_function
             if (do_mass_function(s, s% xa_function_species(k), s% xa_function_weight(k), j)) then
                i = i+1; names(i) = trim(s% xa_function_species(k))
@@ -263,6 +267,10 @@ subroutine set_mesh_function_data( &
                   vals(k,i) = s% omega_function_weight*log10(max(1d-99,abs(s% omega(k))))
                end do
 
+            else if (names(i) == 'newly_nonconv') then
+               !call do_newly_nonconvective(i)
+               call do_mix_type_change(i)
+
             else
                do k=1,num_xa_function
                   call do1_xa_function(k,i)
@@ -274,6 +282,23 @@ subroutine set_mesh_function_data( &
 
          contains
 
+
+         subroutine do_mix_type_change(i)
+            integer, intent(in) :: i
+            integer :: k, j
+            if (s% dt < s% convective_bdy_min_dt_yrs*secyer) return
+            do k=1,nz
+               if (s% dq(k) < s% convective_bdy_dq_limit) cycle
+               if (s% cz_bdy_dq(k) /= 0) vals(k,i) = s% convective_bdy_weight
+            end do
+            do j=1,5
+               do k=2,nz
+                  vals(k,i) = vals(k,i) + vals(k-1,i)
+               end do
+            end do
+
+         end subroutine do_mix_type_change
+
          subroutine do1_xa_function(k,i)
             integer, intent(in) :: k,i
             real(dp) :: weight, param

star_data/private/star_controls.inc

@@ -597,6 +597,9 @@
          real(dp) :: mesh_dlogX_dlogP_full_on(num_mesh_logX)
          real(dp) :: mesh_dlogX_dlogP_full_off(num_mesh_logX)
 
+         real(dp) :: convective_bdy_weight, &
+            convective_bdy_dq_limit, convective_bdy_min_dt_yrs
+
          real(dp) :: mesh_dlog_eps_min_for_extra
          real(dp) :: mesh_dlog_eps_dlogP_full_on
          real(dp) :: mesh_dlog_eps_dlogP_full_off