[cig-commits] [commit] Hiro_latest: Modify connectivity for poles (f07f74b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:21:12 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit f07f74b4488dc3e7651273df9ae8dcde6371fdb6
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Wed Oct 30 08:50:46 2013 -0700
Modify connectivity for poles
>---------------------------------------------------------------
f07f74b4488dc3e7651273df9ae8dcde6371fdb6
.../MHD_src/sph_MHD/set_initial_sph_dynamo.f90 | 4 +--
.../spherical_grid/set_ele_group_global_sph.f90 | 12 ++++----
.../spherical_grid/set_node_group_global_sph.f90 | 18 ++++++------
.../UTILS_src/spherical_grid/set_sph_ele_group.f90 | 4 +--
.../spherical_grid/set_sph_grid_for_equator.f90 | 10 +++----
.../spherical_grid/set_sph_surf_group.f90 | 8 +++---
.../spherical_grid/set_stack_4_sph_groups.f90 | 33 ++++++++++------------
.../spherical_grid/set_surf_group_global_sph.f90 | 12 ++++----
.../INITIAL_FIELD/const_sph_initial_spectr.f90 | 7 +++--
9 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_initial_sph_dynamo.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_initial_sph_dynamo.f90
index 584d9a9..78f2df1 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_initial_sph_dynamo.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_initial_sph_dynamo.f90
@@ -211,7 +211,7 @@
inod = jj + (k-1)*nidx_rj(2)
!
d_rj(inod,ipol%i_temp) = (one-three*xr**2+three*xr**4-xr**6) &
- & * 0.1d0 * three / (two*sqrt(pi))
+ & * 0.1d0 * three / (sqrt(two*pi))
end do
end if
!
@@ -257,7 +257,7 @@
xr = two * radius_1d_rj_r(k) - one * (r_CMB+r_ICB) / shell
inod = jj + (k-1)*nidx_rj(2)
d_rj(inod,is_fld) = (one-three*xr**2+three*xr**4-xr**6) &
- & * 0.1d0 * three / (two*sqrt(pi))
+ & * 0.1d0 * three / (sqrt(two*pi))
end do
end if
!
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_ele_group_global_sph.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_ele_group_global_sph.f90
index c67a7a7..496607a 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_ele_group_global_sph.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_ele_group_global_sph.f90
@@ -37,8 +37,8 @@
!
call allocate_material_data
!
- mat_name(1) = 'inner_core'
- mat_name(2) = 'outer_core'
+ mat_name(1) = IC_ele_grp_name
+ mat_name(2) = OC_ele_grp_name
!
mat_istack(0) = 0
mat_istack(1) = mat_istack(0) + (nlayer_ICB - 1) &
@@ -66,8 +66,8 @@
!
call allocate_material_data
!
- mat_name(1) = 'inner_core'
- mat_name(2) = 'outer_core'
+ mat_name(1) = IC_ele_grp_name
+ mat_name(2) = OC_ele_grp_name
!
mat_istack(0) = 0
mat_istack(1) = mat_istack(0) + (nlayer_ICB - 1) &
@@ -97,8 +97,8 @@
!
call allocate_material_data
!
- mat_name(1) = 'inner_core'
- mat_name(2) = 'outer_core'
+ mat_name(1) = IC_ele_grp_name
+ mat_name(2) = OC_ele_grp_name
!
mat_istack(0) = 0
mat_istack(1) = mat_istack(0) + nlayer_ICB &
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_node_group_global_sph.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_node_group_global_sph.f90
index fdbd999..c7abae6 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_node_group_global_sph.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_node_group_global_sph.f90
@@ -35,9 +35,9 @@
!
call allocate_boundary_data
!
- bc_name(1) = 'ICB'
- bc_name(2) = 'CMB'
- bc_name(3) = 'to_Center'
+ bc_name(1) = ICB_nod_grp_name
+ bc_name(2) = CMB_nod_grp_name
+ bc_name(3) = CTR_nod_grp_name
!
bc_istack(0) = 0
bc_istack(1) = bc_istack(0) &
@@ -75,9 +75,9 @@
!
call allocate_boundary_data
!
- bc_name(1) = 'ICB'
- bc_name(2) = 'CMB'
- bc_name(3) = 'to_Center'
+ bc_name(1) = ICB_nod_grp_name
+ bc_name(2) = CMB_nod_grp_name
+ bc_name(3) = CTR_nod_grp_name
!
bc_name(4) = 'South_pole'
bc_name(5) = 'North_pole'
@@ -128,9 +128,9 @@
!
call allocate_boundary_data
!
- bc_name(1) = 'ICB'
- bc_name(2) = 'CMB'
- bc_name(3) = 'to_Center'
+ bc_name(1) = ICB_nod_grp_name
+ bc_name(2) = CMB_nod_grp_name
+ bc_name(3) = CTR_nod_grp_name
!
bc_name(4) = 'South_pole'
bc_name(5) = 'North_pole'
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_ele_group.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_ele_group.f90
index e0454dd..08a07c1 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_ele_group.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_ele_group.f90
@@ -109,7 +109,7 @@
if(iflag_r(kg1)*iflag_r(kg2) .gt. 0) then
call count_ele_grp_item_on_sphere(ip_t, &
& ele_grp%nitem_grp(icou))
- else if(ele_grp%grp_name(icou) .eq. name_IC &
+ else if(ele_grp%grp_name(icou) .eq. IC_ele_grp_name &
& .and. iflag_r(kg1).gt.0) then
call count_ele_grp_item_on_sphere(ip_t, &
& ele_grp%nitem_grp(icou))
@@ -167,7 +167,7 @@
if(iflag_r(kg1)*iflag_r(kg2) .gt. 0) then
call set_ele_grp_item_on_sphere(ip_r, ip_t, kele, &
& inum, ele_grp)
- else if(ele_grp%grp_name(icou) .eq. name_IC &
+ else if(ele_grp%grp_name(icou) .eq. IC_ele_grp_name &
& .and. iflag_r(kg1).gt.0) then
call set_ele_grp_item_on_sphere(ip_r, ip_t, kele, &
& inum, ele_grp)
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_grid_for_equator.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_grid_for_equator.f90
index c7ac6da..b24ac11 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_grid_for_equator.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_grid_for_equator.f90
@@ -151,12 +151,12 @@
istack_radial_grp_rtp(6) = istack_radial_grp_rtp(5) &
& + nlayer_CMB - nlayer_ICB + 1
!
- name_radial_grp_rtp(1) = 'ICB'
- name_radial_grp_rtp(2) = 'CMB'
- name_radial_grp_rtp(3) = 'to_Center'
+ name_radial_grp_rtp(1) = ICB_nod_grp_name
+ name_radial_grp_rtp(2) = CMB_nod_grp_name
+ name_radial_grp_rtp(3) = CTR_nod_grp_name
name_radial_grp_rtp(4) = 'Mid_OC'
- name_radial_grp_rtp(5) = 'inner_core'
- name_radial_grp_rtp(6) = 'outer_core'
+ name_radial_grp_rtp(5) = IC_ele_grp_name
+ name_radial_grp_rtp(6) = OC_ele_grp_name
!
ntot_radial_grp_rtp = istack_radial_grp_rtp(6)
call allocate_rtp_r_grp_item
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_surf_group.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_surf_group.f90
index 3e9e860..eee4e5b 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_surf_group.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_sph_surf_group.f90
@@ -68,8 +68,8 @@
surf_grp%grp_name(icou) = name_radial_grp_rj(igrp)
!
kr = item_radial_grp_rj(knum)
- if(surf_grp%grp_name(icou) .eq. name_IC &
- & .or. surf_grp%grp_name(icou) .eq. name_2center) then
+ if(surf_grp%grp_name(icou) .eq. ICB_nod_grp_name &
+ & .or. surf_grp%grp_name(icou) .eq. CTR_nod_grp_name) then
kl1 = irev_sph_r(kr, ip_r)
kl2 = irev_sph_r(kr+1,ip_r)
else
@@ -116,8 +116,8 @@
inum = surf_grp%istack_grp(icou-1)
!
kr = item_radial_grp_rj(knum)
- if(surf_grp%grp_name(icou) .eq. name_IC &
- & .or. surf_grp%grp_name(icou) .eq. name_2center) then
+ if(surf_grp%grp_name(icou) .eq. ICB_nod_grp_name &
+ & .or. surf_grp%grp_name(icou) .eq. CTR_nod_grp_name) then
kl1 = irev_sph_r(kr, ip_r)
kl2 = irev_sph_r(kr+1,ip_r)
isf = ifive
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_stack_4_sph_groups.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_stack_4_sph_groups.f90
index abbb2e9..07689e8 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_stack_4_sph_groups.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_stack_4_sph_groups.f90
@@ -14,12 +14,7 @@
!
implicit none
!
- character(len = kchara), parameter :: name_ICB = 'ICB'
- character(len = kchara), parameter :: name_CMB = 'CMB'
- character(len = kchara), parameter :: name_2center = 'to_Center'
character(len = kchara), parameter :: name_mid = 'Mid_OC'
- character(len = kchara), parameter :: name_IC = 'inner_core'
- character(len = kchara), parameter :: name_OC = 'outer_core'
character(len = kchara), parameter :: name_ED = 'Outmost_of_Shell'
!
character(len = kchara), parameter :: name_y00 = 'Y_0_0'
@@ -27,7 +22,7 @@
character(len = kchara), parameter :: name_y11s = 'Y_1_1s'
character(len = kchara), parameter :: name_y11c = 'Y_1_1c'
!
- private :: name_ICB, name_CMB, name_mid, name_OC
+ private :: name_mid
private :: name_y00, name_y10, name_y11s, name_y11c
private :: izero, ione, itwo, ithree
private :: set_stack_sph_grp_by_list, set_stack_sph_grp_by_rng
@@ -48,18 +43,18 @@
!
icou = 0
call set_stack_sph_grp_by_list(icou, nlayer_ICB, nlayer_ICB, &
- & nidx_rtp(1), idx_gl_1d_rtp_r(1), name_ICB, &
+ & nidx_rtp(1), idx_gl_1d_rtp_r(1), ICB_nod_grp_name, &
& num_radial_grp_rtp, istack_radial_grp_rtp, &
& name_radial_grp_rtp)
!
call set_stack_sph_grp_by_list(icou, nlayer_CMB, nlayer_CMB, &
- & nidx_rtp(1), idx_gl_1d_rtp_r(1), name_CMB, &
+ & nidx_rtp(1), idx_gl_1d_rtp_r(1), CMB_nod_grp_name, &
& num_radial_grp_rtp, istack_radial_grp_rtp, &
& name_radial_grp_rtp)
!
call set_stack_sph_grp_by_list(icou, &
& nlayer_2_center, nlayer_2_center, nidx_rtp(1), &
- & idx_gl_1d_rtp_r(1), name_2center, num_radial_grp_rtp, &
+ & idx_gl_1d_rtp_r(1), CTR_nod_grp_name, num_radial_grp_rtp, &
& istack_radial_grp_rtp, name_radial_grp_rtp)
!
if (nidx_global_rtp(1) .gt. nlayer_CMB) then
@@ -78,12 +73,14 @@
!
nlayer_ed = nlayer_ICB-1
call set_stack_sph_grp_by_list(icou, nlayer_2_center, nlayer_ed, &
- & nidx_rtp(1), idx_gl_1d_rtp_r(1), name_IC, num_radial_grp_rtp, &
- & istack_radial_grp_rtp, name_radial_grp_rtp)
+ & nidx_rtp(1), idx_gl_1d_rtp_r(1), IC_ele_grp_name, &
+ & num_radial_grp_rtp, istack_radial_grp_rtp, &
+ & name_radial_grp_rtp)
!
call set_stack_sph_grp_by_list(icou, nlayer_ICB, nlayer_CMB, &
- & nidx_rtp(1), idx_gl_1d_rtp_r(1), name_OC, num_radial_grp_rtp, &
- & istack_radial_grp_rtp, name_radial_grp_rtp)
+ & nidx_rtp(1), idx_gl_1d_rtp_r(1), OC_ele_grp_name, &
+ & num_radial_grp_rtp, istack_radial_grp_rtp, &
+ & name_radial_grp_rtp)
!
ntot_radial_grp_rtp = istack_radial_grp_rtp(num_radial_grp_rtp)
!
@@ -101,15 +98,15 @@
!
icou = 0
call set_stack_sph_grp_by_rng(icou, nlayer_ICB, nlayer_ICB, &
- & ist_rj(1), ied_rj(1), name_ICB, num_radial_grp_rj, &
+ & ist_rj(1), ied_rj(1), ICB_nod_grp_name, num_radial_grp_rj, &
& istack_radial_grp_rj, name_radial_grp_rj)
!
call set_stack_sph_grp_by_rng(icou, nlayer_CMB, nlayer_CMB, &
- & ist_rj(1), ied_rj(1), name_CMB, num_radial_grp_rj, &
+ & ist_rj(1), ied_rj(1), CMB_nod_grp_name, num_radial_grp_rj, &
& istack_radial_grp_rj, name_radial_grp_rj)
!
call set_stack_sph_grp_by_rng(icou, nlayer_2_center, &
- & nlayer_2_center, ist_rj(1), ied_rj(1), name_2center, &
+ & nlayer_2_center, ist_rj(1), ied_rj(1), CTR_nod_grp_name, &
& num_radial_grp_rj, istack_radial_grp_rj, name_radial_grp_rj)
!
if (nidx_global_rtp(1) .gt. nlayer_CMB) then
@@ -126,11 +123,11 @@
!
nlayer_ed = nlayer_ICB-1
call set_stack_sph_grp_by_rng(icou, nlayer_2_center, nlayer_ed, &
- & ist_rj(1), ied_rj(1), name_IC, num_radial_grp_rj, &
+ & ist_rj(1), ied_rj(1), IC_ele_grp_name, num_radial_grp_rj, &
& istack_radial_grp_rj, name_radial_grp_rj)
!
call set_stack_sph_grp_by_rng(icou, nlayer_ICB, nlayer_CMB, &
- & ist_rj(1), ied_rj(1), name_OC, num_radial_grp_rj, &
+ & ist_rj(1), ied_rj(1), OC_ele_grp_name, num_radial_grp_rj, &
& istack_radial_grp_rj, name_radial_grp_rj)
!
ntot_radial_grp_rj = istack_radial_grp_rj(num_radial_grp_rj)
diff --git a/src/Fortran_libraries/UTILS_src/spherical_grid/set_surf_group_global_sph.f90 b/src/Fortran_libraries/UTILS_src/spherical_grid/set_surf_group_global_sph.f90
index d99dd2a..e5c492f 100644
--- a/src/Fortran_libraries/UTILS_src/spherical_grid/set_surf_group_global_sph.f90
+++ b/src/Fortran_libraries/UTILS_src/spherical_grid/set_surf_group_global_sph.f90
@@ -35,9 +35,9 @@
!
call allocate_surface_data
!
- surf_name(1) = 'ICB_surf'
- surf_name(2) = 'CMB_surf'
- surf_name(3) = 'to_Center_surf'
+ surf_name(1) = ICB_sf_grp_name
+ surf_name(2) = CMB_sf_grp_name
+ surf_name(3) = CTR_sf_grp_name
!
surf_istack(0) = 0
surf_istack(1) = surf_istack(0) &
@@ -68,9 +68,9 @@
!
call allocate_surface_data
!
- surf_name(1) = 'ICB_surf'
- surf_name(2) = 'CMB_surf'
- surf_name(3) = 'to_Center_surf'
+ surf_name(1) = ICB_sf_grp_name
+ surf_name(2) = CMB_sf_grp_name
+ surf_name(3) = CTR_sf_grp_name
!
surf_istack(0) = 0
surf_istack(1) = surf_istack(0) &
diff --git a/src/programs/data_utilities/INITIAL_FIELD/const_sph_initial_spectr.f90 b/src/programs/data_utilities/INITIAL_FIELD/const_sph_initial_spectr.f90
index ac349b4..6715a9c 100644
--- a/src/programs/data_utilities/INITIAL_FIELD/const_sph_initial_spectr.f90
+++ b/src/programs/data_utilities/INITIAL_FIELD/const_sph_initial_spectr.f90
@@ -154,7 +154,8 @@
!
!
! Find local addrtess for (l,m) = (4,4)
- jj = find_local_sph_mode_address(4, 4)
+! jj = find_local_sph_mode_address(4, 4)
+ jj = find_local_sph_mode_address(5, 5)
!
! If data for (l,m) = (4,4) is there, set initial temperature
if (jj .gt. 0) then
@@ -169,7 +170,7 @@
! set initial temperature
xr = two * rr - one * (r_CMB+r_ICB) / shell
d_rj(inod,ipol%i_temp) = (one-three*xr**2+three*xr**4-xr**6) &
- & * A_temp * three / (two*sqrt(pi))
+ & * A_temp * three / (sqrt(two*pi))
end do
end if
!
@@ -217,7 +218,7 @@
inod = local_sph_data_address(k,jj)
xr = two * radius_1d_rj_r(k) - one * (r_CMB+r_ICB) / shell
d_rj(inod,ipol%i_light) = (one-three*xr**2+three*xr**4-xr**6) &
- & * A_light * three / (two*sqrt(pi))
+ & * A_light * three / (sqrt(two*pi))
end do
end if
!
More information about the CIG-COMMITS
mailing list