Skip to content

Commit 0ea9c5a

Browse files
hiromatsuihiromatsui
committed
Replace thermal buoyancy field label from 'buoyancy' to 'thermal_buoyancy'
1 parent 8daefcc commit 0ea9c5a

File tree

47 files changed

+92
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+92
-152
lines changed

‎doc/CALYPSO.pdf‎

174 Bytes
Binary file not shown.

‎doc/tex_src/controls_CALYPSO.tex‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,9 @@ \subsection{\tt phys\_values\_ctl}
322322
\tt viscous\_diffusion & Viscous diffusion
323323
& $-\nu \nabla \times \nabla \times \bvec{u}$ \\
324324
\tt inertia & Inertia term & $ -\bvec{\omega} \times \bvec{u} $ \\
325-
\tt buoyancy & Thermal buoyancy & $ -\alpha_{T} T \bvec{g} $ \\
326-
\tt composite\_buoyancy & Compositional buoyancy & $ -\alpha_{C} C\bvec{g} $\\
325+
\tt thermal\_buoyancy & Thermal buoyancy & $ -\alpha_{T} T \bvec{g} $ \\
326+
\tt composite\_buoyancy & Compositional buoyancy & $ -\alpha_{C} C \bvec{g} $\\
327+
\tt buoyancy & Total buoyancy & $ -\left(\alpha_{T} T + \alpha_{C} C \right) \bvec{g} $ \\
327328
\tt Lorentz\_force & Lorentz force & $ \bvec{J} \times \bvec{B} $ \\
328329
\tt Coriolis\_force & Coriolis force & $ -2 \Omega \hat{z} \times \bvec{u} $ \\
329330
\tt pressure\_gradient & Pressure gradient & $ - \nabla P $ \\

‎examples/dynamo_benchmark/Compositional_case_1/control_MHD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ begin MHD_control
7171
! vis_ene_diffuse, mag_ene_diffuse
7272
!
7373
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
74-
! Coriolis_force, buoyancy
74+
! Coriolis_force, thermal_buoyancy
7575
!
7676
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
7777
begin phys_values_ctl

‎examples/dynamo_benchmark/Compositional_case_1/control_snapshot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ begin MHD_control
4444
! vis_ene_diffuse, mag_ene_diffuse
4545
!
4646
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
47-
! Coriolis_force, buoyancy
47+
! Coriolis_force, thermal_buoyancy
4848
!
4949
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5050
begin phys_values_ctl

‎examples/dynamo_benchmark/dynamobench_case_1/control_MHD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ begin MHD_control
6868
! vis_ene_diffuse, mag_ene_diffuse
6969
!
7070
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
71-
! Coriolis_force, buoyancy
71+
! Coriolis_force, thermal_buoyancy
7272
!
7373
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
7474
begin phys_values_ctl

‎examples/dynamo_benchmark/dynamobench_case_1/control_snapshot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ begin MHD_control
4545
! vis_ene_diffuse, mag_ene_diffuse
4646
!
4747
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
48-
! Coriolis_force, buoyancy
48+
! Coriolis_force, thermal_buoyancy
4949
!
5050
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5151
begin phys_values_ctl

‎examples/dynamo_benchmark/dynamobench_case_2/control_MHD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ begin MHD_control
6767
! vis_ene_diffuse, mag_ene_diffuse
6868
!
6969
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
70-
! Coriolis_force, buoyancy
70+
! Coriolis_force, thermal_buoyancy
7171
!
7272
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
7373
begin phys_values_ctl

‎examples/dynamo_benchmark/dynamobench_case_2/control_snapshot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ begin MHD_control
4343
! vis_ene_diffuse, mag_ene_diffuse
4444
!
4545
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
46-
! Coriolis_force, buoyancy
46+
! Coriolis_force, thermal_buoyancy
4747
!
4848
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4949
begin phys_values_ctl

‎examples/dynamo_benchmark/pseudo_vacuum/control_MHD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ begin MHD_control
7171
! vis_ene_diffuse, mag_ene_diffuse
7272
!
7373
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
74-
! Coriolis_force, buoyancy
74+
! Coriolis_force, thermal_buoyancy
7575
!
7676
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
7777
begin phys_values_ctl

‎examples/dynamo_benchmark/pseudo_vacuum/control_snapshot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ begin MHD_control
4343
! vis_ene_diffuse, mag_ene_diffuse
4444
!
4545
! thermal_diffusion, viscous_diffusion, magnetic_diffusion
46-
! Coriolis_force, buoyancy
46+
! Coriolis_force, thermal_buoyancy
4747
!
4848
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4949
begin phys_values_ctl

0 commit comments

Comments
 (0)