restart capability active again, code is now back to where it was before reorganization

src/cmfd_execute.F90

@@ -5,7 +5,7 @@ module cmfd_execute
   use cmfd_power_solver, only: cmfd_power_execute
   use cmfd_slepc_solver, only: cmfd_slepc_execute
   use cmfd_snes_solver,  only: cmfd_snes_execute
-  use global,            only: cmfd
+  use global,            only: cmfd,cmfd_only
 
   implicit none
 
@@ -25,7 +25,7 @@ contains
     integer :: ierr  ! petsc error code
 
     ! set up cmfd
-    call set_up_cmfd()
+    if(.not. cmfd_only) call set_up_cmfd()
 
     ! initialize slepc/petsc
     call SlepcInitialize(PETSC_NULL_CHARACTER,ierr)
@@ -40,7 +40,7 @@ contains
     call SlepcFinalize(ierr)
 
     ! write vtk file
-    call write_cmfd_vtk()
+    if(.not. cmfd_only) call write_cmfd_vtk()
 
   end subroutine execute_cmfd
 

src/cmfd_input.F90

@@ -2,7 +2,7 @@ module cmfd_input
 
   implicit none
   private
-  public :: read_cmfd_xml
+  public :: read_cmfd_xml,read_cmfd_hdf5
 
 contains
 
@@ -248,4 +248,134 @@ contains
 
   end subroutine create_cmfd_tally
 
+!===============================================================================
+! READ_CMFD_HDF5 writes an hdf5 output file with the cmfd object for restarts
+!===============================================================================
+
+  subroutine read_cmfd_hdf5()
+
+    use cmfd_header, only: allocate_cmfd
+    use global,      only: cmfd
+
+#ifdef HDF5
+    use global, only: hdf5_output_file,hdf5_err
+    use hdf5
+    use hdf5_interface, only: hdf5_open_output, hdf5_close_output
+#endif
+
+! integer(HID_T) :: file_id ! File identifier
+    integer(HID_T) :: dataset_id ! Dataset identifier
+    integer :: error ! Error flag
+
+    integer(HSIZE_T), dimension(1) :: dim1
+    integer(HSIZE_T), dimension(3) :: dim3
+    integer(HSIZE_T), dimension(4) :: dim4
+    integer(HSIZE_T), dimension(5) :: dim5
+
+    integer :: nx ! number of mesh cells in x direction
+    integer :: ny ! number of mesh cells in y direction
+    integer :: nz ! number of mesh cells in z direction
+    integer :: ng ! number of energy groups
+
+    ! open output file
+    call hdf5_open_output()
+
+    ! read indices to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/indices",dataset_id,hdf5_err)
+    dim1 = (/4/)
+    call h5dread_f(dataset_id,H5T_NATIVE_INTEGER,cmfd%indices,dim1,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! get indices
+    nx = cmfd % indices(1)
+    ny = cmfd % indices(2)
+    nz = cmfd % indices(3)
+    ng = cmfd % indices(4)
+
+    ! allocate cmfd object
+    call allocate_cmfd(cmfd)
+
+    ! read totalxs to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/totalxs",dataset_id,hdf5_err)
+    dim4 = (/ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%totalxs,dim4,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read p1scattxs to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/p1scattxs",dataset_id,hdf5_err)
+    dim4 = (/ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%p1scattxs,dim4,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read scattxs to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/scattxs",dataset_id,hdf5_err)
+    dim5 = (/ng,ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%scattxs,dim5,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read scattxs to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/nfissxs",dataset_id,hdf5_err)
+    dim5 = (/ng,ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%nfissxs,dim5,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read diffcof to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/diffcof",dataset_id,hdf5_err)
+    dim4 = (/ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%diffcof,dim4,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read current to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/current",dataset_id,hdf5_err)
+    dim5 = (/12,ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%current,dim5,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read flux to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/flux",dataset_id,hdf5_err)
+    dim4 = (/ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%flux,dim4,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read dtilde to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/dtilde",dataset_id,hdf5_err)
+    dim5 = (/6,ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%dtilde,dim5,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read dhat to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/dhat",dataset_id,hdf5_err)
+    dim5 = (/6,ng,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%dhat,dim5,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read albedo to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/albedo",dataset_id,hdf5_err)
+    dim1 = (/6/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%albedo,dim1,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read hxyz to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/hxyz",dataset_id,hdf5_err)
+    dim4 = (/3,nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_DOUBLE,cmfd%hxyz,dim4,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read coremap to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/coremap",dataset_id,hdf5_err)
+    dim3 = (/nx,ny,nz/)
+    call h5dread_f(dataset_id,H5T_NATIVE_INTEGER,cmfd%coremap,dim3,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! read mat_dim to cmfd object
+    call h5dopen_f(hdf5_output_file,"cmfd/mat_dim",dataset_id,hdf5_err)
+    dim1 = (/1/)
+    call h5dread_f(dataset_id,H5T_NATIVE_INTEGER,cmfd%mat_dim,dim1,hdf5_err)
+    call h5dclose_f(dataset_id,hdf5_err)
+
+    ! close output file
+    call hdf5_close_output()
+
+  end subroutine read_cmfd_hdf5
+
 end module cmfd_input

src/main.F90

@@ -1,7 +1,7 @@
 program main
 
   use cmfd_execute,    only: execute_cmfd
-! use cmfd_utils,      only: read_hdf5
+  use cmfd_input,      only: read_cmfd_hdf5
   use constants
   use global
   use finalize,        only: finalize_run
@@ -46,14 +46,18 @@ program main
     ! set CMFD only to true
     cmfd_only = .TRUE.
 
+#ifdef HDF5
     ! read in HDF5 file
-!   call read_hdf5()
+    call read_cmfd_hdf5()
 
     ! run diffusion
-!   call cmfd_solver()
+    call execute_cmfd() 
 
     ! deallocate arrays
-!   call free_memory()
+    call free_memory()
+#else
+    write(*,*) 'Restart capability not supported without HDF5'
+#endif
 
     ! terminate code
     stop