Merge branch 'develop' into threading-new

docs/source/quickinstall.rst

@@ -43,6 +43,7 @@ following commands in a terminal:
 
     git clone git://github.com/mit-crpg/openmc.git
     cd openmc/src
+    git checkout master
     make
     sudo make install
 

docs/source/usersguide/install.rst

@@ -102,6 +102,12 @@ repository::
 
     git clone git://github.com/mit-crpg/openmc.git
 
+By default, the cloned repository will be set to the development branch. To
+switch to the source of the latest stable release, run the following commands::
+
+    cd openmc/src
+    git checkout master
+
 .. _GitHub: https://github.com/mit-crpg/openmc
 .. _git: http://git-scm.com
 .. _ssh: http://en.wikipedia.org/wiki/Secure_Shell

src/eigenvalue.F90

@@ -102,6 +102,9 @@ contains
     ! END OF RUN WRAPUP
 
     if (master) call header("SIMULATION FINISHED", level=1)
+    
+    ! Clear particle
+    call p % clear()
 
   end subroutine run_eigenvalue
 

src/global.F90

@@ -423,6 +423,19 @@ contains
     if (allocated(xs_listings)) deallocate(xs_listings)
     if (allocated(micro_xs)) deallocate(micro_xs)
 
+    ! Deallocate external source
+    if (allocated(external_source % params_space)) &
+         deallocate(external_source % params_space)
+    if (allocated(external_source % params_angle)) &
+         deallocate(external_source % params_angle)
+    if (allocated(external_source % params_energy)) &
+         deallocate(external_source % params_energy)
+
+    ! Deallocate k and entropy
+    if (allocated(k_generation)) deallocate(k_generation)
+    if (allocated(entropy)) deallocate(entropy)
+    if (allocated(entropy_p)) deallocate(entropy_p)
+
     ! Deallocate tally-related arrays
     if (allocated(meshes)) deallocate(meshes)
     if (allocated(tallies)) then
@@ -464,6 +477,9 @@ contains
     call nuclide_dict % clear()
     call sab_dict % clear()
     call xs_listing_dict % clear()
+
+    ! Clear statepoint batch set
+    call statepoint_batch % clear()
     
   end subroutine free_memory
 

src/initialize.F90

@@ -421,6 +421,8 @@ contains
     integer, allocatable :: index_cell_in_univ(:) ! the index in the univ%cells
                                                   ! array for each universe
     type(ElemKeyValueII), pointer :: pair_list => null()
+    type(ElemKeyValueII), pointer :: current => null()
+    type(ElemKeyValueII), pointer :: next => null()
     type(Universe),       pointer :: univ => null()
     type(Cell),           pointer :: c => null()
 
@@ -432,11 +434,12 @@ contains
     ! cells_in_univ_dict, it's the id of the universe and the number of cells.
 
     pair_list => universe_dict % keys()
-    do while (associated(pair_list))
+    current => pair_list
+    do while (associated(current))
       ! find index of universe in universes array
-      i_univ = pair_list % value
+      i_univ = current % value
       univ => universes(i_univ)
-      univ % id = pair_list % key
+      univ % id = current % key
 
       ! check for lowest level universe
       if (univ % id == 0) BASE_UNIVERSE = i_univ
@@ -449,7 +452,9 @@ contains
       univ % n_cells = n_cells_in_univ
 
       ! move to next universe
-      pair_list => pair_list % next
+      next => current % next
+      deallocate(current)
+      current => next
     end do
 
     ! Also allocate a list for keeping track of where cells have been assigned

src/particle_header.F90

@@ -77,6 +77,7 @@ module particle_header
 
   contains
     procedure :: initialize => initialize_particle
+    procedure :: clear => clear_particle
   end type Particle
 
 contains
@@ -110,6 +111,9 @@ contains
 
     class(Particle) :: this
 
+    ! Clear coordinate lists
+    call this % clear()
+
     ! Set particle to neutron that's alive
     this % type  = NEUTRON
     this % alive = .true.
@@ -126,9 +130,6 @@ contains
     this % wgt_bank      = ZERO
     this % n_collision   = 0
 
-    ! remove any original coordinates
-    call deallocate_coord(this % coord0)
-
     ! Set up base level coordinates
     allocate(this % coord0)
     this % coord0 % universe = BASE_UNIVERSE
@@ -136,4 +137,20 @@ contains
 
   end subroutine initialize_particle
 
+!===============================================================================
+! CLEAR_PARTICLE
+!===============================================================================
+
+  subroutine clear_particle(this)
+
+    class(Particle) :: this
+
+    ! remove any coordinate levels
+    call deallocate_coord(this % coord0)
+
+    ! Make sure coord pointer is nullified
+    nullify(this % coord)
+
+  end subroutine clear_particle
+
 end module particle_header