moved init related stuff into subdir init

Marcogarofalo · Oct 19, 2012 · a2279bf · a2279bf
1 parent 0bfd116
commit a2279bf
Show file tree

Hide file tree

Showing 45 changed files with 23 additions and 75 deletions.
diff --git a/LapH_ev.c b/LapH_ev.c
@@ -50,11 +50,9 @@
 #include "read_input.h"
 #include "start.h"
 #include "xchange/xchange.h"
-#include "init_gauge_field.h"
-#include "init_geometry_indices.h"
+#include "init/init.h"
 #include "mpi_init.h"
 #include "solver/eigenvalues_Jacobi.h"
-#include "init_jacobi_field.h"
 
 int main(int argc,char *argv[])
 {

diff --git a/Makefile.in b/Makefile.in
@@ -52,17 +52,12 @@ MODULES = read_input gamma hybrid_update measure_gauge_action start \
 	source_generation boundary update_tm ranlxd  \
 	mpi_init deriv_Sb deriv_Sb_D_psi ranlxs \
 	geometry_eo invert_overlap \
-	init_moment_field init_gauge_tmp prepare_source \
-	init_gauge_field init_geometry_indices init_spinor_field \
-	init_dirac_halfspinor \
-	chebyshev_polynomial_nd Ptilde_nd  \
-	init_chi_spinor_field reweighting_factor_nd \
-	init_bispinor_field \
+	prepare_source chebyshev_polynomial_nd Ptilde_nd  \
+	reweighting_factor_nd \
 	online_measurement update_momenta integrator  phmc \
 	little_D block operator measurements pion_norm \
 	temporalgauge spinor_fft X_psi P_M_eta \
-	jacobi init_jacobi_field \
-	fatal_error invert_clover_eo gettime @SPI_FILES@ init_omp_accumulators
+	jacobi fatal_error invert_clover_eo gettime @SPI_FILES@
 
 ## the GPU modules (all .cu files in $GPUDIR)
 GPUSOURCES := $(wildcard $(srcdir)/$(GPUDIR)/*.cu)

diff --git a/benchmark.c b/benchmark.c
@@ -44,7 +44,6 @@
 #endif
 #ifdef OMP
 # include <omp.h>
-# include "init_omp_accumulators.h"
 #endif
 #include "gettime.h"
 #include "su3.h"
@@ -59,11 +58,7 @@
 #include "operator/tm_operators.h"
 #include "global.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 "init/init.h"
 #include "test/check_geometry.h"
 #include "operator/D_psi.h"
 #include "phmc.h"

diff --git a/check_locallity.c b/check_locallity.c
@@ -54,11 +54,7 @@
 #include "sighandler.h"
 #include "boundary.h"
 #include "solver/solver.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 "init/init.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 xchange operator"
+USESUBDIRS="buffers cu io solver linalg monomial xchange operator init"
 
 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 -loperator -lsolver -lxchange -llinalg -lhmc -lio $LIBS"
+LIBS="-lhmc -lmonomial -loperator -lsolver -lxchange -linit -llinalg -lhmc -lio $LIBS"
 AUTOCONF=autoconf
 
 for i in $USESUBDIRS

diff --git a/gen_sources.c b/gen_sources.c
@@ -48,10 +48,9 @@
 #include "read_input.h"
 #include "mpi_init.h"
 #include "source_generation.h"
-#include "init_geometry_indices.h"
+#include "init/init.h"
 #include "linalg_eo.h"
 #include "phmc.h"
-#include "init_spinor_field.h"
 
 
 void usage() {

diff --git a/hmc_tm.c b/hmc_tm.c
@@ -43,7 +43,6 @@
 #endif
 #ifdef OMP
 # include <omp.h>
-# include "init_omp_accumulators.h"
 #endif
 #include "global.h"
 #include "git_hash.h"
@@ -62,14 +61,7 @@
 #include "mpi_init.h"
 #include "sighandler.h"
 #include "update_tm.h"
-#include "init_gauge_field.h"
-#include "init_geometry_indices.h"
-#include "init_spinor_field.h"
-#include "init_moment_field.h"
-#include "init_gauge_tmp.h"
-#include "init_dirac_halfspinor.h"
-#include "init_bispinor_field.h"
-#include "init_chi_spinor_field.h"
+#include "init/init.h"
 #include "test/check_geometry.h"
 #include "boundary.h"
 #include "phmc.h"

diff --git a/hopping_test.c b/hopping_test.c
@@ -57,11 +57,7 @@
 #include "operator/tm_operators.h"
 #include "global.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 "init/init.h"
 #include "test/check_geometry.h"
 #include "operator/D_psi.h"
 #include "phmc.h"

diff --git a/init_bispinor_field.c → init/init_bispinor_field.c b/init_bispinor_field.c → init/init_bispinor_field.c
diff --git a/init_bispinor_field.h → init/init_bispinor_field.h b/init_bispinor_field.h → init/init_bispinor_field.h
diff --git a/init_chi_spinor_field.c → init/init_chi_spinor_field.c b/init_chi_spinor_field.c → init/init_chi_spinor_field.c
diff --git a/init_chi_spinor_field.h → init/init_chi_spinor_field.h b/init_chi_spinor_field.h → init/init_chi_spinor_field.h
diff --git a/init_dirac_halfspinor.c → init/init_dirac_halfspinor.c b/init_dirac_halfspinor.c → init/init_dirac_halfspinor.c
diff --git a/init_dirac_halfspinor.h → init/init_dirac_halfspinor.h b/init_dirac_halfspinor.h → init/init_dirac_halfspinor.h
diff --git a/init_gauge_field.c → init/init_gauge_field.c b/init_gauge_field.c → init/init_gauge_field.c
diff --git a/init_gauge_field.h → init/init_gauge_field.h b/init_gauge_field.h → init/init_gauge_field.h
diff --git a/init_gauge_tmp.c → init/init_gauge_tmp.c b/init_gauge_tmp.c → init/init_gauge_tmp.c
diff --git a/init_gauge_tmp.h → init/init_gauge_tmp.h b/init_gauge_tmp.h → init/init_gauge_tmp.h
diff --git a/init_geometry_indices.c → init/init_geometry_indices.c b/init_geometry_indices.c → init/init_geometry_indices.c
diff --git a/init_geometry_indices.h → init/init_geometry_indices.h b/init_geometry_indices.h → init/init_geometry_indices.h
diff --git a/init_jacobi_field.c → init/init_jacobi_field.c b/init_jacobi_field.c → init/init_jacobi_field.c
diff --git a/init_jacobi_field.h → init/init_jacobi_field.h b/init_jacobi_field.h → init/init_jacobi_field.h
diff --git a/init_moment_field.c → init/init_moment_field.c b/init_moment_field.c → init/init_moment_field.c
diff --git a/init_moment_field.h → init/init_moment_field.h b/init_moment_field.h → init/init_moment_field.h
diff --git a/init_omp_accumulators.c → init/init_omp_accumulators.c b/init_omp_accumulators.c → init/init_omp_accumulators.c
diff --git a/init_omp_accumulators.h → init/init_omp_accumulators.h b/init_omp_accumulators.h → init/init_omp_accumulators.h
diff --git a/init_spinor_field.c → init/init_spinor_field.c b/init_spinor_field.c → init/init_spinor_field.c
diff --git a/init_spinor_field.h → init/init_spinor_field.h b/init_spinor_field.h → init/init_spinor_field.h
diff --git a/init_stout_smear_vars.c → init/init_stout_smear_vars.c b/init_stout_smear_vars.c → init/init_stout_smear_vars.c
diff --git a/init_stout_smear_vars.h → init/init_stout_smear_vars.h b/init_stout_smear_vars.h → init/init_stout_smear_vars.h
diff --git a/invert.c b/invert.c
@@ -41,7 +41,6 @@
 #endif
 #ifdef OMP
 # include <omp.h>
-# include "init_omp_accumulators.h"
 #endif
 #include "global.h"
 #include "git_hash.h"
@@ -60,13 +59,7 @@
 #include "sighandler.h"
 #include "boundary.h"
 #include "solver/solver.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 "init_bispinor_field.h"
-#include "init_chi_spinor_field.h"
+#include "init/init.h"
 #include "smearing/stout.h"
 #include "invert_eo.h"
 #include "monomial/monomial.h"

diff --git a/monomial/ndpoly_monomial.c b/monomial/ndpoly_monomial.c
@@ -44,7 +44,7 @@
 #include "hamiltonian_field.h"
 #include "boundary.h"
 #include "phmc.h"
-#include "init_chi_spinor_field.h"
+#include "init/init_chi_spinor_field.h"
 #include "solver/matrix_mult_typedef_nd.h"
 #include "operator/clover_leaf.h"
 #include "operator/clovertm_operators.h"

diff --git a/operator.c b/operator.c
@@ -45,7 +45,6 @@
 #include "invert_overlap.h"
 #include "invert_clover_eo.h"
 #include "boundary.h"
-#include "init_chi_spinor_field.h"
 #include "start.h"
 #include "solver/eigenvalues.h"
 #include "solver/solver.h"

diff --git a/operator/Dov_psi.c b/operator/Dov_psi.c
@@ -55,7 +55,6 @@
 #include "solver/sub_low_ev.h"
 #include "Dov_psi.h"
 #include "solver/dirac_operator_eigenvectors.h"
-#include "init_spinor_field.h"
 
 void addproj_q_invsqrt(spinor * const Q, spinor * const P, const int n, const int N);
 /* |R>=rnorm^2 Q^2 |S> */

diff --git a/operator/Hopping_Matrix.c b/operator/Hopping_Matrix.c
@@ -60,7 +60,7 @@
 #  include "xchange/xchange.h"
 #endif
 #include "boundary.h"
-#include "init_dirac_halfspinor.h"
+#include "init/init_dirac_halfspinor.h"
 #include "update_backward_gauge.h"
 #ifdef BGQ
 #  include"DirectPut.h"

diff --git a/operator/tm_sub_Hopping_Matrix.c b/operator/tm_sub_Hopping_Matrix.c
@@ -45,7 +45,7 @@
 #  include "xchange/xchange.h"
 #endif
 #include "boundary.h"
-#include "init_dirac_halfspinor.h"
+#include "init/init_dirac_halfspinor.h"
 #include "update_backward_gauge.h"
 #include "tm_sub_Hopping_Matrix.h"
 

diff --git a/operator/tm_times_Hopping_Matrix.c b/operator/tm_times_Hopping_Matrix.c
@@ -45,7 +45,7 @@
 #  include "xchange/xchange.h"
 #endif
 #include "boundary.h"
-#include "init_dirac_halfspinor.h"
+#include "init/init_dirac_halfspinor.h"
 #include "update_backward_gauge.h"
 #include "tm_times_Hopping_Matrix.h"
 

diff --git a/phmc.c b/phmc.c
@@ -28,10 +28,9 @@
 #include "global.h"
 
 #include "read_input.h"
-#include "init_bispinor_field.h"
 #include "solver/eigenvalues_bi.h"
 #include "solver/solver.h"
-#include "init_chi_spinor_field.h"
+#include "init/init.h"
 #include "chebyshev_polynomial_nd.h"
 #include "Ptilde_nd.h"
 #include "operator/tm_operators_nd.h"

diff --git a/solver/dirac_operator_eigenvectors.c b/solver/dirac_operator_eigenvectors.c
@@ -31,7 +31,6 @@
 #include "operator/D_psi.h"
 #include "ranlxd.h"
 #include "operator/Dov_psi.h"
-#include "init_spinor_field.h"
 
 /*   typedef enum tm_operator_ {PRECWS_DTM,PRECWS_QTM,PRECWS_D_DAGGER_D} tm_operator; */
 

diff --git a/spinor_fft.c b/spinor_fft.c
@@ -20,7 +20,7 @@
 
 #include "spinor_fft.h"
 #include "mpi_init.h"
-#include "init_spinor_field.h"
+#include "init/init.h"
 
 #ifdef HAVE_FFTW
   #include <fftw3.h>

diff --git a/test/check_overlap.c b/test/check_overlap.c
@@ -58,13 +58,7 @@
 #include "sighandler.h"
 #include "boundary.h"
 #include "solver/solver.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 "init_bispinor_field.h"
-#include "init_chi_spinor_field.h"
+#include "init/init.h"
 #include "xchange_halffield.h"
 #include "stout_smear.h"
 #include "invert_eo.h"

diff --git a/test/test_eigenvalues.c b/test/test_eigenvalues.c
@@ -58,12 +58,7 @@
 #include "sighandler.h"
 #include "hybrid_update.h"
 #include "update_tm.h"
-#include "init_gauge_field.h"
-#include "init_geometry_indices.h"
-#include "init_spinor_field.h"
-#include "init_bispinor_field.h"
-#include "init_moment_field.h"
-#include "init_gauge_tmp.h"
+#include "init/init.h"
 #include "test/check_geometry.h"
 #include "boundary.h"
 #include "polyakov_loop.h"

diff --git a/test_lemon.c b/test_lemon.c
@@ -52,8 +52,7 @@
 #include "boundary.h"
 #include "global.h"
 #include "xchange/xchange.h"
-#include "init_gauge_field.h"
-#include "init_geometry_indices.h"
+#include "init/init.h"
 #include "measure_gauge_action.h"
 #include "mpi_init.h"
 

diff --git a/update_tm.c b/update_tm.c
@@ -55,7 +55,7 @@
 #include "expo.h"
 #include "xchange/xchange.h"
 #include "measure_rectangles.h"
-#include "init_gauge_tmp.h"
+#include "init/init_gauge_tmp.h"
 #include "monomial/monomial.h"
 #include "integrator.h"
 #include "hamiltonian_field.h"

diff --git a/xchange/xchange_halffield.c b/xchange/xchange_halffield.c
@@ -41,7 +41,7 @@
 #endif
 #include "mpi_init.h"
 #include "su3.h"
-#include "init_dirac_halfspinor.h"
+#include "init/init_dirac_halfspinor.h"
 #include "xchange_halffield.h"
 
 #if (defined _USE_HALFSPINOR)