[cig-commits] [commit] Hiro_latest: Move parameters from m_control_params_sph_MHD (3cc63a5)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:21:51 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 3cc63a52d243d9ab66ae0809b41ae2750fc98024
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Tue Nov 12 13:00:52 2013 -0800
Move parameters from m_control_params_sph_MHD
>---------------------------------------------------------------
3cc63a52d243d9ab66ae0809b41ae2750fc98024
.../MHD_src/IO/m_sph_boundary_input_data.f90 | 2 -
.../MHD_src/sph_MHD/adjust_fixed_flux_sph.f90 | 4 -
.../MHD_src/sph_MHD/cal_momentum_eq_explicit.f90 | 4 -
.../MHD_src/sph_MHD/cal_sol_sph_MHD_crank.f90 | 1 -
.../MHD_src/sph_MHD/cal_sol_sph_fluid_crank.f90 | 1 -
.../MHD_src/sph_MHD/const_coriolis_sph.f90 | 4 +-
.../MHD_src/sph_MHD/const_data_4_dynamobench.f90 | 1 -
.../MHD_src/sph_MHD/const_r_mat_4_scalar_sph.f90 | 1 -
.../MHD_src/sph_MHD/const_r_mat_4_vector_sph.f90 | 2 -
.../MHD_src/sph_MHD/const_radial_mat_4_sph.f90 | 1 -
.../MHD_src/sph_MHD/const_sph_diffusion.f90 | 3 -
.../MHD_src/sph_MHD/const_sph_divergence.f90 | 1 -
.../MHD_src/sph_MHD/const_sph_radial_grad.f90 | 1 -
.../MHD_src/sph_MHD/const_sph_rotation.f90 | 6 --
.../MHD_src/sph_MHD/initial_magne_dbench_qvc.f90 | 1 -
.../MHD_src/sph_MHD/initial_magne_dynamobench.f90 | 2 -
.../MHD_src/sph_MHD/m_boundary_params_sph_MHD.f90 | 58 ++++++++++-
.../MHD_src/sph_MHD/m_control_params_sph_MHD.f90 | 88 ----------------
.../MHD_src/sph_MHD/m_field_4_dynamobench.f90 | 2 -
.../MHD_src/sph_MHD/set_bc_flag_sph_velo.f90 | 1 -
.../MHD_src/sph_MHD/set_bc_sph_mhd.f90 | 114 +++------------------
.../MHD_src/sph_MHD/set_bc_sph_scalars.f90 | 1 -
.../MHD_src/sph_MHD/set_control_sph_data_MHD.f90 | 2 +-
.../MHD_src/sph_MHD/set_initial_sph_dynamo.f90 | 1 -
.../MHD_src/sph_MHD/set_scalar_boundary_sph.f90 | 1 -
.../MHD_src/sph_MHD/set_sph_exp_rigid_CMB.f90 | 2 +-
.../MHD_src/sph_MHD/set_sph_exp_rigid_ICB.f90 | 2 +-
.../MHD_src/sph_MHD/sum_rot_coriolis_rj_sph.f90 | 1 -
src/programs/SPH_MHD/analyzer_sph_MHD.f90 | 1 -
.../INITIAL_FIELD/analyzer_sph_initial_fld.f90 | 1 -
.../INITIAL_FIELD/const_sph_initial_spectr.f90 | 3 -
.../SNAPSHOT_MHD/analyzer_noviz_sph_snap.f90 | 1 -
.../SNAPSHOT_MHD/analyzer_noviz_sph_zm_snap.f90 | 1 -
.../SNAPSHOT_MHD/analyzer_sph_dynamobench.f90 | 1 -
34 files changed, 73 insertions(+), 243 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 d851875..45bc6fc 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
@@ -223,7 +223,6 @@
subroutine set_fixed_scalar_bc_by_file(field_name, ref_nod_grp, &
& jmax, bc_data, iflag_bc_scalar)
!
- use m_control_params_sph_MHD
use t_boundary_params_sph_MHD
use skip_comment_f
!
@@ -254,7 +253,6 @@
& ref_nod_grp, ref_sf_grp, jmax, bc_data, &
& iflag_bc_scalar)
!
- use m_control_params_sph_MHD
use t_boundary_params_sph_MHD
use skip_comment_f
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/adjust_fixed_flux_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/adjust_fixed_flux_sph.f90
index cd7911a..29ac6eb 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/adjust_fixed_flux_sph.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/adjust_fixed_flux_sph.f90
@@ -35,7 +35,6 @@
subroutine adjust_icb_fix_h_flux_sph
!
use m_t_int_parameter
- use m_control_params_sph_MHD
use m_physical_property
use m_sph_phys_address
use m_coef_fdm_fixed_ICB
@@ -53,7 +52,6 @@
subroutine adjust_cmb_fix_h_flux_sph
!
use m_t_int_parameter
- use m_control_params_sph_MHD
use m_physical_property
use m_sph_phys_address
use m_coef_fdm_fixed_CMB
@@ -72,7 +70,6 @@
subroutine adjust_icb_fix_c_flux_sph
!
use m_t_int_parameter
- use m_control_params_sph_MHD
use m_physical_property
use m_sph_phys_address
use m_coef_fdm_fixed_ICB
@@ -90,7 +87,6 @@
subroutine adjust_cmb_fix_c_flux_sph
!
use m_t_int_parameter
- use m_control_params_sph_MHD
use m_physical_property
use m_sph_phys_address
use m_coef_fdm_fixed_CMB
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/cal_momentum_eq_explicit.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/cal_momentum_eq_explicit.f90
index 693908e..3ad85b8 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/cal_momentum_eq_explicit.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/cal_momentum_eq_explicit.f90
@@ -30,7 +30,6 @@
!
subroutine cal_momentum_eq_exp_sph
!
- use m_control_params_sph_MHD
use cal_explicit_terms
use calypso_mpi
use cal_sph_field_by_rotation
@@ -54,7 +53,6 @@
!
subroutine cal_expricit_sph_adams
!
- use m_control_params_sph_MHD
use cal_explicit_terms
use cal_vorticity_terms_adams
use cal_nonlinear_sph_MHD
@@ -82,10 +80,8 @@
!
subroutine cal_expricit_sph_euler(i_step)
!
- use m_control_params_sph_MHD
use cal_explicit_terms
use cal_vorticity_terms_adams
-! use cal_nonlinear_sph_MHD
!
integer(kind = kint), intent(in) :: i_step
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_MHD_crank.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_MHD_crank.f90
index fb15aac..bfce715 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_MHD_crank.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/cal_sol_sph_MHD_crank.f90
@@ -20,7 +20,6 @@
use calypso_mpi
use m_machine_parameter
use m_control_parameter
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_spheric_param_smp
use m_radial_matrices_sph
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 051d5e1..ee71a05 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
@@ -33,7 +33,6 @@
!
use calypso_mpi
use m_machine_parameter
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_spheric_param_smp
use m_sph_spectr_data
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_coriolis_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_coriolis_sph.f90
index e159338..9f4f016 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_coriolis_sph.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_coriolis_sph.f90
@@ -19,7 +19,6 @@
!
use m_constants
use m_machine_parameter
- use m_control_params_sph_MHD
use m_physical_property
use m_spherical_harmonics
use m_int_4_sph_coriolis_IO
@@ -28,6 +27,9 @@
!
implicit none
!
+!> Integer flag to read integration data file
+ integer(kind = kint) :: iflag_sph_coriolis_file = 0
+!
integer(kind = kint), allocatable, private :: idx_gl(:,:)
private :: set_global_sph_index_4_cor, dealloc_gl_sph_index_cor
private :: set_tri_int_sph_coriolis
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 90fda2d..632c1c5 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
@@ -28,7 +28,6 @@
subroutine s_const_data_4_dynamobench
!
use m_boundary_params_sph_MHD
- use m_control_params_sph_MHD
use calypso_mpi
use cal_rms_fields_by_sph
use global_field_4_dynamobench
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 840c3a0..23ea119 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
@@ -16,7 +16,6 @@
!
use m_constants
use m_machine_parameter
- use m_control_params_sph_MHD
use m_t_int_parameter
use m_spheric_param_smp
use m_spheric_parameter
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 13140a2..8cc4a37 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
@@ -33,7 +33,6 @@
!
subroutine const_radial_mat_vort_2step
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_ludcmp_band
use set_free_slip_sph_mat_bc
@@ -133,7 +132,6 @@
!
subroutine const_radial_mat_4_magne_sph
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use set_sph_magne_mat_bc
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/const_radial_mat_4_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/const_radial_mat_4_sph.f90
index 8e573a5..5e31c33 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/const_radial_mat_4_sph.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/const_radial_mat_4_sph.f90
@@ -30,7 +30,6 @@
subroutine s_const_radial_mat_4_sph
!
use m_control_parameter
- use m_control_params_sph_MHD
use const_r_mat_4_scalar_sph
use const_r_mat_4_vector_sph
!
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 bede760..07b8f6d 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
@@ -33,7 +33,6 @@
use m_sph_spectr_data
use m_sph_phys_address
use m_physical_property
- use m_control_params_sph_MHD
use cal_sph_exp_diffusion
use cal_sph_exp_1st_diff
!
@@ -196,7 +195,6 @@
subroutine const_sph_thermal_diffusion
!
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
@@ -231,7 +229,6 @@
!
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
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 c41575a..8c75b46 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
@@ -21,7 +21,6 @@
use m_spheric_parameter
use m_sph_spectr_data
use m_sph_phys_address
- use m_control_params_sph_MHD
use cal_sph_exp_1st_diff
use cal_sph_exp_rotation
!
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 38d1a71..f40aaf4 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
@@ -43,7 +43,6 @@
use m_spheric_parameter
use m_sph_spectr_data
use m_sph_phys_address
- use m_control_params_sph_MHD
use cal_sph_exp_1st_diff
!
implicit none
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 bbba8f7..8382f4c 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
@@ -66,7 +66,6 @@
!
subroutine const_sph_vorticity
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_sph_phys_address
use set_sph_exp_rigid_ICB
@@ -98,7 +97,6 @@
!
subroutine const_sph_current
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_sph_phys_address
use cal_sph_exp_nod_icb_ins
@@ -136,7 +134,6 @@
!
subroutine const_sph_rotation_uxb(is_fld, is_rot)
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_sph_phys_address
use cal_sph_exp_nod_icb_ins
@@ -198,7 +195,6 @@
!
subroutine const_sph_force_rot2(is_fld, is_rot)
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use set_sph_exp_rigid_ICB
use set_sph_exp_rigid_CMB
@@ -230,7 +226,6 @@
!
subroutine const_sph_viscous_by_vort2
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_sph_phys_address
use m_physical_property
@@ -275,7 +270,6 @@
!
subroutine const_sph_mag_diffuse_by_j
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_sph_phys_address
use m_physical_property
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dbench_qvc.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dbench_qvc.f90
index 72c80c8..9f4c366 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dbench_qvc.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/initial_magne_dbench_qvc.f90
@@ -28,7 +28,6 @@
!
subroutine initial_b_dynamobench_qcv
!
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_sph_spectr_data
!
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 6913f73..2e1e871 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
@@ -29,7 +29,6 @@
!
subroutine initial_b_dynamobench_1
!
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_sph_spectr_data
!
@@ -85,7 +84,6 @@
!
subroutine initial_b_dynamobench_2
!
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_sph_spectr_data
!
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 1c5407f..74d6255 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
@@ -24,6 +24,19 @@
implicit none
!
!
+!> integer flag for fixed velocity boundary at inner core
+ integer(kind = kint), parameter :: iflag_fixed_velo = 0
+!> integer flag for free-slip boundary at inner core
+ 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 insulated magnetic boundary
+ integer(kind = kint), parameter :: iflag_sph_insulator = 0
+!> integer flag for pseudo vacuum magnetic boundary
+ integer(kind = kint), parameter :: iflag_radial_magne = 11
+!
+!
!> Structure for basic velocity boundary condition parameters
type(sph_boundary_type), save :: sph_bc_U
!> Structure for basic magnetic boundary condition parameters
@@ -33,22 +46,59 @@
!> Structure for basic compositional boundary condition parameters
type(sph_boundary_type), save :: sph_bc_C
!
+!
+!> Fixed poloidal velocity spectrum for ICB
+ real(kind= kreal), allocatable :: vp_ICB_bc(:)
+!> Fixed toroidal velocity spectrum for ICB
+ real(kind= kreal), allocatable :: vt_ICB_bc(:)
+!> Fixed poloidal velocity spectrum for CMB
+ real(kind= kreal), allocatable :: vp_CMB_bc(:)
+!> Fixed toroidal velocity spectrum for CMB
+ real(kind= kreal), allocatable :: vt_CMB_bc(:)
+!
! -----------------------------------------------------------------------
!
contains
!
! -----------------------------------------------------------------------
!
- subroutine set_radial_range_by_BC(iflag_icb_bc, sph_bc)
+ subroutine allocate_vsp_bc_array(jmax)
+!
+ integer(kind= kint), intent(in) :: jmax
+!
+ allocate(vp_ICB_bc(jmax))
+ allocate(vt_ICB_bc(jmax))
+ allocate(vp_CMB_bc(jmax))
+ allocate(vt_CMB_bc(jmax))
+ vp_ICB_bc = 0.0d0
+ vt_ICB_bc = 0.0d0
+ vp_CMB_bc = 0.0d0
+ vt_CMB_bc = 0.0d0
+!
+ end subroutine allocate_vsp_bc_array
+!
+! -----------------------------------------------------------------------
+! -----------------------------------------------------------------------
+!
+ subroutine deallocate_vsp_bc_array
+!
+ deallocate(vp_ICB_bc, vt_ICB_bc)
+ deallocate(vp_CMB_bc, vt_CMB_bc)
+!
+ end subroutine deallocate_vsp_bc_array
+!
+! -----------------------------------------------------------------------
+! -----------------------------------------------------------------------
+!
+ subroutine set_radial_range_by_BC(sph_bc)
!
use m_spheric_parameter
!
- integer(kind = kint), intent(in) :: iflag_icb_bc
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
+ if (sph_bc%iflag_icb .eq. iflag_sph_fill_center &
+ & .or. sph_bc%iflag_icb .eq. iflag_sph_fix_center) then
sph_bc%kr_in = nlayer_2_center
else
sph_bc%kr_in = nlayer_ICB
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
deleted file mode 100644
index 318b3e4..0000000
--- a/src/Fortran_libraries/MHD_src/sph_MHD/m_control_params_sph_MHD.f90
+++ /dev/null
@@ -1,88 +0,0 @@
-!>@file m_control_params_sph_MHD.f90
-!!@brief module m_control_params_sph_MHD
-!!
-!!@author H. Matsui
-!!@date Programmed in Oct., 2009
-!
-!>@brief Field and spectr data
-!!
-!!
-!!@verbatim
-!! subroutine allocate_vsp_bc_array(jmax)
-!! subroutine allocate_temp_bc_array(jmax)
-!! subroutine allocate_dscalar_bc_array(jmax)
-!!
-!! subroutine deallocate_vsp_bc_array
-!! subroutine deallocate_temp_bc_array
-!! subroutine deallocate_dscalar_bc_array
-!!@endverbatim
-!!
-!!@n @param jmax number of modes for spherical harmonics @f$L*(L+2)@f$
-!
- module m_control_params_sph_MHD
-!
- use m_precision
-!
- implicit none
-!
-!
-!> integer flag for fixed velocity boundary at inner core
- integer(kind = kint), parameter :: iflag_fixed_velo = 0
-!> integer flag for free-slip boundary at inner core
- 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 insulated magnetic boundary
- integer(kind = kint), parameter :: iflag_sph_insulator = 0
-!> integer flag for pseudo vacuum magnetic boundary
- integer(kind = kint), parameter :: iflag_radial_magne = 11
-!
-!> Fixed poloidal velocity spectrum for ICB
- real(kind= kreal), allocatable :: vp_ICB_bc(:)
-!> Fixed toroidal velocity spectrum for ICB
- real(kind= kreal), allocatable :: vt_ICB_bc(:)
-!> Fixed poloidal velocity spectrum for CMB
- real(kind= kreal), allocatable :: vp_CMB_bc(:)
-!> Fixed toroidal velocity spectrum for CMB
- real(kind= kreal), allocatable :: vt_CMB_bc(:)
-!
- integer(kind = kint) :: iflag_sph_coriolis_file = 0
-!
-!> Number of grid points in zonal direction for dynamo benchmark
- integer(kind = kint) :: mphi_mid_eq = -1
-!
-! -----------------------------------------------------------------------
-!
- contains
-!
-! -----------------------------------------------------------------------
-!
- subroutine allocate_vsp_bc_array(jmax)
-!
- integer(kind= kint), intent(in) :: jmax
-!
- allocate(vp_ICB_bc(jmax))
- allocate(vt_ICB_bc(jmax))
- allocate(vp_CMB_bc(jmax))
- allocate(vt_CMB_bc(jmax))
- vp_ICB_bc = 0.0d0
- vt_ICB_bc = 0.0d0
- vp_CMB_bc = 0.0d0
- vt_CMB_bc = 0.0d0
-!
- end subroutine allocate_vsp_bc_array
-!
-! -----------------------------------------------------------------------
-! -----------------------------------------------------------------------
-!
- subroutine deallocate_vsp_bc_array
-!
- deallocate(vp_ICB_bc, vt_ICB_bc)
- deallocate(vp_CMB_bc, vt_CMB_bc)
-!
- end subroutine deallocate_vsp_bc_array
-!
-! -----------------------------------------------------------------------
-!
- end module m_control_params_sph_MHD
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 684c22d..5d15dad 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
@@ -79,7 +79,6 @@
!
subroutine open_dynamobench_monitor_file
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_sph_phys_address
!
@@ -131,7 +130,6 @@
!
subroutine output_field_4_dynamobench(i_step, time)
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_sph_phys_address
!
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 35448e4..9dbcca8 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
@@ -18,7 +18,6 @@
use m_machine_parameter
use m_boundary_condition_IDs
use m_control_parameter
- use m_control_params_sph_MHD
!
use m_spheric_parameter
!
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 616ac69..4c422a2 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
@@ -16,7 +16,6 @@
!
use m_machine_parameter
use m_control_parameter
- use m_control_params_sph_MHD
use m_boundary_condition_IDs
use m_phys_labels
use m_spheric_parameter
@@ -33,6 +32,7 @@
!
subroutine s_set_bc_sph_mhd
!
+ use m_phys_labels
use m_boundary_params_sph_MHD
use set_bc_flag_sph_velo
use set_bc_sph_scalars
@@ -57,10 +57,10 @@
end if
!
!
- call set_radial_range_by_BC(sph_bc_U%iflag_icb, sph_bc_U)
- call set_radial_range_by_BC(sph_bc_T%iflag_icb, sph_bc_T)
- call set_radial_range_by_BC(sph_bc_C%iflag_icb, sph_bc_C)
- call set_radial_range_by_BC(sph_bc_B%iflag_icb, sph_bc_B)
+ call set_radial_range_by_BC(sph_bc_U)
+ call set_radial_range_by_BC(sph_bc_T)
+ call set_radial_range_by_BC(sph_bc_C)
+ call set_radial_range_by_BC(sph_bc_B)
!
! Set reference temperature and adjust boundary conditions
!
@@ -75,8 +75,14 @@
!
! Check data
!
- if(i_debug .gt. 1) call check_sph_bc_temp_sph
- if(i_debug .gt. 1) call check_sph_bc_composition_sph
+ if(i_debug .gt. 1) then
+ call check_sph_boundary_spectra(fhd_temp, &
+ & nidx_rj(2), idx_gl_1d_rj_j, sph_bc_T)
+ end if
+ if(i_debug .gt. 1) then
+ call check_sph_boundary_spectra(fhd_light, &
+ & nidx_rj(2), idx_gl_1d_rj_j, sph_bc_C)
+ end if
!
end subroutine s_set_bc_sph_mhd
!
@@ -146,98 +152,4 @@
!
! -----------------------------------------------------------------------
!
- subroutine check_sph_bc_temp_sph
-!
- use m_boundary_params_sph_MHD
- use m_spheric_parameter
- use m_bc_data_list
- use m_surf_data_list
-!
- integer(kind = kint) :: i
-!
-!
- if(iflag_debug .gt. 0) then
- write(*,*) 'h_flux_surf%num_bc', h_flux_surf%num_bc
- write(*,*) 'h_flux_surf%ibc_type', h_flux_surf%ibc_type
- write(*,*) 'h_flux_surf%bc_magnitude', h_flux_surf%bc_magnitude
- end if
-!
- if(i_debug .gt. 1) then
- write(*,*) 'sph_bc_T%iflag_icb', sph_bc_T%iflag_icb
- if(sph_bc_T%iflag_icb .eq. iflag_fixed_field) then
- do i = 1, nidx_rj(2)
- write(*,*) 'temp_ICB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_T%ICB_fld(i)
- end do
- end if
- if(sph_bc_T%iflag_icb .eq. iflag_fixed_flux) then
- do i = 1, nidx_rj(2)
- write(*,*) 'heat_flux_ICB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_T%ICB_flux(i)
- end do
- end if
-!
- write(*,*) 'sph_bc_T%iflag_cmb', sph_bc_T%iflag_cmb
- if(sph_bc_T%iflag_cmb .eq. iflag_fixed_field) then
- do i = 1, nidx_rj(2)
- write(*,*) 'temp_CMB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_T%CMB_fld(i)
- end do
- end if
- if(sph_bc_T%iflag_cmb .eq. iflag_fixed_flux) then
- do i = 1, nidx_rj(2)
- write(*,*) 'heat_flux_CMB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_T%CMB_flux(i)
- end do
- end if
-!
- end if
-!
- end subroutine check_sph_bc_temp_sph
-!
-! -----------------------------------------------------------------------
-!
- subroutine check_sph_bc_composition_sph
-!
- use m_boundary_params_sph_MHD
- use m_spheric_parameter
-!
- integer(kind = kint) :: i
-!
-!
- if(i_debug .gt. 1) then
- write(*,*) 'sph_bc_C%iflag_icb', sph_bc_C%iflag_icb
- if(sph_bc_C%iflag_icb .eq. iflag_fixed_field) then
- do i = 1, nidx_rj(2)
- write(*,*) 'comp_ICB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_C%ICB_fld(i)
- end do
- end if
- if(sph_bc_C%iflag_icb .eq. iflag_fixed_flux) then
- do i = 1, nidx_rj(2)
- write(*,*) 'comp_flux_ICB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_C%ICB_flux(i)
- end do
- end if
-!
- write(*,*) 'sph_bc_C%iflag_cmb', sph_bc_C%iflag_cmb
- if(sph_bc_C%iflag_cmb .eq. iflag_fixed_field) then
- do i = 1, nidx_rj(2)
- write(*,*) 'comp_CMB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_C%CMB_fld(i)
- end do
- end if
- if(sph_bc_C%iflag_cmb .eq. iflag_fixed_flux) then
- do i = 1, nidx_rj(2)
- write(*,*) 'comp_flux_CMB', idx_gl_1d_rj_j(i,1:3), &
- & sph_bc_C%CMB_flux(i)
- end do
- end if
-!
- end if
-!
- end subroutine check_sph_bc_composition_sph
-!
-! -----------------------------------------------------------------------
-!
end module set_bc_sph_mhd
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 86893f4..9fbfd4f 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
@@ -18,7 +18,6 @@
!
use m_machine_parameter
use m_control_parameter
- use m_control_params_sph_MHD
use m_boundary_condition_IDs
use m_phys_labels
!
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90
index af7a106..b28a411 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90
@@ -36,10 +36,10 @@
use m_ctl_data_mhd_evo_scheme
use m_int_4_sph_coriolis_IO
use m_node_id_spherical_IO
- use m_control_params_sph_MHD
use m_physical_property
use m_work_4_sph_trans
use m_file_format_switch
+ use const_coriolis_sph
!
use m_field_data_IO
use m_sph_boundary_input_data
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 2df6af1..de88d9e 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
@@ -267,7 +267,6 @@
!
subroutine set_initial_magne_sph
!
- use m_control_params_sph_MHD
use m_boundary_params_sph_MHD
use m_spheric_parameter
use m_sph_spectr_data
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_scalar_boundary_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_scalar_boundary_sph.f90
index d4deeaa..22887d0 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_scalar_boundary_sph.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_scalar_boundary_sph.f90
@@ -29,7 +29,6 @@
use m_precision
!
use m_constants
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_sph_spectr_data
use m_sph_phys_address
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_CMB.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_CMB.f90
index eb7e45b..43b53f2 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_CMB.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_CMB.f90
@@ -26,7 +26,7 @@
use m_precision
!
use m_constants
- use m_control_params_sph_MHD
+ use m_boundary_params_sph_MHD
use m_spheric_parameter
use m_schmidt_poly_on_rtm
use m_sph_spectr_data
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_ICB.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_ICB.f90
index e54da4c..8a59900 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_ICB.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_sph_exp_rigid_ICB.f90
@@ -26,10 +26,10 @@
use m_precision
!
use m_constants
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_schmidt_poly_on_rtm
use m_sph_spectr_data
+ use m_boundary_params_sph_MHD
use m_coef_fdm_fixed_ICB
!
implicit none
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/sum_rot_coriolis_rj_sph.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/sum_rot_coriolis_rj_sph.f90
index 0656b17..99dbbfc 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/sum_rot_coriolis_rj_sph.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/sum_rot_coriolis_rj_sph.f90
@@ -70,7 +70,6 @@
!
use m_machine_parameter
use m_constants
- use m_control_params_sph_MHD
use m_spheric_parameter
use m_sph_spectr_data
use m_sph_phys_address
diff --git a/src/programs/SPH_MHD/analyzer_sph_MHD.f90 b/src/programs/SPH_MHD/analyzer_sph_MHD.f90
index 26b1b6f..eb34a10 100644
--- a/src/programs/SPH_MHD/analyzer_sph_MHD.f90
+++ b/src/programs/SPH_MHD/analyzer_sph_MHD.f90
@@ -20,7 +20,6 @@
use m_machine_parameter
use m_work_time
use m_control_parameter
- use m_control_params_sph_MHD
use m_t_int_parameter
use m_t_step_parameter
!
diff --git a/src/programs/data_utilities/INITIAL_FIELD/analyzer_sph_initial_fld.f90 b/src/programs/data_utilities/INITIAL_FIELD/analyzer_sph_initial_fld.f90
index ad63ca1..0be81e8 100644
--- a/src/programs/data_utilities/INITIAL_FIELD/analyzer_sph_initial_fld.f90
+++ b/src/programs/data_utilities/INITIAL_FIELD/analyzer_sph_initial_fld.f90
@@ -20,7 +20,6 @@
use m_machine_parameter
use m_work_time
use m_control_parameter
- use m_control_params_sph_MHD
use m_t_int_parameter
use m_t_step_parameter
!
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 6715a9c..f5ea944 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
@@ -228,7 +228,6 @@
!
subroutine set_initial_magne_sph
!
- use m_control_params_sph_MHD
use m_sph_spectr_data
!
real (kind = kreal) :: pi, rr
@@ -299,7 +298,6 @@
!
subroutine set_initial_heat_source_sph
!
- use m_control_params_sph_MHD
use m_sph_spectr_data
!
real (kind = kreal) :: rr
@@ -331,7 +329,6 @@
!
subroutine set_initial_light_source_sph
!
- use m_control_params_sph_MHD
use m_sph_spectr_data
!
! real (kind = kreal) :: rr
diff --git a/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_snap.f90 b/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_snap.f90
index 7f93b75..1d10d29 100644
--- a/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_snap.f90
+++ b/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_snap.f90
@@ -21,7 +21,6 @@
use calypso_mpi
use m_work_time
use m_control_parameter
- use m_control_params_sph_MHD
use m_t_int_parameter
use m_t_step_parameter
!
diff --git a/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_zm_snap.f90 b/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_zm_snap.f90
index d2c5294..baed967 100644
--- a/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_zm_snap.f90
+++ b/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_noviz_sph_zm_snap.f90
@@ -19,7 +19,6 @@
use m_machine_parameter
use m_work_time
use m_control_parameter
- use m_control_params_sph_MHD
use m_t_int_parameter
use m_t_step_parameter
!
diff --git a/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_sph_dynamobench.f90 b/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_sph_dynamobench.f90
index 9c70c57..f230499 100644
--- a/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_sph_dynamobench.f90
+++ b/src/programs/data_utilities/SNAPSHOT_MHD/analyzer_sph_dynamobench.f90
@@ -20,7 +20,6 @@
use m_machine_parameter
use m_work_time
use m_control_parameter
- use m_control_params_sph_MHD
use m_t_int_parameter
use m_t_step_parameter
!
More information about the CIG-COMMITS
mailing list