flushing now performed with sets

src/cmfd_execute.F90

@@ -82,8 +82,8 @@ contains
 
   subroutine cmfd_init_batch()
 
-    use global,            only: cmfd_begin, cmfd_on, cmfd_tally_on,         &
-                                 cmfd_inact_flush, cmfd_act_flush, cmfd_run, &
+    use global,            only: cmfd_begin, cmfd_on, cmfd_tally_on, &
+                                 cmfd_reset, cmfd_run,               &
                                  current_batch, cmfd_hold_weights
 
     ! Check to activate CMFD diffusion and possible feedback
@@ -97,21 +97,9 @@ contains
     ! If this is a restart run and we are just replaying batches leave
     if (restart_run .and. current_batch <= restart_batch) return
 
-    ! Check to flush cmfd tallies for active batches, no more inactive flush
-    if (cmfd_run .and. cmfd_act_flush == current_batch) then
+    ! Check to reset tallies
+    if (cmfd_run .and. cmfd_reset % contains(current_batch)) then
       call cmfd_tally_reset()
-      cmfd_tally_on = .true.
-      cmfd_inact_flush(2) = -1
-    end if
-
-    ! Check to flush cmfd tallies during inactive batches (>= on number of
-    ! flushes important as the code will flush on the first batch which we
-    ! dont want to count)
-    if (cmfd_run .and. mod(current_batch,cmfd_inact_flush(1))   &
-       == 0 .and. cmfd_inact_flush(2) > 0 .and. cmfd_begin < current_batch) then
-        cmfd_hold_weights = .true.
-        call cmfd_tally_reset()
-        cmfd_inact_flush(2) = cmfd_inact_flush(2) - 1
     end if
 
   end subroutine cmfd_init_batch

src/cmfd_input.F90

@@ -68,6 +68,7 @@ contains
 
     integer :: ng
     integer, allocatable :: iarray(:)
+    integer, allocatable :: int_array(:)
     logical :: file_exists ! does cmfd.xml exist?
     logical :: found
     character(MAX_LINE_LEN) :: filename
@@ -216,15 +217,20 @@ contains
         cmfd_tally_on = .false.
     end if
 
-    ! Inactive batch flush window
-    if (check_for_node(doc, "inactive_flush")) &
-      call get_node_value(doc, "inactive_flush", cmfd_inact_flush(1))
-    if (check_for_node(doc, "num_flushes")) &
-      call get_node_value(doc, "num_flushes", cmfd_inact_flush(2))
-
-    ! Last flush before active batches
-    if (check_for_node(doc, "active_flush")) &
-      call get_node_value(doc, "active_flush", cmfd_act_flush)
+    ! Check for cmfd tally resets
+    if (check_for_node(doc, "tally_reset")) then
+      n_cmfd_resets = get_arraysize_integer(doc, "tally_reset")
+    else
+      n_cmfd_resets = 0
+    end if
+    if (n_cmfd_resets > 0) then
+      allocate(int_array(n_cmfd_resets))
+      call get_node_array(doc, "tally_reset", int_array)
+      do i = 1, n_cmfd_resets
+        call cmfd_reset % add(int_array(i))
+      end do
+      deallocate(int_array)
+    end if
 
     ! Get display
     if (check_for_node(doc, "display")) &

src/global.F90

@@ -347,11 +347,9 @@ module global
   ! Batch to begin cmfd
   integer :: cmfd_begin = 1
 
-  ! When and how long to flush cmfd tallies during inactive batches
-  integer :: cmfd_inact_flush(2) = (/9999,1/)
-
-  ! Batch to last flush before active batches
-  integer :: cmfd_act_flush = 0
+  ! Tally reset list
+  integer :: n_cmfd_resets
+  type(SetInt) :: cmfd_reset
 
   ! Compute effective downscatter cross section
   logical :: cmfd_downscatter = .false.