From 409c74bc55fd68e8b8971e356e7ab345dfcf5c1b Mon Sep 17 00:00:00 2001
From: Bryan Herman <bherman@kilkenny.bw01.mit.edu>
Date: Sat, 11 Feb 2012 12:02:34 -0800
Subject: [PATCH] slepc solver eigenvector is now placed in parallel in cmfd
 object

---
 src/cmfd_execute.F90      |  4 ++--
 src/cmfd_slepc_solver.F90 | 33 +++++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90
index bf9bed0e72..797fb85777 100644
--- a/src/cmfd_execute.F90
+++ b/src/cmfd_execute.F90
@@ -41,7 +41,7 @@ contains
     if (master) then
 
       ! begin timer
-!     call timer_start(time_cmfd)
+      call timer_start(time_cmfd)
 
       ! set up cmfd
       if(.not. cmfd_only) call set_up_cmfd()
@@ -57,7 +57,7 @@ contains
 #endif
 
       ! stop timer
-!     call timer_stop(time_cmfd)
+      call timer_stop(time_cmfd)
 
       ! write vtk file
       !if(.not. cmfd_only) call write_cmfd_vtk()
diff --git a/src/cmfd_slepc_solver.F90 b/src/cmfd_slepc_solver.F90
index e5097a33cf..a3257bb611 100644
--- a/src/cmfd_slepc_solver.F90
+++ b/src/cmfd_slepc_solver.F90
@@ -39,8 +39,6 @@ contains
 
     ! build operators
     call build_loss_matrix(loss)
-    call MPI_Barrier(MPI_COMM_WORLD,ierr)
-
     call build_prod_matrix(prod)
 
     ! set operators to EPS object
@@ -128,10 +126,13 @@ contains
 
   subroutine extract_results()
 
-    use global, only: cmfd,path_input
+    use global, only: cmfd,path_input,master
 
     integer              :: n         ! problem size
     integer              :: i_eig = 0 ! eigenvalue to extract
+    integer              :: row_start ! starting row 
+    integer              :: row_end   ! ending row
+    real(8),allocatable  :: mybuf(:)  ! temp buffer
     PetscViewer          :: viewer    ! petsc output object
     PetscScalar, pointer :: phi_v(:)  ! pointer to eigenvector info
  
@@ -140,18 +141,34 @@ contains
 
     ! also allocate in cmfd object
     if (.not. allocated(cmfd%phi)) allocate(cmfd%phi(n))
+!   if (.not. allocated(mybuf)) allocate(mybuf(n))
+
+    ! zero out cmfd object
+!   cmfd%phi = 0.0_8
 
     ! extract run information
-!   call EPSGetEigenpair(eps,i_eig,keff,PETSC_NULL,phi,PETSC_NULL_OBJECT,ierr)
-    call EPSGetEigenpair(eps,i_eig,keff,PETSC_NULL,PETSC_NULL_OBJECT,PETSC_NULL_OBJECT,ierr)
+    call EPSGetEigenpair(eps,i_eig,keff,PETSC_NULL,phi,PETSC_NULL_OBJECT,ierr)
+!   call EPSGetEigenpair(eps,i_eig,keff,PETSC_NULL,PETSC_NULL_OBJECT,PETSC_NULL_OBJECT,ierr)
+
+    ! get ownership range
+    call VecGetOwnershipRange(phi,row_start,row_end,ierr)
+
     ! convert petsc phi_object to cmfd_obj
-!   call VecGetArrayF90(phi,phi_v,ierr)
-!   cmfd%phi = phi_v
-!   call VecRestoreArrayF90(phi,phi_v,ierr)
+    call VecGetArrayF90(phi,phi_v,ierr)
+    cmfd%phi(row_start+1:row_end) = phi_v
+    call VecRestoreArrayF90(phi,phi_v,ierr)
 
     ! save eigenvalue
     cmfd%keff = keff
 
+    ! reduce result to master
+!   mybuf = 0.0_8
+!   print *,cmfd%phi
+!   call MPI_REDUCE(cmfd%phi,mybuf,n,MPI_SUM,master,MPI_COMM_WORLD,ierr)
+!   call MPI_Barrier(MPI_COMM_WORLD,ierr)
+!   stop
+!   if (master) print *,mybuf
+
     ! write out results
 !   call PetscViewerBinaryOpen(PETSC_COMM_SELF,trim(path_input)//'fluxvec.bin' &
 !  &     ,FILE_MODE_WRITE,viewer,ierr)