From a1a15e8445ba109f454f0400bb0c17317df78edd Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Sat, 10 Dec 2011 14:22:45 -0500 Subject: [PATCH] changed extension on cmfd files, commented out storage_size commands in source, modified Makefile for PETSc compilation --- src/Makefile | 3 +-- src/{cmfd_header.f90 => cmfd_header.F90} | 0 src/{cmfd_utils.f90 => cmfd_utils.F90} | 0 src/source.F90 | 16 ++++++++-------- 4 files changed, 9 insertions(+), 10 deletions(-) rename src/{cmfd_header.f90 => cmfd_header.F90} (100%) rename src/{cmfd_utils.f90 => cmfd_utils.F90} (100%) diff --git a/src/Makefile b/src/Makefile index 9b7cc0892a..7de59c267d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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} diff --git a/src/cmfd_header.f90 b/src/cmfd_header.F90 similarity index 100% rename from src/cmfd_header.f90 rename to src/cmfd_header.F90 diff --git a/src/cmfd_utils.f90 b/src/cmfd_utils.F90 similarity index 100% rename from src/cmfd_utils.f90 rename to src/cmfd_utils.F90 diff --git a/src/source.F90 b/src/source.F90 index b3b9a552f1..aa326be32a 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -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()