Skip to content

Commit 2a6c576

Browse files
hiromatsuihiromatsui
committed
Replace thermal buoyancy flux label from buopyancy_flux to thermal_buoyancy_flux
1 parent e5199d6 commit 2a6c576

File tree

11 files changed

+58
-33
lines changed

11 files changed

+58
-33
lines changed

‎doc/CALYPSO.pdf‎

107 Bytes
Binary file not shown.

‎doc/tex_src/controls_CALYPSO.tex‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,9 @@ \subsection{\tt phys\_values\_ctl}
376376
& $\bvec{u}\cdot \left( \bvec{J} \times \bvec{B} \right) $ \\
377377
\tt work\_against\_Lorentz & Work against Lorentz force
378378
& $- \bvec{u}\cdot \left( \bvec{J} \times \bvec{B} \right) $ \\
379-
\tt buoyancy\_flux & Thermal buoyancy flux & $ -\alpha_{T} T \bvec{g} \cdot \bvec{u} $ \\
379+
\tt thermal\_buoyancy\_flux & Thermal buoyancy flux & $ -\alpha_{T} T \bvec{g} \cdot \bvec{u} $ \\
380380
\tt composite\_buoyancy\_flux & Compositional buoyancy flux & $ -\alpha_{c} C \bvec{g} \cdot \bvec{u} $ \\
381+
\tt buoyancy\_flux & Total buoyancy flux & $ -\left(\alpha_{T} T + \alpha_{c} C \right) \bvec{g} \cdot \bvec{u} $ \\
381382
\tt magnetic\_ene\_generation & Energy production by magnetic induction
382383
& $ \bvec{B} \cdot \left( \bvec{u} \times \bvec{B} \right) $ \\
383384
\hline

‎src/Fortran_libraries/MHD_src/IO/m_force_control_labels.f90‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ module m_force_control_labels
8282
!
8383
!
8484
!> Filtered thermal buoyancy label
85-
character(len=kchara), parameter &
86-
& :: Filtered_gravity_label = 'Filtered_buoyancy'
85+
character(len=kchara), parameter :: Filtered_thrm_gravity_label &
86+
& = 'Filtered_thermal_buoyancy'
8787
!
8888
character(len=kchara), parameter &
8989
& :: Filtered_gravity_e1 = 'Filtered_gravity'
90+
character(len=kchara), parameter &
91+
& :: Filtered_gravity_e2 = 'Filtered_buoyancy'
9092
!
9193
!> Filtered compositional buoyancy label
9294
character(len=kchara), parameter &
@@ -131,7 +133,7 @@ subroutine set_filter_force_list_array(array_c)
131133
!
132134
call set_sph_force_list_array(array_c)
133135
!
134-
call append_c_to_ctl_array(Filtered_gravity_label, array_c)
136+
call append_c_to_ctl_array(Filtered_thrm_gravity_label, array_c)
135137
call append_c_to_ctl_array(Filtered_comp_gravity_label, array_c)
136138
call append_c_to_ctl_array(hd_filtered_inertia, array_c)
137139
call append_c_to_ctl_array(hd_filtered_Lorentz, array_c)
@@ -153,7 +155,7 @@ subroutine set_sph_force_list_array(array_c)
153155
call append_c_to_ctl_array(gravity_label, array_c)
154156
call append_c_to_ctl_array(comp_gravity_label, array_c)
155157
!
156-
call append_c_to_ctl_array(Filtered_gravity_label, array_c)
158+
call append_c_to_ctl_array(Filtered_thrm_gravity_label, array_c)
157159
call append_c_to_ctl_array(Filtered_comp_gravity_label, array_c)
158160
call append_c_to_ctl_array(hd_filtered_inertia, array_c)
159161
call append_c_to_ctl_array(hd_filtered_Lorentz, array_c)

‎src/Fortran_libraries/MHD_src/IO/set_control_4_force.f90‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ subroutine set_control_force_flags(frc_ctl, fl_prop)
113113
& .or. cmp_no_case(tmpchara, comp_gravity_e6) &
114114
& ) fl_prop%flag_comp_buoyancy = .TRUE.
115115
!
116-
if( cmp_no_case(tmpchara, Filtered_gravity_label) &
116+
if( cmp_no_case(tmpchara, Filtered_thrm_gravity_label) &
117117
& .or. cmp_no_case(tmpchara, Filtered_gravity_e1) &
118+
& .or. cmp_no_case(tmpchara, Filtered_gravity_e2) &
118119
& ) fl_prop%flag_filter_gravity = .TRUE.
119120
!
120121
if( cmp_no_case(tmpchara, Filtered_comp_gravity_label) &

‎src/Fortran_libraries/SERIAL_src/Fields/check_energy_fluxes.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ subroutine add_field_ctl_4_ene_flux(field_ctl)
5353
call add_phys_name_ctl(magnetic_tension, field_ctl)
5454
end if
5555
!
56-
if(check_field_list_ctl(buoyancy_flux, field_ctl)) then
56+
if(check_field_list_ctl(thermal_buoyancy_flux, field_ctl)) then
5757
call add_phys_name_ctl(velocity, field_ctl)
5858
call add_phys_name_ctl(temperature, field_ctl)
5959
call add_phys_name_ctl(thermal_buoyancy, field_ctl)

‎src/Fortran_libraries/SERIAL_src/Fields/m_energy_flux_labels.f90‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424
!! -u \cdot (J \times B)
2525
!! mag_tension_work [i_m_tension_wk]: Work of magnetic tension
2626
!! u \cdot( (B \nabla) B)
27-
!! buoyancy_flux [i_t_buo_gen]: Thermal buoyancy flux
28-
!! -u \cdot (\alpha_{T} g T)
27+
!! thermal_buoyancy_flux [i_t_buo_gen]: Thermal buoyancy flux
28+
!! -\alpha_{T} T g \cdot u
2929
!! composite_buoyancy_flux [i_c_buo_gen]: Compositional buoyancy flux
30-
!! -u \cdot (\alpha_{C} g C)
30+
!! -\alpha_{C} C g \cdot u
31+
!! buoyancy_flux [i_buoyancy_flux]: Total buoyancy flux
32+
!! -(\alpha_{T} T + \alpha_{C} C) g \cdot u
3133
!!
3234
!! magnetic_ene_generation [i_me_gen]:
3335
!! energy flux by magneitic induction
@@ -88,17 +90,24 @@ module m_energy_flux_labels
8890
& math = '$ u_{i} (B_{j} \partial_{j}) B_{i} $')
8991
!
9092
!> Field label of buoyancy flux
91-
!! @f$ -u_{i} \alpha_{T} g_{i} T @f$
92-
type(field_def), parameter :: buoyancy_flux &
93+
!! @f$ -u_{i} \alpha_{T} T g_{i} @f$
94+
type(field_def), parameter :: thermal_buoyancy_flux &
9395
& = field_def(n_comp = n_scalar, &
94-
& name = 'buoyancy_flux', &
95-
& math = '$ -u_{i} \alpha_{T} g_{i} T $')
96+
& name = 'thermal_buoyancy_flux', &
97+
& math = '$ -u_{i} \alpha_{T} T g_{i} $')
9698
!> Field label of compositional buoyancy flux
97-
!! @f$ -u_{i} \alpha_{c} g_{i} C @f$
99+
!! @f$ -u_{i} \alpha_{c} C g_{i} @f$
98100
type(field_def), parameter :: composite_buoyancy_flux &
99101
& = field_def(n_comp = n_scalar, &
100102
& name = 'composite_buoyancy_flux', &
101-
& math = '$ -u_{i} \alpha_{C} g_{i} C $')
103+
& math = '$ -u_{i} \alpha_{C} C g_{i} $')
104+
!> Field label of buoyancy flux
105+
!! @f$ -u_{i} \alpha_{T} T g_{i} @f$
106+
type(field_def), parameter :: buoyancy_flux &
107+
& = field_def(n_comp = n_scalar, &
108+
& name = 'buoyancy_flux', &
109+
& math = '$ -u_{i} (\alpha_{T} T ' &
110+
& // ' + \alpha_{C} C) g_{i} $')
102111
!!
103112
!> Field label of magnetic energy flux
104113
!> @f$ B_{i}e_{ijk} \partial_{j} (e_{klm}u_{l}B_{m}) @f$
@@ -177,8 +186,9 @@ logical function check_enegy_fluxes(field_name)
177186
& .or. (field_name .eq. work_against_Lorentz%name) &
178187
& .or. (field_name .eq. Lorentz_work%name) &
179188
& .or. (field_name .eq. mag_tension_work%name) &
180-
& .or. (field_name .eq. buoyancy_flux%name) &
189+
& .or. (field_name .eq. thermal_buoyancy_flux%name) &
181190
& .or. (field_name .eq. composite_buoyancy_flux%name) &
191+
& .or. (field_name .eq. buoyancy_flux%name) &
182192
!
183193
& .or. (field_name .eq. magnetic_ene_generation%name) &
184194
& .or. (field_name .eq. magnetic_stretch_flux%name) &
@@ -209,8 +219,9 @@ subroutine set_energy_flux_names(array_c2i)
209219
call set_field_label_to_ctl(work_against_Lorentz, array_c2i)
210220
call set_field_label_to_ctl(Lorentz_work, array_c2i)
211221
call set_field_label_to_ctl(mag_tension_work, array_c2i)
212-
call set_field_label_to_ctl(buoyancy_flux, array_c2i)
222+
call set_field_label_to_ctl(thermal_buoyancy_flux, array_c2i)
213223
call set_field_label_to_ctl(composite_buoyancy_flux, array_c2i)
224+
call set_field_label_to_ctl(buoyancy_flux, array_c2i)
214225
call set_field_label_to_ctl(magnetic_ene_generation, array_c2i)
215226
call set_field_label_to_ctl(magnetic_stretch_flux, array_c2i)
216227
call set_field_label_to_ctl(temp_generation, array_c2i)

‎src/Fortran_libraries/SERIAL_src/Fields/m_energy_flux_w_sym_labels.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
!! Work of magnetic tension u \cdot( (B \nabla) B)
3232
!!
3333
!! sym_termal_buo_flux, asym_termal_buo_flux:
34-
!! Thermal buoyancy flux -u \cdot (\alpha_{T} T) g
34+
!! Thermal buoyancy flux -\alpha_{T} T g \cdot u
3535
!! sym_composite_buo_flux, asym_composite_buo_flux:
36-
!! Compositional buoyancy flux -u \cdot (\alpha_{C} C) g
36+
!! Compositional buoyancy flux -\alpha_{C} C g \cdot u
3737
!! sym_buoyancy_flux, asym_buoyancy_flux: Total buoyancy flux
38-
!! -u \cdot (\alpha_{T} T + \alpha_{C} C) g
38+
!! -(\alpha_{T} T + \alpha_{C} C) g \cdot u
3939
!!
4040
!! B_rot_Bsym_x_usym, B_rot_Basym_x_uasym,
4141
!! B_rot_Bsym_x_uasym, B_rot_Basym_x_usym:

‎src/Fortran_libraries/SERIAL_src/Fields/set_each_field_name.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ subroutine set_scalar_field_name &
9494
! Old field label... Should be deleted later!!
9595
if(phys_name_ctl .eq. buoyancy_work%name) then
9696
flag = .TRUE.
97-
call append_field_name_list(buoyancy_flux%name, n_scalar, &
98-
& flag_viz, flag_monitor, ione, fld)
97+
call append_field_name_list(thermal_buoyancy_flux%name, &
98+
& n_scalar, flag_viz, flag_monitor, ione, fld)
9999
return
100100
end if
101101
!

‎src/Fortran_libraries/SERIAL_src/Fields/t_energy_flux_labels.f90‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
!! -u \cdot (J \times B)
2424
!! mag_tension_work [i_m_tension_wk]: Work of magnetic tension
2525
!! u \cdot( (B \nabla) B)
26-
!! buoyancy_flux [i_t_buo_gen]: Thermal buoyancy flux
27-
!! -u \cdot (\alpha_{T} g T)
26+
!! thermal_buoyancy_flux [i_t_buo_gen]: Thermal buoyancy flux
27+
!! -\alpha_{T} T g \cdot u
2828
!! composite_buoyancy_flux [i_c_buo_gen]: Compositional buoyancy flux
29-
!! -u \cdot (\alpha_{C} g C)
29+
!! -\alpha_{C} C g \cdot u
30+
!! buoyancy_flux [i_buoyancy_flux]: Total buoyancy flux
31+
!! -(\alpha_{T} T + \alpha_{C} C) g \cdot u
3032
!!
3133
!! magnetic_ene_generation [i_me_gen]:
3234
!! energy flux by magneitic induction
@@ -75,12 +77,16 @@ module t_energy_flux_labels
7577
!> Field address of work of magnetic tension
7678
!! @f$ u_{i} (B_{j} \partial_{j}) B_{i} @f$
7779
integer (kind=kint) :: i_m_tension_wk = izero
80+
!
7881
!> Field address of thermal buoyancy flux
79-
!! @f$ -u_{i} \alpha_{T} g_{i} T @f$
80-
integer (kind=kint) :: i_t_buo_gen = izero
82+
!! @f$ -u_{i} \alpha_{T} T g_{i} @f$
83+
integer (kind=kint) :: i_t_buo_gen = izero
8184
!> Field address of compositional buoyancy flux
82-
!! @f$ -u_{i} \alpha_{c} g_{i} C @f$
83-
integer (kind=kint) :: i_c_buo_gen = izero
85+
!! @f$ -u_{i} \alpha_{c} C g_{i} @f$
86+
integer (kind=kint) :: i_c_buo_gen = izero
87+
!> Field address of total buoyancy flux
88+
!! @f$ -u_{i} (\alpha_{T} T + \alpha_{c} C) g_{i} @f$
89+
integer (kind=kint) :: i_buoyancy_flux = izero
8490
!!
8591
!> Field address of magnetic energy flux
8692
!> @f$ B_{i}e_{ijk} \partial_{j} \left(e_{klm}u_{l}B_{m}\right) @f$
@@ -139,10 +145,12 @@ subroutine set_enegy_fluxes_addresses &
139145
else if (field_name .eq. mag_tension_work%name) then
140146
ene_flux%i_m_tension_wk = i_phys
141147
!
142-
else if (field_name .eq. buoyancy_flux%name) then
148+
else if (field_name .eq. thermal_buoyancy_flux%name) then
143149
ene_flux%i_t_buo_gen = i_phys
144150
else if (field_name .eq. composite_buoyancy_flux%name) then
145151
ene_flux%i_c_buo_gen = i_phys
152+
else if (field_name .eq. buoyancy_flux%name) then
153+
ene_flux%i_buoyancy_flux = i_phys
146154
!
147155
else if (field_name .eq. magnetic_ene_generation%name) then
148156
ene_flux%i_me_gen = i_phys

‎src/Jupyter/.ipynb_checkpoints/Calypso_control_glossary-checkpoint.ipynb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,9 @@
470470
"|:-|:-|:-|\n",
471471
"|`Lorentz_work` | Work of Lorentz force | ${\\bf u}\\cdot \\left( {\\bf J} \\times {\\bf B} \\right) $| \n",
472472
"|`work_against_Lorentz` | Work against Lorentz force | $- {\\bf u}\\cdot \\left( {\\bf J} \\times {\\bf B} \\right) $| \n",
473-
"|`buoyancy_flux` | Thermal buoyancy flux | $ -\\alpha_{T} T {\\bf g} \\cdot {\\bf u} $|\n",
473+
"|`thermal_buoyancy_flux` | Thermal buoyancy flux | $ -\\alpha_{T} T {\\bf g} \\cdot {\\bf u} $|\n",
474474
"|`composite_buoyancy_flux` | Compositional buoyancy flux | $ -\\alpha_{c} C {\\bf g} \\cdot {\\bf u} $|\n",
475+
"|`buoyancy_flux` | Total buoyancy flux | $ -(\\alpha_{T} T + \\alpha_{c} C){\\bf g} \\cdot {\\bf u} $|\n",
475476
"|`magnetic_ene_generation` | Energy production by induction| $ {\\bf B} \\cdot \\left( {\\bf u} \\times {\\bf B} \\right) $| \n",
476477
"|`kinetic_helicity` | Kinetic helicity | $ {\\bf u} \\cdot {\\bf \\omega} $|\n",
477478
"|`current_helicity` | Current helicity | $ {\\bf B} \\cdot {\\bf J} $|\n",

0 commit comments

Comments
 (0)