moved exchange related files to subdirectory xchange

Marcogarofalo · Oct 19, 2012 · 2a040e9 · 2a040e9
1 parent 6cda434
commit 2a040e9
Show file tree

Hide file tree

Showing 45 changed files with 135 additions and 61 deletions.
diff --git a/Hopping_Matrix.c b/Hopping_Matrix.c
@@ -57,13 +57,7 @@
 #include "global.h"
 #include "su3.h"
 #ifdef MPI
-#  include "xchange_field.h"
-#  ifdef _USE_TSPLITPAR
-#    include "xchange_field_tslice.h"
-#  endif
-#  if defined _USE_HALFSPINOR
-#    include "xchange_halffield.h"
-#  endif
+#  include "xchange/xchange.h"
 #endif
 #include "boundary.h"
 #include "init_dirac_halfspinor.h"

diff --git a/Hopping_Matrix_nocom.c b/Hopping_Matrix_nocom.c
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "global.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "su3.h"
 #include "sse.h"
 #include "boundary.h"

diff --git a/LapH_ev.c b/LapH_ev.c
@@ -49,7 +49,7 @@
 #include "geometry_eo.h"
 #include "read_input.h"
 #include "start.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "init_gauge_field.h"
 #include "init_geometry_indices.h"
 #include "mpi_init.h"

diff --git a/Makefile.in b/Makefile.in
@@ -51,21 +51,17 @@ MODULES = read_input gamma hybrid_update measure_gauge_action start \
 	polyakov_loop getopt sighandler reweighting_factor \
 	source_generation boundary update_tm ranlxd  \
 	mpi_init deriv_Sb deriv_Sb_D_psi ranlxs \
-	xchange_deri geometry_eo invert_overlap \
-	init_moment_field init_gauge_tmp \
-	xchange_field xchange_gauge prepare_source \
+	geometry_eo invert_overlap \
+	init_moment_field init_gauge_tmp prepare_source \
 	init_gauge_field init_geometry_indices init_spinor_field \
-	init_dirac_halfspinor xchange_halffield \
-	tm_operators_nd \
+	init_dirac_halfspinor tm_operators_nd \
 	chebyshev_polynomial_nd Ptilde_nd  \
 	init_chi_spinor_field reweighting_factor_nd \
 	init_bispinor_field D_psi \
-	xchange_lexicfield xchange_2fields online_measurement \
-	 update_momenta \
-	integrator  phmc \
+	online_measurement update_momenta integrator  phmc \
 	little_D block Dov_psi operator measurements pion_norm Dov_proj \
-	xchange_field_tslice temporalgauge spinor_fft X_psi P_M_eta \
-	xchange_jacobi jacobi init_jacobi_field \
+	temporalgauge spinor_fft X_psi P_M_eta \
+	jacobi init_jacobi_field \
 	fatal_error invert_clover_eo gettime @SPI_FILES@ init_omp_accumulators
 
 ## the GPU modules (all .cu files in $GPUDIR)

diff --git a/benchmark.c b/benchmark.c
@@ -58,14 +58,13 @@
 #include "Hopping_Matrix_nocom.h"
 #include "tm_operators.h"
 #include "global.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "init_gauge_field.h"
 #include "init_geometry_indices.h"
 #include "init_spinor_field.h"
 #include "init_moment_field.h"
 #include "init_dirac_halfspinor.h"
 #include "test/check_geometry.h"
-#include "xchange_halffield.h"
 #include "D_psi.h"
 #include "phmc.h"
 #include "mpi_init.h"

diff --git a/block.c b/block.c
@@ -31,7 +31,7 @@
 #include "D_psi.h"
 #include "linalg_eo.h"
 #include "start.h"
-#include "xchange_lexicfield.h"
+#include "xchange/xchange.h"
 #include "block.h"
 #include "solver/lu_solve.h"
 #include "su3.h"

diff --git a/buffers/utils.ih b/buffers/utils.ih
@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include <global.h>
-#include <xchange_gauge.h>
-#include <xchange.h>
+#include <xchange/xchange.h>
 
 #include <buffers/utils.h>
diff --git a/check_locallity.c b/check_locallity.c
@@ -47,7 +47,7 @@
 #include "start.h"
 #include "measure_gauge_action.h"
 #ifdef MPI
-#include "xchange.h"
+#include "xchange/xchange.h"
 #endif
 #include "read_input.h"
 #include "mpi_init.h"
@@ -59,7 +59,6 @@
 #include "init_spinor_field.h"
 #include "init_moment_field.h"
 #include "init_dirac_halfspinor.h"
-#include "xchange_halffield.h"
 #include "smearing/stout.h"
 #include "su3spinor.h"
 #include "invert_eo.h"

diff --git a/configure.in b/configure.in
@@ -40,7 +40,7 @@ AC_CHECK_PROG(CCDEP, gcc, "gcc", "$CC")
 LDFLAGS="$LDFLAGS -L\${HOME}/lib -L\${top_builddir}/lib"
 CCLD=${CC}
 
-USESUBDIRS="buffers cu io solver linalg monomial"
+USESUBDIRS="buffers cu io solver linalg monomial xchange"
 
 AC_CHECK_HEADERS([stdint.h],
 [ dnl for inttypes.h and stdint.h for uint_xxx types
@@ -897,7 +897,7 @@ if test ! -e tests/regressions; then
 fi
 
 
-LIBS="-lhmc -lmonomial -lsolver -llinalg -lhmc -lio $LIBS"
+LIBS="-lhmc -lmonomial -lsolver -lxchange -llinalg -lhmc -lio $LIBS"
 AUTOCONF=autoconf
 
 for i in $USESUBDIRS

diff --git a/deriv_Sb.c b/deriv_Sb.c
@@ -47,7 +47,7 @@
 #include "global.h"
 #include "su3.h"
 #include "boundary.h"
-#include "xchange_2fields.h"
+#include "xchange/xchange.h"
 #include "sse.h"
 #include "update_backward_gauge.h"
 #include "hamiltonian_field.h"

diff --git a/deriv_Sb_D_psi.c b/deriv_Sb_D_psi.c
@@ -27,8 +27,7 @@
 #include "global.h"
 #include "su3.h"
 #include "boundary.h"
-#include "xchange_field.h"
-#include "xchange_lexicfield.h"
+#include "xchange/xchange.h"
 #include "sse.h"
 #include "hamiltonian_field.h"
 #include "deriv_Sb_D_psi.h"

diff --git a/hmc_tm.c b/hmc_tm.c
@@ -56,7 +56,7 @@
 #include "measure_gauge_action.h"
 #include "measure_rectangles.h"
 #ifdef MPI
-# include "xchange.h"
+# include "xchange/xchange.h"
 #endif
 #include "read_input.h"
 #include "mpi_init.h"
@@ -70,7 +70,6 @@
 #include "init_dirac_halfspinor.h"
 #include "init_bispinor_field.h"
 #include "init_chi_spinor_field.h"
-#include "xchange_halffield.h"
 #include "test/check_geometry.h"
 #include "boundary.h"
 #include "phmc.h"

diff --git a/hopping_test.c b/hopping_test.c
@@ -56,7 +56,7 @@
 #include "Hopping_Matrix_nocom.h"
 #include "tm_operators.h"
 #include "global.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "init_gauge_field.h"
 #include "init_geometry_indices.h"
 #include "init_spinor_field.h"

diff --git a/hybrid_update.c b/hybrid_update.c
@@ -35,7 +35,7 @@
 #include "su3spinor.h"
 #include "expo.h"
 #include "sse.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "get_rectangle_staples.h"
 #include "gamma.h"
 #include "get_staples.h"

diff --git a/init_jacobi_field.c b/init_jacobi_field.c
@@ -27,7 +27,7 @@
 #include "global.h"
 #include "su3.h"
 #include "start.h"
-#include "xchange_jacobi.h"
+#include "xchange/xchange.h"
 #include "init_jacobi_field.h"
 
 #ifdef WITHLAPH

diff --git a/invert.c b/invert.c
@@ -52,7 +52,7 @@
 /*#include "eigenvalues.h"*/
 #include "measure_gauge_action.h"
 #ifdef MPI
-#include "xchange.h"
+#include "xchange/xchange.h"
 #endif
 #include <io/utils.h>
 #include "read_input.h"
@@ -67,7 +67,6 @@
 #include "init_dirac_halfspinor.h"
 #include "init_bispinor_field.h"
 #include "init_chi_spinor_field.h"
-#include "xchange_halffield.h"
 #include "smearing/stout.h"
 #include "invert_eo.h"
 #include "monomial/monomial.h"

diff --git a/invert_doublet_eo.c b/invert_doublet_eo.c
@@ -43,7 +43,7 @@
 #include"gamma.h"
 #include"solver/solver.h"
 #include"read_input.h"
-#include"xchange.h"
+#include"xchange/xchange.h"
 #include"tm_operators_nd.h"
 #include"invert_doublet_eo.h"
 

diff --git a/invert_eo.c b/invert_eo.c
@@ -43,7 +43,7 @@
 #include"gamma.h"
 #include"solver/solver.h"
 #include"read_input.h"
-#include"xchange.h"
+#include"xchange/xchange.h"
 #include"solver/poly_precon.h"
 #include"solver/dfl_projector.h"
 #include"invert_eo.h"

diff --git a/jacobi.c b/jacobi.c
@@ -36,7 +36,7 @@
 #endif
 #include "global.h"
 #include "su3.h"
-#include "xchange_jacobi.h"
+#include "xchange/xchange.h"
 
 #ifdef WITHLAPH
 

diff --git a/solver/fgmres.c b/solver/fgmres.c
@@ -43,7 +43,6 @@
 #include"global.h"
 #include"su3.h"
 #include"linalg_eo.h"
-#include"xchange_field.h"
 #include"gmres_precon.h"
 #include"tm_operators.h"
 #include"sub_low_ev.h"

diff --git a/solver/gmres_precon.c b/solver/gmres_precon.c
@@ -51,7 +51,6 @@
 #include"su3.h"
 #include"linalg_eo.h"
 #include"start.h"
-#include"xchange_field.h"
 #include "solver_field.h"
 #include"gmres_precon.h"
 

diff --git a/test/check_xchange.c b/test/check_xchange.c
@@ -37,7 +37,7 @@
 #include "global.h"
 #include "geometry_eo.h"
 #include "start.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 
 void set_deri_point();
 int check_geometry();

diff --git a/test_lemon.c b/test_lemon.c
@@ -51,7 +51,7 @@
 #include "start.h"
 #include "boundary.h"
 #include "global.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "init_gauge_field.h"
 #include "init_geometry_indices.h"
 #include "measure_gauge_action.h"

diff --git a/tm_sub_Hopping_Matrix.c b/tm_sub_Hopping_Matrix.c
@@ -42,10 +42,7 @@
 #  include"DirectPut.h"
 #endif
 #ifdef MPI
-#  include "xchange_field.h"
-#  if defined _USE_HALFSPINOR
-#    include "xchange_halffield.h"
-#  endif
+#  include "xchange/xchange.h"
 #endif
 #include "boundary.h"
 #include "init_dirac_halfspinor.h"

diff --git a/tm_times_Hopping_Matrix.c b/tm_times_Hopping_Matrix.c
@@ -42,10 +42,7 @@
 #  include"DirectPut.h"
 #endif
 #ifdef MPI
-#  include "xchange_field.h"
-#  if defined _USE_HALFSPINOR
-#    include "xchange_halffield.h"
-#  endif
+#  include "xchange/xchange.h"
 #endif
 #include "boundary.h"
 #include "init_dirac_halfspinor.h"

diff --git a/update_gauge.c b/update_gauge.c
@@ -34,7 +34,7 @@
 #include "su3spinor.h"
 #include "expo.h"
 #include "sse.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "hamiltonian_field.h"
 #include "update_gauge.h"
 

diff --git a/update_tm.c b/update_tm.c
@@ -53,7 +53,7 @@
 #include "ranlxd.h"
 #include "read_input.h"
 #include "expo.h"
-#include "xchange.h"
+#include "xchange/xchange.h"
 #include "measure_rectangles.h"
 #include "init_gauge_tmp.h"
 #include "monomial/monomial.h"