From cd56eef967f6bf9caf5b7fb474ef4466d9e4fbaf Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Thu, 20 Jun 2013 06:56:53 -0700 Subject: [PATCH 1/5] removed CMFD checks on keff and albedos --- src/cmfd_execute.F90 | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90 index 197a6ec561..7588d11a52 100644 --- a/src/cmfd_execute.F90 +++ b/src/cmfd_execute.F90 @@ -36,11 +36,6 @@ contains cmfd_act_flush, current_batch, keff, & n_batches, message, master, mpi_err, rank - logical :: leave_cmfd - - ! set leave cmfd to false - leave_cmfd = .false. - ! stop cmfd timer if (master) then call time_cmfd % start() @@ -60,17 +55,6 @@ contains end if - ! check to hold weights - if (cmfd_hold_weights) then - message = 'Not Modifying Weights - Albedo estimate not good, increase batch size.' - call warning() - cmfd_hold_weights = .false. - if (cmfd_feedback) call cmfd_reweight(.false.) - leave_cmfd = .true. - end if - call MPI_BCAST(leave_cmfd, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, mpi_err) - if (leave_cmfd) return - ! filter processors (lowest PETSc group) if (rank < n_procs_cmfd) then @@ -100,19 +84,6 @@ contains end if - ! check to hold weights - if ((abs(cmfd%keff-keff)/keff > cmfd_keff_tol)) then - if (current_batch >= cmfd_inact_flush(1) .or. & - current_batch >= cmfd_act_flush - 1 ) then - message = 'Not Modifying Weights - keff %diff > 0.005, up batch size' - call warning() - if (cmfd_feedback) call cmfd_reweight(.false.) - leave_cmfd = .true. - end if - end if - call MPI_BCAST(leave_cmfd, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, mpi_err) - if (leave_cmfd) return - ! calculate fission source call calc_fission_source() From 182ebdba45b27b24931071d3d1650bcd751d8fd7 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 20 Jun 2013 05:35:48 -0400 Subject: [PATCH 2/5] Moved the setting of estimator to exist for all cases with energyout filters. Conflicts: src/input_xml.F90 --- src/input_xml.F90 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 45abaf9a2e..229282bfe1 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -1747,6 +1747,9 @@ contains tally_(i) % filter(j) % bins(k)) end do + ! Set to analog estimator + t % estimator = ESTIMATOR_ANALOG + case default ! Specified tally filter is invalid, raise error message = "Unknown filter type '" // trim(tally_(i) % & @@ -1958,6 +1961,7 @@ contains end if case ('scatter') t % score_bins(j) = SCORE_SCATTER + case ('nu-scatter') t % score_bins(j) = SCORE_NU_SCATTER From 76ddc858d6331a296c6ddc672174ff1e2348223b Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 21 Jun 2013 16:11:17 -0400 Subject: [PATCH 3/5] Added note about TENDL in documentation. --- docs/source/usersguide/install.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst index 077befb5be..ef01aeff7f 100644 --- a/docs/source/usersguide/install.rst +++ b/docs/source/usersguide/install.rst @@ -239,7 +239,8 @@ Cross Section Configuration In order to run a simulation with OpenMC, you will need cross section data for each nuclide in your problem. Since OpenMC uses ACE format cross sections, you can use nuclear data that was processed with NJOY, such as that distributed with -MCNP_ or Serpent_. +MCNP_ or Serpent_. The TALYS-based evaluated nuclear data library, TENDL_, is +openly available in ACE format. Using JEFF Cross Sections from OECD/NEA --------------------------------------- @@ -292,6 +293,7 @@ file. .. _here: http://www.oecd-nea.org/dbdata/pubs/jeff312-cd.html .. _MCNP: http://mcnp.lanl.gov .. _Serpent: http://montecarlo.vtt.fi +.. _TENDL: ftp://ftp.nrg.eu/pub/www/talys/tendl2012/tendl2012.html -------------- Running OpenMC From 075f8f0b896a491e3287f2a5c1f8d8a1b8eadec5 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Sat, 22 Jun 2013 17:31:10 -0400 Subject: [PATCH 4/5] Fix divide-by-zero when no inactive batches. --- src/output.F90 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/output.F90 b/src/output.F90 index 1ff53f0d01..50c3726487 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -1420,16 +1420,20 @@ contains gen_per_batch) / time_active % elapsed end if else - speed_inactive = real(n_particles * n_inactive * gen_per_batch) / & - time_inactive % elapsed + if (n_inactive > 0) then + speed_inactive = real(n_particles * n_inactive * gen_per_batch) / & + time_inactive % elapsed + end if speed_active = real(n_particles * n_active * gen_per_batch) / & time_active % elapsed end if ! display calculation rate - string = to_str(speed_inactive) - if (.not. (restart_run .and. (restart_batch >= n_inactive))) & - write(ou,101) "Calculation Rate (inactive)", trim(string) + if (.not. (restart_run .and. (restart_batch >= n_inactive)) & + .and. n_inactive > 0) then + string = to_str(speed_inactive) + write(ou,101) "Calculation Rate (inactive)", trim(string) + end if string = to_str(speed_active) write(ou,101) "Calculation Rate (active)", trim(string) From 551f3a2012e5800b48f03d899b321ea70942070f Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Sat, 22 Jun 2013 22:18:27 -0400 Subject: [PATCH 5/5] Updated release notes for 0.5.2. --- docs/source/releasenotes/notes_0.5.2.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/releasenotes/notes_0.5.2.rst b/docs/source/releasenotes/notes_0.5.2.rst index c50ca2fd19..d030615db7 100644 --- a/docs/source/releasenotes/notes_0.5.2.rst +++ b/docs/source/releasenotes/notes_0.5.2.rst @@ -19,7 +19,7 @@ New Features - Python script for mesh tally plotting - Isotopic abundances based on IUPAC 2009 when using -- Particle restart file +- Particle restart files for debugging - Code will abort after certain number of lost particles (defaults to 10) - Region outside lattice can be filled with material (void by default) - 3D voxel plots @@ -41,6 +41,7 @@ Bug Fixes - a3c593_: Fixed bug in use of free gas scattering for H-1. - 3a66e3_: Fixed bug in 2D mesh tally implementation. - ab0793_: Corrected PETSC_NULL references to their correct types. +- 182ebd_: Use analog estimator with energyout filter. .. _7632f3: https://github.com/mit-crpg/openmc/commit/7632f3 .. _f85ac4: https://github.com/mit-crpg/openmc/commit/f85ac4 @@ -53,3 +54,4 @@ Bug Fixes .. _a3c593: https://github.com/mit-crpg/openmc/commit/a3c593 .. _3a66e3: https://github.com/mit-crpg/openmc/commit/3a66e3 .. _ab0793: https://github.com/mit-crpg/openmc/commit/ab0793 +.. _182ebd: https://github.com/mit-crpg/openmc/commit/182ebd