From 01eba5338871c5f9a2c0a4849feecdb2516c5a68 Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Fri, 27 Jan 2012 20:30:23 -0500 Subject: [PATCH] cmfd now deallocated with call to destructor --- src/global.F90 | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/global.F90 b/src/global.F90 index d121993108..7224dfe428 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -239,21 +239,7 @@ contains if (allocated(source_bank)) deallocate(source_bank) ! Deallocate cmfd - if (allocated(cmfd % totalxs)) deallocate(cmfd % totalxs) - if (allocated(cmfd % p1scattxs)) deallocate(cmfd % p1scattxs) - if (allocated(cmfd % scattxs)) deallocate(cmfd % scattxs) - if (allocated(cmfd % nfissxs)) deallocate(cmfd % nfissxs) - if (allocated(cmfd % diffcof)) deallocate(cmfd % diffcof) - if (allocated(cmfd % current)) deallocate(cmfd % current) - if (allocated(cmfd % flux)) deallocate(cmfd % flux) - if (allocated(cmfd % dtilde)) deallocate(cmfd % dtilde) - if (allocated(cmfd % dhat)) deallocate(cmfd % dhat) - if (allocated(cmfd % hxyz)) deallocate(cmfd % hxyz) - if (allocated(cmfd % coremap)) deallocate(cmfd % coremap) - if (allocated(cmfd % phi)) deallocate(cmfd % phi) - if (allocated(cmfd % sourcepdf)) deallocate(cmfd % sourcepdf) - if (allocated(cmfd % sourcecounts)) deallocate(cmfd % sourcecounts) - if (allocated(cmfd % weightfactors)) deallocate(cmfd % weightfactors) + call deallocate_cmfd(cmfd) end subroutine free_memory