organized Makefile further, fixed comment in cmfd utils

This commit is contained in:
Bryan Herman 2012-01-09 14:18:32 -05:00
parent 7db7cdc2fd
commit 29853e4071
2 changed files with 16 additions and 5 deletions

View file

@ -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
#===============================================================================

View file

@ -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)