Use structure for cal_fdm_coefs_4_BCs access

Author: hiromatsui

src/Fortran_libraries/MHD_src/sph_MHD/Makefile.depends

@@ -288,7 +288,7 @@ t_addresses_sph_transform.o: $(MHD_SPH_DIR)/t_addresses_sph_transform.f90 m_prec
 	$(F90) -c $(F90OPTFLAGS) $<
 t_boundary_data_sph_MHD.o: $(MHD_SPH_DIR)/t_boundary_data_sph_MHD.f90 m_precision.o t_boundary_params_sph_MHD.o t_boundary_sph_spectr.o t_coef_sph_velocity_BCs.o t_coef_fdm2_centre.o t_coef_fdm4_vpol_centre.o t_spheric_parameter.o t_control_parameter.o t_time_data.o set_evoluved_boundaries.o
 	$(F90) -c $(F90OPTFLAGS) $<
-t_boundary_params_sph_MHD.o: $(MHD_SPH_DIR)/t_boundary_params_sph_MHD.f90 m_precision.o t_coef_fdm2_scalar_ICB.o t_coef_fdm2_scalar_CMB.o
+t_boundary_params_sph_MHD.o: $(MHD_SPH_DIR)/t_boundary_params_sph_MHD.f90 m_precision.o t_spheric_rj_data.o t_coef_fdm2_scalar_ICB.o t_coef_fdm2_scalar_CMB.o
 	$(F90) -c $(F90OPTFLAGS) $<
 t_boundary_sph_spectr.o: $(MHD_SPH_DIR)/t_boundary_sph_spectr.f90 m_precision.o
 	$(F90) -c $(F90OPTFLAGS) $<

src/Fortran_libraries/MHD_src/sph_MHD/set_bc_sph_mhd.f90

@@ -93,9 +93,7 @@ subroutine set_fdm_matrices_sph_mhd                               &
      &      MHD_BC%velo_BC%nod_BC, MHD_BC%velo_BC%surf_BC,              &
      &      sph_MHD_bc%sph_bc_U, sph_MHD_bc%bcs_U)
 !
-        call cal_fdm_coefs_4_BCs                                        &
-     &     (sph_rj%nidx_rj(1), sph_rj%radius_1d_rj_r,                   &
-     &      sph_MHD_bc%sph_bc_U)
+        call cal_fdm_coefs_4_BCs(sph_rj, sph_MHD_bc%sph_bc_U)
 !
         call density_diff_at_boundaries                                 &
      &     (MHD_prop%fl_prop, radial_variation, sph_MHD_bc%sph_bc_U,    &
@@ -110,9 +108,7 @@ subroutine set_fdm_matrices_sph_mhd                               &
         call set_sph_bc_temp_sph(bc_IO, sph_rj, radial_rj_grp,          &
      &      MHD_BC%temp_BC%nod_BC, MHD_BC%temp_BC%surf_BC,              &
      &      sph_MHD_bc%sph_bc_T, sph_MHD_bc%bcs_T)
-        call cal_fdm_coefs_4_BCs                                        &
-     &     (sph_rj%nidx_rj(1), sph_rj%radius_1d_rj_r,                   &
-     &      sph_MHD_bc%sph_bc_T)
+        call cal_fdm_coefs_4_BCs(sph_rj, sph_MHD_bc%sph_bc_T)
       end if
 !
       if(MHD_prop%cd_prop%iflag_Bevo_scheme .gt. id_no_evolution) then
@@ -121,19 +117,15 @@ subroutine set_fdm_matrices_sph_mhd                               &
      &      CTR_nod_grp_name, CTR_sf_grp_name,                          &
      &      MHD_BC%magne_BC%nod_BC, MHD_BC%magne_BC%surf_BC,            &
      &      sph_MHD_bc%sph_bc_B, sph_MHD_bc%bcs_B)
-        call cal_fdm_coefs_4_BCs                                        &
-     &     (sph_rj%nidx_rj(1), sph_rj%radius_1d_rj_r,                   &
-     &      sph_MHD_bc%sph_bc_B)
+        call cal_fdm_coefs_4_BCs(sph_rj, sph_MHD_bc%sph_bc_B)
       end if
 !
       if(MHD_prop%cp_prop%iflag_scheme .gt. id_no_evolution) then
         if(iflag_debug .gt. 0) write(*,*) 'set_sph_bc_composition_sph'
         call set_sph_bc_composition_sph(bc_IO, sph_rj, radial_rj_grp,   &
      &      MHD_BC%light_BC%nod_BC, MHD_BC%light_BC%surf_BC,            &
      &      sph_MHD_bc%sph_bc_C, sph_MHD_bc%bcs_C)
-        call cal_fdm_coefs_4_BCs                                        &
-     &     (sph_rj%nidx_rj(1), sph_rj%radius_1d_rj_r,                   &
-     &      sph_MHD_bc%sph_bc_C)
+        call cal_fdm_coefs_4_BCs(sph_rj, sph_MHD_bc%sph_bc_C)
       end if
 !
 !      Set FDM matrices for Center

src/Fortran_libraries/MHD_src/sph_MHD/t_boundary_params_sph_MHD.f90

@@ -8,7 +8,8 @@
 !!
 !!
 !!@verbatim
-!!      subroutine cal_fdm_coefs_4_BCs(nri, radius, sph_bc)
+!!      subroutine cal_fdm_coefs_4_BCs(sph_rj, sph_bc)
+!!        type(sph_rj_grid), intent(in) :: sph_rj
 !!        type(sph_boundary_type), intent(inout) :: sph_bc
 !!      subroutine check_fdm_coefs_4_BC2(id_file, label, sph_bc)
 !!        integer(kind = kint), intent(in) :: id_file
@@ -100,25 +101,29 @@ module t_boundary_params_sph_MHD
 !
 ! -----------------------------------------------------------------------
 !
-      subroutine cal_fdm_coefs_4_BCs(nri, radius, sph_bc)
+      subroutine cal_fdm_coefs_4_BCs(sph_rj, sph_bc)
 !
+      use t_spheric_rj_data
       use t_coef_fdm2_scalar_ICB
       use t_coef_fdm2_scalar_CMB
 !
-      integer(kind = kint), intent(in) :: nri
-      real(kind = kreal), intent(in) :: radius(nri)
+      type(sph_rj_grid), intent(in) :: sph_rj
       type(sph_boundary_type), intent(inout) :: sph_bc
 !
+      integer(kind = kint) :: kr_st
 !
-      call cal_fdm2_coef_fix_fld_ICB(radius(sph_bc%kr_in),              &
-     &    sph_bc%fdm2_fix_fld_ICB)
-      call cal_fdm2_coef_fix_df_ICB(radius(sph_bc%kr_in),               &
-     &    sph_bc%fdm2_fix_dr_ICB)
+      kr_st = sph_bc%kr_in
+      call cal_fdm2_coef_fix_fld_ICB(sph_rj%radius_1d_rj_r(kr_st),      &
+     &                               sph_bc%fdm2_fix_fld_ICB)
+      call cal_fdm2_coef_fix_df_ICB(sph_rj%radius_1d_rj_r(kr_st),       &
+     &                              sph_bc%fdm2_fix_dr_ICB)
 !
-      call cal_fdm2_coef_fix_fld_CMB(radius(sph_bc%kr_out-2),           &
-     &    sph_bc%fdm2_fix_fld_CMB)
-      call cal_fdm2_coef_fix_df_CMB(radius(sph_bc%kr_out-1),            &
-     &    sph_bc%fdm2_fix_dr_CMB)
+      kr_st = sph_bc%kr_out-2
+      call cal_fdm2_coef_fix_fld_CMB(sph_rj%radius_1d_rj_r(kr_st),      &
+     &                               sph_bc%fdm2_fix_fld_CMB)
+      kr_st = sph_bc%kr_out-1
+      call cal_fdm2_coef_fix_df_CMB(sph_rj%radius_1d_rj_r(kr_st),       &
+     &                              sph_bc%fdm2_fix_dr_CMB)
 !
       end subroutine cal_fdm_coefs_4_BCs
 !