[cig-commits] [commit] Hiro_latest: Set shorter start and end radius points name for time integration (4dcd07e)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:21:38 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 4dcd07e9662a30662b13fd977fef7a878e568650
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Sat Nov 9 07:29:36 2013 -0800
Set shorter start and end radius points name for time integration
>---------------------------------------------------------------
4dcd07e9662a30662b13fd977fef7a878e568650
.../MHD_src/sph_MHD/const_sph_diffusion.f90 | 30 +++++++++-------------
.../MHD_src/sph_MHD/m_control_params_sph_MHD.f90 | 16 ++++++------
.../MHD_src/sph_MHD/set_bc_sph_mhd.f90 | 24 ++++++++---------
3 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_diffusion.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_diffusion.f90
index da48a2f..4f4a89e 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_diffusion.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_diffusion.f90
@@ -56,10 +56,9 @@
use cal_inner_core_rotation
!
!
- call cal_sph_nod_vect_diffuse2 &
- & (kr_rj_fluid_start, kr_rj_fluid_end, &
- & coef_d_velo, ipol%i_velo, ipol%i_v_diffuse)
- call cal_sph_nod_vect_dr_2(kr_rj_fluid_start, kr_rj_fluid_end, &
+ call cal_sph_nod_vect_diffuse2(kr_in_U, kr_out_U, coef_d_velo, &
+ & ipol%i_velo, ipol%i_v_diffuse)
+ call cal_sph_nod_vect_dr_2(kr_in_U, kr_out_U, &
& d_rj(1,ipol%i_v_diffuse), d_rj(1,idpdr%i_v_diffuse) )
!
if(iflag_icb_velocity .eq. iflag_sph_fill_center) then
@@ -105,10 +104,9 @@
use cal_inner_core_rotation
!
!
- call cal_sph_nod_vect_diffuse2 &
- & (kr_rj_fluid_start, kr_rj_fluid_end, &
- & coef_d_velo, ipol%i_vort, ipol%i_w_diffuse)
- call cal_sph_nod_vect_dr_2(kr_rj_fluid_start, kr_rj_fluid_end, &
+ call cal_sph_nod_vect_diffuse2(kr_in_U, kr_out_U, coef_d_velo, &
+ & ipol%i_vort, ipol%i_w_diffuse)
+ call cal_sph_nod_vect_dr_2(kr_in_U, kr_out_U, &
& d_rj(1,ipol%i_w_diffuse), d_rj(1,idpdr%i_w_diffuse) )
!
!
@@ -173,11 +171,9 @@
end if
!
!
- call cal_sph_nod_vect_diffuse2 &
- & (kr_rj_conduct_start, kr_rj_conduct_end, &
- & coef_d_magne, ipol%i_magne, ipol%i_b_diffuse)
- call cal_sph_nod_vect_dr_2 &
- & (kr_rj_conduct_start, kr_rj_conduct_end, &
+ call cal_sph_nod_vect_diffuse2(kr_in_B, kr_out_B, coef_d_magne, &
+ & ipol%i_magne, ipol%i_b_diffuse)
+ call cal_sph_nod_vect_dr_2(kr_in_B, kr_out_B, &
& d_rj(1,ipol%i_b_diffuse), d_rj(1,idpdr%i_b_diffuse) )
!
if(iflag_cmb_magne .eq. iflag_radial_magne) then
@@ -202,9 +198,8 @@
use cal_sph_exp_fixed_flux
!
!
- call cal_sph_nod_scalar_diffuse2 &
- & (kr_rj_thermal_start, kr_rj_thermal_end, &
- & coef_d_temp, ipol%i_temp, ipol%i_t_diffuse)
+ call cal_sph_nod_scalar_diffuse2(kr_in_T, kr_out_T, coef_d_temp, &
+ & ipol%i_temp, ipol%i_t_diffuse)
!
if (iflag_icb_temp .eq. iflag_fixed_flux) then
call cal_sph_icb_fix_flux_diffuse2(nidx_rj(2), h_flux_ICB_bc, &
@@ -233,8 +228,7 @@
use cal_sph_exp_fixed_flux
!
!
- call cal_sph_nod_scalar_diffuse2 &
- & (kr_rj_light_start, kr_rj_light_end, &
+ call cal_sph_nod_scalar_diffuse2(kr_in_C, kr_out_C, &
& coef_d_light, ipol%i_light, ipol%i_c_diffuse)
!
if (iflag_icb_composition .eq. iflag_fixed_flux) then
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/m_control_params_sph_MHD.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/m_control_params_sph_MHD.f90
index 9d095ca..b3ec163 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/m_control_params_sph_MHD.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/m_control_params_sph_MHD.f90
@@ -99,21 +99,21 @@
integer(kind = kint) :: iflag_sph_coriolis_file = 0
!
!> Start radial address of fluid shell for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_fluid_start = 1
+ integer(kind = kint) :: kr_in_U = 1
!> End radial address of fluid shell for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_fluid_end = 1
+ integer(kind = kint) :: kr_out_U = 1
!> Start radial address to solve heat equation for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_thermal_start = 1
+ integer(kind = kint) :: kr_in_T = 1
!> End radial address to solve heat equation for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_thermal_end = 1
+ integer(kind = kint) :: kr_out_T = 1
!> Start radial address to solve induction for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_conduct_start = 1
+ integer(kind = kint) :: kr_in_B = 1
!> End radial address to solve induction for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_conduct_end = 1
+ integer(kind = kint) :: kr_out_B = 1
!> Start radial address to solve comopsition for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_light_start = 1
+ integer(kind = kint) :: kr_in_C = 1
!> End radial address to solve comopsition for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_rj_light_end = 1
+ integer(kind = kint) :: kr_out_C = 1
!
!> Number of grid points in zonal direction for dynamo benchmark
integer(kind = kint) :: mphi_mid_eq = -1
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_mhd.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_mhd.f90
index 4e864a6..2fbb2dc 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_mhd.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_mhd.f90
@@ -57,35 +57,35 @@
!
if (iflag_icb_velocity .eq. iflag_sph_fill_center &
& .or. iflag_icb_velocity .eq. iflag_sph_fix_center) then
- kr_rj_fluid_start = nlayer_2_center
+ kr_in_U = nlayer_2_center
else
- kr_rj_fluid_start = nlayer_ICB
+ kr_in_U = nlayer_ICB
end if
- kr_rj_fluid_end = nlayer_CMB
+ kr_out_U = nlayer_CMB
!
if (iflag_icb_temp .eq. iflag_sph_fill_center &
& .or. iflag_icb_temp .eq. iflag_sph_fix_center) then
- kr_rj_thermal_start = nlayer_2_center
+ kr_in_T = nlayer_2_center
else
- kr_rj_thermal_start = nlayer_ICB
+ kr_in_T = nlayer_ICB
end if
- kr_rj_thermal_end = nlayer_CMB
+ kr_out_T = nlayer_CMB
!
if (iflag_icb_composition .eq. iflag_sph_fill_center &
& .or. iflag_icb_composition .eq. iflag_sph_fix_center) then
- kr_rj_light_start = nlayer_2_center
+ kr_in_C = nlayer_2_center
else
- kr_rj_light_start = nlayer_ICB
+ kr_in_C = nlayer_ICB
end if
- kr_rj_conduct_end = nlayer_CMB
+ kr_out_C = nlayer_CMB
!
if (iflag_icb_magne .eq. iflag_sph_fill_center &
& .or. iflag_icb_magne .eq. iflag_sph_fix_center) then
- kr_rj_conduct_start = nlayer_2_center
+ kr_in_B = nlayer_2_center
else
- kr_rj_conduct_start = nlayer_ICB
+ kr_in_B = nlayer_ICB
end if
- kr_rj_light_end = nlayer_CMB
+ kr_out_B = nlayer_CMB
!
end subroutine s_set_bc_sph_mhd
!
More information about the CIG-COMMITS
mailing list