From f1101a132d84d908371c900c8070aa0f7d060eda Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Thu, 23 Feb 2012 07:22:32 -0800 Subject: [PATCH] cleaned up unused variables --- src/cmfd_data.F90 | 3 --- src/cmfd_execute.F90 | 14 ++++++-------- src/cmfd_input.F90 | 5 ----- src/cmfd_jacobian_operator.F90 | 16 ---------------- src/cmfd_loss_operator.F90 | 1 - src/cmfd_output.F90 | 22 ++++------------------ src/cmfd_power_solver.F90 | 4 ---- src/cmfd_prod_operator.F90 | 2 -- src/cmfd_slepc_solver.F90 | 2 +- src/cmfd_snes_solver.F90 | 1 - 10 files changed, 11 insertions(+), 59 deletions(-) diff --git a/src/cmfd_data.F90 b/src/cmfd_data.F90 index dc8681aeee..e60ee826c4 100644 --- a/src/cmfd_data.F90 +++ b/src/cmfd_data.F90 @@ -287,10 +287,8 @@ contains integer :: neig_idx(3) ! spatial indices of neighbour integer :: bound(6) ! vector containing indices for boudary check real(8) :: albedo(6) ! albedo vector with global boundaries - real(8) :: cell_totxs ! total cross section of current ijk cell real(8) :: cell_dc ! diffusion coef of current cell real(8) :: cell_hxyz(3) ! cell dimensions of current ijk cell - real(8) :: neig_totxs ! total xs of neighbor cell real(8) :: neig_dc ! diffusion coefficient of neighbor cell real(8) :: neig_hxyz(3) ! cell dimensions of neighbor cell real(8) :: dtilde ! finite difference coupling parameter @@ -555,7 +553,6 @@ contains 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 integer :: i ! iteration counter for x integer :: j ! iteration counter for y integer :: k ! iteration counter for z diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90 index 59217c2753..56bc4676bf 100644 --- a/src/cmfd_execute.F90 +++ b/src/cmfd_execute.F90 @@ -29,7 +29,6 @@ contains subroutine execute_cmfd() integer :: ierr ! petsc error code - integer :: myrank ! initialize mpi communicator call petsc_init_mpi() @@ -89,7 +88,6 @@ contains integer :: ny ! number of mesh cells in y direction integer :: nz ! number of mesh cells in z direction integer :: ng ! number of energy groups - integer rank ! extract spatial and energy indices from object nx = cmfd % indices(1) @@ -132,12 +130,11 @@ contains subroutine petsc_init_mpi() - integer :: new_comm ! new communicator - integer :: orig_group ! original MPI group for MPI_COMM_WORLD - integer :: new_group ! new MPI group subset of orig_group - integer,allocatable :: ranks(:) ! ranks to include for petsc - integer :: k ! iteration counter - integer :: myrank=9999 + integer :: new_comm ! new communicator + integer :: orig_group ! original MPI group for MPI_COMM_WORLD + integer :: new_group ! new MPI group subset of orig_group + integer,allocatable :: ranks(:) ! ranks to include for petsc + integer :: k ! iteration counter ! set ranks 0-6 or min if (n_procs >= 6) then @@ -166,4 +163,5 @@ contains end subroutine petsc_init_mpi #endif + end module cmfd_execute diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index 0b631813e3..1836c1f25f 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -342,20 +342,15 @@ contains use hdf5 use hdf5_interface, only: hdf5_open_output, hdf5_close_output -! 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 - integer :: core_map_int ! open output file diff --git a/src/cmfd_jacobian_operator.F90 b/src/cmfd_jacobian_operator.F90 index f58450b7db..da9281b619 100644 --- a/src/cmfd_jacobian_operator.F90 +++ b/src/cmfd_jacobian_operator.F90 @@ -102,24 +102,9 @@ contains type(jacobian_operator) :: this type(operators) :: ctx - integer :: i ! iteration counter for x - integer :: j ! iteration counter for y - integer :: k ! iteration counter for z - integer :: g ! iteration counter for groups - integer :: l ! iteration counter for leakages - integer :: h ! energy group when doing scattering integer :: n ! the extent of the matrix - integer :: irow ! row counter - integer :: bound(6) ! vector for comparing when looking for bound - integer :: xyz_idx ! index for determining if x,y or z leakage - integer :: dir_idx ! index for determining - or + face of cell - integer :: neig_idx(3) ! spatial indices of neighbour - integer :: nxyz(3,2) ! single vector containing bound. locations - integer :: shift_idx ! parameter to shift index by +1 or -1 integer :: row_start ! index of local starting row integer :: row_end ! index of local final row - integer :: neig_mat_idx ! matrix index of neighbor cell - integer :: scatt_mat_idx ! matrix index for h-->g scattering terms ! get local problem size n = this%n @@ -203,7 +188,6 @@ contains integer :: row_end ! ending local row on process integer, allocatable :: dims(:) ! vec of starting and ending rows integer, allocatable :: dims1(:) ! vec of sizes on each proc - integer, allocatable :: nnzv(:) ! vector of number of nonzeros for jac integer, allocatable :: cols(:) ! vector of column numbers real(8) :: lambda ! eigenvalue real(8), pointer :: xptr(:) ! pointer to solution vector diff --git a/src/cmfd_loss_operator.F90 b/src/cmfd_loss_operator.F90 index ded0a613e0..28633e7c6f 100644 --- a/src/cmfd_loss_operator.F90 +++ b/src/cmfd_loss_operator.F90 @@ -262,7 +262,6 @@ contains integer :: dir_idx ! index for determining - or + face of cell integer :: neig_idx(3) ! spatial indices of neighbour integer :: shift_idx ! parameter to shift index by +1 or -1 - integer :: kount ! integer for counting values in vector integer :: row_start ! the first local row on the processor integer :: row_finish ! the last local row on the processor integer :: irow ! iteration counter over row diff --git a/src/cmfd_output.F90 b/src/cmfd_output.F90 index 8d0e6ae836..c95429249b 100644 --- a/src/cmfd_output.F90 +++ b/src/cmfd_output.F90 @@ -27,19 +27,11 @@ contains integer :: g ! iteration counter for g integer :: h ! iteration counter for outgoing groups integer :: l ! iteration counter for leakage - integer :: io_error ! error for opening file unit real(8) :: leakage ! leakage term in neutron balance real(8) :: interactions ! total number of interactions in balance real(8) :: scattering ! scattering term in neutron balance real(8) :: fission ! fission term in neutron balance real(8) :: res ! residual of neutron balance - character(MAX_FILE_LEN) :: filename - character(30) :: label - - ! open cmfd file for output -! filename = "cmfd_"//trim(to_str(current_cycle))//".out" -! open(FILE=filename, UNIT=UNIT_CMFD, STATUS='replace', ACTION='write', & -! IOSTAT=io_error) ! extract spatial and energy indices from object nx = cmfd % indices(1) @@ -136,16 +128,10 @@ contains use hdf5 use global, only: hdf5_output_file,hdf5_err -! character(LEN=7), parameter :: filename = "cmfd.h5" ! File name -! character(LEN=4) :: grpname = "cmfd" ! Group name - character(LEN=20) :: cycname ! cycle name - -! integer(HID_T) :: file_id ! File identifier - integer(HID_T) :: group_id ! Group identifier - integer(HID_T) :: cycle_id ! Another group id denoting cycle - integer(HID_T) :: dataspace_id ! Data space identifier - integer(HID_T) :: dataset_id ! Dataset identifier - + character(LEN=20) :: cycname ! cycle name + integer(HID_T) :: cycle_id ! Another group id denoting cycle + integer(HID_T) :: dataspace_id ! Data space identifier + integer(HID_T) :: dataset_id ! Dataset identifier integer(HSIZE_T), dimension(1) :: dim1 ! vector for hdf5 dimensions integer(HSIZE_T), dimension(3) :: dim3 ! vector for hdf5 dimensions integer(HSIZE_T), dimension(4) :: dim4 ! vector for hdf5 dimensions diff --git a/src/cmfd_power_solver.F90 b/src/cmfd_power_solver.F90 index 81e5f22964..5aef9e1ef1 100644 --- a/src/cmfd_power_solver.F90 +++ b/src/cmfd_power_solver.F90 @@ -194,13 +194,9 @@ contains real(8) :: stol = 1.e-5_8 ! tolerance on source real(8) :: kerr ! error in keff real(8) :: serr ! error in source - real(8) :: one = -1.0_8 ! one real(8) :: norm_n ! L2 norm of new source real(8) :: norm_o ! L2 norm of old source - integer :: floc ! location of max error in flux - integer :: sloc ! location of max error in source integer :: ierr ! petsc error code - integer :: n ! vector size ! reset convergence flag iconv = .FALSE. diff --git a/src/cmfd_prod_operator.F90 b/src/cmfd_prod_operator.F90 index 85f355ab09..31450370e8 100644 --- a/src/cmfd_prod_operator.F90 +++ b/src/cmfd_prod_operator.F90 @@ -179,9 +179,7 @@ contains integer :: j ! iteration counter for y integer :: k ! iteration counter for z integer :: g ! iteration counter for groups - integer :: l ! iteration counter for leakages integer :: h ! energy group when doing scattering - integer :: gmat_idx ! index in matrix for energy group g integer :: hmat_idx ! index in matrix for energy group h integer :: ierr ! Petsc error code integer :: row_start ! the first local row on the processor diff --git a/src/cmfd_slepc_solver.F90 b/src/cmfd_slepc_solver.F90 index 9ce096f119..dd913a3d52 100644 --- a/src/cmfd_slepc_solver.F90 +++ b/src/cmfd_slepc_solver.F90 @@ -148,7 +148,7 @@ call timer_start(time_cmfd) integer :: row_start ! starting row integer :: row_end ! ending row real(8),allocatable :: mybuf(:) ! temp buffer - PetscViewer :: viewer ! petsc output object +! PetscViewer :: viewer ! petsc output object PetscScalar, pointer :: phi_v(:) ! pointer to eigenvector info ! get problem size diff --git a/src/cmfd_snes_solver.F90 b/src/cmfd_snes_solver.F90 index 439edaf5e8..e55d1e40bf 100644 --- a/src/cmfd_snes_solver.F90 +++ b/src/cmfd_snes_solver.F90 @@ -66,7 +66,6 @@ contains integer :: n ! problem size integer :: row_start ! local row start integer :: row_end ! local row end - integer, allocatable :: nnzv(:) ! vector of number of nonzeros in jacobian real(8), pointer :: xptr(:) ! solution pointer ! set up operator matrices