[cig-commits] [commit] Hiro_latest: Replace radial range parameter in m_boundary_params_sph_MHD (535c5ed)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:21:45 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 535c5edd86536f6adb113532fc3aace2fccaeec8
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Tue Nov 12 10:23:03 2013 -0800
Replace radial range parameter in m_boundary_params_sph_MHD
>---------------------------------------------------------------
535c5edd86536f6adb113532fc3aace2fccaeec8
.../MHD_src/IO/m_sph_boundary_input_data.f90 | 2 ++
.../MHD_src/sph_MHD/cal_sol_sph_fluid_crank.f90 | 2 ++
.../MHD_src/sph_MHD/const_data_4_dynamobench.f90 | 1 +
.../MHD_src/sph_MHD/const_r_mat_4_scalar_sph.f90 | 4 +++
.../MHD_src/sph_MHD/const_r_mat_4_vector_sph.f90 | 1 +
.../MHD_src/sph_MHD/const_sph_diffusion.f90 | 29 ++++++++++--------
.../MHD_src/sph_MHD/const_sph_divergence.f90 | 2 ++
.../MHD_src/sph_MHD/const_sph_radial_grad.f90 | 4 +++
.../MHD_src/sph_MHD/const_sph_rotation.f90 | 3 ++
.../MHD_src/sph_MHD/initial_magne_dynamobench.f90 | 4 +--
.../MHD_src/sph_MHD/m_boundary_params_sph_MHD.f90 | 16 ++++------
.../MHD_src/sph_MHD/m_control_params_sph_MHD.f90 | 34 +++-------------------
.../MHD_src/sph_MHD/m_field_4_dynamobench.f90 | 2 ++
.../MHD_src/sph_MHD/set_bc_flag_sph_velo.f90 | 2 ++
.../MHD_src/sph_MHD/set_bc_sph_mhd.f90 | 32 +++++---------------
.../MHD_src/sph_MHD/set_bc_sph_scalars.f90 | 4 +++
.../MHD_src/sph_MHD/set_initial_sph_dynamo.f90 | 1 +
.../INITIAL_FIELD/SPH_analyzer_const_initial.f90 | 5 ++++
18 files changed, 70 insertions(+), 78 deletions(-)
diff --git a/src/Fortran_libraries/MHD_src/IO/m_sph_boundary_input_data.f90 b/src/Fortran_libraries/MHD_src/IO/m_sph_boundary_input_data.f90
index 38cc2c8..d851875 100644
--- a/src/Fortran_libraries/MHD_src/IO/m_sph_boundary_input_data.f90
+++ b/src/Fortran_libraries/MHD_src/IO/m_sph_boundary_input_data.f90
@@ -224,6 +224,7 @@
& jmax, bc_data, iflag_bc_scalar)
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use skip_comment_f
!
character(len=kchara), intent(in) :: field_name
@@ -254,6 +255,7 @@
& iflag_bc_scalar)
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use skip_comment_f
!
character(len=kchara), intent(in) :: field_name
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_fluid_crank.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_fluid_crank.f90
index b162b51..dce7354 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_fluid_crank.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_fluid_crank.f90
@@ -221,6 +221,7 @@
!
subroutine cal_sol_temperature_sph_crank
!
+ use t_boundary_params_sph_MHD
use set_scalar_boundary_sph
use adjust_fixed_flux_sph
!
@@ -246,6 +247,7 @@
!
subroutine cal_sol_composition_sph_crank
!
+ use t_boundary_params_sph_MHD
use set_scalar_boundary_sph
use adjust_fixed_flux_sph
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_data_4_dynamobench.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_data_4_dynamobench.f90
index f4e7f3d..52f4ef7 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_data_4_dynamobench.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_data_4_dynamobench.f90
@@ -27,6 +27,7 @@
!
subroutine s_const_data_4_dynamobench
!
+ use t_boundary_params_sph_MHD
use m_control_params_sph_MHD
use calypso_mpi
use cal_rms_fields_by_sph
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_scalar_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_scalar_sph.f90
index 21a1067..fba44f6 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_scalar_sph.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_scalar_sph.f90
@@ -36,6 +36,8 @@
!
subroutine const_radial_mat_4_temp_sph
!
+ use t_boundary_params_sph_MHD
+!
integer(kind = kint) :: ip, jst, jed, j
integer(kind = kint) :: ierr
!
@@ -80,6 +82,8 @@
!
subroutine const_radial_mat_4_composit_sph
!
+ use t_boundary_params_sph_MHD
+!
integer(kind = kint) :: ip, jst, jed, j
integer(kind = kint) :: ierr
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_vector_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_vector_sph.f90
index dccfe8a..e12d284 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_vector_sph.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_r_mat_4_vector_sph.f90
@@ -133,6 +133,7 @@
subroutine const_radial_mat_4_magne_sph
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use set_sph_magne_mat_bc
!
integer(kind = kint) :: kr_in, ip, jst, jed, j
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 4f4a89e..00b1162 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
@@ -47,6 +47,7 @@
!
subroutine const_sph_viscous_diffusion
!
+ use m_boundary_params_sph_MHD
use set_sph_exp_rigid_ICB
use set_sph_exp_rigid_CMB
use set_sph_exp_free_ICB
@@ -56,9 +57,9 @@
use cal_inner_core_rotation
!
!
- 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, &
+ call cal_sph_nod_vect_diffuse2(sph_bc_U%kr_in, sph_bc_U%kr_out, &
+ & coef_d_velo, ipol%i_velo, ipol%i_v_diffuse)
+ call cal_sph_nod_vect_dr_2(sph_bc_U%kr_in, sph_bc_U%kr_out, &
& d_rj(1,ipol%i_v_diffuse), d_rj(1,idpdr%i_v_diffuse) )
!
if(iflag_icb_velocity .eq. iflag_sph_fill_center) then
@@ -95,6 +96,7 @@
!
subroutine const_sph_vorticirty_diffusion
!
+ use m_boundary_params_sph_MHD
use set_sph_exp_rigid_ICB
use set_sph_exp_rigid_CMB
use set_sph_exp_free_ICB
@@ -104,9 +106,9 @@
use cal_inner_core_rotation
!
!
- 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, &
+ call cal_sph_nod_vect_diffuse2(sph_bc_U%kr_in, sph_bc_U%kr_out, &
+ & coef_d_velo, ipol%i_vort, ipol%i_w_diffuse)
+ call cal_sph_nod_vect_dr_2(sph_bc_U%kr_in, sph_bc_U%kr_out, &
& d_rj(1,ipol%i_w_diffuse), d_rj(1,idpdr%i_w_diffuse) )
!
!
@@ -146,6 +148,7 @@
!
subroutine const_sph_magnetic_diffusion
!
+ use m_boundary_params_sph_MHD
use cal_sph_exp_nod_icb_ins
use cal_sph_exp_nod_cmb_ins
use cal_sph_exp_nod_icb_qvac
@@ -171,9 +174,9 @@
end if
!
!
- 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, &
+ call cal_sph_nod_vect_diffuse2(sph_bc_B%kr_in, sph_bc_B%kr_out, &
+ & coef_d_magne, ipol%i_magne, ipol%i_b_diffuse)
+ call cal_sph_nod_vect_dr_2(sph_bc_B%kr_in, sph_bc_B%kr_out, &
& d_rj(1,ipol%i_b_diffuse), d_rj(1,idpdr%i_b_diffuse) )
!
if(iflag_cmb_magne .eq. iflag_radial_magne) then
@@ -194,12 +197,13 @@
!
use m_machine_parameter
use m_control_params_sph_MHD
+ use m_boundary_params_sph_MHD
use cal_sph_exp_fixed_scalar
use cal_sph_exp_fixed_flux
!
!
- call cal_sph_nod_scalar_diffuse2(kr_in_T, kr_out_T, coef_d_temp, &
- & ipol%i_temp, ipol%i_t_diffuse)
+ call cal_sph_nod_scalar_diffuse2(sph_bc_T%kr_in, sph_bc_T%kr_out, &
+ & 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, &
@@ -224,11 +228,12 @@
subroutine const_sph_composit_diffusion
!
use m_control_params_sph_MHD
+ use m_boundary_params_sph_MHD
use cal_sph_exp_fixed_scalar
use cal_sph_exp_fixed_flux
!
!
- call cal_sph_nod_scalar_diffuse2(kr_in_C, kr_out_C, &
+ call cal_sph_nod_scalar_diffuse2(sph_bc_C%kr_in, sph_bc_C%kr_out, &
& 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/const_sph_divergence.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_divergence.f90
index efd7432..0cb0676 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_divergence.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_divergence.f90
@@ -35,6 +35,7 @@
!
subroutine const_sph_heat_advect
!
+ use t_boundary_params_sph_MHD
use cal_sph_exp_fixed_scalar
use cal_sph_exp_fixed_flux
!
@@ -64,6 +65,7 @@
!
subroutine const_sph_scalar_advect
!
+ use t_boundary_params_sph_MHD
use cal_sph_exp_fixed_scalar
use cal_sph_exp_fixed_flux
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_radial_grad.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_radial_grad.f90
index 1a62eee..655de2c 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_radial_grad.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_radial_grad.f90
@@ -56,6 +56,7 @@
!
subroutine const_radial_grad_temp
!
+ use t_boundary_params_sph_MHD
use cal_sph_exp_fixed_scalar
use cal_sph_exp_fixed_flux
!
@@ -85,6 +86,7 @@
!
subroutine const_radial_grad_composit
!
+ use t_boundary_params_sph_MHD
use cal_sph_exp_fixed_scalar
use cal_sph_exp_fixed_flux
use cal_sph_exp_rotation
@@ -148,6 +150,7 @@
!
subroutine const_grad_bp_and_current
!
+ use t_boundary_params_sph_MHD
use cal_sph_exp_nod_icb_ins
use cal_sph_exp_nod_cmb_ins
use cal_sph_exp_nod_icb_qvac
@@ -235,6 +238,7 @@
!
subroutine const_grad_poloidal_magne
!
+ use t_boundary_params_sph_MHD
use cal_sph_exp_nod_icb_ins
use cal_sph_exp_nod_cmb_ins
use cal_sph_exp_nod_cmb_qvac
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_rotation.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_rotation.f90
index b631ec5..ddb30a4 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_rotation.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_sph_rotation.f90
@@ -98,6 +98,7 @@
subroutine const_sph_current
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use m_sph_phys_address
use cal_sph_exp_nod_icb_ins
use cal_sph_exp_nod_cmb_ins
@@ -135,6 +136,7 @@
subroutine const_sph_rotation_uxb(is_fld, is_rot)
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use m_sph_phys_address
use cal_sph_exp_nod_icb_ins
use cal_sph_exp_nod_cmb_ins
@@ -271,6 +273,7 @@
subroutine const_sph_mag_diffuse_by_j
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use m_sph_phys_address
use m_physical_property
use cal_sph_exp_fixed_scalar
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dynamobench.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dynamobench.f90
index 3e6f181..6913f73 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dynamobench.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dynamobench.f90
@@ -34,7 +34,7 @@
use m_sph_spectr_data
!
real (kind = kreal) :: pi, rr
- integer(kind = kint) :: is, it, k, j, js, jt
+ integer(kind = kint) :: is, it, k, js, jt
integer(kind = kint), parameter :: ls = 1, lt = 2
!
!
@@ -90,7 +90,7 @@
use m_sph_spectr_data
!
real (kind = kreal) :: pi, rr
- integer(kind = kint) :: is, it, k, j, js, jt
+ integer(kind = kint) :: is, it, k, js, jt
integer(kind = kint), parameter :: ls = 1, lt = 2
!
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/m_boundary_params_sph_MHD.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/m_boundary_params_sph_MHD.f90
index 565dfad..1c5407f 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/m_boundary_params_sph_MHD.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/m_boundary_params_sph_MHD.f90
@@ -8,11 +8,7 @@
!!
!!
!!@verbatim
-!! subroutine alloc_fixed_bc_array(jmax, bc_param)
-!! subroutine dealloc_fixed_bc_array(bc_param)
-!!
-!! subroutine cal_fdm_coefs_4_BCs(nri, radius, bc_param)
-!! subroutine check_fdm_coefs_4_BC2(label, bc_param)
+!! subroutine set_radial_range_by_BC(iflag_icb_bc, sph_bc)
!! type(sph_boundary_type), intent(inout) :: bc_param
!!@endverbatim
!!
@@ -43,21 +39,21 @@
!
! -----------------------------------------------------------------------
!
- subroutine set_radial_range_by_BC(iflag_icb_bc, kr_in, kr_out)
+ subroutine set_radial_range_by_BC(iflag_icb_bc, sph_bc)
!
use m_spheric_parameter
!
integer(kind = kint), intent(in) :: iflag_icb_bc
- integer(kind = kint), intent(inout) :: kr_in, kr_out
+ type(sph_boundary_type), intent(inout) :: sph_bc
!
!
if (iflag_icb_bc .eq. iflag_sph_fill_center &
& .or. iflag_icb_bc .eq. iflag_sph_fix_center) then
- kr_in = nlayer_2_center
+ sph_bc%kr_in = nlayer_2_center
else
- kr_in = nlayer_ICB
+ sph_bc%kr_in = nlayer_ICB
end if
- kr_out = nlayer_CMB
+ sph_bc%kr_out = nlayer_CMB
!
end subroutine set_radial_range_by_BC
!
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 b3ec163..7aa1f62 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
@@ -32,15 +32,6 @@
integer(kind = kint), parameter :: iflag_free_slip = 1
!> integer flag for rotatable inner core
integer(kind = kint), parameter :: iflag_rotatable_ic = 10
-!> integer flag for whole sphere model
- integer(kind = kint), parameter :: iflag_sph_fill_center = 41
-!> integer flag for whole sphere model
- integer(kind = kint), parameter :: iflag_sph_fix_center = 42
-!
-!> integer flag for fixed velocity boundary
- integer(kind = kint), parameter :: iflag_fixed_field = 0
-!> integer flag for free-slip boundary
- integer(kind = kint), parameter :: iflag_fixed_flux = 1
!
!> integer flag for insulated magnetic boundary
integer(kind = kint), parameter :: iflag_sph_insulator = 0
@@ -62,9 +53,9 @@
real(kind= kreal), allocatable :: vt_CMB_bc(:)
!
!> boundary condition flag for tempeture at ICB
- integer(kind = kint) :: iflag_icb_temp = iflag_fixed_field
+ integer(kind = kint) :: iflag_icb_temp = 0
!> boundary condition flag for tempeture at CMB
- integer(kind = kint) :: iflag_cmb_temp = iflag_fixed_field
+ integer(kind = kint) :: iflag_cmb_temp = 0
!
!> Fixed temperature spectrum for ICB
real(kind= kreal), allocatable :: temp_ICB_bc(:)
@@ -76,9 +67,9 @@
real(kind= kreal), allocatable :: h_flux_CMB_bc(:)
!
!> boundary condition flag for composition variation at ICB
- integer(kind = kint) :: iflag_icb_composition = iflag_fixed_field
+ integer(kind = kint) :: iflag_icb_composition = 0
!> boundary condition flag for composition variation at CMB
- integer(kind = kint) :: iflag_cmb_composition = iflag_fixed_field
+ integer(kind = kint) :: iflag_cmb_composition = 0
!
!> Fixed composition spectrum for ICB
real(kind= kreal), allocatable :: composition_ICB_bc(:)
@@ -98,23 +89,6 @@
!
integer(kind = kint) :: iflag_sph_coriolis_file = 0
!
-!> Start radial address of fluid shell for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_in_U = 1
-!> End radial address of fluid shell for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_out_U = 1
-!> Start radial address to solve heat equation for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_in_T = 1
-!> End radial address to solve heat equation for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_out_T = 1
-!> Start radial address to solve induction for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_in_B = 1
-!> End radial address to solve induction for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_out_B = 1
-!> Start radial address to solve comopsition for @f$ f(r,j) @f$
- integer(kind = kint) :: kr_in_C = 1
-!> End radial address to solve comopsition for @f$ f(r,j) @f$
- 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/m_field_4_dynamobench.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/m_field_4_dynamobench.f90
index 82c0b4e..6826e7a 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/m_field_4_dynamobench.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/m_field_4_dynamobench.f90
@@ -80,6 +80,7 @@
subroutine open_dynamobench_monitor_file
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use m_sph_phys_address
!
!
@@ -131,6 +132,7 @@
subroutine output_field_4_dynamobench(i_step, time)
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use m_sph_phys_address
!
integer(kind = kint), intent(in) :: i_step
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_flag_sph_velo.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_flag_sph_velo.f90
index fa34036..40bcb35 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_flag_sph_velo.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_flag_sph_velo.f90
@@ -89,6 +89,8 @@
!
subroutine set_sph_velo_ICB_flag(ibc_type, bc_mag)
!
+ use t_boundary_params_sph_MHD
+!
integer(kind = kint), intent(in) :: ibc_type
real(kind = kreal), intent(in) :: bc_mag
!
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 9a993cf..2ae5df6 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
@@ -33,6 +33,7 @@
!
subroutine s_set_bc_sph_mhd
!
+ use m_boundary_params_sph_MHD
use set_bc_flag_sph_velo
use set_bc_sph_scalars
use set_reference_sph_mhd
@@ -56,12 +57,10 @@
end if
!
!
- call set_radial_range_by_BC(iflag_icb_velocity, &
- & kr_in_U, kr_out_U)
- call set_radial_range_by_BC(iflag_icb_temp, kr_in_T, kr_out_T)
- call set_radial_range_by_BC(iflag_icb_composition, &
- & kr_in_C, kr_out_C)
- call set_radial_range_by_BC(iflag_icb_magne, kr_in_B, kr_out_B)
+ call set_radial_range_by_BC(iflag_icb_velocity, sph_bc_U)
+ call set_radial_range_by_BC(iflag_icb_temp, sph_bc_T)
+ call set_radial_range_by_BC(iflag_icb_composition, sph_bc_C)
+ call set_radial_range_by_BC(iflag_icb_magne, sph_bc_B)
!
! Set reference temperature and adjust boundary conditions
!
@@ -83,26 +82,9 @@
!
! -----------------------------------------------------------------------
!
- subroutine set_radial_range_by_BC(iflag_icb_bc, kr_in, kr_out)
-!
- integer(kind = kint), intent(in) :: iflag_icb_bc
- integer(kind = kint), intent(inout) :: kr_in, kr_out
-!
-!
- if (iflag_icb_bc .eq. iflag_sph_fill_center &
- & .or. iflag_icb_bc .eq. iflag_sph_fix_center) then
- kr_in = nlayer_2_center
- else
- kr_in = nlayer_ICB
- end if
- kr_out = nlayer_CMB
-!
- end subroutine set_radial_range_by_BC
-!
-! -----------------------------------------------------------------------
-!
subroutine set_sph_bc_magne_sph
!
+ use t_boundary_params_sph_MHD
use m_bc_data_list
use m_surf_data_list
!
@@ -166,6 +148,7 @@
!
subroutine check_sph_bc_temp_sph
!
+ use t_boundary_params_sph_MHD
use m_spheric_parameter
use m_bc_data_list
use m_surf_data_list
@@ -216,6 +199,7 @@
!
subroutine check_sph_bc_composition_sph
!
+ use t_boundary_params_sph_MHD
use m_spheric_parameter
!
integer(kind = kint) :: i
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_scalars.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_scalars.f90
index b68bfd9..72b7dea 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_scalars.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_scalars.f90
@@ -35,6 +35,7 @@
subroutine set_sph_bc_temp_sph
!
use m_spheric_parameter
+ use t_boundary_params_sph_MHD
use m_bc_data_list
use m_surf_data_list
use m_constants
@@ -125,6 +126,7 @@
subroutine set_sph_bc_composition_sph
!
use m_spheric_parameter
+ use t_boundary_params_sph_MHD
use m_bc_data_list
use m_surf_data_list
use m_sph_spectr_data
@@ -217,6 +219,7 @@
subroutine set_homogenious_scalar_bc(reference_grp, bc_name, &
& bc_magnitude,jmax, bc_data, iflag_bc_scalar)
!
+ use t_boundary_params_sph_MHD
use m_spheric_parameter
!
character(len=kchara), intent(in) :: reference_grp
@@ -241,6 +244,7 @@
subroutine set_homogenious_grad_bc(ref_nod_grp, ref_sf_grp, &
& bc_name, bc_magnitude, jmax, bc_data, iflag_bc_scalar)
!
+ use t_boundary_params_sph_MHD
use m_spheric_parameter
!
character(len=kchara), intent(in) :: ref_nod_grp, ref_sf_grp
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 78f2df1..3210861 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
@@ -268,6 +268,7 @@
subroutine set_initial_magne_sph
!
use m_control_params_sph_MHD
+ use t_boundary_params_sph_MHD
use m_spheric_parameter
use m_sph_spectr_data
!
diff --git a/src/programs/data_utilities/INITIAL_FIELD/SPH_analyzer_const_initial.f90 b/src/programs/data_utilities/INITIAL_FIELD/SPH_analyzer_const_initial.f90
index 768fefb..1b1cd40 100644
--- a/src/programs/data_utilities/INITIAL_FIELD/SPH_analyzer_const_initial.f90
+++ b/src/programs/data_utilities/INITIAL_FIELD/SPH_analyzer_const_initial.f90
@@ -76,6 +76,11 @@
call set_radius_rot_reft_dat_4_sph(depth_high_t, depth_low_t, &
& high_temp, low_temp, angular)
!
+ if(iflag_debug.gt.0) write(*,*) 's_set_bc_sph_mhd'
+ call s_set_bc_sph_mhd
+!
+! ---------------------------------
+!
if(iflag_debug.gt.0) write(*,*)' sph_initial_spectrum'
call sph_initial_spectrum
!
More information about the CIG-COMMITS
mailing list