Removing obsolete files and updating version number

Author: detar

Make_contents

@@ -1,75 +1,45 @@
-# Makefile for building tar files of MILC code
-#  C. DeTar 8/9/02
-
-# Two ultimate targets:
-#   release  more stable code for general use
-#   work     less stable code for expert use
+# Makefile for building the tar file for the MILC code
+#  C. DeTar 7/13/05
 
 include Make_contents
 
-######################################################################
-# Release version
-
-# The rules for the component tar files
-
-${RELEASE_BASIC_TAR}: ${RELEASE_BASIC}
-	tar -cvf $@ ${RELEASE_BASIC}
-
-${RELEASE_PURE_GAUGE_TAR}: ${RELEASE_PG}
-	tar -cvf $@ ${RELEASE_PG}
-
-${RELEASE_KS_TAR}: ${RELEASE_KS}
-	tar -cvf $@ ${RELEASE_KS}
-
-${RELEASE_WILSON_TAR}: ${RELEASE_WILSON}
-	tar -cvf $@ ${RELEASE_WILSON}
-
-${RELEASE_CLOVER_TAR}: ${RELEASE_CLOVER}
-	tar -cvf $@ ${RELEASE_CLOVER}
-
-${RELEASE_NAME_ROOT}.tar.gz: ${RELEASE}
-	tar -cvf ${RELEASE_NAME_ROOT}.tar ${RELEASE}
-	gzip ${RELEASE_NAME_ROOT}.tar
-
-release: ${RELEASE_NAME_ROOT}.tar.gz
-
 ######################################################################
 # Collaboration version
 
 # The rules for the component tar files
 
-${WORK_BASIC_TAR}: ${WORK_BASIC}
-	tar -cvf $@ ${WORK_BASIC}
+${BASIC_TAR}: ${BASIC}
+	tar -cvf $@ ${BASIC}
 
-${WORK_PURE_GAUGE_TAR}: ${WORK_PG}
-	tar -cvf $@ ${WORK_PG}
+${PURE_GAUGE_TAR}: ${PG}
+	tar -cvf $@ ${PG}
 
-${WORK_FP_TAR}: ${WORK_FP}
-	tar -cvf $@ ${WORK_FP}
+${FP_TAR}: ${FP}
+	tar -cvf $@ ${FP}
 
-${WORK_KS_TAR}: ${WORK_KS}
-	tar -cvf $@ ${WORK_KS}
+${KS_TAR}: ${KS}
+	tar -cvf $@ ${KS}
 
-${WORK_WILSON_TAR}: ${WORK_WILSON}
-	tar -cvf $@ ${WORK_WILSON}
+${WILSON_TAR}: ${WILSON}
+	tar -cvf $@ ${WILSON}
 
-${WORK_CLOVER_TAR}: ${WORK_CLOVER}
-	tar -cvf $@ ${WORK_CLOVER}
+${CLOVER_TAR}: ${CLOVER}
+	tar -cvf $@ ${CLOVER}
 
-${WORK_FORM_TAR}: ${WORK_FORM}
-	tar -cvf $@ ${WORK_FORM}
+${FORM_TAR}: ${FORM}
+	tar -cvf $@ ${FORM}
 
-${WORK_INST_TAR}: ${WORK_INST}
-	tar -cvf $@ ${WORK_INST}
+${INST_TAR}: ${INST}
+	tar -cvf $@ ${INST}
 
-${WORK_SF_TAR}: ${WORK_SF}
-	tar -cvf $@ ${WORK_SF}
+${SF_TAR}: ${SF}
+	tar -cvf $@ ${SF}
 
-${WORK_NAME_ROOT}.tar.gz: ${WORK}
-	tar -cvf ${WORK_NAME_ROOT}.tar ${WORK}
-	gzip ${WORK_NAME_ROOT}.tar
-	-/bin/rm ${WORK_TAR}
+${NAME_ROOT}.tar.gz: ${WORK}
+	tar -cvf ${NAME_ROOT}.tar ${WORK}
+	gzip ${NAME_ROOT}.tar
+	-/bin/rm ${TAR}
 
-work: ${WORK_NAME_ROOT}.tar.gz
+all: ${NAME_ROOT}.tar.gz
 
 ######################################################################

Make_tar

@@ -27,7 +27,7 @@ DIRS = \
   ks_dynamical \
   ks_eigen \
   ks_hl_spectrum \
-  ks_imp_dyn2 \
+  ks_imp_dyn \
   ks_imp_invert_multi \
   ks_imp_utilities \
   propagating_form_factor \

Make_tar_update

@@ -9,7 +9,7 @@
 
 # 1.  See Make_time in the applications directory for instructions for
 #     compiling to turn on timing.  Currently we have timing for
-#     the applications "ks_imp_dyn2", "ks_dynamical", and "clover_invert"
+#     the applications "ks_imp_dyn" and "clover_invert"
 # 2.  Edit to select the appropriate job launch command below or
 #     create one for your platform.
 # 3.  Go to the application directory and run "make -f Make_time"

Make_test_release

@@ -8,8 +8,7 @@
 # C.D. 8/30/02
 
 DIRS = \
-  ks_imp_dyn2 \
-  ks_dynamical \
+  ks_imp_dyn \
   clover_invert
 
 

Make_test_work

@@ -1,5 +1,5 @@
 # Makefile for upacking tar files of MILC code
-#  C. DeTar 8/9/02
+#  C. DeTar 7/13/05
 
 # Targets
 #   all    gets all
@@ -17,8 +17,8 @@
 
 include Make_contents
 
-all: ${WORK_TAR}
-	for f in ${WORK_TAR} ;\
+all: ${TAR}
+	for f in ${TAR} ;\
         do \
 	tar -xf $$f ;\
 	done
@@ -39,10 +39,8 @@ ALL_APPS = \
   heavy \
   hqet_heavy_to_light \
   hvy_qpot \
-  ks_dynamical \
   ks_eigen \
-  ks_imp_dyn1 \
-  ks_imp_dyn2 \
+  ks_imp_dyn \
   ks_imp_utilities \
   ks_imp_invert_multi \
   propagating_form_factor \
@@ -68,11 +66,9 @@ h_dibaryon:  		MAKE_generic_wilson MAKE_generic_clover
 heavy:  		MAKE_generic_wilson 
 hqet_heavy_to_light:  	MAKE_generic_wilson MAKE_generic_clover MAKE_generic_form
 hvy_qpot: 		
-ks_dynamical:  		MAKE_generic_ks 
 ks_eigen:		MAKE_generic_ks 
 ks_hl_spectrum:	        MAKE_generic_ks MAKE_generic_wilson
-ks_imp_dyn1:		MAKE_generic_ks 
-ks_imp_dyn2:		MAKE_generic_ks 
+ks_imp_dyn:		MAKE_generic_ks 
 ks_imp_utilities:	MAKE_generic_ks 
 ks_imp_invert_multi:	MAKE_generic_ks 
 propagating_form_factor:  MAKE_generic_wilson MAKE_generic_clover  MAKE_generic_form
@@ -88,79 +84,77 @@ wilson_static:  	MAKE_generic_wilson
 # Rules for the generic directories
 
 MAKE_basic:
-	tar -xf ${WORK_BASIC_TAR}
+	tar -xf ${BASIC_TAR}
 
 MAKE_generic_clover:
-	tar -xf ${WORK_CLOVER_TAR} generic_clover
+	tar -xf ${CLOVER_TAR} generic_clover
 
 MAKE_generic_form:
-	tar -xf ${WORK_FORM_TAR} generic_form
+	tar -xf ${FORM_TAR} generic_form
 
 MAKE_generic_ks:
-	tar -xf ${WORK_KS_TAR} generic_ks
+	tar -xf ${KS_TAR} generic_ks
 
 MAKE_generic_pg:
-	tar -xf ${WORK_PURE_GAUGE_TAR} generic_pg
+	tar -xf ${PURE_GAUGE_TAR} generic_pg
 
 MAKE_generic_wilson:
-	tar -xf ${WORK_WILSON_TAR} generic_wilson
+	tar -xf ${WILSON_TAR} generic_wilson
 
 
 # Rules for specific application directories
 
 generic_pg \
 pure_gauge \
 hvy_qpot \
-: ${WORK_PURE_GAUGE_TAR}
-	tar -xf ${WORK_PURE_GAUGE_TAR} $@
+: ${PURE_GAUGE_TAR}
+	tar -xf ${PURE_GAUGE_TAR} $@
 
 generic_clover \
 clover_dynamical \
 clover_hybrids \
 clover_invert \
 h_dibaryon \
-: ${WORK_CLOVER_TAR}
-	tar -xf ${WORK_CLOVER_TAR} $@
+: ${CLOVER_TAR}
+	tar -xf ${CLOVER_TAR} $@
 
 generic_form \
 hqet_heavy_to_light \
 ks_hl_spectrum \
 propagating_form_factor \
-: ${WORK_FORM_TAR}
-	tar -xf ${WORK_FORM_TAR} $@
+: ${FORM_TAR}
+	tar -xf ${FORM_TAR} $@
 
 arb_dirac_invert \
 arb_dirac_eigen \
 symanzik_sl32 \
-: ${WORK_FP_TAR}
-	tar -xf ${WORK_FP_TAR} $@
+: ${FP_TAR}
+	tar -xf ${FP_TAR} $@
 
-smooth_inst : ${WORK_INST_TAR}
-	tar -xf ${WORK_INST_TAR} $@
+smooth_inst : ${INST_TAR}
+	tar -xf ${INST_TAR} $@
 
 generic_ks \
 dense_static_su3 \
-ks_dynamical \
 ks_eigen \
-ks_imp_dyn1 \
-ks_imp_dyn2 \
+ks_imp_dyn \
 ks_imp_utilities \
 ks_imp_invert_multi \
 string_break \
-: ${WORK_KS_TAR}
-	tar -xf ${WORK_KS_TAR} $@
+: ${KS_TAR}
+	tar -xf ${KS_TAR} $@
 
 generic_schroed \
 schroed_cl_inv \
 schroed_ks_dyn \
 schroed_pg \
-: ${WORK_SF_TAR}
-	tar -xf ${WORK_SF_TAR} $@
+: ${SF_TAR}
+	tar -xf ${SF_TAR} $@
 
 generic_wilson \
 heavy \
 wilson_dynamical \
 wilson_schroed \
 wilson_static \
-: ${WORK_WILSON_TAR}
-	tar -xf ${WORK_WILSON_TAR} $@
+: ${WILSON_TAR}
+	tar -xf ${WILSON_TAR} $@