to merge

--HG-- branch : week-of-code
clairekope · Nov 13, 2009 · d860837 · d860837
1 parent f13246d
commit d860837
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/src/enzo/Grid_StarParticleHandler.C b/src/enzo/Grid_StarParticleHandler.C
@@ -914,7 +914,7 @@ int grid::StarParticleHandler(HierarchyEntry* SubgridPointer, int level)
     if (NumberOfNewParticles > 0) {
 
       if (debug)
-	printf("StarParticle: New StarParticles = %"ISYM"\n", NumberOfNewParticles);
+	printf("Grid_StarParticleHandler: New StarParticles = %"ISYM"\n", NumberOfNewParticles);
 
       /* Set the particle numbers.  The correct indices will be assigned in 
 	 CommunicationUpdateStarParticleCount in StarParticleFinalize later.*/

diff --git a/src/enzo/Make.config.objects b/src/enzo/Make.config.objects
@@ -128,7 +128,6 @@ OBJS_CONFIG_LIB = \
         ExposeGridHierarchy.o \
         ExternalBoundary_AppendForcingToBaryonFields.o \
         ExternalBoundary_constructor.o \
-	ExternalBoundary_DeleteObsoleteFields.o \
         ExternalBoundary_DetachForcingFromBaryonFields.o \
         ExternalBoundary_IdentifyPhysicalQuantities.o \
         ExternalBoundary_InitializeExternalBoundaryFaceIO.o \
@@ -281,7 +280,6 @@ OBJS_CONFIG_LIB = \
 	Grid_FlagCellsToBeRefinedByMetallicity.o	\
         Grid_DepositMustRefineParticles.o \
 	Grid_FlagCellsToBeRefinedByMustRefineRegion.o	\
-	Grid_DeleteObsoleteFields.o \
         Grid_DepositBaryons.o \
         Grid_DepositParticlePositions.o \
         Grid_DepositParticlePositionsLocal.o \

diff --git a/src/enzo/Makefile b/src/enzo/Makefile
@@ -47,7 +47,6 @@ MODULES  =
 VERBOSE  = 0
 
 # please remove this
-SVN      = hg
 
 #-----------------------------------------------------------------------
 # Make.config.settings is used for setting default values to all compile-time 
@@ -158,10 +157,10 @@ verbose: $(EXE).exe
 	  $(FC) -c -o $@ $(FFLAGS) $*.f >& $(OUTPUT) ; \
 	else \
 	  $(FC) -c -o $@ $(FFLAGS) $*.f >> $(OUTPUT) 2>&1 ; \
-	fi ; \
-	if [ -e $@ ]; then \
+	fi)
+	@(if [ -e $@ ]; then \
              rm -f $*.f; \
-        else \
+          else \
              echo; \
              echo "$(CPP) $(DEFINES) $(CPPFLAGS) $*.src > $*.f"; \
              echo "$(FC) -c -o $@ $(FFLAGS) $*.f"; \
@@ -170,7 +169,7 @@ verbose: $(EXE).exe
              $(FC) -c -o $@ $(FFLAGS) $*.f; \
              echo; \
              exit 1; \
-        fi)
+          fi)
 
 .src90.f90:
 	@echo "Compiling $<"
@@ -181,10 +180,10 @@ verbose: $(EXE).exe
 	  $(F90) -c -o $@ $(F90FLAGS) $*.f90 >& $(OUTPUT) ; \
 	else \
 	  $(F90) -c -o $@ $(F90FLAGS) $*.f90 >> $(OUTPUT) 2>&1 ; \
-	fi ; \
-	if [ -e $@ ]; then \
+	fi)
+	@(if [ -e $@ ]; then \
              rm -f $*.f90; \
-        else \
+          else \
              echo; \
              echo "$(CPP) $(DEFINES) $(CPPFLAGS) $*.src90 > $*.f90"; \
              echo "$(F90) -c -o $@ $(F90FLAGS) $*.f90"; \
@@ -193,7 +192,7 @@ verbose: $(EXE).exe
              $(F90) -c -o $@ $(F90FLAGS) $*.f90; \
              echo; \
              exit 1; \
-        fi)
+          fi)
 
 .c.o:
 	@rm -f $@
@@ -204,15 +203,15 @@ verbose: $(EXE).exe
 	else \
 	  $(CC) -c -o $@ $(DEFINES) $(CFLAGS) $(INCLUDES) $*.c \
 	    >> $(OUTPUT) 2>&1 ; \
-	fi ; \
-	if [ ! -e $@ ]; then \
+	fi)
+	@(if [ ! -e $@ ]; then \
              echo; \
              echo "$(CC) -c -o $@ $(DEFINES) $(CFLAGS) $(INCLUDES) $*.c"; \
              echo; \
              $(CC) -c -o $@ $(DEFINES) $(CFLAGS) $(INCLUDES) $*.c;\
              echo; \
              exit 1; \
-        fi)
+          fi)
 
 .C.o:
 	@rm -f $@
@@ -223,15 +222,15 @@ verbose: $(EXE).exe
 	else \
 	  $(CXX) -c -o $@ $(DEFINES) $(CXXFLAGS) $(INCLUDES) $*.C \
 	    >> $(OUTPUT) 2>&1 ; \
-	fi ; \
-	if [ ! -e $@ ]; then \
+	fi)
+	@(if [ ! -e $@ ]; then \
              echo; \
              echo "$(CXX) -c -o $@ $(DEFINES) $(CXXFLAGS) $(INCLUDES) $*.C"; \
              echo; \
              $(CXX) -c -o $@ $(DEFINES) $(CXXFLAGS) $(INCLUDES) $*.C;\
              echo; \
              exit 1; \
-        fi)
+          fi)
 
 .cu.o: 
 	@rm -f $@
@@ -242,15 +241,15 @@ verbose: $(EXE).exe
 	else \
 	  $(CUDACOMPILER) -c -o $@ $(DEFINES) $(CUDACOMPFLAGS) \
 	    $(INCLUDES) $*.cu >> $(OUTPUT) 2>&1 ; \
-	fi ; \
-	if [ ! -e $@ ]; then \
+	fi)
+	@(if [ ! -e $@ ]; then \
 	     echo; \
              echo "$(CUDACOMPILER) -c -o $@ $(DEFINES) $(CUDACOMPFLAGS) $(INCLUDES) $*.cu"; \
              echo; \
              $(CUDACOMPILER)  -c -o $@ $(DEFINES) $(CUDACOMPFLAGS) $(INCLUDES) $*.cu;\
              echo; \
              exit 1; \
-        fi)
+          fi)
 
 #-----------------------------------------------------------------------
 # Generate all make-generated source files