diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/Makefile.depends b/src/Fortran_libraries/PARALLEL_src/COMM_src/Makefile.depends
index c3e01c02..ac5f8ac1 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/Makefile.depends
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/Makefile.depends
@@ -10,8 +10,6 @@ bcast_control_arrays.o: $(COMMDIR)/bcast_control_arrays.f90 m_precision.o m_cons
 	$(F90) -c $(F90OPTFLAGS) $<
 bcast_file_IO_parameter.o: $(COMMDIR)/bcast_file_IO_parameter.f90 m_precision.o m_constants.o t_file_IO_parameter.o calypso_mpi_int.o calypso_mpi_char.o transfer_to_long_integers.o calypso_mpi_logical.o
 	$(F90) -c $(F90OPTFLAGS) $<
-cal_local_position_by_tetra.o: $(COMMDIR)/cal_local_position_by_tetra.f90 m_precision.o m_geometry_constants.o
-	$(F90) -c $(F90OPTFLAGS) $<
 calypso_SR.o: $(COMMDIR)/calypso_SR.f90 m_precision.o m_constants.o calypso_mpi.o t_solver_SR.o calypso_SR_core.o set_to_send_buffer.o select_copy_from_recv.o set_to_send_buf_tri.o select_copy_from_recv_tri.o
 	$(F90) -c $(F90OPTFLAGS) $<
 calypso_SR_2.o: $(COMMDIR)/calypso_SR_2.f90 m_precision.o m_constants.o calypso_mpi.o t_solver_SR.o calypso_SR_core.o set_to_send_buffer.o select_copy_from_recv.o set_to_send_buf_tri.o select_copy_from_recv_tri.o
@@ -122,8 +120,6 @@ t_mesh_SR.o: $(COMMDIR)/t_mesh_SR.f90 m_precision.o t_solver_SR.o t_solver_SR_in
 	$(F90) -c $(F90OPTFLAGS) $<
 t_para_double_numbering.o: $(COMMDIR)/t_para_double_numbering.f90 m_precision.o m_constants.o calypso_mpi.o t_solver_SR.o t_solver_SR_int.o t_geometry_data.o t_comm_table.o solver_SR_type.o find_belonged_process.o
 	$(F90) -c $(F90OPTFLAGS) $<
-t_parallel_surface_indices.o: $(COMMDIR)/t_parallel_surface_indices.f90 m_precision.o m_machine_parameter.o m_geometry_constants.o t_mesh_data.o t_comm_table.o t_mesh_SR.o t_para_double_numbering.o t_geometry_data.o t_surface_data.o reverse_SR_int.o solver_SR_type.o
-	$(F90) -c $(F90OPTFLAGS) $<
 t_solver_SR.o: $(COMMDIR)/t_solver_SR.f90 m_precision.o calypso_mpi.o
 	$(F90) -c $(F90OPTFLAGS) $<
 t_solver_SR_int.o: $(COMMDIR)/t_solver_SR_int.f90 m_precision.o calypso_mpi.o t_solver_SR.o
diff --git a/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/Makefile.depends b/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/Makefile.depends
index 777d18a6..ac115c94 100644
--- a/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/Makefile.depends
+++ b/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/Makefile.depends
@@ -1,3 +1,5 @@
+cal_local_position_by_tetra.o: $(INTERPOLATE_DIR)/cal_local_position_by_tetra.f90 m_precision.o m_geometry_constants.o
+	$(F90) -c $(F90OPTFLAGS) $<
 cal_position_and_grad.o: $(INTERPOLATE_DIR)/cal_position_and_grad.f90 m_precision.o m_constants.o m_geometry_constants.o cal_shape_function_3d.o interpolate_position_in_ele.o cal_shape_function_2d.o cal_shape_function_1d.o
 	$(F90) -c $(F90OPTFLAGS) $<
 interpolate_position_in_ele.o: $(INTERPOLATE_DIR)/interpolate_position_in_ele.f90 m_precision.o
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/cal_local_position_by_tetra.f90 b/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/cal_local_position_by_tetra.f90
similarity index 100%
rename from src/Fortran_libraries/PARALLEL_src/COMM_src/cal_local_position_by_tetra.f90
rename to src/Fortran_libraries/PARALLEL_src/INTERPOLATE/cal_local_position_by_tetra.f90
diff --git a/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/t_find_interpolate_in_ele.f90 b/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/t_find_interpolate_in_ele.f90
index 4171b3fb..baed8b4f 100644
--- a/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/t_find_interpolate_in_ele.f90
+++ b/src/Fortran_libraries/PARALLEL_src/INTERPOLATE/t_find_interpolate_in_ele.f90
@@ -88,6 +88,7 @@ subroutine find_interpolate_in_ele(x_target, maxitr, eps_iter,    &
      &          org_node, org_ele, jele, itp_ele_work, xi, ierr_inter)
 !
       use m_connect_hexa_2_tetra
+!      use t_ctl_params_4_gen_table
       use cal_local_position_by_tetra
       use modify_local_positions
       use solver_33_array
diff --git a/src/Fortran_libraries/VIZ_src/fieldline/Makefile.depends b/src/Fortran_libraries/VIZ_src/fieldline/Makefile.depends
index ab07a534..bafda1bd 100644
--- a/src/Fortran_libraries/VIZ_src/fieldline/Makefile.depends
+++ b/src/Fortran_libraries/VIZ_src/fieldline/Makefile.depends
@@ -94,6 +94,8 @@ t_fline_seeds_surf_group.o: $(FIELDLINE_DIR)/t_fline_seeds_surf_group.f90 m_prec
 	$(F90) -c $(F90OPTFLAGS) $<
 t_local_fline.o: $(FIELDLINE_DIR)/t_local_fline.f90 m_precision.o m_constants.o t_ctl_params_viz_fields.o
 	$(F90) -c $(F90OPTFLAGS) $<
+t_parallel_surface_indices.o: $(FIELDLINE_DIR)/t_parallel_surface_indices.f90 m_precision.o m_machine_parameter.o m_geometry_constants.o t_mesh_data.o t_comm_table.o t_mesh_SR.o t_para_double_numbering.o t_geometry_data.o t_surface_data.o reverse_SR_int.o solver_SR_type.o
+	$(F90) -c $(F90OPTFLAGS) $<
 t_particle_trace.o: $(FIELDLINE_DIR)/t_particle_trace.f90 m_precision.o m_machine_parameter.o m_geometry_constants.o m_work_time.o t_time_data.o t_mesh_data.o t_phys_data.o t_parallel_surface_indices.o t_control_params_4_fline.o t_source_of_filed_line.o t_trace_data_send_recv.o t_broadcast_trace_data.o t_tracing_data.o t_local_fline.o t_ucd_data.o t_control_data_flines.o m_connect_hexa_2_tetra.o multi_tracer_fieldline.o multi_tracer_file_IO.o multi_trace_particle.o t_mesh_SR.o set_fields_for_fieldline.o trace_particle.o collect_fline_data.o parallel_ucd_IO_select.o set_fline_seeds_from_list.o
 	$(F90) -c $(F90OPTFLAGS) $<
 t_source_of_filed_line.o: $(FIELDLINE_DIR)/t_source_of_filed_line.f90 m_precision.o m_constants.o t_control_params_4_fline.o
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/t_parallel_surface_indices.f90 b/src/Fortran_libraries/VIZ_src/fieldline/t_parallel_surface_indices.f90
similarity index 100%
rename from src/Fortran_libraries/PARALLEL_src/COMM_src/t_parallel_surface_indices.f90
rename to src/Fortran_libraries/VIZ_src/fieldline/t_parallel_surface_indices.f90
diff --git a/src/option_settings b/src/option_settings
index 55e2767f..4abaa5a6 100644
--- a/src/option_settings
+++ b/src/option_settings
@@ -10,7 +10,8 @@ CC=icc FC=ifort F77=ifort CXX=icc AR=xiar MPICC=mpicc MPIFC=mpif90 \
 PKG_CONFIG=/usr/bin/pkg-config CFLAGS='-Os -Wall -g -xCORE-AVX2 -axMIC-AVX512' \
 FCFLAGS='-Os -xCORE-AVX2 -axMIC-AVX512 -warn all -g -nogen-interfaces'  \
 FFTW3_CFLAGS='$$(TACC_FFTW3_INC)' FFTW3_LIBS='-L$$(TACC_FFTW3_LIB) -lfftw3' \
---with-blas=-mkl=sequential --enable-fftw3 --enable-libpng --with-hdf5 --with-zlib=/usr/lib64 \
+--with-blas=-mkl=sequential --enable-fftw3 --enable-libpng --with-hdf5 \
+--with-zlib=/usr/lib64 --without-pgplot --without-aquaterm \
 PKG_CONFIG_PATH='/usr/lib64/pkgconfig:/home/hmatsui/local/lib/pkgconfig'