[commit] Hiro_latest: Correct typo from ‘raidal_grid_type_ctl’ to ‘radial_grid_type_ctl’ (884b3f4)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:21:16 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 884b3f42aaa2dda204b53108ef19dc2bcb40a70f
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Wed Oct 30 10:53:08 2013 -0700
Correct typo from ‘raidal_grid_type_ctl’ to ‘radial_grid_type_ctl’
>---------------------------------------------------------------
884b3f42aaa2dda204b53108ef19dc2bcb40a70f
examples/assemble_sph/sph_lm31r48c_2/control_sph_shell | 2 +-
examples/assemble_sph/sph_lm31r48c_4/control_sph_shell | 2 +-
.../Compositional_case_1/control_sph_shell | 2 +-
.../dynamobench_case_0/control_sph_shell | 2 +-
.../dynamobench_case_1/control_sph_shell | 2 +-
.../dynamobench_case_2/control_sph_shell | 2 +-
.../dynamo_benchmark/pseudo_vacuum/control_sph_shell | 2 +-
.../pseudo_vacuum/sph_lm31r48c_4/control_sph_shell | 2 +-
.../spherical_shell/Chebyshev_points/control_sph_shell | 2 +-
.../Chebyshev_points/sph_lm31r48c_4/control_sph_shell | 2 +-
.../spherical_shell/equidistance/control_sph_shell | 2 +-
.../explicitly_defined/control_sph_shell | 2 +-
.../spherical_shell/with_inner_core/control_sph_shell | 2 +-
.../SERIAL_src/IO/m_ctl_data_4_sphere_model.f90 | 12 ++++++------
src/Fortran_libraries/SERIAL_src/IO/skip_comment_f.f90 | 12 ++++++------
.../UTILS_src/spherical_grid/const_sph_radial_grid.f90 | 2 +-
.../spherical_grid/set_ctl_gen_shell_grids.f90 | 18 +++++++++---------
17 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/examples/assemble_sph/sph_lm31r48c_2/control_sph_shell b/examples/assemble_sph/sph_lm31r48c_2/control_sph_shell
index 536141b..4efd98c 100644
--- a/examples/assemble_sph/sph_lm31r48c_2/control_sph_shell
+++ b/examples/assemble_sph/sph_lm31r48c_2/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/assemble_sph/sph_lm31r48c_4/control_sph_shell b/examples/assemble_sph/sph_lm31r48c_4/control_sph_shell
index 4847b6f..ea7ffcc 100644
--- a/examples/assemble_sph/sph_lm31r48c_4/control_sph_shell
+++ b/examples/assemble_sph/sph_lm31r48c_4/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/dynamo_benchmark/Compositional_case_1/control_sph_shell b/examples/dynamo_benchmark/Compositional_case_1/control_sph_shell
index e680050..387571f 100644
--- a/examples/dynamo_benchmark/Compositional_case_1/control_sph_shell
+++ b/examples/dynamo_benchmark/Compositional_case_1/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/dynamo_benchmark/dynamobench_case_0/control_sph_shell b/examples/dynamo_benchmark/dynamobench_case_0/control_sph_shell
index e680050..387571f 100644
--- a/examples/dynamo_benchmark/dynamobench_case_0/control_sph_shell
+++ b/examples/dynamo_benchmark/dynamobench_case_0/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/dynamo_benchmark/dynamobench_case_1/control_sph_shell b/examples/dynamo_benchmark/dynamobench_case_1/control_sph_shell
index e680050..387571f 100644
--- a/examples/dynamo_benchmark/dynamobench_case_1/control_sph_shell
+++ b/examples/dynamo_benchmark/dynamobench_case_1/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/dynamo_benchmark/dynamobench_case_2/control_sph_shell b/examples/dynamo_benchmark/dynamobench_case_2/control_sph_shell
index d5b8674..0048f86 100644
--- a/examples/dynamo_benchmark/dynamobench_case_2/control_sph_shell
+++ b/examples/dynamo_benchmark/dynamobench_case_2/control_sph_shell
@@ -29,7 +29,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/dynamo_benchmark/pseudo_vacuum/control_sph_shell b/examples/dynamo_benchmark/pseudo_vacuum/control_sph_shell
index e680050..387571f 100644
--- a/examples/dynamo_benchmark/pseudo_vacuum/control_sph_shell
+++ b/examples/dynamo_benchmark/pseudo_vacuum/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/dynamo_benchmark/pseudo_vacuum/sph_lm31r48c_4/control_sph_shell b/examples/dynamo_benchmark/pseudo_vacuum/sph_lm31r48c_4/control_sph_shell
index 4847b6f..ea7ffcc 100644
--- a/examples/dynamo_benchmark/pseudo_vacuum/sph_lm31r48c_4/control_sph_shell
+++ b/examples/dynamo_benchmark/pseudo_vacuum/sph_lm31r48c_4/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/spherical_shell/Chebyshev_points/control_sph_shell b/examples/spherical_shell/Chebyshev_points/control_sph_shell
index e680050..387571f 100644
--- a/examples/spherical_shell/Chebyshev_points/control_sph_shell
+++ b/examples/spherical_shell/Chebyshev_points/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/spherical_shell/Chebyshev_points/sph_lm31r48c_4/control_sph_shell b/examples/spherical_shell/Chebyshev_points/sph_lm31r48c_4/control_sph_shell
index 4847b6f..ea7ffcc 100644
--- a/examples/spherical_shell/Chebyshev_points/sph_lm31r48c_4/control_sph_shell
+++ b/examples/spherical_shell/Chebyshev_points/sph_lm31r48c_4/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/spherical_shell/equidistance/control_sph_shell b/examples/spherical_shell/equidistance/control_sph_shell
index 3eb1514..774ea96 100644
--- a/examples/spherical_shell/equidistance/control_sph_shell
+++ b/examples/spherical_shell/equidistance/control_sph_shell
@@ -27,7 +27,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/examples/spherical_shell/explicitly_defined/control_sph_shell b/examples/spherical_shell/explicitly_defined/control_sph_shell
index beb3607..6ad8233 100644
--- a/examples/spherical_shell/explicitly_defined/control_sph_shell
+++ b/examples/spherical_shell/explicitly_defined/control_sph_shell
@@ -26,7 +26,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl explicit
+ radial_grid_type_ctl explicit
array r_layer 49
r_layer 1 5.384615384615384E-001
r_layer 2 5.395320768422367E-001
diff --git a/examples/spherical_shell/with_inner_core/control_sph_shell b/examples/spherical_shell/with_inner_core/control_sph_shell
index d5b8674..0048f86 100644
--- a/examples/spherical_shell/with_inner_core/control_sph_shell
+++ b/examples/spherical_shell/with_inner_core/control_sph_shell
@@ -29,7 +29,7 @@ begin spherical_shell_ctl
ngrid_meridonal_ctl 48
ngrid_zonal_ctl 96
!
- raidal_grid_type_ctl Chebyshev
+ radial_grid_type_ctl Chebyshev
num_fluid_grid_ctl 48
fluid_core_size_ctl 1.0
ICB_to_CMB_ratio_ctl 0.35
diff --git a/src/Fortran_libraries/SERIAL_src/IO/m_ctl_data_4_sphere_model.f90 b/src/Fortran_libraries/SERIAL_src/IO/m_ctl_data_4_sphere_model.f90
index 51c0659..f2f42b9 100644
--- a/src/Fortran_libraries/SERIAL_src/IO/m_ctl_data_4_sphere_model.f90
+++ b/src/Fortran_libraries/SERIAL_src/IO/m_ctl_data_4_sphere_model.f90
@@ -25,12 +25,12 @@
!! ngrid_meridonal_ctl 12
!! ngrid_zonal_ctl 24
!!
-!! raidal_grid_type_ctl: Definition for radial grid
+!! radial_grid_type_ctl: Definition for radial grid
!! explicit: Set each radial grid explicitly
!! Chebyshev: Set Chebyshev collocation points
!! equi_distance: Set equi-diatance grid
!!
-!! raidal_grid_type_ctl explicit
+!! radial_grid_type_ctl explicit
!! array r_layer 4
!! r_layer 1 0.3584615384615
!! r_layer 2 0.5384615384615 ICB
@@ -38,7 +38,7 @@
!! r_layer 4 1.538461538462 CMB
!! end array r_layer
!!
-!! raidal_grid_type_ctl Chebyshev
+!! radial_grid_type_ctl Chebyshev
!! num_fluid_grid_ctl 5
!! fluid_core_size_ctl 0.35
!! ICB_to_CMB_ratio_ctl 1.0
@@ -92,7 +92,7 @@
character(len = kchara), allocatable :: bc_bondary_name_ctl(:)
!
!> Grid spacing type
- character(len = kchara) :: raidal_grid_type_ctl
+ character(len = kchara) :: radial_grid_type_ctl
!> Minimum radius of the simulation domain @f$ R_{c} @f$
integer(kind = kint) :: num_fluid_grid_ctl
!> ICB radius @f$ R_{i} @f$
@@ -131,7 +131,7 @@
& :: hd_sph_g_type = 'sph_grid_type_ctl'
!
character(len=kchara), parameter &
- & :: hd_r_grid_type = 'raidal_grid_type_ctl'
+ & :: hd_r_grid_type = 'radial_grid_type_ctl'
character(len=kchara), parameter &
& :: hd_n_fluid_grid = 'num_fluid_grid_ctl'
character(len=kchara), parameter &
@@ -263,7 +263,7 @@
call read_character_ctl_item(hd_sph_g_type, &
& i_sph_g_type, sph_grid_type_ctl)
call read_character_ctl_item(hd_r_grid_type, &
- & i_r_grid_type, raidal_grid_type_ctl)
+ & i_r_grid_type, radial_grid_type_ctl)
!
call read_integer_ctl_item(hd_sph_truncate, &
& i_sph_truncate, ltr_ctl)
diff --git a/src/Fortran_libraries/SERIAL_src/IO/skip_comment_f.f90 b/src/Fortran_libraries/SERIAL_src/IO/skip_comment_f.f90
index 1075add..f3b2dd8 100644
--- a/src/Fortran_libraries/SERIAL_src/IO/skip_comment_f.f90
+++ b/src/Fortran_libraries/SERIAL_src/IO/skip_comment_f.f90
@@ -16,7 +16,7 @@
!!
!! subroutine change_2_upper_case(string)
!! subroutine change_2_lower_case(string)
-!! integer function compare_ignore_cases(ref_chara, cmp_chara)
+!! integer function cmp_no_case(ref_chara, cmp_chara)
!! if ref_chara and cmp_chara are same ignoreing case,
!! returns 1, othewwise returns 0
!!@endverbatim
@@ -163,7 +163,7 @@
!
!-----------------------------------------------------------------------
!
- integer function compare_ignore_cases(ref_chara, cmp_chara)
+ integer function cmp_no_case(ref_chara, cmp_chara)
!
character*(*), intent(in) :: ref_chara
character(len=kchara), intent(in) :: cmp_chara
@@ -173,7 +173,7 @@
!
len = len_trim(ref_chara)
if(len_trim(cmp_chara) .ne. len) then
- compare_ignore_cases = 0
+ cmp_no_case = 0
return
end if
!
@@ -182,11 +182,11 @@
call change_2_lower_case(ref_tmp)
call change_2_lower_case(cmp_tmp)
!
- compare_ignore_cases = 0
- if(ref_tmp .eq. cmp_tmp) compare_ignore_cases = 1
+ cmp_no_case = 0
+ if(ref_tmp .eq. cmp_tmp) cmp_no_case = 1
return
!
- end function compare_ignore_cases
+ end function cmp_no_case
!
!-----------------------------------------------------------------------
!
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/const_sph_radial_grid.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/const_sph_radial_grid.f90
index 4b7b785..ec784a2 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/const_sph_radial_grid.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/const_sph_radial_grid.f90
@@ -65,7 +65,7 @@
write(*,*) 'radial grid is written in radial_point.dat'
open(id_file, file='radial_point.dat')
!
- write(id_file,'(a)') ' raidal_grid_type_ctl explicit'
+ write(id_file,'(a)') ' radial_grid_type_ctl explicit'
write(id_file,'(a,i6)') ' array r_layer ', nidx_global_rtp(1)
do k = 1, nidx_global_rtp(1)
write(id_file,'(a,i6,1pE25.15e3)') &
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_ctl_gen_shell_grids.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_ctl_gen_shell_grids.f90
index c29ce3e..85b97a4 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_ctl_gen_shell_grids.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_ctl_gen_shell_grids.f90
@@ -99,17 +99,17 @@
nidx_global_rtp(3) = 4
l_truncation = 2
!
- if (raidal_grid_type_ctl .eq. 'explicit' &
- & .or. raidal_grid_type_ctl .eq. 'Explicit' &
- & .or. raidal_grid_type_ctl .eq. 'EXPLICIT') then
+ if (radial_grid_type_ctl .eq. 'explicit' &
+ & .or. radial_grid_type_ctl .eq. 'Explicit' &
+ & .or. radial_grid_type_ctl .eq. 'EXPLICIT') then
iflag_radial_grid = igrid_non_euqidist
- else if(raidal_grid_type_ctl .eq. 'chebyshev' &
- & .or. raidal_grid_type_ctl .eq. 'Chebyshev' &
- & .or. raidal_grid_type_ctl .eq. 'CHEBYSHEV') then
+ else if(radial_grid_type_ctl .eq. 'chebyshev' &
+ & .or. radial_grid_type_ctl .eq. 'Chebyshev' &
+ & .or. radial_grid_type_ctl .eq. 'CHEBYSHEV') then
iflag_radial_grid = igrid_Chebyshev
- else if(raidal_grid_type_ctl .eq. 'equi_distance' &
- & .or. raidal_grid_type_ctl .eq. 'Equi_distance' &
- & .or. raidal_grid_type_ctl .eq. 'EQUI_DISTANCE') then
+ else if(radial_grid_type_ctl .eq. 'equi_distance' &
+ & .or. radial_grid_type_ctl .eq. 'Equi_distance' &
+ & .or. radial_grid_type_ctl .eq. 'EQUI_DISTANCE') then
iflag_radial_grid = igrid_euqidistance
end if
!
More information about the CIG-COMMITS
mailing list