Replace index for thermal buoyancy from i_buoyancy to i_thrm_buo

hiromatsui · hiromatsui · commit a2ad235c65a2 · 2025-09-26T15:00:45.000+09:00
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/add_base_force_4_sph_trns.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/add_base_force_4_sph_trns.f90
@@ -257,8 +257,8 @@ subroutine add_linear_force_bwd_trns_snap                         &
 !
 !
       call add_field_name_4_sph_trns_snap(d_rj,                         &
-     &    ipol_frc%i_buoyancy, iphys_frc%i_buoyancy,                    &
-     &    b_trns_frc%i_buoyancy, trns)
+     &    ipol_frc%i_thrm_buo, iphys_frc%i_thrm_buo,                    &
+     &    b_trns_frc%i_thrm_buo, trns)
       call add_field_name_4_sph_trns_snap(d_rj,                         &
      &    ipol_frc%i_comp_buo, iphys_frc%i_comp_buo,                    &
      &    b_trns_frc%i_comp_buo, trns)
@@ -337,8 +337,8 @@ subroutine add_rot_force_4_sph_trns_snap(d_rj,                    &
      &    ipol_rot_frc%i_lorentz, iphys_rot_frc%i_lorentz,              &
      &    b_trns_rot_frc%i_lorentz, trns)
       call add_field_name_4_sph_trns_snap(d_rj,                         &
-     &    ipol_rot_frc%i_buoyancy, iphys_rot_frc%i_buoyancy,            &
-     &    b_trns_rot_frc%i_buoyancy, trns)
+     &    ipol_rot_frc%i_thrm_buo, iphys_rot_frc%i_thrm_buo,            &
+     &    b_trns_rot_frc%i_thrm_buo, trns)
       call add_field_name_4_sph_trns_snap(d_rj,                         &
      &    ipol_rot_frc%i_comp_buo, iphys_rot_frc%i_comp_buo,            &
      &    b_trns_rot_frc%i_comp_buo, trns)
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/cal_div_of_forces.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/cal_div_of_forces.f90
@@ -72,7 +72,7 @@ subroutine sum_div_of_forces                                      &
      &   .and. fl_prop%flag_coriolis                                    &
      &   .and. fl_prop%flag_lorentz) then
         call set_MHD_terms_to_div_force                                 &
-     &     (ipol_base%i_press, ipol_div_frc, ipol_div_frc%i_buoyancy,   &
+     &     (ipol_base%i_press, ipol_div_frc, ipol_div_frc%i_thrm_buo,   &
      &      rj_fld%n_point, rj_fld%ntot_phys, rj_fld%d_fld)
 !
       else if( fl_prop%flag_inertia                                     &
@@ -99,7 +99,7 @@ subroutine sum_div_of_forces                                      &
      &   .and. fl_prop%flag_coriolis                                    &
      &   .and. (fl_prop%flag_lorentz  .eqv. .FALSE.)) then
         call set_div_cv_terms_to_force                                  &
-     &     (ipol_base%i_press, ipol_div_frc, ipol_div_frc%i_buoyancy,   &
+     &     (ipol_base%i_press, ipol_div_frc, ipol_div_frc%i_thrm_buo,   &
      &      rj_fld%n_point, rj_fld%ntot_phys, rj_fld%d_fld)
 !
       else if( fl_prop%flag_inertia                                     &
@@ -132,7 +132,7 @@ subroutine sum_div_of_forces                                      &
         end if
         if(fl_prop%flag_thermal_buoyancy) then
           call add_term_to_div_force                                    &
-     &       (ipol_base%i_press, ipol_div_frc%i_buoyancy,               &
+     &       (ipol_base%i_press, ipol_div_frc%i_thrm_buo,               &
      &        rj_fld%n_point, rj_fld%ntot_phys, rj_fld%d_fld)
         end if
         if(fl_prop%flag_comp_buoyancy) then
@@ -162,7 +162,7 @@ subroutine set_DMHD_terms_to_div_force                            &
         d_rj(inod,is_press) = -  d_rj(inod,ipol_div_frc%i_m_advect)     &
      &                         + d_rj(inod,ipol_div_frc%i_Coriolis)     &
      &                         + d_rj(inod,ipol_div_frc%i_lorentz)      &
-     &                         + d_rj(inod,ipol_div_frc%i_buoyancy)     &
+     &                         + d_rj(inod,ipol_div_frc%i_thrm_buo)     &
      &                         + d_rj(inod,ipol_div_frc%i_comp_buo)
       end do
 !$omp end parallel do
@@ -211,7 +211,7 @@ subroutine set_div_dcv_terms_to_force                             &
       do inod = 1, nnod_rj
         d_rj(inod,is_press) = -  d_rj(inod,ipol_div_frc%i_m_advect)     &
      &                         + d_rj(inod,ipol_div_frc%i_Coriolis)     &
-     &                         + d_rj(inod,ipol_div_frc%i_buoyancy)     &
+     &                         + d_rj(inod,ipol_div_frc%i_thrm_buo)     &
      &                         + d_rj(inod,ipol_div_frc%i_comp_buo)
       end do
 !$omp end parallel do
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/cal_self_buoyancies_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/cal_self_buoyancies_sph.f90
@@ -94,7 +94,7 @@ subroutine sel_buoyancies_sph_MHD                                 &
 !
 !
       call sel_buoyancy_sph_rj(fl_prop%i_grav, sph_rj, leg, ibuo_temp,  &
-     &    ipol_frc%i_buoyancy, fl_prop%coef_buo, sph_bc_U, rj_fld)
+     &    ipol_frc%i_thrm_buo, fl_prop%coef_buo, sph_bc_U, rj_fld)
       call sel_buoyancy_sph_rj(fl_prop%i_grav, sph_rj, leg, ibuo_comp,  &
      &    ipol_frc%i_comp_buo, fl_prop%coef_comp_buo, sph_bc_U, rj_fld)
 !
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/cal_sph_divergence_of_force.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/cal_sph_divergence_of_force.f90
@@ -128,7 +128,7 @@ subroutine cal_div_of_buoyancies_sph_2                            &
       if(flag_thermal_buoyancy) then
         call const_sph_div_force                                        &
      &     (sph_rj, r_2nd, sph_MHD_bc%sph_bc_U, g_sph_rj,               &
-     &      ipol_frc%i_buoyancy, ipol_div_frc%i_buoyancy, rj_fld)
+     &      ipol_frc%i_thrm_buo, ipol_div_frc%i_thrm_buo, rj_fld)
       end if
 !
       if(flag_comp_buoyancy) then
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/rot_self_buoyancies_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/rot_self_buoyancies_sph.f90
@@ -58,7 +58,7 @@ subroutine sel_rot_buoyancy_sph_MHD(sph_rj,                       &
 !
 !
       call sel_rot_buoyancy_sph_rj(fl_prop%i_grav, sph_rj,              &
-     &    ipol_base%i_temp, ipol_rot_frc%i_buoyancy,                    &
+     &    ipol_base%i_temp, ipol_rot_frc%i_thrm_buo,                    &
      &    fl_prop%coef_buo, sph_bc_U, rj_fld)
 ! 
       call sel_rot_buoyancy_sph_rj(fl_prop%i_grav, sph_rj,              &
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/self_buoyancy_on_sphere.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/self_buoyancy_on_sphere.f90
@@ -73,7 +73,7 @@ subroutine r_buoyancy_on_sphere                                   &
 !
         if (iflag_debug.eq.1) write(*,*) 'cal_r_buoyancy_on_sphere'
         call cal_r_buoyancy_on_sphere(kr, coef_buo,                     &
-     &      ipol_scalar, ipol_div_frc%i_buoyancy,                       &
+     &      ipol_scalar, ipol_div_frc%i_thrm_buo,                       &
      &      sph_rj%nidx_rj, sph_rj%radius_1d_rj_r,                      &
      &      rj_fld%n_point, rj_fld%ntot_phys, rj_fld%d_fld)
       end if
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/sum_rotation_of_forces.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/sum_rotation_of_forces.f90
@@ -74,7 +74,7 @@ subroutine sum_forces_to_explicit                                 &
 !
       if(fl_prop%flag_thermal_buoyancy) then
         call add_each_force_to_forces                                   &
-     &     (ipol_exp%i_forces, ipol_force%i_buoyancy,                   &
+     &     (ipol_exp%i_forces, ipol_force%i_thrm_buo,                   &
      &      rj_fld%n_point, rj_fld%ntot_phys, rj_fld%d_fld)
       end if
       if(fl_prop%flag_comp_buoyancy) then
@@ -108,7 +108,7 @@ subroutine licv_forces_to_explicit                                &
       end if
       if(fl_prop%flag_thermal_buoyancy) then
         call add_each_force_to_forces                                   &
-     &     (ipol_exp%i_forces, ipol_force%i_buoyancy,                   &
+     &     (ipol_exp%i_forces, ipol_force%i_thrm_buo,                   &
      &      rj_fld%n_point, rj_fld%ntot_phys, rj_fld%d_fld)
       end if
       if(fl_prop%flag_comp_buoyancy) then
diff --git a/src/Fortran_libraries/SERIAL_src/Fields/m_base_force_labels.f90 b/src/Fortran_libraries/SERIAL_src/Fields/m_base_force_labels.f90
@@ -27,7 +27,7 @@
 !!   thermal_buoyancy     [i_thrm_buo]: Thermal buoyancy - \alpha_{T} g T
 !!   composite_buoyancy   [i_comp_buo]:
 !!                       compositional buoyancy          - \alpha_{C} g C
-!!   buoyancy             [i_buoyancy]: Total buoyancy
+!!   buoyancy             [i_thrm_buo]: Total buoyancy
 !!                            - (\alpha_{T} T + \alpha_{C} C) g
 !!
 !!   vecp_induction   [i_vp_induct]:     induction         u \times B
diff --git a/src/Fortran_libraries/SERIAL_src/Fields/m_div_force_labels.f90 b/src/Fortran_libraries/SERIAL_src/Fields/m_div_force_labels.f90
@@ -21,7 +21,7 @@
 !!   div_inertia                [div_forces%i_m_advect]
 !!   div_Coriolis_force         [div_forces%i_Coriolis]
 !!   div_Lorentz_force          [div_forces%i_lorentz]
-!!   div_buoyancy               [div_forces%i_buoyancy]
+!!   div_buoyancy               [div_forces%i_thrm_buo]
 !!   div_composite_buoyancy     [div_forces%i_comp_buo]
 !!
 !!   div_momentum_flux          [div_forces%i_m_flux]
diff --git a/src/Fortran_libraries/SERIAL_src/Fields/m_rot_force_labels.f90 b/src/Fortran_libraries/SERIAL_src/Fields/m_rot_force_labels.f90
@@ -18,7 +18,7 @@
 !!   rot_inertia              [rot_forces%i_m_advect]
 !!   rot_Coriolis_force       [rot_forces%i_Coriolis]
 !!   rot_Lorentz_force        [rot_forces%i_lorentz]
-!!   rot_buoyancy             [rot_forces%i_buoyancy]
+!!   rot_buoyancy             [rot_forces%i_thrm_buo]
 !!   rot_composite_buoyancy   [rot_forces%i_comp_buo]
 !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/src/Fortran_libraries/SERIAL_src/Fields/set_sym_force_labels.f90 b/src/Fortran_libraries/SERIAL_src/Fields/set_sym_force_labels.f90
@@ -24,7 +24,7 @@
 !!   Lorentz_force_by_sym       [force_by_sym%i_lorentz]
 !!   magnetic_tension_by_sym    [force_by_sym%i_m_tension]
 !!
-!!   sym_buoyancy               [force_by_sym%i_buoyancy]
+!!   sym_buoyancy               [force_by_sym%i_thrm_buo]
 !!   sym_comp_buoyancy          [force_by_sym%i_comp_buo]
 !!
 !!   vecp_induction_by_sym      [force_by_sym%i_vp_induct]
@@ -110,7 +110,7 @@ subroutine set_sym_sym_force_addresses                           &
             force_by_sym_sym%i_m_tension =  i_phys
 !
             else if(field_name .eq. asym_thermal_buoyancy%name) then
-            force_by_sym_sym%i_buoyancy =   i_phys
+            force_by_sym_sym%i_thrm_buo =   i_phys
             else if(field_name .eq. asym_composite_buoyancy%name) then
             force_by_sym_sym%i_comp_buo =   i_phys
 !
@@ -240,14 +240,13 @@ subroutine set_sym_asym_force_addresses                           &
             force_by_sym_asym%i_m_tension =  i_phys
 !
             else if(field_name .eq. sym_thermal_buoyancy%name) then
-            force_by_sym_asym%i_buoyancy =   i_phys
+            force_by_sym_asym%i_thrm_buo =   i_phys
             else if(field_name .eq. sym_composite_buoyancy%name) then
             force_by_sym_asym%i_comp_buo =   i_phys
 !
             else if(field_name .eq. usym_x_Basym%name) then
             force_by_sym_asym%i_vp_induct =    i_phys
-            else if(field_name .eq. rot_usym_x_Basym%name)    &
-      &   then
+            else if(field_name .eq. rot_usym_x_Basym%name) then
             force_by_sym_asym%i_induction =  i_phys
             else if(field_name .eq. Bsym_nabla_uasym%name) then
             force_by_sym_asym%i_mag_stretch =  i_phys
diff --git a/src/Fortran_libraries/SERIAL_src/Fields/t_base_force_labels.f90 b/src/Fortran_libraries/SERIAL_src/Fields/t_base_force_labels.f90
@@ -27,7 +27,7 @@
 !!   Lorentz_force   [i_lorentz]:  Lorentz force     J \times B
 !!   magnetic_tension  [i_m_tension]:  magnetic tension   (B \nabla) B
 !!   Coriolis_force   [i_coriolis]:  Coriolis force     2 \Omega \times u
-!!   thermal_buoyancy     [i_buoyancy]: Thermal buoyancy - \alpha_{T} T g
+!!   thermal_buoyancy     [i_thrm_buo]: Thermal buoyancy - \alpha_{T} T g
 !!   composite_buoyancy   [i_comp_buo]:
 !!                       compositional buoyancy          - \alpha_{C} C g
 !!   buoyancy   [i_buoyancy]:   total buoyancy
@@ -89,11 +89,14 @@ module t_base_force_labels
 !!         @f$ -2 e_{ijk} \Omega_{j} u_{k} @f$
         integer (kind=kint) :: i_coriolis =        izero
 !>        start address for thermal buoyancy
-!!         @f$ -\alpha_{T} g_{i} T @f$
-        integer (kind=kint) :: i_buoyancy =        izero
+!!         @f$ -\alpha_{T} T g_{i} @f$
+        integer (kind=kint) :: i_thrm_buo =        izero
 !>        start address for compositional buoyancy
-!!         @f$ -\alpha_{C} g_{i} C @f$
+!!         @f$ -\alpha_{C} C g_{i} @f$
         integer (kind=kint) :: i_comp_buo =        izero
+!>        start address for thermal buoyancy
+!!         @f$ -(\alpha_{T} T + \alpha_{C} C) g_{i} @f$
+        integer (kind=kint) :: i_buoyancy =        izero
 !
 !>        start address for magnetic induction
 !!         @f$ e_{ijk} \partial_{j}\left(e_{klm}u_{l}B_{m} \right)@f$
@@ -176,7 +179,7 @@ subroutine set_base_force_addresses                               &
           forces%i_m_tension =  i_phys
 !
         else if (field_name .eq. thermal_buoyancy%name) then
-          forces%i_buoyancy =   i_phys
+          forces%i_thrm_buo =   i_phys
         else if (field_name .eq. composite_buoyancy%name) then
           forces%i_comp_buo =   i_phys
 !
@@ -242,7 +245,7 @@ subroutine set_rot_force_addresses                                &
           rot_forces%i_lorentz =    i_phys
 !
         else if (field_name .eq. rot_buoyancy%name) then
-          rot_forces%i_buoyancy =   i_phys
+          rot_forces%i_thrm_buo =   i_phys
         else if (field_name .eq. rot_composite_buoyancy%name) then
           rot_forces%i_comp_buo =   i_phys
         end if
@@ -277,7 +280,7 @@ subroutine set_div_force_addresses                                &
           div_forces%i_lorentz =    i_phys
 !
         else if (field_name .eq. div_buoyancy%name) then
-          div_forces%i_buoyancy =   i_phys
+          div_forces%i_thrm_buo =   i_phys
         else if (field_name .eq. div_composite_buoyancy%name) then
           div_forces%i_comp_buo =   i_phys
 !

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ subroutine sel_buoyancies_sph_MHD &`
`94`	`94`	`!`
`95`	`95`	`!`
`96`	`96`	`call sel_buoyancy_sph_rj(fl_prop%i_grav, sph_rj, leg, ibuo_temp, &`
`97`		`- & ipol_frc%i_buoyancy, fl_prop%coef_buo, sph_bc_U, rj_fld)`
	`97`	`+ & ipol_frc%i_thrm_buo, fl_prop%coef_buo, sph_bc_U, rj_fld)`
`98`	`98`	`call sel_buoyancy_sph_rj(fl_prop%i_grav, sph_rj, leg, ibuo_comp, &`
`99`	`99`	`& ipol_frc%i_comp_buo, fl_prop%coef_comp_buo, sph_bc_U, rj_fld)`
`100`	`100`	`!`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ subroutine cal_div_of_buoyancies_sph_2 &`
`128`	`128`	`if(flag_thermal_buoyancy) then`
`129`	`129`	`call const_sph_div_force &`
`130`	`130`	`& (sph_rj, r_2nd, sph_MHD_bc%sph_bc_U, g_sph_rj, &`
`131`		`- & ipol_frc%i_buoyancy, ipol_div_frc%i_buoyancy, rj_fld)`
	`131`	`+ & ipol_frc%i_thrm_buo, ipol_div_frc%i_thrm_buo, rj_fld)`
`132`	`132`	`end if`
`133`	`133`	`!`
`134`	`134`	`if(flag_comp_buoyancy) then`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ subroutine sel_rot_buoyancy_sph_MHD(sph_rj, &`
`58`	`58`	`!`
`59`	`59`	`!`
`60`	`60`	`call sel_rot_buoyancy_sph_rj(fl_prop%i_grav, sph_rj, &`
`61`		`- & ipol_base%i_temp, ipol_rot_frc%i_buoyancy, &`
	`61`	`+ & ipol_base%i_temp, ipol_rot_frc%i_thrm_buo, &`
`62`	`62`	`& fl_prop%coef_buo, sph_bc_U, rj_fld)`
`63`	`63`	`!`
`64`	`64`	`call sel_rot_buoyancy_sph_rj(fl_prop%i_grav, sph_rj, &`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ subroutine r_buoyancy_on_sphere &`
`73`	`73`	`!`
`74`	`74`	`if (iflag_debug.eq.1) write(,) 'cal_r_buoyancy_on_sphere'`
`75`	`75`	`call cal_r_buoyancy_on_sphere(kr, coef_buo, &`
`76`		`- & ipol_scalar, ipol_div_frc%i_buoyancy, &`
	`76`	`+ & ipol_scalar, ipol_div_frc%i_thrm_buo, &`
`77`	`77`	`& sph_rj%nidx_rj, sph_rj%radius_1d_rj_r, &`
`78`	`78`	`& rj_fld%n_point, rj_fld%ntot_phys, rj_fld%d_fld)`
`79`	`79`	`end if`