[cig-commits] [commit] Hiro_latest: Make new module for data communication for nodal vector. (a6fe652)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:20:35 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit a6fe652000d1f2bcf07e3d97317f05d32f7b8a7f
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Fri Sep 27 14:44:55 2013 -0700
Make new module for data communication for nodal vector.
>---------------------------------------------------------------
a6fe652000d1f2bcf07e3d97317f05d32f7b8a7f
.../MHD_src/sph_MHD/FEM_analyzer_sph_MHD.f90 | 5 +-
.../PARALLEL_src/COMM_src/m_parallel_var_dof.f90 | 87 ----------------------
.../COMM_src/nodal_vector_send_recv.f90 | 1 +
.../COMM_src/set_ctl_parallel_platform.f90 | 2 +
.../SNAPSHOT_MHD/SPH_analyzer_d_bench.f90 | 5 +-
5 files changed, 9 insertions(+), 91 deletions(-)
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/FEM_analyzer_sph_MHD.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/FEM_analyzer_sph_MHD.f90
index 3cc907d..1c810eb 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/FEM_analyzer_sph_MHD.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/FEM_analyzer_sph_MHD.f90
@@ -43,6 +43,7 @@
!
subroutine FEM_initialize
!
+ use m_array_for_send_recv
use m_geometry_parameter
use m_t_step_parameter
use m_surface_geometry_data
@@ -82,8 +83,8 @@
call deallocate_surface_geometry
call deallocate_edge_geometry
!
- if (iflag_debug.gt.0 ) write(*,*) 'allocate_iccgN_matrix'
- call allocate_iccgN_matrix(isix, numnod)
+ if (iflag_debug.gt.0 ) write(*,*) 'allocate_vector_for_solver'
+ call allocate_vector_for_solver(isix, numnod)
!
if(iflag_debug.gt.0) write(*,*)' init_send_recv'
call init_send_recv
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90
index 6306eae..79eed0c 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90
@@ -10,13 +10,6 @@
!
! subroutine parallel_cal_init
!
-! subroutine verify_iccgN_matrix(NB, numnod)
-! subroutine allocate_iccgN_matrix(NB, numnod)
-! subroutine deallocate_iccgN_matrix
-!
-! subroutine allocate_iccg_int_matrix(numnod)
-! subroutine deallocate_iccg_int_matrix
-!
module m_parallel_var_dof
!
use calypso_mpi
@@ -34,15 +27,6 @@
!> error flag
integer(kind=kint) :: ierr
!
-!> file type parameter (0: ascii, 1: binary)
- integer(kind = kint) :: ifile_type = 0
-!
- real(kind=kreal), allocatable :: x_vec(:)
- real(kind=kreal), allocatable :: bb(:)
- integer(kind = kint) :: isize_solver_vect = -1
-!
- integer(kind=kint), allocatable :: ix_vec(:)
-!
real(kind=kreal) :: START_TIME, END_TIME, COMMtime
!
! ----------------------------------------------------------------------
@@ -61,79 +45,8 @@
call MPI_COMM_SIZE(SOLVER_COMM, nprocs, ierr)
call MPI_COMM_RANK(SOLVER_COMM, my_rank , ierr)
!
- if(my_rank .gt. 0) return
- iflag_debug = i_debug
-!
end subroutine parallel_cal_init
!
! ---------------------------------------------------------------------
-! ---------------------------------------------------------------------
-!
- subroutine verify_iccgN_matrix(NB, numnod)
-!
- integer(kind = kint), intent(in) :: NB, numnod
- integer(kind = kint) :: ncomp
-!
-!
- ncomp = NB*numnod
- if (isize_solver_vect .lt. 0) then
- call allocate_iccgN_matrix(NB,numnod)
- else
- if (isize_solver_vect .lt. ncomp) then
- call deallocate_iccgN_matrix
- call allocate_iccgN_matrix(NB,numnod)
- end if
- end if
-!
- end subroutine verify_iccgN_matrix
-!
-! ---------------------------------------------------------------------
-!
- subroutine allocate_iccgN_matrix(NB, numnod)
-!
- integer(kind = kint), intent(in) :: NB, numnod
-!
-!
- allocate(x_vec(NB*numnod))
- allocate(bb(NB*numnod))
- x_vec =0.0d00
- bb =0.0d00
-!
- isize_solver_vect = NB*numnod
-!
- end subroutine allocate_iccgN_matrix
-!
-! ---------------------------------------------------------------------
-!
- subroutine deallocate_iccgN_matrix
-!
-!
- deallocate(x_vec, bb)
-!
- isize_solver_vect = 0
-!
- end subroutine deallocate_iccgN_matrix
-!
-! ---------------------------------------------------------------------
-!
- subroutine allocate_iccg_int_matrix(numnod)
-!
- integer(kind = kint), intent(in) :: numnod
-!
-!
- allocate(ix_vec(numnod))
- ix_vec = 0
-!
- end subroutine allocate_iccg_int_matrix
-!
-! ---------------------------------------------------------------------
-!
- subroutine deallocate_iccg_int_matrix
-!
- deallocate(ix_vec)
-!
- end subroutine deallocate_iccg_int_matrix
-!
-! ---------------------------------------------------------------------
!
end module m_parallel_var_dof
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90
index 5a1587f..82d3194 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90
@@ -43,6 +43,7 @@
!
subroutine nod_scalar_send_recv(scl_nod)
!
+ use m_array_for_send_recv
use solver_SR
!
real(kind = kreal), intent(inout) :: scl_nod(numnod)
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90
index dd06bdd..614fea3 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90
@@ -37,6 +37,8 @@
end if
end if
!
+ if(my_rank .eq. 0) iflag_debug = i_debug
+!
end subroutine check_control_num_domains
!
! ----------------------------------------------------------------------
diff --git a/src/programs/data_utilities/SNAPSHOT_MHD/SPH_analyzer_d_bench.f90 b/src/programs/data_utilities/SNAPSHOT_MHD/SPH_analyzer_d_bench.f90
index f2e224a..7049001 100644
--- a/src/programs/data_utilities/SNAPSHOT_MHD/SPH_analyzer_d_bench.f90
+++ b/src/programs/data_utilities/SNAPSHOT_MHD/SPH_analyzer_d_bench.f90
@@ -29,6 +29,7 @@
!
use m_constants
use m_parallel_var_dof
+ use m_array_for_send_recv
use m_machine_parameter
use m_control_parameter
!
@@ -69,8 +70,8 @@
call set_sph_sprctr_data_address
call set_sph_nod_data_address
!
- if (iflag_debug.gt.0 ) write(*,*) 'allocate_iccgN_matrix'
- call allocate_iccgN_matrix(isix, nnod_rtp)
+ if (iflag_debug.gt.0 ) write(*,*) 'allocate_vector_for_solver'
+ call allocate_vector_for_solver(isix, nnod_rtp)
!
if ( iflag_debug.gt.0 ) write(*,*) 'init_rms_4_sph_spectr'
call init_rms_4_sph_spectr
More information about the CIG-COMMITS
mailing list