From 29853e407189c7307c2b1b4669e13d334a94e2d8 Mon Sep 17 00:00:00 2001
From: Bryan Herman <bherman@mit.edu>
Date: Mon, 9 Jan 2012 14:18:32 -0500
Subject: [PATCH] organized Makefile further, fixed comment in cmfd utils

---
 src/Makefile       | 17 +++++++++++++----
 src/cmfd_utils.F90 |  4 +++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 486400d06a..16b08332bc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,11 +16,11 @@ include OBJECTS
 #===============================================================================
 
 COMPILER    = petsc
-DEBUG       = no
+DEBUG       = no 
 PROFILE     = no
 OPTIMIZE    = no
 USE_MPI     = no
-USE_HDF5    = yes 
+USE_HDF5    = yes
 
 #===============================================================================
 # Intel Fortran compiler options
@@ -85,8 +85,17 @@ ifeq ($(COMPILER),petsc)
   include ${PETSC_DIR}/conf/variables
   include ${PETSC_DIR}/conf/rules
   LDFLAGS = ${PETSC_SYS_LIB}
-  F90FLAGS += -I${HDF5_PREFIX}/include
-  LDFLAGS += -L${HDF5_PREFIX}/lib ${HDF5_PREFIX}/lib/libhdf5hl_fortran.a  ${HDF5_PREFIX}/lib/libhdf5_hl.a ${HDF5_PREFIX}/lib/libhdf5_fortran.a ${HDF5_PREFIX}/lib/libhdf5.a -lz -lrt -lm -Wl,-rpath -Wl,${HDF5_PREFIX}/lib
+
+  ifeq ($(USE_HDF5),yes)
+    F90FLAGS += -I${HDF5_PREFIX}/include
+    LDFLAGS += -L${HDF5_PREFIX}/lib ${HDF5_PREFIX}/lib/libhdf5hl_fortran.a ${HDF5_PREFIX}/lib/libhdf5_hl.a ${HDF5_PREFIX}/lib/libhdf5_fortran.a ${HDF5_PREFIX}/lib/libhdf5.a -lz -lrt -lm -Wl,-rpath -Wl,${HDF5_PREFIX}/lib
+  endif
+
+  ifeq ($(DEBUG),yes)
+    F90FLAGS += -g -fbacktrace -fbounds-check
+    LDFLAGS  += -g
+  endif
+
 endif
 
 #===============================================================================
diff --git a/src/cmfd_utils.F90 b/src/cmfd_utils.F90
index 26eed73a10..4cc9b2b6ca 100644
--- a/src/cmfd_utils.F90
+++ b/src/cmfd_utils.F90
@@ -465,6 +465,8 @@ contains
     ! close file
     close(UNIT=UNIT_CMFD)
 
+    STOP
+
   end subroutine neutron_balance
 
 !===============================================================================
@@ -520,7 +522,7 @@ contains
   end subroutine set_coremap
 
 !===============================================================================
-! GET_REFLECTOR_ALBEDO is a function that calculates the albedo to the reflector 
+! GET_REFLECTOR_ALBEDO is a function that calculates the albedo to the reflector
 !===============================================================================
 
   function get_reflector_albedo(l,g,i,j,k)