Skip to content

Commit 50ad2bf

Browse files
hiromatsuihiromatsui
committed
Merge remote-tracking branch 'refs/remotes/origin/Ver.2.0_alpha' into Ver.2.0_alpha
2 parents d388467 + 01fcdd0 commit 50ad2bf

File tree

63 files changed

+63902
-63843
lines changed

Some content is hidden

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

63 files changed

+63902
-63843
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

‎doc/tex_src/programs_CALYPSO.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ \subsubsection{Mean square amplitude data}
13951395
3 1 3 1 3 3 1 1
13961396
t_step time K_ene_pol K_ene_tor K_ene temperature vorticity_pol
13971397
vorticity_tor vorticity pressure M_ene_pol M_ene_tor M_ene
1398-
current_density_pol current_density_tor current_density buoyancy_flux
1398+
current_density_pol current_density_tor current_density thermal_buoyancy_flux
13991399
Lorentz_work
14001400
100 2.00000000000000E-004 3.08485175580558E+001 2.97052514317492E-001
14011401
3.11455700723732E+001 8.37549401638792E-002 3.83545285358558E+001

‎examples/dynamo_benchmark/Compositional_case_1/control_MHD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ begin MHD_control
6565
! vector_potential, magnetic_field, current_density, magnetic_potential
6666
! composition, perturbation_temp
6767
!
68-
! buoyancy_flux, Lorentz_work
68+
! thermal_buoyancy_flux, Lorentz_work
6969
! magnetic_ene_generation
7070
! temp_generation, part_temp_gen
7171
! vis_ene_diffuse, mag_ene_diffuse

‎examples/dynamo_benchmark/Compositional_case_1/control_snapshot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ begin MHD_control
3838
! vector_potential, magnetic_field, current_density, magnetic_potential
3939
! composition, perturbation_temp
4040
!
41-
! buoyancy_flux, Lorentz_work
41+
! thermal_buoyancy_flux, Lorentz_work
4242
! magnetic_ene_generation
4343
! temp_generation, part_temp_gen
4444
! vis_ene_diffuse, mag_ene_diffuse

‎examples/dynamo_benchmark/dynamobench_case_1/control_MHD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ begin MHD_control
6262
! vector_potential, magnetic_field, current_density, magnetic_potential
6363
! composition, perturbation_temp
6464
!
65-
! buoyancy_flux, Lorentz_work
65+
! thermal_buoyancy_flux, Lorentz_work
6666
! magnetic_ene_generation
6767
! temp_generation, part_temp_gen
6868
! vis_ene_diffuse, mag_ene_diffuse
@@ -81,7 +81,7 @@ begin MHD_control
8181
nod_value_ctl current_density Viz_On Monitor_On
8282
!
8383
nod_value_ctl Lorentz_work Viz_On Monitor_On
84-
nod_value_ctl buoyancy_flux Viz_On Monitor_On
84+
nod_value_ctl thermal_buoyancy_flux Viz_On Monitor_On
8585
end array nod_value_ctl
8686
end phys_values_ctl
8787
!

‎examples/dynamo_benchmark/dynamobench_case_1/control_psf_zm‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ begin cross_section_ctl
2828
array output_field
2929
output_field temperature scalar
3030
!
31-
output_field velocity spherical_vector
32-
output_field velocity cylinder_r
33-
output_field velocity z
34-
output_field magnetic_field spherical_vector
35-
output_field magnetic_field cylinder_r
36-
output_field magnetic_field z
37-
!
38-
output_field Lorentz_work scalar
39-
output_field buoyancy_flux scalar
31+
output_field velocity spherical_vector
32+
output_field velocity cylinder_r
33+
output_field velocity z
34+
output_field magnetic_field spherical_vector
35+
output_field magnetic_field cylinder_r
36+
output_field magnetic_field z
37+
!
38+
output_field Lorentz_work scalar
39+
output_field thermal_buoyancy_flux scalar
4040
end array output_field
4141
end output_field_define
4242
end cross_section_ctl

‎examples/dynamo_benchmark/dynamobench_case_1/control_snapshot‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ begin MHD_control
3939
! vector_potential, magnetic_field, current_density, magnetic_potential
4040
! composition, perturbation_temp
4141
!
42-
! buoyancy_flux, Lorentz_work
42+
! thermal_buoyancy_flux, Lorentz_work
4343
! magnetic_ene_generation
4444
! temp_generation, part_temp_gen
4545
! vis_ene_diffuse, mag_ene_diffuse
@@ -50,24 +50,24 @@ begin MHD_control
5050
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5151
begin phys_values_ctl
5252
array nod_value_ctl
53-
nod_value_ctl velocity Viz_On Monitor_On
54-
nod_value_ctl temperature Viz_On Monitor_On
55-
nod_value_ctl pressure Viz_On Monitor_On
56-
nod_value_ctl vorticity Viz_On Monitor_On
57-
nod_value_ctl magnetic_field Viz_On Monitor_On
58-
nod_value_ctl current_density Viz_On Monitor_On
53+
nod_value_ctl velocity Viz_On Monitor_On
54+
nod_value_ctl temperature Viz_On Monitor_On
55+
nod_value_ctl pressure Viz_On Monitor_On
56+
nod_value_ctl vorticity Viz_On Monitor_On
57+
nod_value_ctl magnetic_field Viz_On Monitor_On
58+
nod_value_ctl current_density Viz_On Monitor_On
5959
!
6060
nod_value_ctl Lorentz_work Viz_On Monitor_On
61-
nod_value_ctl buoyancy_flux Viz_On Monitor_On
61+
nod_value_ctl thermal_buoyancy_flux Viz_On Monitor_On
6262
!
63-
nod_value_ctl Coriolis_force Viz_On Monitor_On
63+
nod_value_ctl Coriolis_force Viz_On Monitor_On
6464
nod_value_ctl Lorentz_force Viz_On Monitor_On
65-
nod_value_ctl inertia Viz_On Monitor_On
65+
nod_value_ctl inertia Viz_On Monitor_On
6666
!
67-
nod_value_ctl rot_Coriolis_force Viz_On Monitor_On
68-
nod_value_ctl rot_Lorentz_force Viz_On Monitor_On
69-
nod_value_ctl rot_inertia Viz_On Monitor_On
70-
nod_value_ctl rot_thermal_buoyancy Viz_On Monitor_On
67+
nod_value_ctl rot_Coriolis_force Viz_On Monitor_On
68+
nod_value_ctl rot_Lorentz_force Viz_On Monitor_On
69+
nod_value_ctl rot_inertia Viz_On Monitor_On
70+
nod_value_ctl rot_thermal_buoyancy Viz_On Monitor_On
7171
end array nod_value_ctl
7272
end phys_values_ctl
7373
!

‎examples/dynamo_benchmark/dynamobench_case_2/control_MHD‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ begin MHD_control
6161
! vector_potential, magnetic_field, current_density, magnetic_potential
6262
! composition, perturbation_temp
6363
!
64-
! buoyancy_flux, Lorentz_work, mag_tension_work
64+
! thermal_buoyancy_flux, Lorentz_work, mag_tension_work
6565
! magnetic_ene_generation
6666
! temp_generation, part_temp_gen
6767
! vis_ene_diffuse, mag_ene_diffuse
@@ -72,15 +72,15 @@ begin MHD_control
7272
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
7373
begin phys_values_ctl
7474
array nod_value_ctl
75-
nod_value_ctl velocity Viz_On Monitor_On
76-
nod_value_ctl temperature Viz_On Monitor_On
77-
nod_value_ctl pressure Viz_On Monitor_On
78-
nod_value_ctl vorticity Viz_On Monitor_On
79-
nod_value_ctl magnetic_field Viz_On Monitor_On
80-
nod_value_ctl current_density Viz_On Monitor_On
75+
nod_value_ctl velocity Viz_On Monitor_On
76+
nod_value_ctl temperature Viz_On Monitor_On
77+
nod_value_ctl pressure Viz_On Monitor_On
78+
nod_value_ctl vorticity Viz_On Monitor_On
79+
nod_value_ctl magnetic_field Viz_On Monitor_On
80+
nod_value_ctl current_density Viz_On Monitor_On
8181
!
8282
nod_value_ctl Lorentz_work Viz_On Monitor_On
83-
nod_value_ctl buoyancy_flux Viz_On Monitor_On
83+
nod_value_ctl thermal_buoyancy_flux Viz_On Monitor_On
8484
!
8585
nod_value_ctl Coriolis_force Viz_On Monitor_On
8686
nod_value_ctl Lorentz_force Viz_On Monitor_On

‎examples/dynamo_benchmark/dynamobench_case_2/control_psf_zm‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ begin cross_section_ctl
2626
!
2727
begin output_field_define
2828
array output_field
29-
output_field temperature scalar
29+
output_field temperature scalar
3030
!
31-
output_field velocity spherical_vector
32-
output_field velocity cylinder_r
33-
output_field velocity z
34-
output_field magnetic_field spherical_vector
35-
output_field magnetic_field cylinder_r
36-
output_field magnetic_field z
31+
output_field velocity spherical_vector
32+
output_field velocity cylinder_r
33+
output_field velocity z
34+
output_field magnetic_field spherical_vector
35+
output_field magnetic_field cylinder_r
36+
output_field magnetic_field z
3737
!
38-
output_field Lorentz_work scalar
39-
output_field buoyancy_flux scalar
38+
output_field Lorentz_work scalar
39+
output_field thermal_buoyancy_flux scalar
4040
end array output_field
4141
end output_field_define
4242
end cross_section_ctl

0 commit comments

Comments
 (0)