From 0a87766fdc824662589feb840f15dbc814e042b4 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sun, 4 Mar 2018 13:40:34 +0000 Subject: [PATCH] Reorganized modules subdirs, changing name from aux to auxil. --- base/modules/Makefile | 162 +++++++++--------- .../{aux => auxil}/psb_c_ip_reord_mod.f90 | 0 .../{basics => auxil}/psb_c_realloc_mod.F90 | 0 .../modules/{aux => auxil}/psb_c_sort_mod.f90 | 0 .../{aux => auxil}/psb_d_ip_reord_mod.f90 | 0 .../{basics => auxil}/psb_d_realloc_mod.F90 | 0 .../modules/{aux => auxil}/psb_d_sort_mod.f90 | 0 .../{basics => auxil}/psb_e_realloc_mod.F90 | 0 base/modules/{aux => auxil}/psb_hash_mod.f90 | 0 .../{aux => auxil}/psb_i_ip_reord_mod.f90 | 0 .../modules/{aux => auxil}/psb_i_sort_mod.f90 | 0 .../{aux => auxil}/psb_ip_reord_mod.f90 | 0 .../{aux => auxil}/psb_l_ip_reord_mod.f90 | 0 .../modules/{aux => auxil}/psb_l_sort_mod.f90 | 0 .../{basics => auxil}/psb_m_realloc_mod.F90 | 0 .../{aux => auxil}/psb_s_ip_reord_mod.f90 | 0 .../{basics => auxil}/psb_s_realloc_mod.F90 | 0 .../modules/{aux => auxil}/psb_s_sort_mod.f90 | 0 base/modules/{aux => auxil}/psb_sort_mod.f90 | 0 .../modules/{aux => auxil}/psb_string_mod.f90 | 0 .../{aux => auxil}/psb_z_ip_reord_mod.f90 | 0 .../{basics => auxil}/psb_z_realloc_mod.F90 | 0 .../modules/{aux => auxil}/psb_z_sort_mod.f90 | 0 .../{basics => auxil}/psi_c_p2p_mod.F90 | 0 .../{basics => auxil}/psi_c_reduce_mod.F90 | 0 .../{aux => auxil}/psi_c_serial_mod.f90 | 0 .../{basics => auxil}/psi_d_p2p_mod.F90 | 0 .../{basics => auxil}/psi_d_reduce_mod.F90 | 0 .../{aux => auxil}/psi_d_serial_mod.f90 | 0 .../{basics => auxil}/psi_e_p2p_mod.F90 | 0 .../{basics => auxil}/psi_e_reduce_mod.F90 | 0 .../{aux => auxil}/psi_i_serial_mod.f90 | 0 .../{basics => auxil}/psi_m_p2p_mod.F90 | 0 .../{basics => auxil}/psi_m_reduce_mod.F90 | 0 .../{basics => auxil}/psi_s_p2p_mod.F90 | 0 .../{basics => auxil}/psi_s_reduce_mod.F90 | 0 .../{aux => auxil}/psi_s_serial_mod.f90 | 0 .../modules/{aux => auxil}/psi_serial_mod.f90 | 0 .../{basics => auxil}/psi_z_p2p_mod.F90 | 0 .../{basics => auxil}/psi_z_reduce_mod.F90 | 0 .../{aux => auxil}/psi_z_serial_mod.f90 | 0 notes.txt | 15 +- 42 files changed, 95 insertions(+), 82 deletions(-) rename base/modules/{aux => auxil}/psb_c_ip_reord_mod.f90 (100%) rename base/modules/{basics => auxil}/psb_c_realloc_mod.F90 (100%) rename base/modules/{aux => auxil}/psb_c_sort_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_d_ip_reord_mod.f90 (100%) rename base/modules/{basics => auxil}/psb_d_realloc_mod.F90 (100%) rename base/modules/{aux => auxil}/psb_d_sort_mod.f90 (100%) rename base/modules/{basics => auxil}/psb_e_realloc_mod.F90 (100%) rename base/modules/{aux => auxil}/psb_hash_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_i_ip_reord_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_i_sort_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_ip_reord_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_l_ip_reord_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_l_sort_mod.f90 (100%) rename base/modules/{basics => auxil}/psb_m_realloc_mod.F90 (100%) rename base/modules/{aux => auxil}/psb_s_ip_reord_mod.f90 (100%) rename base/modules/{basics => auxil}/psb_s_realloc_mod.F90 (100%) rename base/modules/{aux => auxil}/psb_s_sort_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_sort_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_string_mod.f90 (100%) rename base/modules/{aux => auxil}/psb_z_ip_reord_mod.f90 (100%) rename base/modules/{basics => auxil}/psb_z_realloc_mod.F90 (100%) rename base/modules/{aux => auxil}/psb_z_sort_mod.f90 (100%) rename base/modules/{basics => auxil}/psi_c_p2p_mod.F90 (100%) rename base/modules/{basics => auxil}/psi_c_reduce_mod.F90 (100%) rename base/modules/{aux => auxil}/psi_c_serial_mod.f90 (100%) rename base/modules/{basics => auxil}/psi_d_p2p_mod.F90 (100%) rename base/modules/{basics => auxil}/psi_d_reduce_mod.F90 (100%) rename base/modules/{aux => auxil}/psi_d_serial_mod.f90 (100%) rename base/modules/{basics => auxil}/psi_e_p2p_mod.F90 (100%) rename base/modules/{basics => auxil}/psi_e_reduce_mod.F90 (100%) rename base/modules/{aux => auxil}/psi_i_serial_mod.f90 (100%) rename base/modules/{basics => auxil}/psi_m_p2p_mod.F90 (100%) rename base/modules/{basics => auxil}/psi_m_reduce_mod.F90 (100%) rename base/modules/{basics => auxil}/psi_s_p2p_mod.F90 (100%) rename base/modules/{basics => auxil}/psi_s_reduce_mod.F90 (100%) rename base/modules/{aux => auxil}/psi_s_serial_mod.f90 (100%) rename base/modules/{aux => auxil}/psi_serial_mod.f90 (100%) rename base/modules/{basics => auxil}/psi_z_p2p_mod.F90 (100%) rename base/modules/{basics => auxil}/psi_z_reduce_mod.F90 (100%) rename base/modules/{aux => auxil}/psi_z_serial_mod.f90 (100%) diff --git a/base/modules/Makefile b/base/modules/Makefile index a522efd96..cc6728928 100644 --- a/base/modules/Makefile +++ b/base/modules/Makefile @@ -1,32 +1,32 @@ include ../../Make.inc BASIC_MODS= psb_const_mod.o psb_error_mod.o psb_realloc_mod.o \ - basics/psb_m_realloc_mod.o \ - basics/psb_e_realloc_mod.o \ - basics/psb_s_realloc_mod.o \ - basics/psb_d_realloc_mod.o \ - basics/psb_c_realloc_mod.o \ - basics/psb_z_realloc_mod.o + auxil/psb_m_realloc_mod.o \ + auxil/psb_e_realloc_mod.o \ + auxil/psb_s_realloc_mod.o \ + auxil/psb_d_realloc_mod.o \ + auxil/psb_c_realloc_mod.o \ + auxil/psb_z_realloc_mod.o COMMINT=psi_comm_buffers_mod.o psi_penv_mod.o psi_bcast_mod.o \ - psi_p2p_mod.o basics/psi_m_p2p_mod.o \ - basics/psi_e_p2p_mod.o \ - basics/psi_s_p2p_mod.o \ - basics/psi_d_p2p_mod.o \ - basics/psi_c_p2p_mod.o \ - basics/psi_z_p2p_mod.o \ + psi_p2p_mod.o auxil/psi_m_p2p_mod.o \ + auxil/psi_e_p2p_mod.o \ + auxil/psi_s_p2p_mod.o \ + auxil/psi_d_p2p_mod.o \ + auxil/psi_c_p2p_mod.o \ + auxil/psi_z_p2p_mod.o \ psi_reduce_mod.o \ - basics/psi_e_reduce_mod.o \ - basics/psi_m_reduce_mod.o \ - basics/psi_s_reduce_mod.o \ - basics/psi_d_reduce_mod.o \ - basics/psi_c_reduce_mod.o \ - basics/psi_z_reduce_mod.o - -UTIL_MODS = aux/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_mod.o\ + auxil/psi_e_reduce_mod.o \ + auxil/psi_m_reduce_mod.o \ + auxil/psi_s_reduce_mod.o \ + auxil/psi_d_reduce_mod.o \ + auxil/psi_c_reduce_mod.o \ + auxil/psi_z_reduce_mod.o + +UTIL_MODS = auxil/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_mod.o\ desc/psb_gen_block_map_mod.o desc/psb_list_map_mod.o desc/psb_repl_map_mod.o\ desc/psb_glist_map_mod.o desc/psb_hash_map_mod.o \ - desc/psb_desc_mod.o aux/psb_sort_mod.o \ + desc/psb_desc_mod.o auxil/psb_sort_mod.o \ serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o \ serial/psb_serial_mod.o \ tools/psb_cd_tools_mod.o tools/psb_i_tools_mod.o tools/psb_s_tools_mod.o tools/psb_d_tools_mod.o\ @@ -44,17 +44,17 @@ UTIL_MODS = aux/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_mod serial/psb_vect_mod.o\ psblas/psb_s_psblas_mod.o psblas/psb_c_psblas_mod.o \ psblas/psb_d_psblas_mod.o psblas/psb_z_psblas_mod.o psblas/psb_psblas_mod.o \ - aux/psi_serial_mod.o aux/psi_i_serial_mod.o \ - aux/psi_s_serial_mod.o aux/psi_d_serial_mod.o aux/psi_c_serial_mod.o aux/psi_z_serial_mod.o \ + auxil/psi_serial_mod.o auxil/psi_i_serial_mod.o \ + auxil/psi_s_serial_mod.o auxil/psi_d_serial_mod.o auxil/psi_c_serial_mod.o auxil/psi_z_serial_mod.o \ psi_mod.o psi_i_mod.o psi_s_mod.o psi_d_mod.o psi_c_mod.o psi_z_mod.o\ - aux/psb_ip_reord_mod.o\ - aux/psb_i_ip_reord_mod.o aux/psb_l_ip_reord_mod.o \ - aux/psb_s_ip_reord_mod.o aux/psb_d_ip_reord_mod.o \ - aux/psb_c_ip_reord_mod.o aux/psb_z_ip_reord_mod.o \ - aux/psb_i_sort_mod.o aux/psb_l_sort_mod.o \ - aux/psb_s_sort_mod.o aux/psb_d_sort_mod.o \ - aux/psb_c_sort_mod.o aux/psb_z_sort_mod.o \ - psb_check_mod.o aux/psb_hash_mod.o\ + auxil/psb_ip_reord_mod.o\ + auxil/psb_i_ip_reord_mod.o auxil/psb_l_ip_reord_mod.o \ + auxil/psb_s_ip_reord_mod.o auxil/psb_d_ip_reord_mod.o \ + auxil/psb_c_ip_reord_mod.o auxil/psb_z_ip_reord_mod.o \ + auxil/psb_i_sort_mod.o auxil/psb_l_sort_mod.o \ + auxil/psb_s_sort_mod.o auxil/psb_d_sort_mod.o \ + auxil/psb_c_sort_mod.o auxil/psb_z_sort_mod.o \ + psb_check_mod.o auxil/psb_hash_mod.o\ serial/psb_base_mat_mod.o serial/psb_mat_mod.o\ serial/psb_s_base_mat_mod.o serial/psb_s_csr_mat_mod.o serial/psb_s_csc_mat_mod.o serial/psb_s_mat_mod.o \ serial/psb_d_base_mat_mod.o serial/psb_d_csr_mat_mod.o serial/psb_d_csc_mat_mod.o serial/psb_d_mat_mod.o \ @@ -84,55 +84,55 @@ $(UTIL_MODS): $(BASIC_MODS) psi_penv_mod.o: psi_comm_buffers_mod.o psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o: psi_penv_mod.o -psb_realloc_mod.o: basics/psb_m_realloc_mod.o \ - basics/psb_e_realloc_mod.o \ - basics/psb_s_realloc_mod.o \ - basics/psb_d_realloc_mod.o \ - basics/psb_c_realloc_mod.o \ - basics/psb_z_realloc_mod.o - -psi_p2p_mod.o: basics/psi_m_p2p_mod.o \ - basics/psi_e_p2p_mod.o \ - basics/psi_s_p2p_mod.o \ - basics/psi_d_p2p_mod.o \ - basics/psi_c_p2p_mod.o \ - basics/psi_z_p2p_mod.o -psi_reduce_mod.o: basics/psi_e_reduce_mod.o \ - basics/psi_m_reduce_mod.o \ - basics/psi_s_reduce_mod.o \ - basics/psi_d_reduce_mod.o \ - basics/psi_c_reduce_mod.o \ - basics/psi_z_reduce_mod.o - -basics/psi_m_p2p_mod.o basics/psi_e_p2p_mod.o basics/psi_s_p2p_mod.o \ -basics/psi_d_p2p_mod.o basics/psi_c_p2p_mod.o basics/psi_z_p2p_mod.o\ -basics/psi_e_reduce_mod.o basics/psi_m_reduce_mod.o basics/psi_s_reduce_mod.o \ -basics/psi_d_reduce_mod.o basics/psi_c_reduce_mod.o basics/psi_z_reduce_mod.o: psi_penv_mod.o - -aux/psb_string_mod.o desc/psb_desc_const_mod.o psi_comm_buffers_mod.o: psb_const_mod.o -aux/psb_hash_mod.o: psb_realloc_mod.o psb_const_mod.o -aux/psb_i_sort_mod.o aux/psb_s_sort_mod.o aux/psb_d_sort_mod.o aux/psb_c_sort_mod.o aux/psb_z_sort_mod.o \ -aux/psb_ip_reord_mod.o aux/psi_serial_mod.o aux/psb_sort_mod.o: $(BASIC_MODS) -aux/psb_sort_mod.o: aux/psb_i_sort_mod.o aux/psb_l_sort_mod.o \ - aux/psb_s_sort_mod.o aux/psb_d_sort_mod.o \ - aux/psb_c_sort_mod.o aux/psb_z_sort_mod.o \ - aux/psb_ip_reord_mod.o aux/psi_serial_mod.o -aux/psi_serial_mod.o: aux/psi_i_serial_mod.o \ - aux/psi_s_serial_mod.o aux/psi_d_serial_mod.o aux/psi_c_serial_mod.o aux/psi_z_serial_mod.o -aux/psi_i_serial_mod.o aux/psi_s_serial_mod.o aux/psi_d_serial_mod.o aux/psi_c_serial_mod.o aux/psi_z_serial_mod.o: psb_const_mod.o - -aux/psb_ip_reord_mod.o: aux/psb_i_ip_reord_mod.o aux/psb_l_ip_reord_mod.o \ - aux/psb_s_ip_reord_mod.o aux/psb_d_ip_reord_mod.o \ - aux/psb_c_ip_reord_mod.o aux/psb_z_ip_reord_mod.o - -serial/psb_base_mat_mod.o: aux/psi_serial_mod.o +psb_realloc_mod.o: auxil/psb_m_realloc_mod.o \ + auxil/psb_e_realloc_mod.o \ + auxil/psb_s_realloc_mod.o \ + auxil/psb_d_realloc_mod.o \ + auxil/psb_c_realloc_mod.o \ + auxil/psb_z_realloc_mod.o + +psi_p2p_mod.o: auxil/psi_m_p2p_mod.o \ + auxil/psi_e_p2p_mod.o \ + auxil/psi_s_p2p_mod.o \ + auxil/psi_d_p2p_mod.o \ + auxil/psi_c_p2p_mod.o \ + auxil/psi_z_p2p_mod.o +psi_reduce_mod.o: auxil/psi_e_reduce_mod.o \ + auxil/psi_m_reduce_mod.o \ + auxil/psi_s_reduce_mod.o \ + auxil/psi_d_reduce_mod.o \ + auxil/psi_c_reduce_mod.o \ + auxil/psi_z_reduce_mod.o + +auxil/psi_m_p2p_mod.o auxil/psi_e_p2p_mod.o auxil/psi_s_p2p_mod.o \ +auxil/psi_d_p2p_mod.o auxil/psi_c_p2p_mod.o auxil/psi_z_p2p_mod.o\ +auxil/psi_e_reduce_mod.o auxil/psi_m_reduce_mod.o auxil/psi_s_reduce_mod.o \ +auxil/psi_d_reduce_mod.o auxil/psi_c_reduce_mod.o auxil/psi_z_reduce_mod.o: psi_penv_mod.o + +auxil/psb_string_mod.o desc/psb_desc_const_mod.o psi_comm_buffers_mod.o: psb_const_mod.o +auxil/psb_hash_mod.o: psb_realloc_mod.o psb_const_mod.o +auxil/psb_i_sort_mod.o auxil/psb_s_sort_mod.o auxil/psb_d_sort_mod.o auxil/psb_c_sort_mod.o auxil/psb_z_sort_mod.o \ +auxil/psb_ip_reord_mod.o auxil/psi_serial_mod.o auxil/psb_sort_mod.o: $(BASIC_MODS) +auxil/psb_sort_mod.o: auxil/psb_i_sort_mod.o auxil/psb_l_sort_mod.o \ + auxil/psb_s_sort_mod.o auxil/psb_d_sort_mod.o \ + auxil/psb_c_sort_mod.o auxil/psb_z_sort_mod.o \ + auxil/psb_ip_reord_mod.o auxil/psi_serial_mod.o +auxil/psi_serial_mod.o: auxil/psi_i_serial_mod.o \ + auxil/psi_s_serial_mod.o auxil/psi_d_serial_mod.o auxil/psi_c_serial_mod.o auxil/psi_z_serial_mod.o +auxil/psi_i_serial_mod.o auxil/psi_s_serial_mod.o auxil/psi_d_serial_mod.o auxil/psi_c_serial_mod.o auxil/psi_z_serial_mod.o: psb_const_mod.o + +auxil/psb_ip_reord_mod.o: auxil/psb_i_ip_reord_mod.o auxil/psb_l_ip_reord_mod.o \ + auxil/psb_s_ip_reord_mod.o auxil/psb_d_ip_reord_mod.o \ + auxil/psb_c_ip_reord_mod.o auxil/psb_z_ip_reord_mod.o + +serial/psb_base_mat_mod.o: auxil/psi_serial_mod.o serial/psb_s_base_mat_mod.o serial/psb_d_base_mat_mod.o serial/psb_c_base_mat_mod.o serial/psb_z_base_mat_mod.o: serial/psb_base_mat_mod.o serial/psb_s_base_mat_mod.o: serial/psb_s_base_vect_mod.o serial/psb_d_base_mat_mod.o: serial/psb_d_base_vect_mod.o serial/psb_c_base_mat_mod.o: serial/psb_c_base_vect_mod.o serial/psb_z_base_mat_mod.o: serial/psb_z_base_vect_mod.o serial/psb_c_base_vect_mod.o serial/psb_s_base_vect_mod.o serial/psb_d_base_vect_mod.o serial/psb_z_base_vect_mod.o: serial/psb_i_base_vect_mod.o -serial/psb_i_base_vect_mod.o serial/psb_c_base_vect_mod.o serial/psb_s_base_vect_mod.o serial/psb_d_base_vect_mod.o serial/psb_z_base_vect_mod.o: aux/psi_serial_mod.o psb_realloc_mod.o +serial/psb_i_base_vect_mod.o serial/psb_c_base_vect_mod.o serial/psb_s_base_vect_mod.o serial/psb_d_base_vect_mod.o serial/psb_z_base_vect_mod.o: auxil/psi_serial_mod.o psb_realloc_mod.o serial/psb_s_mat_mod.o: serial/psb_s_base_mat_mod.o serial/psb_s_csr_mat_mod.o serial/psb_s_csc_mat_mod.o serial/psb_s_vect_mod.o serial/psb_d_mat_mod.o: serial/psb_d_base_mat_mod.o serial/psb_d_csr_mat_mod.o serial/psb_d_csc_mat_mod.o serial/psb_d_vect_mod.o serial/psb_i_vect_mod.o serial/psb_c_mat_mod.o: serial/psb_c_base_mat_mod.o serial/psb_c_csr_mat_mod.o serial/psb_c_csc_mat_mod.o serial/psb_c_vect_mod.o @@ -148,15 +148,15 @@ serial/psb_s_vect_mod.o: serial/psb_s_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_d_vect_mod.o: serial/psb_d_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_c_vect_mod.o: serial/psb_c_base_vect_mod.o serial/psb_i_vect_mod.o serial/psb_z_vect_mod.o: serial/psb_z_base_vect_mod.o serial/psb_i_vect_mod.o -serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o: serial/psb_mat_mod.o aux/psb_string_mod.o aux/psb_sort_mod.o aux/psi_serial_mod.o +serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o: serial/psb_mat_mod.o auxil/psb_string_mod.o auxil/psb_sort_mod.o auxil/psi_serial_mod.o serial/psb_vect_mod.o: serial/psb_i_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o error.o psb_realloc_mod.o: psb_error_mod.o psb_error_impl.o: psb_penv_mod.o -psb_spmat_type.o: aux/psb_string_mod.o aux/psb_sort_mod.o +psb_spmat_type.o: auxil/psb_string_mod.o auxil/psb_sort_mod.o desc/psb_desc_mod.o: psb_penv_mod.o psb_realloc_mod.o\ - aux/psb_hash_mod.o desc/psb_hash_map_mod.o desc/psb_list_map_mod.o \ + auxil/psb_hash_mod.o desc/psb_hash_map_mod.o desc/psb_list_map_mod.o \ desc/psb_repl_map_mod.o desc/psb_gen_block_map_mod.o desc/psb_desc_const_mod.o\ desc/psb_indx_map_mod.o serial/psb_i_vect_mod.o psi_i_mod.o: desc/psb_desc_mod.o serial/psb_i_vect_mod.o @@ -164,16 +164,16 @@ psi_s_mod.o: desc/psb_desc_mod.o serial/psb_s_vect_mod.o psi_d_mod.o: desc/psb_desc_mod.o serial/psb_d_vect_mod.o psi_c_mod.o: desc/psb_desc_mod.o serial/psb_c_vect_mod.o psi_z_mod.o: desc/psb_desc_mod.o serial/psb_z_vect_mod.o -psi_mod.o: psb_penv_mod.o desc/psb_desc_mod.o aux/psi_serial_mod.o serial/psb_serial_mod.o\ +psi_mod.o: psb_penv_mod.o desc/psb_desc_mod.o auxil/psi_serial_mod.o serial/psb_serial_mod.o\ psi_i_mod.o psi_s_mod.o psi_d_mod.o psi_c_mod.o psi_z_mod.o desc/psb_indx_map_mod.o: desc/psb_desc_const_mod.o psb_error_mod.o psb_penv_mod.o desc/psb_hash_map_mod.o desc/psb_list_map_mod.o desc/psb_repl_map_mod.o desc/psb_gen_block_map_mod.o:\ desc/psb_indx_map_mod.o desc/psb_desc_const_mod.o \ - aux/psb_sort_mod.o psb_penv_mod.o + auxil/psb_sort_mod.o psb_penv_mod.o desc/psb_glist_map_mod.o: desc/psb_list_map_mod.o -desc/psb_hash_map_mod.o: aux/psb_hash_mod.o aux/psb_sort_mod.o -desc/psb_gen_block_map_mod.o: aux/psb_hash_mod.o +desc/psb_hash_map_mod.o: auxil/psb_hash_mod.o auxil/psb_sort_mod.o +desc/psb_gen_block_map_mod.o: auxil/psb_hash_mod.o psb_check_mod.o: desc/psb_desc_mod.o diff --git a/base/modules/aux/psb_c_ip_reord_mod.f90 b/base/modules/auxil/psb_c_ip_reord_mod.f90 similarity index 100% rename from base/modules/aux/psb_c_ip_reord_mod.f90 rename to base/modules/auxil/psb_c_ip_reord_mod.f90 diff --git a/base/modules/basics/psb_c_realloc_mod.F90 b/base/modules/auxil/psb_c_realloc_mod.F90 similarity index 100% rename from base/modules/basics/psb_c_realloc_mod.F90 rename to base/modules/auxil/psb_c_realloc_mod.F90 diff --git a/base/modules/aux/psb_c_sort_mod.f90 b/base/modules/auxil/psb_c_sort_mod.f90 similarity index 100% rename from base/modules/aux/psb_c_sort_mod.f90 rename to base/modules/auxil/psb_c_sort_mod.f90 diff --git a/base/modules/aux/psb_d_ip_reord_mod.f90 b/base/modules/auxil/psb_d_ip_reord_mod.f90 similarity index 100% rename from base/modules/aux/psb_d_ip_reord_mod.f90 rename to base/modules/auxil/psb_d_ip_reord_mod.f90 diff --git a/base/modules/basics/psb_d_realloc_mod.F90 b/base/modules/auxil/psb_d_realloc_mod.F90 similarity index 100% rename from base/modules/basics/psb_d_realloc_mod.F90 rename to base/modules/auxil/psb_d_realloc_mod.F90 diff --git a/base/modules/aux/psb_d_sort_mod.f90 b/base/modules/auxil/psb_d_sort_mod.f90 similarity index 100% rename from base/modules/aux/psb_d_sort_mod.f90 rename to base/modules/auxil/psb_d_sort_mod.f90 diff --git a/base/modules/basics/psb_e_realloc_mod.F90 b/base/modules/auxil/psb_e_realloc_mod.F90 similarity index 100% rename from base/modules/basics/psb_e_realloc_mod.F90 rename to base/modules/auxil/psb_e_realloc_mod.F90 diff --git a/base/modules/aux/psb_hash_mod.f90 b/base/modules/auxil/psb_hash_mod.f90 similarity index 100% rename from base/modules/aux/psb_hash_mod.f90 rename to base/modules/auxil/psb_hash_mod.f90 diff --git a/base/modules/aux/psb_i_ip_reord_mod.f90 b/base/modules/auxil/psb_i_ip_reord_mod.f90 similarity index 100% rename from base/modules/aux/psb_i_ip_reord_mod.f90 rename to base/modules/auxil/psb_i_ip_reord_mod.f90 diff --git a/base/modules/aux/psb_i_sort_mod.f90 b/base/modules/auxil/psb_i_sort_mod.f90 similarity index 100% rename from base/modules/aux/psb_i_sort_mod.f90 rename to base/modules/auxil/psb_i_sort_mod.f90 diff --git a/base/modules/aux/psb_ip_reord_mod.f90 b/base/modules/auxil/psb_ip_reord_mod.f90 similarity index 100% rename from base/modules/aux/psb_ip_reord_mod.f90 rename to base/modules/auxil/psb_ip_reord_mod.f90 diff --git a/base/modules/aux/psb_l_ip_reord_mod.f90 b/base/modules/auxil/psb_l_ip_reord_mod.f90 similarity index 100% rename from base/modules/aux/psb_l_ip_reord_mod.f90 rename to base/modules/auxil/psb_l_ip_reord_mod.f90 diff --git a/base/modules/aux/psb_l_sort_mod.f90 b/base/modules/auxil/psb_l_sort_mod.f90 similarity index 100% rename from base/modules/aux/psb_l_sort_mod.f90 rename to base/modules/auxil/psb_l_sort_mod.f90 diff --git a/base/modules/basics/psb_m_realloc_mod.F90 b/base/modules/auxil/psb_m_realloc_mod.F90 similarity index 100% rename from base/modules/basics/psb_m_realloc_mod.F90 rename to base/modules/auxil/psb_m_realloc_mod.F90 diff --git a/base/modules/aux/psb_s_ip_reord_mod.f90 b/base/modules/auxil/psb_s_ip_reord_mod.f90 similarity index 100% rename from base/modules/aux/psb_s_ip_reord_mod.f90 rename to base/modules/auxil/psb_s_ip_reord_mod.f90 diff --git a/base/modules/basics/psb_s_realloc_mod.F90 b/base/modules/auxil/psb_s_realloc_mod.F90 similarity index 100% rename from base/modules/basics/psb_s_realloc_mod.F90 rename to base/modules/auxil/psb_s_realloc_mod.F90 diff --git a/base/modules/aux/psb_s_sort_mod.f90 b/base/modules/auxil/psb_s_sort_mod.f90 similarity index 100% rename from base/modules/aux/psb_s_sort_mod.f90 rename to base/modules/auxil/psb_s_sort_mod.f90 diff --git a/base/modules/aux/psb_sort_mod.f90 b/base/modules/auxil/psb_sort_mod.f90 similarity index 100% rename from base/modules/aux/psb_sort_mod.f90 rename to base/modules/auxil/psb_sort_mod.f90 diff --git a/base/modules/aux/psb_string_mod.f90 b/base/modules/auxil/psb_string_mod.f90 similarity index 100% rename from base/modules/aux/psb_string_mod.f90 rename to base/modules/auxil/psb_string_mod.f90 diff --git a/base/modules/aux/psb_z_ip_reord_mod.f90 b/base/modules/auxil/psb_z_ip_reord_mod.f90 similarity index 100% rename from base/modules/aux/psb_z_ip_reord_mod.f90 rename to base/modules/auxil/psb_z_ip_reord_mod.f90 diff --git a/base/modules/basics/psb_z_realloc_mod.F90 b/base/modules/auxil/psb_z_realloc_mod.F90 similarity index 100% rename from base/modules/basics/psb_z_realloc_mod.F90 rename to base/modules/auxil/psb_z_realloc_mod.F90 diff --git a/base/modules/aux/psb_z_sort_mod.f90 b/base/modules/auxil/psb_z_sort_mod.f90 similarity index 100% rename from base/modules/aux/psb_z_sort_mod.f90 rename to base/modules/auxil/psb_z_sort_mod.f90 diff --git a/base/modules/basics/psi_c_p2p_mod.F90 b/base/modules/auxil/psi_c_p2p_mod.F90 similarity index 100% rename from base/modules/basics/psi_c_p2p_mod.F90 rename to base/modules/auxil/psi_c_p2p_mod.F90 diff --git a/base/modules/basics/psi_c_reduce_mod.F90 b/base/modules/auxil/psi_c_reduce_mod.F90 similarity index 100% rename from base/modules/basics/psi_c_reduce_mod.F90 rename to base/modules/auxil/psi_c_reduce_mod.F90 diff --git a/base/modules/aux/psi_c_serial_mod.f90 b/base/modules/auxil/psi_c_serial_mod.f90 similarity index 100% rename from base/modules/aux/psi_c_serial_mod.f90 rename to base/modules/auxil/psi_c_serial_mod.f90 diff --git a/base/modules/basics/psi_d_p2p_mod.F90 b/base/modules/auxil/psi_d_p2p_mod.F90 similarity index 100% rename from base/modules/basics/psi_d_p2p_mod.F90 rename to base/modules/auxil/psi_d_p2p_mod.F90 diff --git a/base/modules/basics/psi_d_reduce_mod.F90 b/base/modules/auxil/psi_d_reduce_mod.F90 similarity index 100% rename from base/modules/basics/psi_d_reduce_mod.F90 rename to base/modules/auxil/psi_d_reduce_mod.F90 diff --git a/base/modules/aux/psi_d_serial_mod.f90 b/base/modules/auxil/psi_d_serial_mod.f90 similarity index 100% rename from base/modules/aux/psi_d_serial_mod.f90 rename to base/modules/auxil/psi_d_serial_mod.f90 diff --git a/base/modules/basics/psi_e_p2p_mod.F90 b/base/modules/auxil/psi_e_p2p_mod.F90 similarity index 100% rename from base/modules/basics/psi_e_p2p_mod.F90 rename to base/modules/auxil/psi_e_p2p_mod.F90 diff --git a/base/modules/basics/psi_e_reduce_mod.F90 b/base/modules/auxil/psi_e_reduce_mod.F90 similarity index 100% rename from base/modules/basics/psi_e_reduce_mod.F90 rename to base/modules/auxil/psi_e_reduce_mod.F90 diff --git a/base/modules/aux/psi_i_serial_mod.f90 b/base/modules/auxil/psi_i_serial_mod.f90 similarity index 100% rename from base/modules/aux/psi_i_serial_mod.f90 rename to base/modules/auxil/psi_i_serial_mod.f90 diff --git a/base/modules/basics/psi_m_p2p_mod.F90 b/base/modules/auxil/psi_m_p2p_mod.F90 similarity index 100% rename from base/modules/basics/psi_m_p2p_mod.F90 rename to base/modules/auxil/psi_m_p2p_mod.F90 diff --git a/base/modules/basics/psi_m_reduce_mod.F90 b/base/modules/auxil/psi_m_reduce_mod.F90 similarity index 100% rename from base/modules/basics/psi_m_reduce_mod.F90 rename to base/modules/auxil/psi_m_reduce_mod.F90 diff --git a/base/modules/basics/psi_s_p2p_mod.F90 b/base/modules/auxil/psi_s_p2p_mod.F90 similarity index 100% rename from base/modules/basics/psi_s_p2p_mod.F90 rename to base/modules/auxil/psi_s_p2p_mod.F90 diff --git a/base/modules/basics/psi_s_reduce_mod.F90 b/base/modules/auxil/psi_s_reduce_mod.F90 similarity index 100% rename from base/modules/basics/psi_s_reduce_mod.F90 rename to base/modules/auxil/psi_s_reduce_mod.F90 diff --git a/base/modules/aux/psi_s_serial_mod.f90 b/base/modules/auxil/psi_s_serial_mod.f90 similarity index 100% rename from base/modules/aux/psi_s_serial_mod.f90 rename to base/modules/auxil/psi_s_serial_mod.f90 diff --git a/base/modules/aux/psi_serial_mod.f90 b/base/modules/auxil/psi_serial_mod.f90 similarity index 100% rename from base/modules/aux/psi_serial_mod.f90 rename to base/modules/auxil/psi_serial_mod.f90 diff --git a/base/modules/basics/psi_z_p2p_mod.F90 b/base/modules/auxil/psi_z_p2p_mod.F90 similarity index 100% rename from base/modules/basics/psi_z_p2p_mod.F90 rename to base/modules/auxil/psi_z_p2p_mod.F90 diff --git a/base/modules/basics/psi_z_reduce_mod.F90 b/base/modules/auxil/psi_z_reduce_mod.F90 similarity index 100% rename from base/modules/basics/psi_z_reduce_mod.F90 rename to base/modules/auxil/psi_z_reduce_mod.F90 diff --git a/base/modules/aux/psi_z_serial_mod.f90 b/base/modules/auxil/psi_z_serial_mod.f90 similarity index 100% rename from base/modules/aux/psi_z_serial_mod.f90 rename to base/modules/auxil/psi_z_serial_mod.f90 diff --git a/notes.txt b/notes.txt index 93539623e..808f3eda2 100644 --- a/notes.txt +++ b/notes.txt @@ -16,4 +16,17 @@ sizes psb_lpk_: Can be 32 or 64 bits, always used for "global" indices and sizes, must be psb_lpk_ >= psb_ipk_ - psb_8pk_: always 64 bits, used for SIZEOF & friends. + psb_epk_: always 64 bits, used for SIZEOF & friends. + +5. Let's define the SND/RCV/SUM/MAX & friends in terms of M and E, the + compiler will remap I and L onto them automatically + +6. Similar for sort; except for the inner routines of heap, where we + provide heap types I_IDX_HEAP, they have to be written + independently beccause the encapsulated types are always + different. + +7. For communication stuff: let us define psb_i_base_vect and + psb_l_base_vect; the communication routines will work in terms of + them, then remap onto the array routines, which are going to be + written in terms of E and M.