changed extension on cmfd files, commented out storage_size commands in source, modified Makefile for PETSc compilation

This commit is contained in:
Bryan Herman 2011-12-10 14:22:45 -05:00
parent bf9cbb0c16
commit a1a15e8445
4 changed files with 9 additions and 10 deletions

View file

@ -77,10 +77,9 @@ ifeq ($(COMPILER),gfortran)
endif
# use petsc compiler
ifeq ($(COMPILER),petsc)
F90 = ${FLINKER}
F90FLAGS := -cpp -ffree-form
F90FLAGS := -cpp -ffree-form -I ${PETSC_DIR}/include
include ${PETSC_DIR}/conf/variables
include ${PETSC_DIR}/conf/rules
LDFLAGS = ${PETSC_SYS_LIB}

View file

@ -45,11 +45,11 @@ contains
! Allocate source bank
allocate(source_bank(maxwork), STAT=alloc_err)
if (alloc_err /= 0) then
#ifndef NO_F2008
bytes = maxwork * storage_size(bank_obj) / 8
#else
!#ifndef NO_F2008
! bytes = maxwork * storage_size(bank_obj) / 8
!#else
bytes = maxwork * 64 / 8
#endif
!#endif
message = "Could not allocate source bank. Attempted to allocate " &
// trim(int_to_str(bytes)) // " bytes."
call fatal_error()
@ -58,11 +58,11 @@ contains
! Allocate fission bank
allocate(fission_bank(3*maxwork), STAT=alloc_err)
if (alloc_err /= 0) then
#ifndef NO_F2008
bytes = 3 * maxwork * storage_size(bank_obj) / 8
#else
!#ifndef NO_F2008
! bytes = 3 * maxwork * storage_size(bank_obj) / 8
!#else
bytes = 3 * maxwork * 64 / 8
#endif
!#endif
message = "Could not allocate fission bank. Attempted to allocate " &
// trim(int_to_str(bytes)) // " bytes."
call fatal_error()