Skip to content

Commit 386891d

Browse files
hiromatsuihiromatsui
committed
Change default flag for thermal buoyancy to Thermal_buoyancy
1 parent 1a68e65 commit 386891d

File tree

19 files changed

+93
-87
lines changed

19 files changed

+93
-87
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
!! Coriolis_force (Coriolis)
2828
!! Lorentz_force (Lorentz)
2929
!!
30-
!! buoyancy (Thermal_buoyancy, Thermal_gravity, gravity)
30+
!! Thermal_buoyancy (buoyancy, Thermal_gravity, gravity)
3131
!! Compositional_buoyancy (composite_buoyancy, composite_gravity
3232
!! compositional_gravity)
3333
!!

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ subroutine set_coefs_4_momentum_eq(fl_prop, mom_ctl, &
150150
coefs_buoyancy%num = 0
151151
else
152152
if (mom_ctl%coef_4_termal_buo%icou .eq. 0) then
153-
e_message = 'Set coefficients for buoyancy'
153+
e_message = 'Set coefficients for thermal buoyancy'
154154
call calypso_MPI_abort(ierr_dless, e_message)
155155
else
156156
coefs_buoyancy%num = mom_ctl%coef_4_termal_buo%num

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
!! gravity_type_ctl radial
3434
!!
3535
!! !!!! direction of gravity (opposite direction to that of buoyancy)
36-
!! array gravity_vec 3
37-
!! gravity_vec x 0.000 end
38-
!! gravity_vec y 0.000 end
39-
!! gravity_vec z -1.000 end
36+
!! array gravity_vec
37+
!! gravity_vec x 0.000
38+
!! gravity_vec y 0.000
39+
!! gravity_vec z -1.000
4040
!! end array gravity_vec
4141
!! end gravity_define
4242
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
!! begin forces_define
2626
!!!!! define of forces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
2727
!! available forces
28-
!! gravity, Coriolis, Lorentz, Compositional_buoyancy
28+
!! Thermal_buoyancy, Coriolis, Lorentz, Compositional_buoyancy
2929
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
3030
!! array force_ctl
31-
!! force_ctl gravity
31+
!! force_ctl Thermal_buoyancy
3232
!! force_ctl Coriolis
3333
!! force_ctl Lorentz
3434
!! force_ctl Compositional_buoyancy

‎src/Fortran_libraries/MHD_src/sph_MHD/check_dependency_for_MHD.f90‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,23 +148,23 @@ subroutine check_field_dependencies &
148148
!
149149
if(fl_prop%iflag_scheme .gt. id_no_evolution) then
150150
if(fl_prop%flag_thermal_buoyancy) then
151-
msg = 'Buoyancy needs'
151+
msg = 'Thermal buoyancy is required'
152152
call check_missing_field_w_msg(fld, msg, iphys_base%i_temp)
153153
end if
154154
!
155155
if(fl_prop%flag_comp_buoyancy) then
156-
msg = 'Compositional buoyancy needs'
156+
msg = 'Compositional buoyancy is required'
157157
call check_missing_field_w_msg(fld, msg, iphys_base%i_light)
158158
end if
159159
!
160160
if(fl_prop%flag_lorentz) then
161-
msg = 'Lorentz force needs'
161+
msg = 'Lorentz force is required'
162162
call check_missing_field_w_msg(fld, msg, iphys_base%i_magne)
163163
end if
164164
end if
165165
!
166166
if(cd_prop%iflag_magneto_cv .eq. id_turn_ON) then
167-
msg = 'Magnetoconvection needs'
167+
msg = 'Magnetoconvection is required'
168168
call check_missing_field_w_msg(fld, msg, iphys_base%i_back_B)
169169
end if
170170
!

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

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -48,73 +48,79 @@ module m_sym_ene_flux_labels
4848
!> Field label of work of inertia
4949
!! @f$ u_{i} (\tilde{u}_{j} \partial_{j} \tilde{u}_{i}) @f$,
5050
!! @f$ u_{i} (e_{ijk} \tilde{\omega}_{j} \tilde{u}_{k}) @f$
51-
type(field_def), parameter :: mns_us_d_ws_x_ua &
52-
& = field_def(n_comp = n_scalar, &
53-
& name = '-us_d_ws_x_ua', &
54-
& math = '$ u_{i} (e_{ijk}' &
55-
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
51+
type(field_def), parameter :: mns_us_d_ws_x_ua &
52+
& = field_def(n_comp = n_scalar, &
53+
& name = '-us_d_ws_x_ua', &
54+
& math = '$ u_{i} (e_{ijk}' &
55+
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
5656
!> Field label of work of inertia
5757
!! @f$ u_{i} (\tilde{u}_{j} \partial_{j} \tilde{u}_{i}) @f$,
5858
!! @f$ u_{i} (e_{ijk} \tilde{\omega}_{j} \tilde{u}_{k}) @f$
59-
type(field_def), parameter :: mns_us_d_wa_x_us &
60-
& = field_def(n_comp = n_scalar, &
61-
& name = '-us_d_wa_x_us', &
62-
& math = '$ u_{i} (e_{ijk}' &
63-
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
59+
type(field_def), parameter :: mns_us_d_wa_x_us &
60+
& = field_def(n_comp = n_scalar, &
61+
& name = '-us_d_wa_x_us', &
62+
& math = '$ u_{i} (e_{ijk}' &
63+
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
6464
!> Field label of work of inertia
6565
!! @f$ u_{i} (\tilde{u}_{j} \partial_{j} \tilde{u}_{i}) @f$,
6666
!! @f$ u_{i} (e_{ijk} \tilde{\omega}_{j} \tilde{u}_{k}) @f$
67-
type(field_def), parameter :: mns_ua_d_ws_x_us &
68-
& = field_def(n_comp = n_scalar, &
69-
& name = '-ua_d_ws_x_us', &
70-
& math = '$ u_{i} (e_{ijk}' &
71-
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
67+
type(field_def), parameter :: mns_ua_d_ws_x_us &
68+
& = field_def(n_comp = n_scalar, &
69+
& name = '-ua_d_ws_x_us', &
70+
& math = '$ u_{i} (e_{ijk}' &
71+
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
7272
!> Field label of work of inertia
7373
!! @f$ u_{i} (\tilde{u}_{j} \partial_{j} \tilde{u}_{i}) @f$,
7474
!! @f$ u_{i} (e_{ijk} \tilde{\omega}_{j} \tilde{u}_{k}) @f$
75-
type(field_def), parameter :: mns_ua_d_wa_x_ua &
76-
& = field_def(n_comp = n_scalar, &
77-
& name = '-ua_d_wa_x_ua', &
78-
& math = '$ u_{i} (e_{ijk}' &
79-
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
75+
type(field_def), parameter :: mns_ua_d_wa_x_ua &
76+
& = field_def(n_comp = n_scalar, &
77+
& name = '-ua_d_wa_x_ua', &
78+
& math = '$ u_{i} (e_{ijk}' &
79+
& // ' \tilde{\omega}_{j} \tilde{u}_{k})$')
8080
!
8181
!> Field label of work of Lorentz force
8282
!! @f$ u_{symi} (e_{ijk} \tilde{J}_{symj} \tilde{B}_{asymk}) @f$
83-
type(field_def), parameter :: us_d_js_x_ba &
84-
& = field_def(n_comp = n_scalar, &
85-
& name = 'us_d_js_x_ba', &
86-
& math = '$ u_{symi} (e_{ijk} \tilde{J}_{symj} \tilde{B}_{asymk})$')
83+
type(field_def), parameter :: us_d_js_x_ba &
84+
& = field_def(n_comp = n_scalar, &
85+
& name = 'us_d_js_x_ba', &
86+
& math = '$ u_{symi} (e_{ijk}' &
87+
& // ' \tilde{J}_{symj} \tilde{B}_{asymk})$')
8788
!> Field label of work of Lorentz force
8889
!! @f$ u_{symi} (e_{ijk} \tilde{J}_{asymj} \tilde{B}_{symk}) @f$
89-
type(field_def), parameter :: us_d_ja_x_bs &
90-
& = field_def(n_comp = n_scalar, &
91-
& name = 'us_d_ja_x_bs', &
92-
& math = '$ u_{symi} (e_{ijk} \tilde{J}_{asymj} \tilde{B}_{symk})$')
90+
type(field_def), parameter :: us_d_ja_x_bs &
91+
& = field_def(n_comp = n_scalar, &
92+
& name = 'us_d_ja_x_bs', &
93+
& math = '$ u_{symi} (e_{ijk}' &
94+
& //' \tilde{J}_{asymj} \tilde{B}_{symk})$')
9395
!> Field label of work of Lorentz force
9496
!! @f$ u_{asymi} (e_{ijk} \tilde{J}_{symj} \tilde{B}_{symk}) @f$
95-
type(field_def), parameter :: ua_d_js_x_bs &
96-
& = field_def(n_comp = n_scalar, &
97-
& name = 'ua_d_js_x_bs', &
98-
& math = '$ u_{asymi} (e_{ijk} \tilde{J}_{symj} \tilde{B}_{symk})$')
97+
type(field_def), parameter :: ua_d_js_x_bs &
98+
& = field_def(n_comp = n_scalar, &
99+
& name = 'ua_d_js_x_bs', &
100+
& math = '$ u_{asymi} (e_{ijk}' &
101+
& // ' \tilde{J}_{symj} \tilde{B}_{symk})$')
99102
!> Field label of work of Lorentz force
100103
!! @f$ u_{asymi} (e_{ijk} \tilde{J}_{asymj} \tilde{B}_{asymk}) @f$
101-
type(field_def), parameter :: ua_d_ja_x_ba &
102-
& = field_def(n_comp = n_scalar, &
103-
& name = 'ua_d_ja_x_ba', &
104-
& math = '$ u_{asymi} (e_{ijk} \tilde{J}_{asymj} \tilde{B}_{asymk})$')
105-
!
104+
type(field_def), parameter :: ua_d_ja_x_ba &
105+
& = field_def(n_comp = n_scalar, &
106+
& name = 'ua_d_ja_x_ba', &
107+
& math = '$ u_{asymi} (e_{ijk}' &
108+
& // ' \tilde{J}_{asymj} \tilde{B}_{asymk})$')
109+
!
106110
!> Field label for sym buoyancy flux
107111
!! @f$ -u_{symi} \alpha_{T} g_{i} \tilde{T}_{sym} @f$
108-
type(field_def), parameter :: sym_buoyancy_flux &
109-
& = field_def(n_comp = n_scalar, &
110-
& name = 'sym_buoyancy_flux', &
111-
& math = '$ u_{asymi} (e_{ijk} \tilde{J}_{asymj} \tilde{B}_{symk})$')
112+
type(field_def), parameter :: sym_buoyancy_flux &
113+
& = field_def(n_comp = n_scalar, &
114+
& name = 'sym_buoyancy_flux', &
115+
& math = '$ u_{asymi} (e_{ijk}' &
116+
& // ' \tilde{J}_{asymj} \tilde{B}_{symk})$')
112117
!> Field label for asym buoyancy flux
113118
!! @f$ -u_{asymi} \alpha_{T} g_{i} \tilde{T}_{asym} @f$
114-
type(field_def), parameter :: asym_buoyancy_flux &
115-
& = field_def(n_comp = n_scalar, &
116-
& name = 'asym_buoyancy_flux', &
117-
& math = '$ -u_{asymi} \alpha_{T} g_{i} \tilde{T}_{asym} $')
119+
type(field_def), parameter :: asym_buoyancy_flux &
120+
& = field_def(n_comp = n_scalar, &
121+
& name = 'asym_buoyancy_flux', &
122+
& math = '$ -u_{asymi} \alpha_{T}' &
123+
& // ' g_{i} \tilde{T}_{asym} $')
118124
!
119125
! ----------------------------------------------------------------------
120126
!

‎src/programs/SPH_MHD/control_MHD‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,11 @@ begin MHD_control
259259
!
260260
!!!!! define of forces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
261261
! available forces
262-
! gravity, Coriolis, Lorentz
262+
! Thermal_buoyancy, Coriolis, Lorentz
263263
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
264264
begin forces_define
265265
array force_ctl
266-
force_ctl gravity
266+
force_ctl Thermal_buoyancy
267267
force_ctl Coriolis
268268
force_ctl Lorentz
269269
force_ctl Compositional_buoyancy
@@ -504,11 +504,11 @@ begin MHD_control
504504
end array sph_filter_ctl
505505
!
506506
array SGS_terms_ctl
507-
SGS_terms_ctl heat end
508-
SGS_terms_ctl inertia end
509-
SGS_terms_ctl Lorentz end
510-
SGS_terms_ctl induction end
511-
SGS_terms_ctl gravity end
507+
SGS_terms_ctl heat
508+
SGS_terms_ctl inertia
509+
SGS_terms_ctl Lorentz
510+
SGS_terms_ctl induction
511+
SGS_terms_ctl Thermal_buoyancy
512512
end array SGS_terms_ctl
513513
end SGS_control
514514
!

‎tests/Dynamo_Benchmark/Dynamobench_Case0/control_MHD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ begin MHD_control
124124
!
125125
!!!!! define of forces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
126126
! available forces
127-
! gravity, Coriolis, Lorentz
127+
! Thermal_buoyancy, Coriolis, Lorentz
128128
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
129129
begin forces_define
130130
array force_ctl
131-
force_ctl gravity
131+
force_ctl Thermal_buoyancy
132132
force_ctl Coriolis
133133
end array force_ctl
134134
end forces_define

‎tests/Dynamo_Benchmark/Dynamobench_Case1/control_MHD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ begin MHD_control
115115
!
116116
!!!!! define of forces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
117117
! available forces
118-
! gravity, Coriolis, Lorentz
118+
! Thermal_buoyancy, Coriolis, Lorentz
119119
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
120120
begin forces_define
121121
array force_ctl
122-
force_ctl gravity
122+
force_ctl Thermal_buoyancy
123123
force_ctl Coriolis
124124
force_ctl Lorentz
125125
end array force_ctl

‎tests/Dynamo_Benchmark/Dynamobench_Case2/control_MHD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ begin MHD_control
115115
!
116116
!!!!! define of forces !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
117117
! available forces
118-
! gravity, Coriolis, Lorentz
118+
! Thermal_buoyancy, Coriolis, Lorentz
119119
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
120120
begin forces_define
121121
array force_ctl
122-
force_ctl gravity
122+
force_ctl Thermal_buoyancy
123123
force_ctl Coriolis
124124
force_ctl Lorentz
125125
end array force_ctl

0 commit comments

Comments
 (0)